From b53403c54c4fef4ecf5b9b8ba98eb643a0297858 Mon Sep 17 00:00:00 2001 From: Gabor Kelemen Date: Sat, 6 Jul 2019 21:41:44 +0200 Subject: tdf#42949 Fix IWYU warnings in include/ Recheck directories in include/ between vcl and svx in the module hierarchy Found with bin/find-unneeded-includes Only removal proposals are dealt with here. New IWYU and recent developments in f-u-i helped to identify some non self contained files, those were fixed too. Change-Id: Ieab6083ee2aae33baf32d05943b07ad2de6f9d7f Reviewed-on: https://gerrit.libreoffice.org/75170 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- include/IwyuFilter_include.yaml | 12 ++++++++++++ include/canvas/base/canvasbase.hxx | 1 + include/canvas/base/canvascustomspritebase.hxx | 2 ++ include/canvas/base/graphicdevicebase.hxx | 6 ++++++ include/cppcanvas/sprite.hxx | 2 -- include/sfx2/dinfdlg.hxx | 1 + include/sfx2/groupid.hxx | 4 ++++ include/sfx2/objsh.hxx | 1 - include/svtools/calendar.hxx | 4 ---- include/svtools/langhelp.hxx | 2 ++ include/svtools/prnsetup.hxx | 1 + include/svtools/rtftoken.h | 2 ++ include/svtools/simptabl.hxx | 1 - include/vcl/BitmapColor.hxx | 1 - include/vcl/IContext.hxx | 2 ++ include/vcl/IPrioritable.hxx | 2 ++ include/vcl/Scanline.hxx | 1 - include/vcl/aboutdialog.hxx | 1 - include/vcl/animate/AnimationBitmap.hxx | 1 - include/vcl/msgbox.hxx | 1 + include/xmloff/nmspmap.hxx | 1 - 21 files changed, 36 insertions(+), 13 deletions(-) (limited to 'include') diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index a9b99c14814e..e9b112c4261b 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -279,6 +279,10 @@ blacklist: include/vcl/FilterConfigItem.hxx: # Needed on Windows with --disable-pch - com/sun/star/beans/PropertyValue.hpp + include/vcl/builderfactory.hxx: + # Needed for macro #define + - vcl/builder.hxx + - vcl/vclptr.hxx include/vcl/decoview.hxx: # Full definition needed for VclPtr - vcl/outdev.hxx @@ -298,6 +302,14 @@ blacklist: include/vcl/mtfxmldump.hxx: # Full definition needed for o3tl::enumarray - vcl/metaactiontypes.hxx + include/vcl/salbtype.hxx: + # TODO remove this file entirely, contains only these headers now + - vcl/BitmapAccessMode.hxx + - vcl/BitmapBuffer.hxx + - vcl/BitmapColor.hxx + - vcl/BitmapPalette.hxx + - vcl/ColorMask.hxx + - vcl/Scanline.hxx include/vcl/outdevstate.hxx: # Full definition needed for boost::optional - vcl/mapmod.hxx diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx index 3166e7fbb086..371b234b5ca1 100644 --- a/include/canvas/base/canvasbase.hxx +++ b/include/canvas/base/canvasbase.hxx @@ -21,6 +21,7 @@ #define INCLUDED_CANVAS_BASE_CANVASBASE_HXX #include +#include #include #include #include diff --git a/include/canvas/base/canvascustomspritebase.hxx b/include/canvas/base/canvascustomspritebase.hxx index cb75f500db62..f67a7849f69c 100644 --- a/include/canvas/base/canvascustomspritebase.hxx +++ b/include/canvas/base/canvascustomspritebase.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_CANVAS_BASE_CANVASCUSTOMSPRITEBASE_HXX #define INCLUDED_CANVAS_BASE_CANVASCUSTOMSPRITEBASE_HXX +#include + #include #include #include diff --git a/include/canvas/base/graphicdevicebase.hxx b/include/canvas/base/graphicdevicebase.hxx index b7b3b22a0921..5590178a7d8f 100644 --- a/include/canvas/base/graphicdevicebase.hxx +++ b/include/canvas/base/graphicdevicebase.hxx @@ -20,6 +20,12 @@ #ifndef INCLUDED_CANVAS_BASE_GRAPHICDEVICEBASE_HXX #define INCLUDED_CANVAS_BASE_GRAPHICDEVICEBASE_HXX +#include +#include +#include +#include +#include + #include #include diff --git a/include/cppcanvas/sprite.hxx b/include/cppcanvas/sprite.hxx index 6135ebb106b6..3321eb6a03a3 100644 --- a/include/cppcanvas/sprite.hxx +++ b/include/cppcanvas/sprite.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_CPPCANVAS_SPRITE_HXX #define INCLUDED_CPPCANVAS_SPRITE_HXX -#include - namespace basegfx { class B2DHomMatrix; diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 3f25e3403543..8d51697334e8 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -22,6 +22,7 @@ #include #include +#include #include #include #include diff --git a/include/sfx2/groupid.hxx b/include/sfx2/groupid.hxx index 1e6823c85af8..7829fa8c0298 100644 --- a/include/sfx2/groupid.hxx +++ b/include/sfx2/groupid.hxx @@ -19,6 +19,10 @@ #ifndef INCLUDED_SFX2_GROUPID_HXX #define INCLUDED_SFX2_GROUPID_HXX +#include + +#include + // !! If you add a new group, please change sfxbasecontroller.cxx and // !! com.sun.star.frame.CommandGroup accordingly! diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index eaa93afd72da..1658f6db6b26 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -27,7 +27,6 @@ #include #include -#include #include #include #include diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index 562b1e9de169..b2c4ee7a5acd 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -21,13 +21,9 @@ #define INCLUDED_SVTOOLS_CALENDAR_HXX #include -#include #include -#include #include -#include -#include class MouseEvent; class TrackingEvent; diff --git a/include/svtools/langhelp.hxx b/include/svtools/langhelp.hxx index e3f914c7457e..248c559b6340 100644 --- a/include/svtools/langhelp.hxx +++ b/include/svtools/langhelp.hxx @@ -12,6 +12,8 @@ #include +#include + #include /** Localize a URI to one of the foundation's webservices diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx index 4d75ce0a313c..5ea91fecaa01 100644 --- a/include/svtools/prnsetup.hxx +++ b/include/svtools/prnsetup.hxx @@ -21,6 +21,7 @@ #define INCLUDED_SVTOOLS_PRNSETUP_HXX #include +#include #include #include diff --git a/include/svtools/rtftoken.h b/include/svtools/rtftoken.h index 15061a81c45c..754408dd9d40 100644 --- a/include/svtools/rtftoken.h +++ b/include/svtools/rtftoken.h @@ -20,6 +20,8 @@ #ifndef INCLUDED_SVTOOLS_RTFTOKEN_H #define INCLUDED_SVTOOLS_RTFTOKEN_H +#include + namespace rtl { class OUString; }; diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index dad32aa3cab2..44778f673069 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -24,7 +24,6 @@ #include #include #include -#include class SvSimpleTable; class SVT_DLLPUBLIC SvSimpleTableContainer : public Control diff --git a/include/vcl/BitmapColor.hxx b/include/vcl/BitmapColor.hxx index f6e1751a3be5..0ae0370455a9 100644 --- a/include/vcl/BitmapColor.hxx +++ b/include/vcl/BitmapColor.hxx @@ -22,7 +22,6 @@ #include #include -#include class VCL_DLLPUBLIC BitmapColor final : public Color { diff --git a/include/vcl/IContext.hxx b/include/vcl/IContext.hxx index 841c9d69e828..532242f213e5 100644 --- a/include/vcl/IContext.hxx +++ b/include/vcl/IContext.hxx @@ -13,6 +13,8 @@ #include #include +#include + namespace vcl { diff --git a/include/vcl/IPrioritable.hxx b/include/vcl/IPrioritable.hxx index 29b2fd708008..55faf6431243 100644 --- a/include/vcl/IPrioritable.hxx +++ b/include/vcl/IPrioritable.hxx @@ -10,6 +10,8 @@ #ifndef INCLUDED_VCL_IPRIORITABLE_HXX #define INCLUDED_VCL_IPRIORITABLE_HXX +#include + #define VCL_PRIORITY_DEFAULT -1 namespace vcl diff --git a/include/vcl/Scanline.hxx b/include/vcl/Scanline.hxx index d855f78a2e54..4c68efe4c41e 100644 --- a/include/vcl/Scanline.hxx +++ b/include/vcl/Scanline.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_VCL_SCANLINE_HXX #define INCLUDED_VCL_SCANLINE_HXX -#include #include typedef sal_uInt8* Scanline; diff --git a/include/vcl/aboutdialog.hxx b/include/vcl/aboutdialog.hxx index 8a620a004c5a..02cc2e734b10 100644 --- a/include/vcl/aboutdialog.hxx +++ b/include/vcl/aboutdialog.hxx @@ -10,7 +10,6 @@ #ifndef INCLUDED_VCL_ABOUT_DIALOG_HXX #define INCLUDED_VCL_ABOUT_DIALOG_HXX -#include #include #include #include diff --git a/include/vcl/animate/AnimationBitmap.hxx b/include/vcl/animate/AnimationBitmap.hxx index 8dd9a0272862..ae8aaab1634f 100644 --- a/include/vcl/animate/AnimationBitmap.hxx +++ b/include/vcl/animate/AnimationBitmap.hxx @@ -21,7 +21,6 @@ #define INCLUDED_VCL_ANIMATE_ANIMATIONBITMAP_HXX #include -#include #include enum class Disposal diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx index ccdcf3aec7ff..042cef0a4010 100644 --- a/include/vcl/msgbox.hxx +++ b/include/vcl/msgbox.hxx @@ -21,6 +21,7 @@ #define INCLUDED_VCL_MSGBOX_HXX #include +#include VCL_DLLPUBLIC Image const & GetStandardInfoBoxImage(); VCL_DLLPUBLIC OUString GetStandardInfoBoxText(); diff --git a/include/xmloff/nmspmap.hxx b/include/xmloff/nmspmap.hxx index 9c4c57393200..234b5e4dda2a 100644 --- a/include/xmloff/nmspmap.hxx +++ b/include/xmloff/nmspmap.hxx @@ -22,7 +22,6 @@ #include -#include #include #include -- cgit