Kaydet (Commit) d433c4e9 authored tarafından Noel Grandin's avatar Noel Grandin

convert more Start timer methods from sal_uLong->sal_uInt64

Change-Id: I1ed43bab00a5bc456032410ccf32b3fd64cc970c
Reviewed-on: https://gerrit.libreoffice.org/68419
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 4b983376
...@@ -518,7 +518,7 @@ void SvpSalInstance::StopTimer() ...@@ -518,7 +518,7 @@ void SvpSalInstance::StopTimer()
m_nTimeoutMS = 0; m_nTimeoutMS = 0;
} }
void SvpSalInstance::StartTimer( sal_uLong nMS ) void SvpSalInstance::StartTimer( sal_uInt64 nMS )
{ {
timeval aPrevTimeout (m_aTimeout); timeval aPrevTimeout (m_aTimeout);
gettimeofday (&m_aTimeout, nullptr); gettimeofday (&m_aTimeout, nullptr);
......
...@@ -120,7 +120,7 @@ public: ...@@ -120,7 +120,7 @@ public:
void CloseWakeupPipe(bool log); void CloseWakeupPipe(bool log);
void CreateWakeupPipe(bool log); void CreateWakeupPipe(bool log);
void StartTimer( sal_uLong nMS ); void StartTimer( sal_uInt64 nMS );
void StopTimer(); void StopTimer();
inline void registerFrame( SalFrame* pFrame ); inline void registerFrame( SalFrame* pFrame );
......
...@@ -53,7 +53,7 @@ public: ...@@ -53,7 +53,7 @@ public:
AquaSalTimer(); AquaSalTimer();
virtual ~AquaSalTimer() override; virtual ~AquaSalTimer() override;
void Start( sal_uLong nMS ) override; void Start( sal_uInt64 nMS ) override;
void Stop() override; void Stop() override;
void handleStartTimerEvent( NSEvent* pEvent ); void handleStartTimerEvent( NSEvent* pEvent );
......
...@@ -88,7 +88,7 @@ class GtkSalTimer : public SalTimer ...@@ -88,7 +88,7 @@ class GtkSalTimer : public SalTimer
public: public:
GtkSalTimer(); GtkSalTimer();
virtual ~GtkSalTimer() override; virtual ~GtkSalTimer() override;
virtual void Start( sal_uLong nMS ) override; virtual void Start( sal_uInt64 nMS ) override;
virtual void Stop() override; virtual void Stop() override;
bool Expired(); bool Expired();
......
...@@ -195,7 +195,7 @@ public: ...@@ -195,7 +195,7 @@ public:
YieldFunc handle ); YieldFunc handle );
virtual void Remove( int fd ); virtual void Remove( int fd );
virtual void StartTimer( sal_uLong nMS ); virtual void StartTimer( sal_uInt64 nMS );
virtual void StopTimer(); virtual void StopTimer();
virtual bool CheckTimeout( bool bExecuteTimers = true ); virtual bool CheckTimeout( bool bExecuteTimers = true );
......
...@@ -41,7 +41,7 @@ class WinSalTimer final : public SalTimer, protected VersionedEvent ...@@ -41,7 +41,7 @@ class WinSalTimer final : public SalTimer, protected VersionedEvent
bool m_bForceRealTimer; ///< enforce using a real timer for 0ms bool m_bForceRealTimer; ///< enforce using a real timer for 0ms
bool m_bSetTimerRunning; ///< true, if a SetTimer is running bool m_bSetTimerRunning; ///< true, if a SetTimer is running
void ImplStart( sal_uIntPtr nMS ); void ImplStart( sal_uInt64 nMS );
void ImplStop(); void ImplStop();
void ImplHandleTimerEvent( WPARAM aWPARAM ); void ImplHandleTimerEvent( WPARAM aWPARAM );
void ImplHandleElapsedTimer(); void ImplHandleElapsedTimer();
......
...@@ -76,7 +76,7 @@ void AquaSalTimer::queueDispatchTimerEvent( bool bAtStart ) ...@@ -76,7 +76,7 @@ void AquaSalTimer::queueDispatchTimerEvent( bool bAtStart )
bAtStart, GetNextEventVersion() ); bAtStart, GetNextEventVersion() );
} }
void AquaSalTimer::Start( sal_uLong nMS ) void AquaSalTimer::Start( sal_uInt64 nMS )
{ {
SalData* pSalData = GetSalData(); SalData* pSalData = GetSalData();
......
...@@ -34,7 +34,7 @@ void SalXLib::StopTimer() ...@@ -34,7 +34,7 @@ void SalXLib::StopTimer()
m_nTimeoutMS = 0; m_nTimeoutMS = 0;
} }
void SalXLib::StartTimer( sal_uLong nMS ) void SalXLib::StartTimer( sal_uInt64 nMS )
{ {
timeval Timeout (m_aTimeout); // previous timeout. timeval Timeout (m_aTimeout); // previous timeout.
gettimeofday (&m_aTimeout, nullptr); gettimeofday (&m_aTimeout, nullptr);
...@@ -63,7 +63,7 @@ void X11SalTimer::Stop() ...@@ -63,7 +63,7 @@ void X11SalTimer::Stop()
mpXLib->StopTimer(); mpXLib->StopTimer();
} }
void X11SalTimer::Start( sal_uLong nMS ) void X11SalTimer::Start( sal_uInt64 nMS )
{ {
mpXLib->StartTimer( nMS ); mpXLib->StartTimer( nMS );
} }
......
...@@ -795,7 +795,7 @@ bool GtkSalTimer::Expired() ...@@ -795,7 +795,7 @@ bool GtkSalTimer::Expired()
return !!sal_gtk_timeout_expired( m_pTimeout, &nDummy, &aTimeNow); return !!sal_gtk_timeout_expired( m_pTimeout, &nDummy, &aTimeNow);
} }
void GtkSalTimer::Start( sal_uLong nMS ) void GtkSalTimer::Start( sal_uInt64 nMS )
{ {
// glib is not 64bit safe in this regard. // glib is not 64bit safe in this regard.
assert( nMS <= G_MAXINT ); assert( nMS <= G_MAXINT );
......
...@@ -820,7 +820,7 @@ bool GtkSalTimer::Expired() ...@@ -820,7 +820,7 @@ bool GtkSalTimer::Expired()
return !!sal_gtk_timeout_expired( m_pTimeout, &nDummy, &aTimeNow); return !!sal_gtk_timeout_expired( m_pTimeout, &nDummy, &aTimeNow);
} }
void GtkSalTimer::Start( sal_uLong nMS ) void GtkSalTimer::Start( sal_uInt64 nMS )
{ {
// glib is not 64bit safe in this regard. // glib is not 64bit safe in this regard.
assert( nMS <= G_MAXINT ); assert( nMS <= G_MAXINT );
......
...@@ -60,7 +60,7 @@ void WinSalTimer::ImplStop() ...@@ -60,7 +60,7 @@ void WinSalTimer::ImplStop()
InvalidateEvent(); InvalidateEvent();
} }
void WinSalTimer::ImplStart( sal_uLong nMS ) void WinSalTimer::ImplStart( sal_uInt64 nMS )
{ {
SalData* pSalData = GetSalData(); SalData* pSalData = GetSalData();
assert( !pSalData->mpInstance || pSalData->mnAppThreadId == GetCurrentThreadId() ); assert( !pSalData->mpInstance || pSalData->mnAppThreadId == GetCurrentThreadId() );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment