[Libreoffice-commits] core.git: bin/find-unneeded-includes include/comphelper include/IwyuFilter_include.yaml include/vcl sc/IwyuFilter_sc.yaml sc/source sd/IwyuFilter_sd.yaml sd/source sw/IwyuFilter_sw.yaml

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Jan 24 10:29:20 UTC 2019 

 bin/find-unneeded-includes                              |    1 +
 include/IwyuFilter_include.yaml                         |    3 ---
 include/comphelper/unique_disposing_ptr.hxx             |    3 +--
 include/vcl/dockwin.hxx                                 |    3 +--
 sc/IwyuFilter_sc.yaml                                   |    6 ------
 sc/source/ui/inc/docsh.hxx                              |    2 +-
 sc/source/ui/inc/gridwin.hxx                            |    2 +-
 sc/source/ui/inc/output.hxx                             |    2 +-
 sc/source/ui/inc/tabvwsh.hxx                            |    3 +--
 sd/IwyuFilter_sd.yaml                                   |   11 -----------
 sd/source/ui/inc/ViewShell.hxx                          |    3 +--
 sd/source/ui/inc/ViewShellImplementation.hxx            |    3 +--
 sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx    |    2 +-
 sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx |    2 +-
 sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx   |    2 +-
 sw/IwyuFilter_sw.yaml                                   |    9 ---------
 16 files changed, 12 insertions(+), 45 deletions(-)

New commits:
commit 38aa12075432cc6b4e6de60de84c04c1f480768d
Author:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Tue Jan 22 18:14:35 2019 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Jan 24 11:28:52 2019 +0100

    find-unneeeded-includes: don't propose to replace o3tl/deleter.hxx
    
    As seen while analysing
    sw/source/core/inc/DocumentChartDataProviderManager.hxx
    replacing o3tl/deleter.hxx with fw declaration does not work,
    it compiles only when it is transitively included.
    
    This also removes mistakenly added fw declarations and
    now unnecessary IwyuFilter blacklist items
    
    Change-Id: I2d631f0693dbfd0bb0e62218a525113042c9a907
    Reviewed-on: https://gerrit.libreoffice.org/66750
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/bin/find-unneeded-includes b/bin/find-unneeded-includes
index 948e12ccd8c7..e955ae7d33e4 100755
--- a/bin/find-unneeded-includes
+++ b/bin/find-unneeded-includes
@@ -68,6 +68,7 @@ def ignoreRemoval(include, toAdd, absFileName, moduleRules):
     # Avoid proposing o3tl fw declaration
     o3tl = {
         "o3tl/typed_flags_set.hxx" : "namespace o3tl { template <typename T> struct typed_flags; }",
+        "o3tl/deleter.hxx" : "namespace o3tl { template <typename T> struct default_delete; }",
     }
     for k, v, in o3tl.items():
         if include == k and v in toAdd:
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index d4f652f42911..5da7e0550fc0 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -255,9 +255,6 @@ blacklist:
     include/vcl/devicecoordinate.hxx:
     # Needed for #if configure switch
     - basegfx/point/b2ipoint.hxx
-    include/vcl/edit.hxx:
-    # Needed for template
-    - o3tl/deleter.hxx
     include/vcl/event.hxx:
     # Needed for enum type 
     - vcl/window.hxx
diff --git a/include/comphelper/unique_disposing_ptr.hxx b/include/comphelper/unique_disposing_ptr.hxx
index e72b039e6606..51a9710f606d 100644
--- a/include/comphelper/unique_disposing_ptr.hxx
+++ b/include/comphelper/unique_disposing_ptr.hxx
@@ -17,10 +17,9 @@
 #include <com/sun/star/frame/XDesktop.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
+#include <o3tl/deleter.hxx>
 #include <vcl/svapp.hxx>
 
