compilerplugins/clang/virtualdead.unusedparams.results | 6 ------
include/vcl/idle.hxx | 3 +--
include/vcl/task.hxx | 3 +--
include/vcl/timer.hxx | 3 +--
include/vcl/treelist.hxx | 6 +-----
include/vcl/treelistbox.hxx | 3 +--
sw/inc/SwDocIdle.hxx | 3 +--
sw/source/core/doc/SwDocIdle.cxx | 2 +-
vcl/source/app/idle.cxx | 2 +-
vcl/source/app/scheduler.cxx | 4 ++--
vcl/source/app/timer.cxx | 2 +-
vcl/source/treelist/treelist.cxx | 7 +++----
vcl/source/treelist/treelistbox.cxx | 4 +---
13 files changed, 15 insertions(+), 33 deletions(-)
New commits:
commit fec35bf15da6f226ee90bc19e538ee36cc47a172
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Oct 17 16:17:45 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun Oct 20 21:54:00 2019 +0200
loplugin:virtualdead unused param in Task::UpdateMinPeriod
Change-Id: Ie24f56fed811b3b317d6c20e15289e7cecfb738d
Reviewed-on: https://gerrit.libreoffice.org/81157
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
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 )
commit fb74f7b6631d0c01de9919dfe77894588dea1c45
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Oct 17 16:11:45 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun Oct 20 21:53:47 2019 +0200
loplugin:virtualdead unused param in SvListView::ModelIsMoving
Change-Id: I83af14bb3a29cb8a4a36f714ac2fb91687f13996
Reviewed-on: https://gerrit.libreoffice.org/81156
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/compilerplugins/clang/virtualdead.unusedparams.results
b/compilerplugins/clang/virtualdead.unusedparams.results
index a22567d37cea..186a2780eaba 100644
--- a/compilerplugins/clang/virtualdead.unusedparams.results
+++ b/compilerplugins/clang/virtualdead.unusedparams.results
@@ -214,9 +214,6 @@ include/vcl/opengl/OpenGLContext.hxx:141
include/vcl/task.hxx:71
unsigned long Task::UpdateMinPeriod(unsigned long,unsigned long,)const
01
-include/vcl/treelist.hxx:304
- void SvListView::ModelIsMoving(class SvTreeListEntry *,class
SvTreeListEntry *,unsigned long,)
- 100
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/treelist.hxx b/include/vcl/treelist.hxx
index 61b7ea742832..2d8fc7b4379d 100644
--- a/include/vcl/treelist.hxx
+++ b/include/vcl/treelist.hxx
@@ -299,11 +299,7 @@ public:
virtual void ModelHasCleared();
virtual void ModelHasInserted( SvTreeListEntry* pEntry );
virtual void ModelHasInsertedTree( SvTreeListEntry* pEntry );
- virtual void ModelIsMoving(
- SvTreeListEntry* pSource,
- SvTreeListEntry* pTargetParent,
- sal_uLong nPos
- );
+ virtual void ModelIsMoving( SvTreeListEntry* pSource );
virtual void ModelHasMoved( SvTreeListEntry* pSource );
virtual void ModelIsRemoving( SvTreeListEntry* pEntry );
virtual void ModelHasRemoved( SvTreeListEntry* pEntry );
diff --git a/include/vcl/treelistbox.hxx b/include/vcl/treelistbox.hxx
index 0606f106a087..4dcd516cea22 100644
--- a/include/vcl/treelistbox.hxx
+++ b/include/vcl/treelistbox.hxx
@@ -634,8 +634,7 @@ public:
virtual void ModelHasCleared() override;
virtual void ModelHasInserted( SvTreeListEntry* pEntry ) override;
virtual void ModelHasInsertedTree( SvTreeListEntry* pEntry ) override;
- virtual void ModelIsMoving(SvTreeListEntry* pSource,
- SvTreeListEntry* pTargetParent, sal_uLong nChildPos )
override;
+ virtual void ModelIsMoving(SvTreeListEntry* pSource ) override;
virtual void ModelHasMoved(SvTreeListEntry* pSource ) override;
virtual void ModelIsRemoving( SvTreeListEntry* pEntry ) override;
virtual void ModelHasRemoved( SvTreeListEntry* pEntry ) override;
diff --git a/vcl/source/treelist/treelist.cxx b/vcl/source/treelist/treelist.cxx
index 49ac19692756..11a4221e5305 100644
--- a/vcl/source/treelist/treelist.cxx
+++ b/vcl/source/treelist/treelist.cxx
@@ -1157,8 +1157,7 @@ void SvListView::ModelHasInsertedTree( SvTreeListEntry* )
{
}
-void SvListView::ModelIsMoving( SvTreeListEntry* /* pSource */ ,
- SvTreeListEntry* /* pTargetParent */ , sal_uLong /* nPos */ )
+void SvListView::ModelIsMoving( SvTreeListEntry* /* pSource */ )
{
}
@@ -1292,7 +1291,7 @@ void SvListView::Impl::ActionClear()
}
void SvListView::ModelNotification( SvListAction nActionId, SvTreeListEntry*
pEntry1,
- SvTreeListEntry* pEntry2, sal_uLong nPos )
+ SvTreeListEntry* /*pEntry2*/, sal_uLong /*nPos*/ )
{
switch( nActionId )
{
@@ -1312,7 +1311,7 @@ void SvListView::ModelNotification( SvListAction
nActionId, SvTreeListEntry* pEn
ModelHasRemoved( pEntry1 );
break;
case SvListAction::MOVING:
- ModelIsMoving( pEntry1, pEntry2, nPos );
+ ModelIsMoving( pEntry1 );
m_pImpl->ActionMoving( pEntry1 );
break;
case SvListAction::MOVED:
diff --git a/vcl/source/treelist/treelistbox.cxx
b/vcl/source/treelist/treelistbox.cxx
index 6569fc6b7c82..529839943445 100644
--- a/vcl/source/treelist/treelistbox.cxx
+++ b/vcl/source/treelist/treelistbox.cxx
@@ -2230,9 +2230,7 @@ void SvTreeListBox::ModelHasInserted( SvTreeListEntry*
pEntry )
pImpl->EntryInserted( pEntry );
}
-void SvTreeListBox::ModelIsMoving(SvTreeListEntry* pSource,
- SvTreeListEntry* /* pTargetParent */,
- sal_uLong /* nChildPos */ )
+void SvTreeListBox::ModelIsMoving(SvTreeListEntry* pSource )
{
pImpl->MovingEntry( pSource );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
