summaryrefslogtreecommitdiff
path: root/vcl/win/app/saltimer.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-10-14 16:44:22 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-10-15 07:59:13 +0000
commit48b1c8898d2f5a54435d23c412a0c65b553ef46d (patch)
treeef87e03b112f675718ee542d86d42ed7c8beb4fb /vcl/win/app/saltimer.cxx
parent613213240a84327a0a72bb5ee98cc88d50c1fd0e (diff)
clang-cl loplugin: vcl
Change-Id: I40f8a6fef9d66b28a1d72551a6873b041b38b09e Reviewed-on: https://gerrit.libreoffice.org/29841 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/win/app/saltimer.cxx')
-rw-r--r--vcl/win/app/saltimer.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/win/app/saltimer.cxx b/vcl/win/app/saltimer.cxx
index ff230c2c2c61..7930ac9e0b6c 100644
--- a/vcl/win/app/saltimer.cxx
+++ b/vcl/win/app/saltimer.cxx
@@ -44,13 +44,13 @@ void ImplSalStopTimer()
HANDLE hTimer = pSalData->mnTimerId;
if (hTimer)
{
- pSalData->mnTimerId = 0; // reset so it doesn't restart
- DeleteTimerQueueTimer(NULL, hTimer, INVALID_HANDLE_VALUE);
+ pSalData->mnTimerId = nullptr; // reset so it doesn't restart
+ DeleteTimerQueueTimer(nullptr, hTimer, INVALID_HANDLE_VALUE);
pSalData->mnNextTimerTime = 0;
}
MSG aMsg;
// this needs to run on the main thread
- while (PeekMessageW(&aMsg, 0, SAL_MSG_TIMER_CALLBACK, SAL_MSG_TIMER_CALLBACK, PM_REMOVE))
+ while (PeekMessageW(&aMsg, nullptr, SAL_MSG_TIMER_CALLBACK, SAL_MSG_TIMER_CALLBACK, PM_REMOVE))
{
// just remove all the SAL_MSG_TIMER_CALLBACKs
// when the application end, this SAL_MSG_TIMER_CALLBACK start the timer again
@@ -74,10 +74,10 @@ void ImplSalStartTimer( sal_uLong nMS, bool bMutex )
// cannot change a one-shot timer, so delete it and create new one
if (pSalData->mnTimerId)
{
- DeleteTimerQueueTimer(NULL, pSalData->mnTimerId, INVALID_HANDLE_VALUE);
- pSalData->mnTimerId = 0;
+ DeleteTimerQueueTimer(nullptr, pSalData->mnTimerId, INVALID_HANDLE_VALUE);
+ pSalData->mnTimerId = nullptr;
}
- CreateTimerQueueTimer(&pSalData->mnTimerId, NULL, SalTimerProc, NULL, nMS, 0, WT_EXECUTEINTIMERTHREAD);
+ CreateTimerQueueTimer(&pSalData->mnTimerId, nullptr, SalTimerProc, nullptr, nMS, 0, WT_EXECUTEINTIMERTHREAD);
pSalData->mnNextTimerTime = pSalData->mnLastEventTime + nMS;
}
@@ -101,7 +101,7 @@ void WinSalTimer::Start( sal_uLong nMS )
SendMessageW( pSalData->mpFirstInstance->mhComWnd, SAL_MSG_STARTTIMER, 0, (LPARAM)nMS );
}
else
- ImplSalStartTimer( nMS, FALSE );
+ ImplSalStartTimer( nMS );
}
void WinSalTimer::Stop()
@@ -178,7 +178,7 @@ void EmitTimerCallback()
// with a small timeout, because we didn't get the mutex
// - but not if mnTimerId is 0, which is set by ImplSalStopTimer()
if (pSalData->mnTimerId)
- ImplSalStartTimer(pSalData->mnTimerOrgMS, false);
+ ImplSalStartTimer(pSalData->mnTimerOrgMS);
}
else
{