diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:12:07 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:20 +0100 |
commit | c0bd59c15b4a6e8523693c8a354456b9fadb8832 (patch) | |
tree | 67a35c16019355b6eac3faff74ce63d44eddfa96 /include/connectivity | |
parent | 047239d5ca229bb8ad85a2d9fcd2ae7b6f35b976 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: Iefeeb51c2b101c097a8d77a4625f84baf1f2da44
Diffstat (limited to 'include/connectivity')
-rw-r--r-- | include/connectivity/FValue.hxx | 38 | ||||
-rw-r--r-- | include/connectivity/dbexception.hxx | 8 | ||||
-rw-r--r-- | include/connectivity/dbtools.hxx | 8 | ||||
-rw-r--r-- | include/connectivity/predicateinput.hxx | 10 | ||||
-rw-r--r-- | include/connectivity/sqliterator.hxx | 4 | ||||
-rw-r--r-- | include/connectivity/sqlnode.hxx | 6 | ||||
-rw-r--r-- | include/connectivity/sqlparse.hxx | 8 |
7 files changed, 41 insertions, 41 deletions
diff --git a/include/connectivity/FValue.hxx b/include/connectivity/FValue.hxx index 247b5615442c..c740078a155f 100644 --- a/include/connectivity/FValue.hxx +++ b/include/connectivity/FValue.hxx @@ -84,7 +84,7 @@ namespace connectivity ,m_bModified(false) ,m_bSigned(true) { - m_aValue.m_pString = NULL; + m_aValue.m_pString = nullptr; } ORowSetValue(const ORowSetValue& _rRH) @@ -94,7 +94,7 @@ namespace connectivity ,m_bModified(false) ,m_bSigned(true) { - m_aValue.m_pString = NULL; + m_aValue.m_pString = nullptr; operator=(_rRH); } @@ -105,7 +105,7 @@ namespace connectivity ,m_bModified(false) ,m_bSigned(true) { - m_aValue.m_pString = NULL; + m_aValue.m_pString = nullptr; operator=(_rRH); } @@ -116,7 +116,7 @@ namespace connectivity ,m_bModified(false) ,m_bSigned(true) { - m_aValue.m_pString = NULL; + m_aValue.m_pString = nullptr; operator=(_rRH); } @@ -127,7 +127,7 @@ namespace connectivity ,m_bModified(false) ,m_bSigned(true) { - m_aValue.m_pString = NULL; + m_aValue.m_pString = nullptr; operator=(_rRH); } @@ -138,7 +138,7 @@ namespace connectivity ,m_bModified(false) ,m_bSigned(true) { - m_aValue.m_pString = NULL; + m_aValue.m_pString = nullptr; operator=(_rRH); } @@ -149,7 +149,7 @@ namespace connectivity ,m_bModified(false) ,m_bSigned(false) { - m_aValue.m_pString = NULL; + m_aValue.m_pString = nullptr; operator=(_rRH); } ORowSetValue(const sal_Int16& _rRH) @@ -159,7 +159,7 @@ namespace connectivity ,m_bModified(false) ,m_bSigned(true) { - m_aValue.m_pString = NULL; + m_aValue.m_pString = nullptr; operator=(_rRH); } ORowSetValue(const sal_uInt16& _rRH) @@ -169,7 +169,7 @@ namespace connectivity ,m_bModified(false) ,m_bSigned(false) { - m_aValue.m_pString = NULL; + m_aValue.m_pString = nullptr; operator=(_rRH); } ORowSetValue(const sal_Int32& _rRH) @@ -179,7 +179,7 @@ namespace connectivity ,m_bModified(false) ,m_bSigned(true) { - m_aValue.m_pString = NULL; + m_aValue.m_pString = nullptr; operator=(_rRH); } ORowSetValue(const sal_uInt32& _rRH) @@ -189,7 +189,7 @@ namespace connectivity ,m_bModified(false) ,m_bSigned(false) { - m_aValue.m_pString = NULL; + m_aValue.m_pString = nullptr; operator=(_rRH); } ORowSetValue(const sal_Int64& _rRH) @@ -199,7 +199,7 @@ namespace connectivity ,m_bModified(false) ,m_bSigned(true) { - m_aValue.m_pString = NULL; + m_aValue.m_pString = nullptr; operator=(_rRH); } ORowSetValue(const sal_uInt64& _rRH) @@ -209,7 +209,7 @@ namespace connectivity ,m_bModified(false) ,m_bSigned(false) { - m_aValue.m_pString = NULL; + m_aValue.m_pString = nullptr; operator=(_rRH); } @@ -220,7 +220,7 @@ namespace connectivity ,m_bModified(false) ,m_bSigned(true) { - m_aValue.m_pString = NULL; + m_aValue.m_pString = nullptr; operator=(_rRH); } @@ -231,7 +231,7 @@ namespace connectivity ,m_bModified(false) ,m_bSigned(true) { - m_aValue.m_pString = NULL; + m_aValue.m_pString = nullptr; operator=(_rRH); } @@ -242,7 +242,7 @@ namespace connectivity ,m_bModified(false) ,m_bSigned(true) { - m_aValue.m_pString = NULL; + m_aValue.m_pString = nullptr; operator=(_rRH); } @@ -253,7 +253,7 @@ namespace connectivity ,m_bModified(false) ,m_bSigned(true) { - m_aValue.m_pString = NULL; + m_aValue.m_pString = nullptr; operator=(_rRH); } @@ -264,7 +264,7 @@ namespace connectivity ,m_bModified(false) ,m_bSigned(true) { - m_aValue.m_pString = NULL; + m_aValue.m_pString = nullptr; operator=(_rRH); } @@ -371,7 +371,7 @@ namespace connectivity { free(); m_bNull = true; - m_aValue.m_pString = NULL; + m_aValue.m_pString = nullptr; } bool isBound() const { return m_bBound; } diff --git a/include/connectivity/dbexception.hxx b/include/connectivity/dbexception.hxx index 69c3a0f1e347..6e7cb972e16b 100644 --- a/include/connectivity/dbexception.hxx +++ b/include/connectivity/dbexception.hxx @@ -177,7 +177,7 @@ public: /** determines whether there are more elements in the exception chain */ - bool hasMoreElements() const { return ( m_pCurrent != NULL ); } + bool hasMoreElements() const { return ( m_pCurrent != nullptr ); } /** retrieves the current element in the chain, or <NULL/> if the chain has been completely traveled. @@ -284,7 +284,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwGenericSQLException( OOO_DLLPUBLIC_DBTOOLS void throwFeatureNotImplementedSQLException( const OUString& _rFeatureName, const css::uno::Reference< css::uno::XInterface >& _rxContext, - const css::uno::Any* _pNextException = NULL + const css::uno::Any* _pNextException = nullptr ) throw (css::sdbc::SQLException); @@ -323,7 +323,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwSQLException( const OUString& _rSQLState, const css::uno::Reference< css::uno::XInterface >& _rxContext, const sal_Int32 _nErrorCode = 0, - const css::uno::Any* _pNextException = NULL + const css::uno::Any* _pNextException = nullptr ) throw (css::sdbc::SQLException); @@ -335,7 +335,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwSQLException( StandardSQLState _eSQLState, const css::uno::Reference< css::uno::XInterface >& _rxContext, const sal_Int32 _nErrorCode = 0, - const css::uno::Any* _pNextException = NULL + const css::uno::Any* _pNextException = nullptr ) throw (css::sdbc::SQLException); diff --git a/include/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx index 5eb727674733..a9baa7faed04 100644 --- a/include/connectivity/dbtools.hxx +++ b/include/connectivity/dbtools.hxx @@ -259,7 +259,7 @@ namespace dbtools const sal_Int32 _nCommandType, const OUString& _rCommand, css::uno::Reference< css::lang::XComponent >& _rxKeepFieldsAlive, - SQLExceptionInfo* _pErrorInfo = NULL + SQLExceptionInfo* _pErrorInfo = nullptr ); @@ -295,7 +295,7 @@ namespace dbtools const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, const sal_Int32 _nCommandType, const OUString& _rCommand, - SQLExceptionInfo* _pErrorInfo = NULL + SQLExceptionInfo* _pErrorInfo = nullptr ); @@ -663,7 +663,7 @@ namespace dbtools OOO_DLLPUBLIC_DBTOOLS OUString createStandardColumnPart( const css::uno::Reference< css::beans::XPropertySet >& descriptor ,const css::uno::Reference< css::sdbc::XConnection>& _xConnection - ,ISQLStatementHelper* _pHelper = NULL + ,ISQLStatementHelper* _pHelper = nullptr ,const OUString& _sCreatePattern = OUString()); /** creates a SQL CREATE TABLE statement @@ -682,7 +682,7 @@ namespace dbtools OOO_DLLPUBLIC_DBTOOLS OUString createSqlCreateTableStatement( const css::uno::Reference< css::beans::XPropertySet >& descriptor ,const css::uno::Reference< css::sdbc::XConnection>& _xConnection - ,ISQLStatementHelper* _pHelper = NULL + ,ISQLStatementHelper* _pHelper = nullptr ,const OUString& _sCreatePattern = OUString()); /** creates a SDBC column with the help of getColumns. diff --git a/include/connectivity/predicateinput.hxx b/include/connectivity/predicateinput.hxx index 900b7160d7a5..98b722f5e002 100644 --- a/include/connectivity/predicateinput.hxx +++ b/include/connectivity/predicateinput.hxx @@ -57,7 +57,7 @@ namespace dbtools OPredicateInputController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, - const ::connectivity::IParseContext* _pParseContext = NULL + const ::connectivity::IParseContext* _pParseContext = nullptr ); /** transforms a "raw" predicate value (usually obtained from a user input) into a valid predicate for the given column @@ -72,7 +72,7 @@ namespace dbtools bool normalizePredicateString( OUString& _rPredicateValue, const css::uno::Reference< css::beans::XPropertySet >& _rxField, - OUString* _pErrorMessage = NULL + OUString* _pErrorMessage = nullptr ) const; /** get the value of the predicate, as a string to be used in a WHERE clause @@ -88,13 +88,13 @@ namespace dbtools OUString getPredicateValueStr( const OUString& _rPredicateValue, const css::uno::Reference< css::beans::XPropertySet > & _rxField, - OUString* _pErrorMessage = NULL + OUString* _pErrorMessage = nullptr ) const; OUString getPredicateValueStr( const OUString& _sField , const OUString& _rPredicateValue - , OUString* _pErrorMessage = NULL) const; + , OUString* _pErrorMessage = nullptr) const; /** get the value of the predicate, either as an empty or as a string @param _rPredicateValue @@ -109,7 +109,7 @@ namespace dbtools css::uno::Any getPredicateValue( const OUString& _rPredicateValue, const css::uno::Reference< css::beans::XPropertySet > & _rxField, - OUString* _pErrorMessage = NULL + OUString* _pErrorMessage = nullptr ) const; private: diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx index dddd2dd9df0c..6ff72db3cf6c 100644 --- a/include/connectivity/sqliterator.hxx +++ b/include/connectivity/sqliterator.hxx @@ -136,7 +136,7 @@ namespace connectivity const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, const css::uno::Reference< css::container::XNameAccess >& _rxTables, const OSQLParser& _rParser, - const OSQLParseNode* pRoot = NULL ); + const OSQLParseNode* pRoot = nullptr ); ~OSQLParseTreeIterator(); inline static void * SAL_CALL operator new( size_t nSize ) @@ -344,7 +344,7 @@ namespace connectivity in the error message will be replaced with _rReplaceToken2 */ void impl_appendError( IParseContext::ErrorCode _eError, - const OUString* _pReplaceToken1 = NULL, const OUString* _pReplaceToken2 = NULL ); + const OUString* _pReplaceToken1 = nullptr, const OUString* _pReplaceToken2 = nullptr ); /** appends an SQLException corresponding to the given error code to our error collection */ diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx index e30c7a274c73..b50e5f4c807d 100644 --- a/include/connectivity/sqlnode.hxx +++ b/include/connectivity/sqlnode.hxx @@ -315,7 +315,7 @@ namespace connectivity void parseNodeToStr(OUString& rString, const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, - const IParseContext* pContext = NULL, + const IParseContext* pContext = nullptr, bool _bIntl = false, bool _bQuote= true) const; @@ -325,7 +325,7 @@ namespace connectivity const css::uno::Reference< css::util::XNumberFormatter > & xFormatter, const css::lang::Locale& rIntl, sal_Char _cDec, - const IParseContext* pContext = NULL ) const; + const IParseContext* pContext = nullptr ) const; void parseNodeToPredicateStr(OUString& rString, const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, @@ -334,7 +334,7 @@ namespace connectivity const OUString &_sTableAlias, const css::lang::Locale& rIntl, sal_Char _cDec, - const IParseContext* pContext = NULL ) const; + const IParseContext* pContext = nullptr ) const; OSQLParseNode* getByRule(OSQLParseNode::Rule eRule) const; diff --git a/include/connectivity/sqlparse.hxx b/include/connectivity/sqlparse.hxx index abe5e8411cb2..3210fbaa385f 100644 --- a/include/connectivity/sqlparse.hxx +++ b/include/connectivity/sqlparse.hxx @@ -172,7 +172,7 @@ namespace connectivity public: // if NULL, a default context will be used // the context must live as long as the parser - OSQLParser(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const IParseContext* _pContext = NULL); + OSQLParser(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const IParseContext* _pContext = nullptr); ~OSQLParser(); // Parsing an SQLStatement @@ -195,7 +195,7 @@ namespace connectivity const SQLError& getErrorHelper() const; // TokenIDToStr: token name belonging to a token number. - static OString TokenIDToStr(sal_uInt32 nTokenID, const IParseContext* pContext = NULL); + static OString TokenIDToStr(sal_uInt32 nTokenID, const IParseContext* pContext = nullptr); #if OSL_DEBUG_LEVEL > 1 // (empty string if not found) @@ -212,7 +212,7 @@ namespace connectivity // RuleId with enum, far more efficient static sal_uInt32 RuleID(OSQLParseNode::Rule eRule); // compares the _sFunctionName with all known function names and return the DataType of the return value - static sal_Int32 getFunctionReturnType(const OUString& _sFunctionName, const IParseContext* pContext = NULL); + static sal_Int32 getFunctionReturnType(const OUString& _sFunctionName, const IParseContext* pContext = nullptr); // returns the type for a parameter in a given function name static sal_Int32 getFunctionParameterType(sal_uInt32 _nTokenId,sal_uInt32 _nPos); @@ -233,7 +233,7 @@ namespace connectivity sal_Int16 buildComparsionRule(OSQLParseNode*& pAppend,OSQLParseNode* pLiteral); // pCompre will be deleted if it is not used - sal_Int16 buildPredicateRule(OSQLParseNode*& pAppend,OSQLParseNode* const pLiteral,OSQLParseNode* pCompare,OSQLParseNode* pLiteral2 = NULL); + sal_Int16 buildPredicateRule(OSQLParseNode*& pAppend,OSQLParseNode* const pLiteral,OSQLParseNode* pCompare,OSQLParseNode* pLiteral2 = nullptr); sal_Int16 buildLikeRule(OSQLParseNode* pAppend, OSQLParseNode*& pLiteral, const OSQLParseNode* pEscape); sal_Int16 buildStringNodes(OSQLParseNode*& pLiteral); |