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 /include | |
| parent | e379476e449c2e711f9d782cfb06b70211874c4c (diff) | |
Scheduler: Changed uLong to uInt32/uInt64
Change-Id: Ic60463027c7f1b2d513539adba834b8d8e0ce6d3
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/scheduler.hxx | 6 | ||||
| -rw-r--r-- | include/vcl/timer.hxx | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/include/vcl/scheduler.hxx b/include/vcl/scheduler.hxx index 1e7b3edc91c9..fc3668ec1744 100644 --- a/include/vcl/scheduler.hxx +++ b/include/vcl/scheduler.hxx @@ -30,8 +30,8 @@ struct ImplSchedulerData Scheduler* mpScheduler; // Pointer to VCL Scheduler instance bool mbDelete; // Destroy this scheduler? bool mbInScheduler; // Scheduler currently processed? - sal_uLong mnUpdateTime; // Last Update Time - sal_uLong mnUpdateStack; // Update Stack + sal_uInt64 mnUpdateTime; // Last Update Time + sal_uInt32 mnUpdateStack; // Update Stack void Invoke(); @@ -59,7 +59,7 @@ protected: friend struct ImplSchedulerData; virtual void SetDeletionFlags(); virtual bool ReadyForSchedule( bool bTimer ) { return !bTimer; } - virtual sal_uLong UpdateMinPeriod( sal_uLong nMinPeriod, sal_uLong nTime ); + virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nMinPeriod, sal_uInt64 nTime ); public: Scheduler(); diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx index e2fd4a7c74de..d671919f5687 100644 --- a/include/vcl/timer.hxx +++ b/include/vcl/timer.hxx @@ -27,12 +27,12 @@ class VCL_DLLPUBLIC Timer : public Scheduler { protected: Link maTimeoutHdl; // Callback Link - sal_uLong mnTimeout; + sal_uInt64 mnTimeout; bool mbAuto; virtual void SetDeletionFlags() SAL_OVERRIDE; virtual bool ReadyForSchedule( bool bTimer ) SAL_OVERRIDE; - virtual sal_uLong UpdateMinPeriod( sal_uLong nMinPeriod, sal_uLong nTime ) SAL_OVERRIDE; + virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nMinPeriod, sal_uInt64 nTime ) SAL_OVERRIDE; public: Timer(); @@ -42,13 +42,13 @@ public: /// of course, you can also sub-class and override 'Invoke' void SetTimeoutHdl( const Link& rLink ) { maTimeoutHdl = rLink; } const Link& GetTimeoutHdl() const { return maTimeoutHdl; } - void SetTimeout( sal_uLong nTimeoutMs ); - sal_uLong GetTimeout() const { return mnTimeout; } + void SetTimeout( sal_uInt64 nTimeoutMs ); + sal_uInt64 GetTimeout() const { return mnTimeout; } virtual void Invoke() SAL_OVERRIDE; void Timeout() { Invoke(); } Timer& operator=( const Timer& rTimer ); - virtual void Start() SAL_OVERRIDE; - static void ImplStartTimer( ImplSVData* pSVData, sal_uLong nMS ); + virtual void Start() SAL_OVERRIDE; + static void ImplStartTimer( ImplSVData* pSVData, sal_uInt64 nMS ); }; /// An auto-timer is a multi-shot timer re-emitting itself at |