summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/salhelper/singletonref.hxx2
-rw-r--r--salhelper/qa/test_api.cxx12
-rw-r--r--salhelper/source/condition.cxx2
-rw-r--r--salhelper/source/dynload.cxx8
-rw-r--r--salhelper/source/timer.cxx36
5 files changed, 30 insertions, 30 deletions
diff --git a/include/salhelper/singletonref.hxx b/include/salhelper/singletonref.hxx
index 7b2df10fa9f5..83bbf34ba6ac 100644
--- a/include/salhelper/singletonref.hxx
+++ b/include/salhelper/singletonref.hxx
@@ -185,7 +185,7 @@ class SingletonRef
};
template< class SingletonClass >
-SingletonClass* SingletonRef< SingletonClass >::m_pInstance = 0;
+SingletonClass* SingletonRef< SingletonClass >::m_pInstance = NULL;
template< class SingletonClass >
sal_Int32 SingletonRef< SingletonClass >::m_nRef = 0;
diff --git a/salhelper/qa/test_api.cxx b/salhelper/qa/test_api.cxx
index 686e5cda4617..4a73b63d273b 100644
--- a/salhelper/qa/test_api.cxx
+++ b/salhelper/qa/test_api.cxx
@@ -128,7 +128,7 @@ void Test::testCondition() {
void Test::testConditionModifier() {
- salhelper::ConditionModifier * p = 0;
+ salhelper::ConditionModifier * p = nullptr;
CPPUNIT_ASSERT(typeid (*p) == typeid (salhelper::ConditionModifier));
CPPUNIT_ASSERT(typeid (p) == typeid (salhelper::ConditionModifier *));
CPPUNIT_ASSERT(
@@ -143,7 +143,7 @@ void Test::testConditionModifier() {
}
void Test::testConditionWaiter() {
- salhelper::ConditionWaiter * p = 0;
+ salhelper::ConditionWaiter * p = nullptr;
CPPUNIT_ASSERT(typeid (*p) == typeid (salhelper::ConditionWaiter));
CPPUNIT_ASSERT(typeid (p) == typeid (salhelper::ConditionWaiter *));
CPPUNIT_ASSERT(
@@ -177,7 +177,7 @@ void Test::testConditionWaiterTimedout() {
}
void Test::testORealDynamicLoader() {
- salhelper::ORealDynamicLoader * p = 0;
+ salhelper::ORealDynamicLoader * p = nullptr;
CPPUNIT_ASSERT(typeid (p) != typeid (salhelper::ORealDynamicLoader));
CPPUNIT_ASSERT(typeid (p) == typeid (salhelper::ORealDynamicLoader *));
CPPUNIT_ASSERT(
@@ -222,14 +222,14 @@ void Test::testSimpleReferenceObject() {
void Test::testDerivedCondition() {
osl::Mutex mutex;
std::unique_ptr< salhelper::Condition > p(new DerivedCondition(mutex));
- CPPUNIT_ASSERT(dynamic_cast< DerivedCondition * >(p.get()) != 0);
+ CPPUNIT_ASSERT(dynamic_cast< DerivedCondition * >(p.get()) != nullptr);
}
void Test::testDerivedConditionWaiterTimedout() {
std::unique_ptr< salhelper::ConditionWaiter::timedout > p(
new DerivedConditionWaiterTimedout);
CPPUNIT_ASSERT(
- dynamic_cast< DerivedConditionWaiterTimedout * >(p.get()) != 0);
+ dynamic_cast< DerivedConditionWaiterTimedout * >(p.get()) != nullptr);
try {
throw DerivedConditionWaiterTimedout();
} catch (salhelper::ConditionWaiter::timedout &) {
@@ -241,7 +241,7 @@ void Test::testDerivedConditionWaiterTimedout() {
void Test::testDerivedSimpleReferenceObject() {
salhelper::SimpleReferenceObject * p = new DerivedSimpleReferenceObject;
try {
- CPPUNIT_ASSERT(dynamic_cast< DerivedSimpleReferenceObject * >(p) != 0);
+ CPPUNIT_ASSERT(dynamic_cast< DerivedSimpleReferenceObject * >(p) != nullptr);
} catch (...) {
delete static_cast< DerivedSimpleReferenceObject * >(p);
throw;
diff --git a/salhelper/source/condition.cxx b/salhelper/source/condition.cxx
index e330960ebe85..afcadb7d6a36 100644
--- a/salhelper/source/condition.cxx
+++ b/salhelper/source/condition.cxx
@@ -86,7 +86,7 @@ ConditionWaiter::ConditionWaiter(Condition& aCond)
: m_aCond(aCond)
{
while(true) {
- osl_waitCondition(m_aCond.m_aCondition,0);
+ osl_waitCondition(m_aCond.m_aCondition,nullptr);
m_aCond.m_aMutex.acquire();
if(m_aCond.applies())
diff --git a/salhelper/source/dynload.cxx b/salhelper/source/dynload.cxx
index f881b52937e7..7c9c9ce55612 100644
--- a/salhelper/source/dynload.cxx
+++ b/salhelper/source/dynload.cxx
@@ -55,7 +55,7 @@ ORealDynamicLoader* ORealDynamicLoader::newInstance(ORealDynamicLoader ** ppSetT
if ( !pModule )
{
- return NULL;
+ return nullptr;
}
initFunc = reinterpret_cast<ApiInitFunction>(osl_getFunctionSymbol(
@@ -64,7 +64,7 @@ ORealDynamicLoader* ORealDynamicLoader::newInstance(ORealDynamicLoader ** ppSetT
if ( !initFunc )
{
osl_unloadModule(pModule);
- return NULL;
+ return nullptr;
}
return(new ORealDynamicLoader(ppSetToZeroInDestructor, moduleName,
@@ -78,14 +78,14 @@ ORealDynamicLoader::~ORealDynamicLoader()
{
// set the address to zero
if( ppSetToZeroInDestructor )
- *ppSetToZeroInDestructor = 0;
+ *ppSetToZeroInDestructor = nullptr;
if (m_pModule)
{
#ifndef DISABLE_DYNLOADING
osl_unloadModule(m_pModule);
#endif
- m_pModule = NULL;
+ m_pModule = nullptr;
}
}
diff --git a/salhelper/source/timer.cxx b/salhelper/source/timer.cxx
index d538b12e5d4f..ee42e583441d 100644
--- a/salhelper/source/timer.cxx
+++ b/salhelper/source/timer.cxx
@@ -83,7 +83,7 @@ Timer::Timer()
: m_aTimeOut( 0 ),
m_aExpired( 0 ),
m_aRepeatDelta( 0 ),
- m_pNext( NULL )
+ m_pNext( nullptr )
{
}
@@ -91,7 +91,7 @@ Timer::Timer( const TTimeValue& rTime )
: m_aTimeOut( rTime ),
m_aExpired( 0 ),
m_aRepeatDelta( 0 ),
- m_pNext( NULL )
+ m_pNext( nullptr )
{
}
@@ -99,7 +99,7 @@ Timer::Timer( const TTimeValue& rTime, const TTimeValue& Repeat )
: m_aTimeOut( rTime ),
m_aExpired( 0 ),
m_aRepeatDelta( Repeat ),
- m_pNext( NULL )
+ m_pNext( nullptr )
{
}
@@ -119,7 +119,7 @@ void Timer::start()
OSL_ASSERT(pManager);
- if ( pManager != 0 )
+ if ( pManager != nullptr )
{
pManager->registerTimer(this);
}
@@ -132,7 +132,7 @@ void Timer::stop()
OSL_ASSERT(pManager);
- if ( pManager != 0 )
+ if ( pManager != nullptr )
{
pManager->unregisterTimer(this);
}
@@ -164,7 +164,7 @@ sal_Bool Timer::expiresBefore(const Timer* pTimer) const
{
OSL_ASSERT(pTimer);
- if ( pTimer != 0 )
+ if ( pTimer != nullptr )
{
return m_aExpired < pTimer->m_aExpired;
}
@@ -242,17 +242,17 @@ namespace
struct theTimerManagerMutex : public rtl::Static< osl::Mutex, theTimerManagerMutex> {};
}
-TimerManager* salhelper::TimerManager::m_pManager = NULL;
+TimerManager* salhelper::TimerManager::m_pManager = nullptr;
TimerManager::TimerManager()
{
osl::MutexGuard Guard(theTimerManagerMutex::get());
- OSL_ASSERT(m_pManager == 0);
+ OSL_ASSERT(m_pManager == nullptr);
m_pManager = this;
- m_pHead= 0;
+ m_pHead= nullptr;
m_notEmpty.reset();
@@ -265,7 +265,7 @@ TimerManager::~TimerManager()
osl::MutexGuard Guard(theTimerManagerMutex::get());
if ( m_pManager == this )
- m_pManager = 0;
+ m_pManager = nullptr;
}
void TimerManager::onTerminated()
@@ -287,7 +287,7 @@ bool TimerManager::registerTimer(Timer* pTimer)
{
OSL_ASSERT(pTimer);
- if ( pTimer == 0 )
+ if ( pTimer == nullptr )
{
return false;
}
@@ -328,7 +328,7 @@ bool TimerManager::unregisterTimer(Timer* pTimer)
{
OSL_ASSERT(pTimer);
- if ( pTimer == 0 )
+ if ( pTimer == nullptr )
{
return false;
}
@@ -356,7 +356,7 @@ bool TimerManager::lookupTimer(const Timer* pTimer)
{
OSL_ASSERT(pTimer);
- if ( pTimer == 0 )
+ if ( pTimer == nullptr )
{
return false;
}
@@ -365,7 +365,7 @@ bool TimerManager::lookupTimer(const Timer* pTimer)
osl::MutexGuard Guard(m_Lock);
// check the list
- for (Timer* pIter = m_pHead; pIter != 0; pIter= pIter->m_pNext)
+ for (Timer* pIter = m_pHead; pIter != nullptr; pIter= pIter->m_pNext)
{
if (pIter == pTimer)
{
@@ -381,7 +381,7 @@ void TimerManager::checkForTimeout()
m_Lock.acquire();
- if ( m_pHead == 0 )
+ if ( m_pHead == nullptr )
{
m_Lock.release();
return;
@@ -434,19 +434,19 @@ void TimerManager::run()
while (schedule())
{
TTimeValue delay;
- TTimeValue* pDelay=0;
+ TTimeValue* pDelay=nullptr;
m_Lock.acquire();
- if (m_pHead != 0)
+ if (m_pHead != nullptr)
{
delay = m_pHead->getRemainingTime();
pDelay=&delay;
}
else
{
- pDelay=0;
+ pDelay=nullptr;
}
generated by cgit (git 2.34.1) at 2025-01-15 13:20:37 +0000