diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-28 15:49:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-10-01 07:34:23 +0000 |
| commit | fc04f76336fdf8c96e35382cdeb497e2f939705c (patch) | |
| tree | 70c9bbd054a34a9bca9d22bb7afbb9c4349beff0 /vcl/source/app/timer.cxx | |
| parent | eb4811590c85895ce531674596bdd6afb3397725 (diff) | |
fdo#82577: Handle Time
Put the TOOLS Time class in the tools namespace. Avoids clash with the X11
Time typedef.
Change-Id: Iac57d5aef35e81ace1ee0d5e6d76cb278f8ad866
Reviewed-on: https://gerrit.libreoffice.org/11684
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/source/app/timer.cxx')
| -rw-r--r-- | vcl/source/app/timer.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx index 703f7e81f03d..ecbfa7467cdc 100644 --- a/vcl/source/app/timer.cxx +++ b/vcl/source/app/timer.cxx @@ -92,7 +92,7 @@ void Timer::ImplTimerCallbackProc() ImplTimerData* pPrevTimerData; sal_uLong nMinPeriod = MAX_TIMER_PERIOD; sal_uLong nDeltaTime; - sal_uLong nTime = Time::GetSystemTicks(); + sal_uLong nTime = tools::Time::GetSystemTicks(); if ( pSVData->mbNoCallTimer ) return; @@ -133,7 +133,7 @@ void Timer::ImplTimerCallbackProc() } // determine new time - sal_uLong nNewTime = Time::GetSystemTicks(); + sal_uLong nNewTime = tools::Time::GetSystemTicks(); pPrevTimerData = NULL; pTimerData = pSVData->mpFirstTimerData; while ( pTimerData ) @@ -263,7 +263,7 @@ void Timer::Start() // insert timer and start mpTimerData = new ImplTimerData; mpTimerData->mpTimer = this; - mpTimerData->mnUpdateTime = Time::GetSystemTicks(); + mpTimerData->mnUpdateTime = tools::Time::GetSystemTicks(); mpTimerData->mnTimerUpdate = pSVData->mnTimerUpdate; mpTimerData->mbDelete = false; mpTimerData->mbInTimeout = false; @@ -291,7 +291,7 @@ void Timer::Start() } else { - mpTimerData->mnUpdateTime = Time::GetSystemTicks(); + mpTimerData->mnUpdateTime = tools::Time::GetSystemTicks(); mpTimerData->mnTimerUpdate = pSVData->mnTimerUpdate; mpTimerData->mbDelete = false; } |