[Libreoffice-commits] core.git: vcl/headless vcl/inc vcl/osx vcl/unx vcl/win
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Feb 27 09:37:15 UTC 2019
vcl/headless/svpinst.cxx | 2 +-
vcl/inc/headless/svpinst.hxx | 2 +-
vcl/inc/osx/saltimer.h | 2 +-
vcl/inc/unx/gtk/gtkdata.hxx | 2 +-
vcl/inc/unx/saldisp.hxx | 2 +-
vcl/inc/win/saltimer.h | 2 +-
vcl/osx/saltimer.cxx | 2 +-
vcl/unx/generic/app/saltimer.cxx | 4 ++--
vcl/unx/gtk/gtkdata.cxx | 2 +-
vcl/unx/gtk3/gtk3gtkdata.cxx | 2 +-
vcl/win/app/saltimer.cxx | 2 +-
11 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit d433c4e9e956622ec7387ab9198f4db856524199
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Feb 27 09:15:21 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Feb 27 10:36:49 2019 +0100
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: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 908866cc3293..49a64c7fa8bf 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -518,7 +518,7 @@ void SvpSalInstance::StopTimer()
m_nTimeoutMS = 0;
}
-void SvpSalInstance::StartTimer( sal_uLong nMS )
+void SvpSalInstance::StartTimer( sal_uInt64 nMS )
{
timeval aPrevTimeout (m_aTimeout);
gettimeofday (&m_aTimeout, nullptr);
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index 6ba9a3c07932..684abde290fa 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -120,7 +120,7 @@ public:
void CloseWakeupPipe(bool log);
void CreateWakeupPipe(bool log);
- void StartTimer( sal_uLong nMS );
+ void StartTimer( sal_uInt64 nMS );
void StopTimer();
inline void registerFrame( SalFrame* pFrame );
diff --git a/vcl/inc/osx/saltimer.h b/vcl/inc/osx/saltimer.h
index 0680cf966bbc..cdde3ec8471d 100644
--- a/vcl/inc/osx/saltimer.h
+++ b/vcl/inc/osx/saltimer.h
@@ -53,7 +53,7 @@ public:
AquaSalTimer();
virtual ~AquaSalTimer() override;
- void Start( sal_uLong nMS ) override;
+ void Start( sal_uInt64 nMS ) override;
void Stop() override;
void handleStartTimerEvent( NSEvent* pEvent );
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index d71fb3d04aac..2475b20a28d4 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -88,7 +88,7 @@ class GtkSalTimer : public SalTimer
public:
GtkSalTimer();
virtual ~GtkSalTimer() override;
- virtual void Start( sal_uLong nMS ) override;
+ virtual void Start( sal_uInt64 nMS ) override;
virtual void Stop() override;
bool Expired();
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index c5bc241a37cc..eda1ed863523 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -195,7 +195,7 @@ public:
YieldFunc handle );
virtual void Remove( int fd );
- virtual void StartTimer( sal_uLong nMS );
+ virtual void StartTimer( sal_uInt64 nMS );
virtual void StopTimer();
virtual bool CheckTimeout( bool bExecuteTimers = true );
diff --git a/vcl/inc/win/saltimer.h b/vcl/inc/win/saltimer.h
index 8cce204e8428..a467de815d85 100644
--- a/vcl/inc/win/saltimer.h
+++ b/vcl/inc/win/saltimer.h
@@ -41,7 +41,7 @@ class WinSalTimer final : public SalTimer, protected VersionedEvent
bool m_bForceRealTimer; ///< enforce using a real timer for 0ms
bool m_bSetTimerRunning; ///< true, if a SetTimer is running
- void ImplStart( sal_uIntPtr nMS );
+ void ImplStart( sal_uInt64 nMS );
void ImplStop();
void ImplHandleTimerEvent( WPARAM aWPARAM );
void ImplHandleElapsedTimer();
diff --git a/vcl/osx/saltimer.cxx b/vcl/osx/saltimer.cxx
index 79dac0fdee9f..65eece9bfbf0 100644
--- a/vcl/osx/saltimer.cxx
+++ b/vcl/osx/saltimer.cxx
@@ -76,7 +76,7 @@ void AquaSalTimer::queueDispatchTimerEvent( bool bAtStart )
bAtStart, GetNextEventVersion() );
}
-void AquaSalTimer::Start( sal_uLong nMS )
+void AquaSalTimer::Start( sal_uInt64 nMS )
{
SalData* pSalData = GetSalData();
diff --git a/vcl/unx/generic/app/saltimer.cxx b/vcl/unx/generic/app/saltimer.cxx
index bf690db494a4..639c37a98335 100644
--- a/vcl/unx/generic/app/saltimer.cxx
+++ b/vcl/unx/generic/app/saltimer.cxx
@@ -34,7 +34,7 @@ void SalXLib::StopTimer()
m_nTimeoutMS = 0;
}
-void SalXLib::StartTimer( sal_uLong nMS )
+void SalXLib::StartTimer( sal_uInt64 nMS )
{
timeval Timeout (m_aTimeout); // previous timeout.
gettimeofday (&m_aTimeout, nullptr);
@@ -63,7 +63,7 @@ void X11SalTimer::Stop()
mpXLib->StopTimer();
}
-void X11SalTimer::Start( sal_uLong nMS )
+void X11SalTimer::Start( sal_uInt64 nMS )
{
mpXLib->StartTimer( nMS );
}
diff --git a/vcl/unx/gtk/gtkdata.cxx b/vcl/unx/gtk/gtkdata.cxx
index 298442954c83..48f3eeaf2e60 100644
--- a/vcl/unx/gtk/gtkdata.cxx
+++ b/vcl/unx/gtk/gtkdata.cxx
@@ -795,7 +795,7 @@ bool GtkSalTimer::Expired()
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.
assert( nMS <= G_MAXINT );
diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx
index 40aee7217ea7..3b7d662e9990 100644
--- a/vcl/unx/gtk3/gtk3gtkdata.cxx
+++ b/vcl/unx/gtk3/gtk3gtkdata.cxx
@@ -820,7 +820,7 @@ bool GtkSalTimer::Expired()
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.
assert( nMS <= G_MAXINT );
diff --git a/vcl/win/app/saltimer.cxx b/vcl/win/app/saltimer.cxx
index 44f33b3ee4f7..3aa919ec41b5 100644
--- a/vcl/win/app/saltimer.cxx
+++ b/vcl/win/app/saltimer.cxx
@@ -60,7 +60,7 @@ void WinSalTimer::ImplStop()
InvalidateEvent();
}
-void WinSalTimer::ImplStart( sal_uLong nMS )
+void WinSalTimer::ImplStart( sal_uInt64 nMS )
{
SalData* pSalData = GetSalData();
assert( !pSalData->mpInstance || pSalData->mnAppThreadId == GetCurrentThreadId() );
More information about the Libreoffice-commits
mailing list