diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-25 14:38:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-26 07:35:04 +0100 |
| commit | 589ce33041df5ca1c3f6d914d5d33d0fffb69f8f (patch) | |
| tree | f597b3b70fe109d805baeb71fedc27b9e4780a75 | |
| parent | b792e4ee22d7b625a214f6eceb1c223f35b9a606 (diff) | |
sal_uIntPtr->sal_uInt64 in SalTimer::Start
because the call site specifies millis in a sal_uInt64 variable
Change-Id: I5cf42407b9e7f3cdef976d8f442609723fd67af9
Reviewed-on: https://gerrit.libreoffice.org/68342
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | vcl/inc/qt5/Qt5Timer.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/saltimer.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/unx/saltimer.h | 2 | ||||
| -rw-r--r-- | vcl/inc/win/saltimer.h | 2 | ||||
| -rw-r--r-- | vcl/qt5/Qt5Timer.cxx | 2 | ||||
| -rw-r--r-- | vcl/win/app/saltimer.cxx | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/vcl/inc/qt5/Qt5Timer.hxx b/vcl/inc/qt5/Qt5Timer.hxx index 9d68f0b200c5..20b2a4c70cf7 100644 --- a/vcl/inc/qt5/Qt5Timer.hxx +++ b/vcl/inc/qt5/Qt5Timer.hxx @@ -40,7 +40,7 @@ Q_SIGNALS: public: Qt5Timer(); - virtual void Start(sal_uIntPtr nMS) override; + virtual void Start(sal_uInt64 nMS) override; virtual void Stop() override; }; diff --git a/vcl/inc/saltimer.hxx b/vcl/inc/saltimer.hxx index 726d71eba335..8c849a8c9c2e 100644 --- a/vcl/inc/saltimer.hxx +++ b/vcl/inc/saltimer.hxx @@ -40,7 +40,7 @@ public: virtual ~SalTimer() COVERITY_NOEXCEPT_FALSE; // AutoRepeat and Restart - virtual void Start( sal_uLong nMS ) = 0; + virtual void Start( sal_uInt64 nMS ) = 0; virtual void Stop() = 0; // Callbacks (indepen in \sv\source\app\timer.cxx) diff --git a/vcl/inc/unx/saltimer.h b/vcl/inc/unx/saltimer.h index 93d4ad613b52..bc209da3a6fb 100644 --- a/vcl/inc/unx/saltimer.h +++ b/vcl/inc/unx/saltimer.h @@ -31,7 +31,7 @@ public: virtual ~X11SalTimer() override; // override all pure virtual methods - void Start( sal_uIntPtr nMS ) override; + void Start( sal_uInt64 nMS ) override; void Stop() override; }; diff --git a/vcl/inc/win/saltimer.h b/vcl/inc/win/saltimer.h index 3dd18f0a485f..8cce204e8428 100644 --- a/vcl/inc/win/saltimer.h +++ b/vcl/inc/win/saltimer.h @@ -51,7 +51,7 @@ public: WinSalTimer(); virtual ~WinSalTimer() override; - virtual void Start(sal_uIntPtr nMS) override; + virtual void Start(sal_uInt64 nMS) override; virtual void Stop() override; inline bool IsDirectTimeout() const; diff --git a/vcl/qt5/Qt5Timer.cxx b/vcl/qt5/Qt5Timer.cxx index 7fcb7e17dcda..9868052dd85f 100644 --- a/vcl/qt5/Qt5Timer.cxx +++ b/vcl/qt5/Qt5Timer.cxx @@ -42,7 +42,7 @@ void Qt5Timer::timeoutActivated() void Qt5Timer::startTimer(int nMS) { m_aTimer.start(nMS); } -void Qt5Timer::Start(sal_uIntPtr nMS) { Q_EMIT startTimerSignal(nMS); } +void Qt5Timer::Start(sal_uInt64 nMS) { Q_EMIT startTimerSignal(nMS); } void Qt5Timer::stopTimer() { m_aTimer.stop(); } diff --git a/vcl/win/app/saltimer.cxx b/vcl/win/app/saltimer.cxx index e89dbd561425..44f33b3ee4f7 100644 --- a/vcl/win/app/saltimer.cxx +++ b/vcl/win/app/saltimer.cxx @@ -105,7 +105,7 @@ WinSalTimer::~WinSalTimer() Stop(); } -void WinSalTimer::Start( sal_uLong nMS ) +void WinSalTimer::Start( sal_uInt64 nMS ) { WinSalInstance *pInst = GetSalData()->mpInstance; if ( pInst && !pInst->IsMainThread() ) |