diff options
| author | Tobias Madl <tobias.madl.dev@gmail.com> | 2015-03-09 08:44:26 +0000 |
|---|---|---|
| committer | Tobias Madl <tobias.madl.dev@gmail.com> | 2015-03-09 08:45:48 +0000 |
| commit | 9c7016b5b530ca212b1275f44f9e2fc0527109ee (patch) | |
| tree | 5840038c6aa132916f7aa4863ec03eef18c6ecfd /vcl | |
| parent | e379476e449c2e711f9d782cfb06b70211874c4c (diff) | |
Scheduler: Changed uLong to uInt32/uInt64
Change-Id: Ic60463027c7f1b2d513539adba834b8d8e0ce6d3
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/svdata.hxx | 4 | ||||
| -rw-r--r-- | vcl/source/app/scheduler.cxx | 8 | ||||
| -rw-r--r-- | vcl/source/app/timer.cxx | 12 |
3 files changed, 12 insertions, 12 deletions
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 967f3dfdce23..3b04e76f6d9c 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -316,8 +316,8 @@ struct ImplSVData SalI18NImeStatus* mpImeStatus; // interface to ime status window SalSystem* mpSalSystem; // SalSystem interface ResMgr* mpResMgr; // SV-Resource-Manager - sal_uLong mnTimerPeriod; // current timer period - sal_uLong mnUpdateStack; // Scheduler on stack + sal_uInt64 mnTimerPeriod; // current timer period + sal_uInt32 mnUpdateStack; // Scheduler on stack ImplSVAppData maAppData; // indepen data for class Application ImplSVGDIData maGDIData; // indepen data for Output classes ImplSVWinData maWinData; // indepen data for Windows classes diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx index 5a0061f4cccf..56eaf12b6d31 100644 --- a/vcl/source/app/scheduler.cxx +++ b/vcl/source/app/scheduler.cxx @@ -23,7 +23,7 @@ #include <vcl/timer.hxx> #include <saltimer.hxx> -#define MAX_TIMER_PERIOD ((sal_uLong)0xFFFFFFFF) +#define MAX_TIMER_PERIOD ((sal_uInt64)0xFFFFFFFF) void ImplSchedulerData::Invoke() { @@ -116,8 +116,8 @@ void Scheduler::ProcessTaskScheduling( bool bTimer ) ImplSchedulerData* pSchedulerData = NULL; ImplSchedulerData* pPrevSchedulerData = NULL; ImplSVData* pSVData = ImplGetSVData(); - sal_uLong nTime = tools::Time::GetSystemTicks(); - sal_uLong nMinPeriod = MAX_TIMER_PERIOD; + sal_uInt64 nTime = tools::Time::GetSystemTicks(); + sal_uInt64 nMinPeriod = MAX_TIMER_PERIOD; pSVData->mnUpdateStack++; if ((pSchedulerData = ImplSchedulerData::GetMostImportantTask(bTimer))) @@ -168,7 +168,7 @@ void Scheduler::ProcessTaskScheduling( bool bTimer ) pSVData->mnUpdateStack--; } -sal_uLong Scheduler::UpdateMinPeriod( sal_uLong nMinPeriod, sal_uLong nTime ) +sal_uInt64 Scheduler::UpdateMinPeriod( sal_uInt64 nMinPeriod, sal_uInt64 nTime ) { // this period is only usefull for timer // so in this implementation it' only a pass through diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx index b4389fe8dbc4..7e631d1e7801 100644 --- a/vcl/source/app/timer.cxx +++ b/vcl/source/app/timer.cxx @@ -23,9 +23,9 @@ #include <svdata.hxx> #include <salinst.hxx> -#define MAX_TIMER_PERIOD ((sal_uLong)0xFFFFFFFF) +#define MAX_TIMER_PERIOD ((sal_uInt64)0xFFFFFFFF) -void Timer::ImplStartTimer( ImplSVData* pSVData, sal_uLong nMS ) +void Timer::ImplStartTimer( ImplSVData* pSVData, sal_uInt64 nMS ) { if ( !nMS ) nMS = 1; @@ -54,10 +54,10 @@ bool Timer::ReadyForSchedule( bool bTimer ) return (mpSchedulerData->mnUpdateTime + mnTimeout) <= tools::Time::GetSystemTicks(); } -sal_uLong Timer::UpdateMinPeriod( sal_uLong nMinPeriod, sal_uLong nTime ) +sal_uInt64 Timer::UpdateMinPeriod( sal_uInt64 nMinPeriod, sal_uInt64 nTime ) { - sal_uLong nNewTime = tools::Time::GetSystemTicks(); - sal_uLong nDeltaTime; + sal_uInt64 nNewTime = tools::Time::GetSystemTicks(); + sal_uInt64 nDeltaTime; //determine smallest time slot if( mpSchedulerData->mnUpdateTime == nTime ) { @@ -114,7 +114,7 @@ void Timer::Start() Timer::ImplStartTimer( pSVData, mnTimeout ); } -void Timer::SetTimeout( sal_uLong nNewTimeout ) +void Timer::SetTimeout( sal_uInt64 nNewTimeout ) { mnTimeout = nNewTimeout; // if timer is active then renew clock |