diff options
-rw-r--r-- | compilerplugins/clang/virtualdead.unusedparams.results | 3 | ||||
-rw-r--r-- | include/vcl/idle.hxx | 3 | ||||
-rw-r--r-- | include/vcl/task.hxx | 3 | ||||
-rw-r--r-- | include/vcl/timer.hxx | 3 | ||||
-rw-r--r-- | sw/inc/SwDocIdle.hxx | 3 | ||||
-rw-r--r-- | sw/source/core/doc/SwDocIdle.cxx | 2 | ||||
-rw-r--r-- | vcl/source/app/idle.cxx | 2 | ||||
-rw-r--r-- | vcl/source/app/scheduler.cxx | 4 | ||||
-rw-r--r-- | vcl/source/app/timer.cxx | 2 |
9 files changed, 9 insertions, 16 deletions
diff --git a/compilerplugins/clang/virtualdead.unusedparams.results b/compilerplugins/clang/virtualdead.unusedparams.results index 186a2780eaba..353e844c8218 100644 --- a/compilerplugins/clang/virtualdead.unusedparams.results +++ b/compilerplugins/clang/virtualdead.unusedparams.results @@ -211,9 +211,6 @@ include/vcl/ITiledRenderable.hxx:209 include/vcl/opengl/OpenGLContext.hxx:141 struct SystemWindowData OpenGLContext::generateWinData(class vcl::Window *,_Bool,) 10 -include/vcl/task.hxx:71 - unsigned long Task::UpdateMinPeriod(unsigned long,unsigned long,)const - 01 include/xmloff/xmlimp.hxx:244 class SvXMLImportContext * SvXMLImport::CreateDocumentContext(const unsigned short,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XAttributeList> &,) 110 diff --git a/include/vcl/idle.hxx b/include/vcl/idle.hxx index f58061313611..7bbd52d41f3b 100644 --- a/include/vcl/idle.hxx +++ b/include/vcl/idle.hxx @@ -35,8 +35,7 @@ private: sal_uInt64 GetTimeout() const = delete; protected: - virtual sal_uInt64 UpdateMinPeriod( - sal_uInt64 nMinPeriod, sal_uInt64 nTimeNow ) const override; + virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nTimeNow ) const override; Idle( bool bAuto, const sal_Char *pDebugName ); diff --git a/include/vcl/task.hxx b/include/vcl/task.hxx index f39661461d99..0fc124de7a65 100644 --- a/include/vcl/task.hxx +++ b/include/vcl/task.hxx @@ -64,11 +64,10 @@ protected: * need another mechanism to wake up the Scheduler or rely on other * Tasks to be scheduled, or simply use a polling Timer. * - * @param nMinPeriod the currently expected sleep time * @param nTimeNow the current time * @return the sleep time of the Task to become ready */ - virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nMinPeriod, sal_uInt64 nTimeNow ) const = 0; + virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nTimeNow ) const = 0; public: Task( const sal_Char *pDebugName ); diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx index 2ee882f60596..088a1e50e9c9 100644 --- a/include/vcl/timer.hxx +++ b/include/vcl/timer.hxx @@ -31,8 +31,7 @@ class VCL_DLLPUBLIC Timer : public Task protected: virtual void SetDeletionFlags() override; - virtual sal_uInt64 UpdateMinPeriod( - sal_uInt64 nMinPeriod, sal_uInt64 nTimeNow ) const override; + virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nTimeNow ) const override; Timer( bool bAuto, const sal_Char *pDebugName ); diff --git a/sw/inc/SwDocIdle.hxx b/sw/inc/SwDocIdle.hxx index 38072f8f3cdf..708dc1c1cb78 100644 --- a/sw/inc/SwDocIdle.hxx +++ b/sw/inc/SwDocIdle.hxx @@ -39,8 +39,7 @@ private: SwDoc &m_rDoc; protected: - virtual sal_uInt64 UpdateMinPeriod( - sal_uInt64 nMinPeriod, sal_uInt64 nTimeNow ) const override; + virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nTimeNow ) const override; public: SwDocIdle( SwDoc &doc ); diff --git a/sw/source/core/doc/SwDocIdle.cxx b/sw/source/core/doc/SwDocIdle.cxx index d2bf04f408dc..24f51c90e908 100644 --- a/sw/source/core/doc/SwDocIdle.cxx +++ b/sw/source/core/doc/SwDocIdle.cxx @@ -30,7 +30,7 @@ namespace sw { -sal_uInt64 SwDocIdle::UpdateMinPeriod( sal_uInt64 /* nMinPeriod */, sal_uInt64 /* nTimeNow */ ) const +sal_uInt64 SwDocIdle::UpdateMinPeriod( sal_uInt64 /* nTimeNow */ ) const { bool bReadyForSchedule = true; diff --git a/vcl/source/app/idle.cxx b/vcl/source/app/idle.cxx index a9a509775a7b..301cbb0bb727 100644 --- a/vcl/source/app/idle.cxx +++ b/vcl/source/app/idle.cxx @@ -52,7 +52,7 @@ void Idle::Start() Task::StartTimer(nPeriod); } -sal_uInt64 Idle::UpdateMinPeriod( sal_uInt64 /* nMinPeriod */, sal_uInt64 /* nTimeNow */ ) const +sal_uInt64 Idle::UpdateMinPeriod( sal_uInt64 /* nTimeNow */ ) const { return Scheduler::ImmediateTimeoutMs; } diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx index 80e1f3808c79..7081383545ec 100644 --- a/vcl/source/app/scheduler.cxx +++ b/vcl/source/app/scheduler.cxx @@ -419,7 +419,7 @@ bool Scheduler::ProcessTaskScheduling() assert(pSchedulerData->mpTask); if (pSchedulerData->mpTask->IsActive()) { - nReadyPeriod = pSchedulerData->mpTask->UpdateMinPeriod( nMinPeriod, nTime ); + nReadyPeriod = pSchedulerData->mpTask->UpdateMinPeriod( nTime ); if (ImmediateTimeoutMs == nReadyPeriod) { if (!pMostUrgent) @@ -523,7 +523,7 @@ bool Scheduler::ProcessTaskScheduling() else if (bTaskAlive) { pMostUrgent->mnUpdateTime = nTime; - nReadyPeriod = pMostUrgent->mpTask->UpdateMinPeriod( nMinPeriod, nTime ); + nReadyPeriod = pMostUrgent->mpTask->UpdateMinPeriod( nTime ); if ( nMinPeriod > nReadyPeriod ) nMinPeriod = nReadyPeriod; UpdateSystemTimer( rSchedCtx, nMinPeriod, false, nTime ); diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx index 262c935522c6..6b1a9c790ac3 100644 --- a/vcl/source/app/timer.cxx +++ b/vcl/source/app/timer.cxx @@ -29,7 +29,7 @@ void Timer::SetDeletionFlags() Task::SetDeletionFlags(); } -sal_uInt64 Timer::UpdateMinPeriod( sal_uInt64, sal_uInt64 nTimeNow ) const +sal_uInt64 Timer::UpdateMinPeriod( sal_uInt64 nTimeNow ) const { sal_uInt64 nWakeupTime = GetSchedulerData()->mnUpdateTime + mnTimeout; return ( nWakeupTime <= nTimeNow ) |