diff options
author | Gabor Kelemen <kelemeng@ubuntu.com> | 2018-10-31 01:07:00 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2018-11-12 14:10:51 +0100 |
commit | 2b39827a0ef0ee3065e3e6abed371cd68c38e83d (patch) | |
tree | e6c8947ee13eb8e31fcfc79723c5200aba361342 /sd/source/ui/slidesorter/inc/view | |
parent | 5d43a4d941b34cb076a6a2463dccd327ff83e7b9 (diff) |
tdf#42949 Fix IWYU warnings in sd/source/ui/slidesorter/inc/*
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I48e3c5a62314baa11d6c53ce41311a9a0f1c661b
Reviewed-on: https://gerrit.libreoffice.org/62678
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sd/source/ui/slidesorter/inc/view')
9 files changed, 19 insertions, 39 deletions
diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index 5706500825c9..3ca03fba5d9b 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -20,29 +20,16 @@ #ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLIDESORTERVIEW_HXX #define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLIDESORTERVIEW_HXX -#include <SlideSorter.hxx> #include <model/SlsPageDescriptor.hxx> #include <model/SlsSharedPageDescriptor.hxx> #include <view/SlsLayouter.hxx> #include <view/SlsILayerPainter.hxx> #include <View.hxx> -#include <sfx2/viewfrm.hxx> -#include <pres.hxx> -#include <o3tl/deleter.hxx> #include <tools/gen.hxx> -#include <svx/svdmodel.hxx> #include <vcl/region.hxx> -#include <vcl/outdev.hxx> -#include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <memory> -class Point; - -namespace sd { namespace slidesorter { namespace controller { -class Properties; -} } } - namespace sd { namespace slidesorter { namespace cache { class PageCache; } } } @@ -51,10 +38,13 @@ 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; } } + namespace sd { namespace slidesorter { namespace view { class LayeredDevice; -class Layouter; class PageObjectPainter; class ToolTip; diff --git a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx index 0175f6e07200..3705546a8a56 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx @@ -23,7 +23,6 @@ #include <tools/SdGlobalResourceContainer.hxx> #include <memory> -#include <vcl/mapmod.hxx> namespace vcl { class Font; } diff --git a/sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx b/sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx index 35c58de2b285..a8c39b9bc650 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSILAYERPAINTER_HXX #define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSILAYERPAINTER_HXX -#include <sal/types.h> #include <memory> class OutputDevice; diff --git a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx index 9dcbd754e04c..8b3a408ca45f 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx @@ -20,10 +20,8 @@ #ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSINSERTIONINDICATOROVERLAY_HXX #define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSINSERTIONINDICATOROVERLAY_HXX -#include <model/SlsSharedPageDescriptor.hxx> #include <view/SlsILayerPainter.hxx> #include <controller/SlsTransferableData.hxx> -#include <sdxfer.hxx> #include <tools/gen.hxx> #include <vcl/bitmapex.hxx> @@ -31,15 +29,12 @@ #include <vector> class OutputDevice; +class SdTransferable; namespace sd { namespace slidesorter { class SlideSorter; } } -namespace sd { namespace slidesorter { namespace controller { -class Transferable; -} } } - namespace sd { namespace slidesorter { namespace view { class FramePainter; diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx index dce7ebc9edbf..a57b3a7ece38 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx @@ -20,17 +20,15 @@ #ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSLAYOUTER_HXX #define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSLAYOUTER_HXX -#include <SlideSorter.hxx> -#include <view/SlsPageObjectLayouter.hxx> -#include <view/SlsTheme.hxx> +#include <vcl/vclptr.hxx> +#include <tools/gen.hxx> #include <sal/types.h> -#include <tools/fract.hxx> -#include <vcl/mapmod.hxx> #include <memory> -#include <vector> -#include <utility> -class Size; +namespace sd { class Window; } +namespace sd { namespace slidesorter { namespace model { class SlideSorterModel; } } } +namespace sd { namespace slidesorter { namespace view { class PageObjectLayouter; } } } +namespace sd { namespace slidesorter { namespace view { class Theme; } } } namespace sd { namespace slidesorter { namespace view { diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx index 4dcfd6aadc18..9b8629fa642f 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx @@ -20,12 +20,12 @@ #ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSPAGEOBJECTLAYOUTER_HXX #define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSPAGEOBJECTLAYOUTER_HXX -#include <SlideSorter.hxx> #include <model/SlsSharedPageDescriptor.hxx> #include <tools/gen.hxx> #include <vcl/image.hxx> namespace vcl { class Font; } +namespace sd { class Window; } namespace sd { namespace slidesorter { namespace view { diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx index ce7098a86a0d..4cd1deaeec5c 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx @@ -20,9 +20,7 @@ #ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSPAGEOBJECTPAINTER_HXX #define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSPAGEOBJECTPAINTER_HXX -#include <SlideSorter.hxx> -#include <model/SlsPageDescriptor.hxx> -#include <view/SlsLayouter.hxx> +#include <model/SlsSharedPageDescriptor.hxx> #include <view/SlsTheme.hxx> #include <memory> @@ -30,6 +28,8 @@ namespace sd { namespace slidesorter { namespace cache { class PageCache; } } } +namespace sd { namespace slidesorter { class SlideSorter; } } + namespace sd { namespace slidesorter { namespace view { class Layouter; diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx index 1f4827c0c5a6..e94c97b1c44b 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx @@ -20,15 +20,13 @@ #ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSTHEME_HXX #define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSTHEME_HXX -#include <model/SlsVisualState.hxx> - #include <vcl/bitmapex.hxx> -#include <vcl/font.hxx> -#include <vcl/gradient.hxx> #include <tools/color.hxx> #include <memory> +namespace vcl { class Font; } + namespace sd { namespace slidesorter { namespace controller { class Properties; } } } diff --git a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx index 3f3b2ea24291..a73c966aef38 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx @@ -20,10 +20,11 @@ #ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSTOOLTIP_HXX #define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSTOOLTIP_HXX -#include <SlideSorter.hxx> #include <model/SlsSharedPageDescriptor.hxx> #include <vcl/timer.hxx> +namespace sd { namespace slidesorter { class SlideSorter; } } + namespace sd { namespace slidesorter { namespace view { /** Manage the display of tool tips. The tool tip text changes when the |