diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-12-10 08:06:06 +0100 |
---|---|---|
committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-20 01:25:49 -0400 |
commit | 5e94b28f3392f544d52a72836521be9168db2768 (patch) | |
tree | f0e152e0e42128543958487e8e3e81d94a58a750 /connectivity/source | |
parent | 9eef06f0db88461e9efa92c8cac6107200f7b942 (diff) |
loplugin:nullptr: More NULL -> nullptr automatic rewrite
Change-Id: Ie83819e2bcdc5fa160b39296b005ca9a5ff74b1d
(cherry picked from commit fb8a3fac5d448451794804a7470be45fa14da453)
Diffstat (limited to 'connectivity/source')
-rw-r--r-- | connectivity/source/drivers/evoab2/NResultSet.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/odbc/OResultSet.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/odbc/OStatement.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/inc/java/GlobalRef.hxx | 12 | ||||
-rw-r--r-- | connectivity/source/inc/java/LocalRef.hxx | 10 |
5 files changed, 14 insertions, 14 deletions
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index 0b9310bbfdc0..1f1d1d970d4c 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -499,7 +499,7 @@ ESource * findSource( const char *id ) { ESourceList *pSourceList = nullptr; - g_return_val_if_fail (id != nullptr, NULL); + g_return_val_if_fail (id != nullptr, nullptr); if (!e_book_get_addressbooks (&pSourceList, nullptr)) pSourceList = nullptr; diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx index f1bab6f05b6d..cca085dc2bf8 100644 --- a/connectivity/source/drivers/odbc/OResultSet.cxx +++ b/connectivity/source/drivers/odbc/OResultSet.cxx @@ -1280,7 +1280,7 @@ template < typename T, SQLINTEGER BufferLength > T OResultSet::getStmtOption (SQ { T result (dflt); OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); - N3SQLGetStmtAttr(m_aStatementHandle, fOption, &result, BufferLength, NULL); + N3SQLGetStmtAttr(m_aStatementHandle, fOption, &result, BufferLength, nullptr); return result; } template < typename T, SQLINTEGER BufferLength > SQLRETURN OResultSet::setStmtOption (SQLINTEGER fOption, T value) const diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index 24d5268b79ff..6a5687396566 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -425,7 +425,7 @@ template < typename T, SQLINTEGER BufferLength > T OStatement_Base::getStmtOptio { T result (dflt); OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); - N3SQLGetStmtAttr(m_aStatementHandle, fOption, &result, BufferLength, NULL); + N3SQLGetStmtAttr(m_aStatementHandle, fOption, &result, BufferLength, nullptr); return result; } template < typename T, SQLINTEGER BufferLength > SQLRETURN OStatement_Base::setStmtOption (SQLINTEGER fOption, T value) const diff --git a/connectivity/source/inc/java/GlobalRef.hxx b/connectivity/source/inc/java/GlobalRef.hxx index 8a23976eefb1..6ce67eb73f5f 100644 --- a/connectivity/source/inc/java/GlobalRef.hxx +++ b/connectivity/source/inc/java/GlobalRef.hxx @@ -35,12 +35,12 @@ namespace connectivity { namespace jdbc { public: GlobalRef() - :m_object( NULL ) + :m_object( nullptr ) { } GlobalRef( const GlobalRef& _source ) - :m_object( NULL ) + :m_object( nullptr ) { *this = _source; } @@ -62,17 +62,17 @@ namespace connectivity { namespace jdbc void reset() { - if ( m_object != NULL ) + if ( m_object != nullptr ) { SDBThreadAttach t; t.env().DeleteGlobalRef( m_object ); - m_object = NULL; + m_object = nullptr; } } void set( JNIEnv& _environment, T _object ) { - if ( m_object != NULL ) + if ( m_object != nullptr ) _environment.DeleteGlobalRef( m_object ); m_object = _object; if ( m_object ) @@ -91,7 +91,7 @@ namespace connectivity { namespace jdbc bool is() const { - return m_object != NULL; + return m_object != nullptr; } private: diff --git a/connectivity/source/inc/java/LocalRef.hxx b/connectivity/source/inc/java/LocalRef.hxx index 2e0369a384c0..95135dfa0bba 100644 --- a/connectivity/source/inc/java/LocalRef.hxx +++ b/connectivity/source/inc/java/LocalRef.hxx @@ -38,7 +38,7 @@ namespace connectivity { namespace jdbc public: explicit LocalRef( JNIEnv& environment ) :m_environment( environment ) - ,m_object( NULL ) + ,m_object( nullptr ) { } @@ -56,7 +56,7 @@ namespace connectivity { namespace jdbc T release() { T t = m_object; - m_object = NULL; + m_object = nullptr; return t; } @@ -64,16 +64,16 @@ namespace connectivity { namespace jdbc void reset() { - if ( m_object != NULL ) + if ( m_object != nullptr ) { m_environment.DeleteLocalRef( m_object ); - m_object = NULL; + m_object = nullptr; } } JNIEnv& env() const { return m_environment; } T get() const { return m_object; } - bool is() const { return m_object != NULL; } + bool is() const { return m_object != nullptr; } private: LocalRef(LocalRef &) = delete; |