diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:22:15 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:35 +0100 |
commit | de63cac20fba1e7661687a4f1c1ce91182f4dfa0 (patch) | |
tree | 5350f357dbf174ccd167e2af3ae58a18698306d7 /salhelper/source | |
parent | 26f05d59bc1c25b8a0d19be7f4738fd12e557001 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: If341fc7d18bb6f07d76dd259f5dd77b447c93566
Diffstat (limited to 'salhelper/source')
-rw-r--r-- | salhelper/source/condition.cxx | 2 | ||||
-rw-r--r-- | salhelper/source/dynload.cxx | 8 | ||||
-rw-r--r-- | salhelper/source/timer.cxx | 36 |
3 files changed, 23 insertions, 23 deletions
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; } |