diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:27:27 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:55 +0100 |
commit | 715cabb4d4bdaa5d764ee9461345a02b527b9f5a (patch) | |
tree | c0d9f9b2838a4f08708f04ad93a9d05740cc9f60 /include/uno | |
parent | loplugin:nullptr (automatic rewrite) (diff) | |
download | core-715cabb4d4bdaa5d764ee9461345a02b527b9f5a.tar.gz core-715cabb4d4bdaa5d764ee9461345a02b527b9f5a.zip |
loplugin:nullptr (automatic rewrite)
Change-Id: I5bd7c5251daeeb6e0e98ef23588b2e6d7e580b78
Diffstat (limited to 'include/uno')
-rw-r--r-- | include/uno/current_context.hxx | 10 | ||||
-rw-r--r-- | include/uno/dispatcher.hxx | 20 | ||||
-rw-r--r-- | include/uno/environment.hxx | 6 | ||||
-rw-r--r-- | include/uno/mapping.hxx | 20 |
4 files changed, 28 insertions, 28 deletions
diff --git a/include/uno/current_context.hxx b/include/uno/current_context.hxx index 5627044039ab..8f04104bc3c6 100644 --- a/include/uno/current_context.hxx +++ b/include/uno/current_context.hxx @@ -45,7 +45,7 @@ inline Reference< XCurrentContext > SAL_CALL getCurrentContext() { Reference< XCurrentContext > xRet; ::rtl::OUString aEnvTypeName( CPPU_CURRENT_LANGUAGE_BINDING_NAME ); - ::uno_getCurrentContext( reinterpret_cast<void **>(&xRet), aEnvTypeName.pData, 0 ); + ::uno_getCurrentContext( reinterpret_cast<void **>(&xRet), aEnvTypeName.pData, NULL ); return xRet; } /** Setting the current context. @@ -57,7 +57,7 @@ inline bool SAL_CALL setCurrentContext( Reference< XCurrentContext > const & xContext ) { ::rtl::OUString aEnvTypeName( CPPU_CURRENT_LANGUAGE_BINDING_NAME ); - return (::uno_setCurrentContext( xContext.get(), aEnvTypeName.pData, 0 ) != sal_False); + return (::uno_setCurrentContext( xContext.get(), aEnvTypeName.pData, NULL ) != sal_False); } /** Objects of this class are used for applying a current context until they are destructed, i.e. @@ -95,13 +95,13 @@ public: inline ContextLayer::ContextLayer( Reference< XCurrentContext > const & xNewContext ) : m_aEnvTypeName( CPPU_CURRENT_LANGUAGE_BINDING_NAME ) { - ::uno_getCurrentContext( reinterpret_cast<void **>(&m_xPreviousContext), m_aEnvTypeName.pData, 0 ); - ::uno_setCurrentContext( xNewContext.get(), m_aEnvTypeName.pData, 0 ); + ::uno_getCurrentContext( reinterpret_cast<void **>(&m_xPreviousContext), m_aEnvTypeName.pData, NULL ); + ::uno_setCurrentContext( xNewContext.get(), m_aEnvTypeName.pData, NULL ); } inline ContextLayer::~ContextLayer() { - ::uno_setCurrentContext( m_xPreviousContext.get(), m_aEnvTypeName.pData, 0 ); + ::uno_setCurrentContext( m_xPreviousContext.get(), m_aEnvTypeName.pData, NULL ); } } diff --git a/include/uno/dispatcher.hxx b/include/uno/dispatcher.hxx index e457713fff4d..75bf1a7503cf 100644 --- a/include/uno/dispatcher.hxx +++ b/include/uno/dispatcher.hxx @@ -46,7 +46,7 @@ public: uno_Interface * m_pUnoI; inline bool is() const - { return m_pUnoI != 0; } + { return m_pUnoI != NULL; } inline ~UnoInterfaceReference(); inline UnoInterfaceReference(); @@ -84,13 +84,13 @@ private: inline UnoInterfaceReference::~UnoInterfaceReference() { - if (m_pUnoI != 0) + if (m_pUnoI != NULL) (*m_pUnoI->release)( m_pUnoI ); } inline UnoInterfaceReference::UnoInterfaceReference() - : m_pUnoI( 0 ) + : m_pUnoI( NULL ) { } @@ -105,7 +105,7 @@ inline UnoInterfaceReference::UnoInterfaceReference( inline UnoInterfaceReference::UnoInterfaceReference( uno_Interface * pUnoI ) : m_pUnoI( pUnoI ) { - if (m_pUnoI != 0) + if (m_pUnoI != NULL) (*m_pUnoI->acquire)( m_pUnoI ); } @@ -114,7 +114,7 @@ inline UnoInterfaceReference::UnoInterfaceReference( UnoInterfaceReference const & ref ) : m_pUnoI( ref.m_pUnoI ) { - if (m_pUnoI != 0) + if (m_pUnoI != NULL) (*m_pUnoI->acquire)( m_pUnoI ); } @@ -122,9 +122,9 @@ inline UnoInterfaceReference::UnoInterfaceReference( inline UnoInterfaceReference & UnoInterfaceReference::set( uno_Interface * pUnoI ) { - if (pUnoI != 0) + if (pUnoI != NULL) (*pUnoI->acquire)( pUnoI ); - if (m_pUnoI != 0) + if (m_pUnoI != NULL) (*m_pUnoI->release)( m_pUnoI ); m_pUnoI = pUnoI; return *this; @@ -134,7 +134,7 @@ inline UnoInterfaceReference & UnoInterfaceReference::set( inline UnoInterfaceReference & UnoInterfaceReference::set( uno_Interface * pUnoI, __sal_NoAcquire ) { - if (m_pUnoI != 0) + if (m_pUnoI != NULL) (*m_pUnoI->release)( m_pUnoI ); m_pUnoI = pUnoI; return *this; @@ -143,10 +143,10 @@ inline UnoInterfaceReference & UnoInterfaceReference::set( inline void UnoInterfaceReference::clear() { - if (m_pUnoI != 0) + if (m_pUnoI != NULL) { (*m_pUnoI->release)( m_pUnoI ); - m_pUnoI = 0; + m_pUnoI = NULL; } } diff --git a/include/uno/environment.hxx b/include/uno/environment.hxx index 78cf1634cd41..623f9f72f1de 100644 --- a/include/uno/environment.hxx +++ b/include/uno/environment.hxx @@ -73,7 +73,7 @@ public: @param pEnv environment */ - inline Environment( uno_Environment * pEnv = 0 ); + inline Environment( uno_Environment * pEnv = NULL ); /** Gets a specific environment. If the specified environment does not exist, then a default one is created and registered. @@ -134,7 +134,7 @@ public: @return true, if a environment is set, false otherwise */ inline bool SAL_CALL is() const - { return (_pEnv != 0); } + { return (_pEnv != NULL); } /** Releases a set environment. */ @@ -201,7 +201,7 @@ inline void Environment::clear() if (_pEnv) { (*_pEnv->release)( _pEnv ); - _pEnv = 0; + _pEnv = NULL; } } diff --git a/include/uno/mapping.hxx b/include/uno/mapping.hxx index 6c950930d3df..9a7220d3a510 100644 --- a/include/uno/mapping.hxx +++ b/include/uno/mapping.hxx @@ -98,7 +98,7 @@ public: @param pMapping another mapping */ - inline Mapping( uno_Mapping * pMapping = 0 ); + inline Mapping( uno_Mapping * pMapping = NULL ); /** Copy constructor. @@ -136,7 +136,7 @@ public: @return true if a mapping is set */ inline bool SAL_CALL is() const - { return (_pMapping != 0); } + { return (_pMapping != NULL); } /** Releases a set mapping. */ @@ -195,21 +195,21 @@ public: inline Mapping::Mapping( const ::rtl::OUString & rFrom, const ::rtl::OUString & rTo, const ::rtl::OUString & rAddPurpose ) - : _pMapping( 0 ) + : _pMapping( NULL ) { uno_getMappingByName( &_pMapping, rFrom.pData, rTo.pData, rAddPurpose.pData ); } inline Mapping::Mapping( uno_Environment * pFrom, uno_Environment * pTo, const ::rtl::OUString & rAddPurpose ) - : _pMapping( 0 ) + : _pMapping( NULL ) { uno_getMapping( &_pMapping, pFrom, pTo, rAddPurpose.pData ); } inline Mapping::Mapping( const Environment & rFrom, const Environment & rTo, const ::rtl::OUString & rAddPurpose ) - : _pMapping(0) + : _pMapping(NULL) { uno_getMapping( &_pMapping, rFrom.get(), rTo.get(), rAddPurpose.pData ); } @@ -239,7 +239,7 @@ inline void Mapping::clear() if (_pMapping) { (*_pMapping->release)( _pMapping ); - _pMapping = 0; + _pMapping = NULL; } } @@ -256,7 +256,7 @@ inline Mapping & Mapping::operator = ( uno_Mapping * pMapping ) inline void Mapping::mapInterface( void ** ppOut, void * pInterface, const css::uno::Type & rType ) const { - typelib_TypeDescription * pTD = 0; + typelib_TypeDescription * pTD = NULL; TYPELIB_DANGER_GET( &pTD, rType.getTypeLibType() ); if (pTD) { @@ -268,7 +268,7 @@ inline void Mapping::mapInterface( inline void * Mapping::mapInterface( void * pInterface, typelib_InterfaceTypeDescription * pTypeDescr ) const { - void * pOut = 0; + void * pOut = NULL; (*_pMapping->mapInterface)( _pMapping, &pOut, pInterface, pTypeDescr ); return pOut; } @@ -276,7 +276,7 @@ inline void * Mapping::mapInterface( inline void * Mapping::mapInterface( void * pInterface, const css::uno::Type & rType ) const { - void * pOut = 0; + void * pOut = NULL; mapInterface( &pOut, pInterface, rType ); return pOut; } @@ -325,7 +325,7 @@ inline bool mapToUno( uno_Interface ** ppRet, const Reference< C > & x ) OSL_ASSERT( aMapping.is() ); aMapping.mapInterface( reinterpret_cast<void **>(ppRet), x.get(), ::cppu::getTypeFavourUnsigned( &x ) ); - return (0 != *ppRet); + return (NULL != *ppRet); } } |