loplugin:virtualdead

Change-Id: Ic002692801113de5778826db5e3faf9869a48307
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100816
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

6 files changed, 12 insertions, 15 deletions

diff --git a/compilerplugins/clang/virtualdead.py b/compilerplugins/clang/virtualdead.py
index ed43d1a6d20d..2966662ff8fc 100755
--- a/compilerplugins/clang/virtualdead.py
+++ b/compilerplugins/clang/virtualdead.py
@@ -62,6 +62,7 @@ for callInfo, callValues in callDict.iteritems():
     if srcloc.startswith("Widgets/"): continue
     if srcloc.startswith("Core/"): continue
     if srcloc.startswith("/Qt"): continue
+    if srcloc.startswith("Qt"): continue
     functionSig = callInfo[0]
     tmp1list.append((srcloc, functionSig, callValue))
 
@@ -94,6 +95,7 @@ for name, bitfield in tmp2dict.iteritems():
     if srcloc.startswith("Widgets/"): continue
     if srcloc.startswith("Core/"): continue
     if srcloc.startswith("/Qt"): continue
+    if srcloc.startswith("Qt"): continue
     # ignore external stuff
     if srcloc.startswith("workdir/"): continue
     # referenced by generated code in workdir/
diff --git a/compilerplugins/clang/virtualdead.results b/compilerplugins/clang/virtualdead.results
index 604c5ac664fb..a7ea08a6118e 100644
--- a/compilerplugins/clang/virtualdead.results
+++ b/compilerplugins/clang/virtualdead.results
@@ -64,8 +64,8 @@ include/unotools/desktopterminationobserver.hxx:36
 include/vbahelper/vbahelperinterface.hxx:74
     int InheritedHelperInterfaceImpl::getCreator()
     1400204879
-include/vcl/treelistbox.hxx:502
-    void SvTreeListBox::NotifyEndScroll()
+include/vcl/toolkit/treelistbox.hxx:512
+    void SvTreeListBox::PreparePaint(class OutputDevice &,class SvTreeListEntry &,)
     empty
 sc/source/core/opencl/formulagroupcl.cxx:1069
     void sc::opencl::(anonymous namespace)::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class std::__cxx11::basic_stringstream<char> &,)
@@ -79,7 +79,7 @@ sc/source/ui/vba/vbasheetobject.hxx:117
 sc/source/ui/vba/vbasheetobjects.cxx:142
     class rtl::OUString ScVbaObjectContainer::implGetShapeServiceName()const
     "com.sun.star.drawing.ControlShape"
-slideshow/source/engine/animationfactory.cxx:434
+slideshow/source/engine/animationfactory.cxx:593
     void slideshow::internal::(anonymous namespace)::GenericAnimation::prefetch()
     empty
 vcl/inc/qt5/Qt5FilePicker.hxx:172
diff --git a/compilerplugins/clang/virtualdead.unusedparams.results b/compilerplugins/clang/virtualdead.unusedparams.results
index 5cb5f8923929..130223cb56be 100644
--- a/compilerplugins/clang/virtualdead.unusedparams.results
+++ b/compilerplugins/clang/virtualdead.unusedparams.results
@@ -130,10 +130,13 @@ include/vcl/dndhelp.hxx:62
 include/vcl/opengl/OpenGLContext.hxx:141
     struct SystemWindowData OpenGLContext::generateWinData(class vcl::Window *,_Bool,)
     10
-include/vcl/treelistbox.hxx:428
+include/vcl/toolkit/treelistbox.hxx:431
     enum DragDropMode SvTreeListBox::NotifyStartDrag(class TransferDataContainer &,class SvTreeListEntry *,)
     00
-include/vcl/treelistbox.hxx:589
+include/vcl/toolkit/treelistbox.hxx:512
+    void SvTreeListBox::PreparePaint(class OutputDevice &,class SvTreeListEntry &,)
+    00
+include/vcl/toolkit/treelistbox.hxx:591
     _Bool SvTreeListBox::EditingEntry(class SvTreeListEntry *,class Selection &,)
     10
 sc/inc/filter.hxx:82
@@ -196,10 +199,10 @@ sw/source/core/access/acccontext.hxx:352
 sw/source/core/inc/txmsrt.hxx:145
     void SwTOXSortTabBase::FillText(class SwTextNode &,const class SwIndex &,unsigned short,const class SwRootFrame *const,)const
     1100
-sw/source/filter/ww8/wrtww8.hxx:796
+sw/source/filter/ww8/wrtww8.hxx:793
     void MSWordExportBase::WriteHyperlinkData(const class sw::mark::IFieldmark &,)
     0
-sw/source/filter/ww8/wrtww8.hxx:861
+sw/source/filter/ww8/wrtww8.hxx:858
     void MSWordExportBase::OutputGrfNode(const class SwGrfNode &,)
     0
 vcl/inc/outdev.h:122
diff --git a/include/vcl/toolkit/treelistbox.hxx b/include/vcl/toolkit/treelistbox.hxx
index c8ccdd775ac3..f485ca967b89 100644
--- a/include/vcl/toolkit/treelistbox.hxx
+++ b/include/vcl/toolkit/treelistbox.hxx
@@ -509,7 +509,6 @@ protected:
     virtual void    Command( const CommandEvent& rCEvt ) override;
 
     virtual void    RequestHelp( const HelpEvent& rHEvt ) override;
-    virtual void    PreparePaint(vcl::RenderContext& rRenderContext, SvTreeListEntry& rEntry);
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) override;
 
     void            InitSettings();
diff --git a/vcl/source/treelist/iconview.cxx b/vcl/source/treelist/iconview.cxx
index 9e0ab737b2c3..5041500bc89c 100644
--- a/vcl/source/treelist/iconview.cxx
+++ b/vcl/source/treelist/iconview.cxx
@@ -79,8 +79,6 @@ void IconView::PaintEntry(SvTreeListEntry& rEntry, long nX, long nY,
 
     tools::Rectangle aRect; // multi purpose
 
-    PreparePaint(rRenderContext, rEntry);
-
     pImpl->UpdateContextBmpWidthMax(&rEntry);
 
     short nTempEntryHeight = GetEntryHeight();
diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx
index 74be3d890402..f1ac3f23f01f 100644
--- a/vcl/source/treelist/treelistbox.cxx
+++ b/vcl/source/treelist/treelistbox.cxx
@@ -2558,7 +2558,6 @@ void SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry, long nLine, vcl::Render
     tools::Rectangle aRect; // multi purpose
 
     bool bHorSBar = pImpl->HasHorScrollBar();
-    PreparePaint(rRenderContext, rEntry);
 
     pImpl->UpdateContextBmpWidthMax(&rEntry);
 
@@ -2846,10 +2845,6 @@ void SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry, long nLine, vcl::Render
     }
 }
 
-void SvTreeListBox::PreparePaint(vcl::RenderContext& /*rRenderContext*/, SvTreeListEntry& /*rEntry*/)
-{
-}
-
 void SvTreeListBox::DrawCustomEntry(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect, const SvTreeListEntry& rEntry)
 {
     aCustomRenderHdl.Call(std::tuple<vcl::RenderContext&, const tools::Rectangle&, const SvTreeListEntry&>(rRenderContext, rRect, rEntry));