-namespace o3tl { template <typename T> struct default_delete; }
-
 namespace comphelper
 {
 //Similar to std::unique_ptr, except additionally releases the ptr on XComponent::disposing and/or XTerminateListener::notifyTermination if supported
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index 7bbbc9e49d79..5d88e9de65f1 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -21,13 +21,12 @@
 #define INCLUDED_VCL_DOCKWIN_HXX
 
 #include <vcl/dllapi.h>
+#include <o3tl/deleter.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/floatwin.hxx>
 #include <memory>
 #include <vector>
 
-namespace o3tl { template <typename T> struct default_delete; }
-
 // data to be sent with docking events
 struct DockingData
 {
diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index 571bcd22258a..f5ef18ecba0f 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -118,9 +118,6 @@ blacklist:
     # base class has to be a complete type
     - com/sun/star/frame/XDispatchProviderInterceptor.hpp
     - com/sun/star/view/XSelectionChangeListener.hpp
-    sc/inc/document.hxx:
-    # std::unique_ptr deleter type has to be complete
-    - o3tl/deleter.hxx
     sc/inc/docuno.hxx:
     # base class has to be a complete type
     - com/sun/star/container/XEnumerationAccess.hpp
@@ -479,9 +476,6 @@ blacklist:
     sc/source/ui/inc/ExponentialSmoothingDialog.hxx:
     # base class has to be a complete type
     - viewdata.hxx
-    sc/source/ui/inc/impex.hxx:
-    # Needed for template
-    - o3tl/deleter.hxx
     sc/source/ui/inc/MatrixComparisonGenerator.hxx:
     # base class has to be a complete type
     - viewdata.hxx
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index b6c523958c5f..e68a6d5bc560 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -24,6 +24,7 @@
 #include <sfx2/docfac.hxx>
 #include <sfx2/sfxmodelfactory.hxx>
 #include <sfx2/viewsh.hxx>
+#include <o3tl/deleter.hxx>
 
 #include <scdllapi.h>
 #include <document.hxx>
@@ -63,7 +64,6 @@ namespace com { namespace sun { namespace star { namespace script { namespace vb
 
 namespace ooo { namespace vba { namespace excel { class XWorkbook; } } }
 
-namespace o3tl { template <typename T> struct default_delete; }
 namespace com { namespace sun { namespace star { namespace datatransfer { class XTransferable2; } } } }
 
 namespace sfx2 { class FileDialogHelper; }
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 37ff1afeebb6..62444a5f2151 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -25,6 +25,7 @@
 #include "viewdata.hxx"
 #include "cbutton.hxx"
 #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
+#include <o3tl/deleter.hxx>
 
 #include <memory>
 #include <vector>
@@ -38,7 +39,6 @@ namespace sc {
 }
 
 namespace sdr { namespace overlay { class OverlayManager; } }
-namespace o3tl { template <typename T> struct default_delete; }
 
 class FmFormView;
 struct ScTableInfo;
diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index 6150dd78f8d8..d68d9b7c9a7d 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -27,6 +27,7 @@
 #include <tools/gen.hxx>
 #include <editeng/svxenum.hxx>
 #include <vcl/outdev.hxx>
+#include <o3tl/deleter.hxx>
 
 namespace sc {
     struct SpellCheckContext;
@@ -36,7 +37,6 @@ namespace editeng {
     struct MisspellRanges;
 }
 namespace drawinglayer { namespace processor2d { class BaseProcessor2D; } }
-namespace o3tl { template <typename T> struct default_delete; }
 
 namespace vcl { class Font; }
 class EditEngine;
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index d35f1f67e1b6..38e127f32a7e 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -24,6 +24,7 @@
 #include <svx/fmshell.hxx>
 #include <sfx2/viewsh.hxx>
 #include <editeng/svxenum.hxx>
+#include <o3tl/deleter.hxx>
 #include <scdllapi.h>
 #include "dbfunc.hxx"
 #include "target.hxx"
@@ -60,8 +61,6 @@ class ScRangeName;
 
 struct ScHeaderFieldData;
 
-namespace o3tl { template <typename T> struct default_delete; }
-
 namespace editeng { class SvxBorderLine; }
 
 namespace com { namespace sun { namespace star { namespace frame {
diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
index 8d0edb64c426..5a3bd62b3d8c 100644
--- a/sd/IwyuFilter_sd.yaml
+++ b/sd/IwyuFilter_sd.yaml
@@ -110,8 +110,6 @@ blacklist:
     sd/source/ui/framework/module/ToolBarModule.hxx:
     # base class has to be a complete type
     - com/sun/star/drawing/framework/XConfigurationChangeListener.hpp
-    # Needed for template
-    - o3tl/deleter.hxx
     sd/source/ui/framework/module/SlideSorterModule.hxx:
     # base class has to be a complete type
     - com/sun/star/drawing/framework/XConfigurationChangeListener.hpp
@@ -160,9 +158,6 @@ blacklist:
     sd/source/ui/inc/fupage.hxx:
     # base class has to be a complete type
     - vcl/weld.hxx
-    sd/source/ui/inc/OutlineView.hxx:
-    #std::unique_ptr deleter type has to be complete
-    - o3tl/deleter.hxx
     sd/source/ui/inc/slideshow.hxx:
     # typedef needs a complete type
     - com/sun/star/lang/XServiceInfo.hpp
@@ -174,9 +169,6 @@ blacklist:
     # base class has to be a complete type
     - com/sun/star/lang/XUnoTunnel.hpp
     - com/sun/star/util/XReplaceDescriptor.hpp
-    sd/source/ui/inc/ViewShellManager.hxx:
-    #std::unique_ptr deleter type has to be complete
-    - o3tl/deleter.hxx
     sd/source/ui/inc/ViewTabBar.hxx:
     # base class has to be a complete type
     - com/sun/star/drawing/framework/XConfigurationChangeListener.hpp
@@ -232,9 +224,6 @@ blacklist:
     sd/source/ui/inc/tools/SlotStateListener.hxx:
     # base class has to be a complete type
     - com/sun/star/frame/XStatusListener.hpp
-    sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx:
-    # Needed for template
-    - o3tl/deleter.hxx
     sd/source/ui/presenter/PresenterHelper.hxx:
     # base class has to be a complete type
     - com/sun/star/drawing/XPresenterHelper.hpp
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index ba6412524751..a012366e1bfa 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -24,6 +24,7 @@
 
 #include <sfx2/viewsh.hxx>
 #include <vcl/prntypes.hxx>
+#include <o3tl/deleter.hxx>
 #include <pres.hxx>
 #include "View.hxx"
 #include "fupoor.hxx"
@@ -31,8 +32,6 @@
 
 #include <memory>
 
-namespace o3tl { template <typename T> struct default_delete; }
-
 class SdPage;
 class SvxRuler;
 class SdrOle2Obj;       // for the ones, who have undefined parts of SVDRAW
diff --git a/sd/source/ui/inc/ViewShellImplementation.hxx b/sd/source/ui/inc/ViewShellImplementation.hxx
index 723789d28245..77dfc3ea0ded 100644
--- a/sd/source/ui/inc/ViewShellImplementation.hxx
+++ b/sd/source/ui/inc/ViewShellImplementation.hxx
@@ -23,10 +23,9 @@
 #include "ViewShell.hxx"
 #include "ViewShellManager.hxx"
 #include "ToolBarManager.hxx"
+#include <o3tl/deleter.hxx>
 #include <memory>
 
-namespace o3tl { template <typename T> struct default_delete; }
-
 class SvxIMapDlg;
 
 namespace sd {
diff --git a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
index 2fb0b61747fd..00fe6aa21622 100644
--- a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
+++ b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
@@ -22,10 +22,10 @@
 
 #include <memory>
 #include <sal/types.h>
+#include <o3tl/deleter.hxx>
 
 namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
 namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
-namespace o3tl { template <typename T> struct default_delete; }
 
 namespace sd {
 
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
index af705bd05385..a6667ef3ea57 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
@@ -24,13 +24,13 @@
 #include <canvas/elapsedtime.hxx>
 #include <vcl/idle.hxx>
 #include <sal/types.h>
+#include <o3tl/deleter.hxx>
 
 #include <functional>
 #include <memory>
 #include <vector>
 
 namespace sd { namespace slidesorter { class SlideSorter; } }
-namespace o3tl { template <typename T> struct default_delete; }
 
 namespace sd { namespace slidesorter { namespace controller {
 
diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
index 3ca03fba5d9b..e1444a586831 100644
--- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
@@ -24,6 +24,7 @@
 #include <model/SlsSharedPageDescriptor.hxx>
 #include <view/SlsLayouter.hxx>
 #include <view/SlsILayerPainter.hxx>
+#include <o3tl/deleter.hxx>
 
 #include <View.hxx>
 #include <tools/gen.hxx>
@@ -38,7 +39,6 @@ namespace sd { namespace slidesorter { namespace model {
 class SlideSorterModel;
 } } }
 
-namespace o3tl { template <typename T> struct default_delete; }
 namespace sd { class Window; }
 namespace sd { namespace slidesorter { class SlideSorter; } }
 
diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml
index 3cdfbe677d19..f15fbc15ee67 100644
--- a/sw/IwyuFilter_sw.yaml
+++ b/sw/IwyuFilter_sw.yaml
@@ -25,12 +25,6 @@ blacklist:
     sw/inc/swtypes.hxx:
     # Needed for macro #define
     - com/sun/star/i18n/CollatorOptions.hpp
-    sw/inc/doc.hxx:
-    - o3tl/deleter.hxx
-    sw/inc/docsh.hxx:
-    - o3tl/deleter.hxx
-    sw/inc/list.hxx:
-    - o3tl/deleter.hxx
     sw/inc/IDocumentLinksAdministration.hxx:
     - sal/types.h
     sw/inc/pagedesc.hxx:
@@ -56,7 +50,6 @@ blacklist:
     - com/sun/star/frame/XTerminateListener2.hpp
     - com/sun/star/lang/XServiceInfo.hpp
     - com/sun/star/util/XJobManager.hpp
-    - o3tl/deleter.hxx
     sw/inc/splargs.hxx:
     # inline dtor, complete type is needed
     - com/sun/star/linguistic2/XSpellAlternatives.hpp
@@ -234,8 +227,6 @@ blacklist:
     - com/sun/star/text/XTextColumns.hpp
     sw/inc/pagepreviewlayout.hxx:
     - vector
-    sw/inc/shellio.hxx:
-    - o3tl/deleter.hxx
     sw/inc/unostyle.hxx:
     # Base class needs complete type
     - com/sun/star/beans/XPropertySet.hpp

More information about the Libreoffice-commits mailing list