diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-12-10 08:06:06 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-12-10 08:06:06 +0100 |
| commit | fb8a3fac5d448451794804a7470be45fa14da453 (patch) | |
| tree | 110395d7cf3b7ad304e34a007ea597263adcfad8 /include/comphelper | |
| parent | b8ecfd83bac98ea58a435c59856da8fd94f5c6d9 (diff) | |
loplugin:nullptr: More NULL -> nullptr automatic rewrite
Change-Id: Ie83819e2bcdc5fa160b39296b005ca9a5ff74b1d
Diffstat (limited to 'include/comphelper')
| -rw-r--r-- | include/comphelper/listenernotification.hxx | 4 | ||||
| -rw-r--r-- | include/comphelper/sequence.hxx | 8 | ||||
| -rw-r--r-- | include/comphelper/types.hxx | 6 | ||||
| -rw-r--r-- | include/comphelper/uno3.hxx | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/include/comphelper/listenernotification.hxx b/include/comphelper/listenernotification.hxx index 65edfa5c36a1..fd11ce6574a4 100644 --- a/include/comphelper/listenernotification.hxx +++ b/include/comphelper/listenernotification.hxx @@ -166,7 +166,7 @@ namespace comphelper public: OSimpleListenerContainer( ::osl::Mutex& _rMutex ) :OListenerContainer( _rMutex ) - ,m_pNotificationMethod( NULL ) + ,m_pNotificationMethod( nullptr ) { } @@ -208,7 +208,7 @@ namespace comphelper { m_pNotificationMethod = _pNotify; bool bRet = OListenerContainer::impl_notify( _rEvent ); - m_pNotificationMethod = NULL; + m_pNotificationMethod = nullptr; return bRet; } diff --git a/include/comphelper/sequence.hxx b/include/comphelper/sequence.hxx index 17d1b67c0d64..a5fba55f1ec6 100644 --- a/include/comphelper/sequence.hxx +++ b/include/comphelper/sequence.hxx @@ -157,9 +157,9 @@ namespace comphelper template <class TYPE> inline OSequenceIterator<TYPE>::OSequenceIterator(const css::uno::Sequence< TYPE >& _rSeq) - :m_pElements(NULL) + :m_pElements(nullptr) ,m_nLen(0) - ,m_pCurrent(NULL) + ,m_pCurrent(nullptr) { construct(_rSeq); } @@ -167,9 +167,9 @@ namespace comphelper template <class TYPE> inline OSequenceIterator<TYPE>::OSequenceIterator(const css::uno::Any& _rSequenceAny) - :m_pElements(NULL) + :m_pElements(nullptr) ,m_nLen(0) - ,m_pCurrent(NULL) + ,m_pCurrent(nullptr) { css::uno::Sequence< TYPE > aContainer; bool bSuccess = _rSequenceAny >>= aContainer; diff --git a/include/comphelper/types.hxx b/include/comphelper/types.hxx index 6901e6c52ded..e01e6f640f8f 100644 --- a/include/comphelper/types.hxx +++ b/include/comphelper/types.hxx @@ -57,19 +57,19 @@ namespace comphelper if (xComp.is()) { xComp->dispose(); - _rxComp = NULL; + _rxComp = nullptr; } } template <class TYPE> bool getImplementation(TYPE*& _pObject, const css::uno::Reference< css::uno::XInterface >& _rxIFace) { - _pObject = NULL; + _pObject = nullptr; css::uno::Reference< css::lang::XUnoTunnel > xTunnel(_rxIFace, css::uno::UNO_QUERY); if (xTunnel.is()) _pObject = reinterpret_cast< TYPE* >(xTunnel->getSomething(TYPE::getUnoTunnelImplementationId())); - return (_pObject != NULL); + return (_pObject != nullptr); } diff --git a/include/comphelper/uno3.hxx b/include/comphelper/uno3.hxx index a75a4abbb9d3..b5167181e03a 100644 --- a/include/comphelper/uno3.hxx +++ b/include/comphelper/uno3.hxx @@ -170,7 +170,7 @@ namespace comphelper template <class iface> bool query_aggregation(const css::uno::Reference< css::uno::XAggregation >& _rxAggregate, css::uno::Reference<iface>& _rxOut) { - _rxOut = static_cast<iface*>(NULL); + _rxOut = static_cast<iface*>(nullptr); if (_rxAggregate.is()) { css::uno::Any aCheck = _rxAggregate->queryAggregation( |