summaryrefslogtreecommitdiffstats
path: root/include/cppuhelper
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:13:11 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:21 +0100
commitbf3f8403029fcea9ce7d53078697efb24c09a75b (patch)
tree3f99977435c7794529d3975c798afceb86444deb /include/cppuhelper
parentloplugin:nullptr (automatic rewrite) (diff)
downloadcore-bf3f8403029fcea9ce7d53078697efb24c09a75b.tar.gz
core-bf3f8403029fcea9ce7d53078697efb24c09a75b.zip
loplugin:nullptr (automatic rewrite)
Change-Id: I62a63915dfc0bced2cd8ffe3999cbde5c4d97b0b
Diffstat (limited to 'include/cppuhelper')
-rw-r--r--include/cppuhelper/factory.hxx8
-rw-r--r--include/cppuhelper/interfacecontainer.h2
-rw-r--r--include/cppuhelper/interfacecontainer.hxx2
-rw-r--r--include/cppuhelper/typeprovider.hxx2
-rw-r--r--include/cppuhelper/weak.hxx10
-rw-r--r--include/cppuhelper/weakref.hxx2
6 files changed, 13 insertions, 13 deletions
diff --git a/include/cppuhelper/factory.hxx b/include/cppuhelper/factory.hxx
index 6803c71bb6fc..7f69b76814f2 100644
--- a/include/cppuhelper/factory.hxx
+++ b/include/cppuhelper/factory.hxx
@@ -138,7 +138,7 @@ SAL_CALL createSingleComponentFactory(
ComponentFactoryFunc fptr,
::rtl::OUString const & rImplementationName,
css::uno::Sequence< ::rtl::OUString > const & rServiceNames,
- rtl_ModuleCount * pModCount = 0 );
+ rtl_ModuleCount * pModCount = NULL );
/** Creates a single service factory which holds the instance created only once.
@@ -155,7 +155,7 @@ createOneInstanceComponentFactory(
ComponentFactoryFunc fptr,
::rtl::OUString const & rImplementationName,
css::uno::Sequence< ::rtl::OUString > const & rServiceNames,
- rtl_ModuleCount * pModCount = 0 );
+ rtl_ModuleCount * pModCount = NULL );
/** Deprecated. The type of the instanciate function used as argument of the create*Factory functions.
@@ -186,7 +186,7 @@ createSingleFactory(
const ::rtl::OUString & rImplementationName,
ComponentInstantiation pCreateFunction,
const css::uno::Sequence< ::rtl::OUString > & rServiceNames,
- rtl_ModuleCount * pModCount = 0 );
+ rtl_ModuleCount * pModCount = NULL );
/** Deprecated. Creates a factory wrapping another one.
This means the methods of the interfaces XServiceProvider, XServiceInfo and
@@ -227,7 +227,7 @@ createOneInstanceFactory(
const ::rtl::OUString & rComponentName,
ComponentInstantiation pCreateFunction,
const css::uno::Sequence< ::rtl::OUString > & rServiceNames,
- rtl_ModuleCount * pModCount = 0 );
+ rtl_ModuleCount * pModCount = NULL );
/** Deprecated. Creates a single service factory based on a registry.
diff --git a/include/cppuhelper/interfacecontainer.h b/include/cppuhelper/interfacecontainer.h
index b1200c0e8f77..245b7188ec88 100644
--- a/include/cppuhelper/interfacecontainer.h
+++ b/include/cppuhelper/interfacecontainer.h
@@ -49,7 +49,7 @@ namespace detail {
{
css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > *pAsSequence;
css::uno::XInterface * pAsInterface;
- element_alias() : pAsInterface(0) {}
+ element_alias() : pAsInterface(NULL) {}
};
}
diff --git a/include/cppuhelper/interfacecontainer.hxx b/include/cppuhelper/interfacecontainer.hxx
index a87bdccc74cd..9b858f9b2e54 100644
--- a/include/cppuhelper/interfacecontainer.hxx
+++ b/include/cppuhelper/interfacecontainer.hxx
@@ -90,7 +90,7 @@ OInterfaceContainerHelper * OMultiTypeInterfaceContainerHelperVar< key , hashImp
typename InterfaceMap::iterator iter = find( rKey );
if( iter != m_pMap->end() )
return static_cast<OInterfaceContainerHelper*>( (*iter).second );
- return 0;
+ return NULL;
}
diff --git a/include/cppuhelper/typeprovider.hxx b/include/cppuhelper/typeprovider.hxx
index c98e260c3bdd..9dc9709cbae5 100644
--- a/include/cppuhelper/typeprovider.hxx
+++ b/include/cppuhelper/typeprovider.hxx
@@ -191,7 +191,7 @@ public:
@param bUseEthernetAddress whether an ethernet mac address should be taken into account
*/
inline OImplementationId( bool bUseEthernetAddress = true )
- : _pSeq( 0 )
+ : _pSeq( NULL )
, _bUseEthernetAddress( bUseEthernetAddress )
{}
/** Constructor giving implementation id.
diff --git a/include/cppuhelper/weak.hxx b/include/cppuhelper/weak.hxx
index 4f06c3ad4516..5b05edd97907 100644
--- a/include/cppuhelper/weak.hxx
+++ b/include/cppuhelper/weak.hxx
@@ -100,8 +100,8 @@ public:
*/
inline OWeakObject()
: m_refCount( 0 )
- , m_pWeakConnectionPoint( 0 )
- , m_pReserved(0)
+ , m_pWeakConnectionPoint( NULL )
+ , m_pReserved(NULL)
{}
#endif
/** Dummy copy constructor. Set the reference count to zero.
@@ -111,8 +111,8 @@ public:
inline OWeakObject( const OWeakObject & rObj )
: css::uno::XWeak()
, m_refCount( 0 )
- , m_pWeakConnectionPoint( 0 )
- , m_pReserved(0)
+ , m_pWeakConnectionPoint( NULL )
+ , m_pReserved(NULL)
{
(void) rObj;
}
@@ -170,7 +170,7 @@ public:
*/
static inline css::uno::XInterface * acquire(OWeakObject * instance)
{
- assert(instance != 0);
+ assert(instance != NULL);
instance->acquire();
return instance;
}
diff --git a/include/cppuhelper/weakref.hxx b/include/cppuhelper/weakref.hxx
index 018454e4ffca..c07ec732c888 100644
--- a/include/cppuhelper/weakref.hxx
+++ b/include/cppuhelper/weakref.hxx
@@ -44,7 +44,7 @@ public:
/** Default ctor. Creates an empty weak reference.
*/
inline WeakReferenceHelper()
- : m_pImpl( 0 )
+ : m_pImpl( NULL )
{}
/** Copy ctor. Initialize this reference with the same interface as in rWeakRef.