diff options
author | Gabor Kelemen <kelemeng@ubuntu.com> | 2018-12-31 20:22:02 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2019-01-15 11:54:11 +0100 |
commit | cec7ae9f3c69ecc83462f28fc4987e37dc1b420e (patch) | |
tree | e0554c836821251f174760ce2b9b5674636a2b59 /include/toolkit/controls | |
parent | e69c7cc46ef5a100d9581b7efb01ab4a868d1924 (diff) |
tdf#42949 Fix IWYU warnings in include/toolkit/*
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: Icebcf1a6ab073dce935a74ce79ee0f302b62e8a8
Reviewed-on: https://gerrit.libreoffice.org/65947
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'include/toolkit/controls')
18 files changed, 27 insertions, 72 deletions
diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx index 180fd538551c..9123c61e484d 100644 --- a/include/toolkit/controls/accessiblecontrolcontext.hxx +++ b/include/toolkit/controls/accessiblecontrolcontext.hxx @@ -24,11 +24,12 @@ #include <comphelper/accimplaccess.hxx> #include <comphelper/uno3.hxx> #include <com/sun/star/lang/XEventListener.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/awt/XWindow.hpp> #include <vcl/vclptr.hxx> namespace vcl { class Window; } +namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } } +namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } +namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } } namespace toolkit { diff --git a/include/toolkit/controls/animatedimages.hxx b/include/toolkit/controls/animatedimages.hxx index c4820ce86f69..d6bac5fe6009 100644 --- a/include/toolkit/controls/animatedimages.hxx +++ b/include/toolkit/controls/animatedimages.hxx @@ -20,14 +20,14 @@ #ifndef INCLUDED_TOOLKIT_CONTROLS_ANIMATEDIMAGES_HXX #define INCLUDED_TOOLKIT_CONTROLS_ANIMATEDIMAGES_HXX -#include <toolkit/controls/unocontrolbase.hxx> #include <toolkit/controls/unocontrolmodel.hxx> #include <com/sun/star/awt/XAnimatedImages.hpp> -#include <com/sun/star/container/XContainerListener.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase1.hxx> #include <memory> +namespace com { namespace sun { namespace star { namespace container { class XContainerListener; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } + namespace toolkit { diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx index 9d92b8d4e8dc..b2f4af1f5484 100644 --- a/include/toolkit/controls/controlmodelcontainerbase.hxx +++ b/include/toolkit/controls/controlmodelcontainerbase.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/util/XChangesListener.hpp> #include <com/sun/star/util/XModifyListener.hpp> #include <com/sun/star/beans/XPropertyChangeListener.hpp> -#include <com/sun/star/resource/XStringResourceResolver.hpp> #include <cppuhelper/implbase8.hxx> #include <cppuhelper/implbase3.hxx> #include <cppuhelper/weak.hxx> @@ -37,13 +36,13 @@ #include <toolkit/controls/unocontrolcontainer.hxx> #include <cppuhelper/propshlp.hxx> #include <cppuhelper/basemutex.hxx> -#include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/awt/tab/XTabPageModel.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XInitialization.hpp> -#include <tools/gen.hxx> #include <vector> +namespace com { namespace sun { namespace star { namespace resource { class XStringResourceResolver; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } + // class ControlModelContainerBase typedef UnoControlModel ControlModel_Base; diff --git a/include/toolkit/controls/dialogcontrol.hxx b/include/toolkit/controls/dialogcontrol.hxx index 082e08205f3e..83e9b13b2800 100644 --- a/include/toolkit/controls/dialogcontrol.hxx +++ b/include/toolkit/controls/dialogcontrol.hxx @@ -22,17 +22,11 @@ #include <toolkit/controls/controlmodelcontainerbase.hxx> #include <com/sun/star/awt/UnoControlDialog.hpp> -#include <com/sun/star/awt/XTopWindow.hpp> -#include <com/sun/star/awt/XDialog2.hpp> #include <com/sun/star/awt/XSimpleTabController.hpp> -#include <com/sun/star/graphic/XGraphicObject.hpp> -#include <toolkit/helper/servicenames.hxx> #include <toolkit/helper/macros.hxx> -#include <toolkit/controls/unocontrolcontainer.hxx> -#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase3.hxx> -#include <list> + +namespace com { namespace sun { namespace star { namespace awt { class XTopWindowListener; } } } } typedef ::cppu::AggImplInheritanceHelper2 < ControlContainerBase , css::awt::XUnoControlDialog diff --git a/include/toolkit/controls/eventcontainer.hxx b/include/toolkit/controls/eventcontainer.hxx index cc1d20493e4c..29ce0beecf80 100644 --- a/include/toolkit/controls/eventcontainer.hxx +++ b/include/toolkit/controls/eventcontainer.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_TOOLKIT_CONTROLS_EVENTCONTAINER_HXX #define INCLUDED_TOOLKIT_CONTROLS_EVENTCONTAINER_HXX -#include <osl/diagnose.h> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XContainer.hpp> diff --git a/include/toolkit/controls/formattedcontrol.hxx b/include/toolkit/controls/formattedcontrol.hxx index 8bacfa35b6bf..cf2cd9129bba 100644 --- a/include/toolkit/controls/formattedcontrol.hxx +++ b/include/toolkit/controls/formattedcontrol.hxx @@ -22,9 +22,8 @@ #include <toolkit/controls/unocontrols.hxx> #include <toolkit/controls/unocontrolmodel.hxx> -#include <toolkit/helper/servicenames.hxx> -#include <com/sun/star/util/XNumberFormatter.hpp> +namespace com { namespace sun { namespace star { namespace util { class XNumberFormatter; } } } } namespace toolkit diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx b/include/toolkit/controls/geometrycontrolmodel.hxx index cf8ea9bdacd0..be0daf863ad5 100644 --- a/include/toolkit/controls/geometrycontrolmodel.hxx +++ b/include/toolkit/controls/geometrycontrolmodel.hxx @@ -24,21 +24,14 @@ #include <comphelper/propagg.hxx> #include <comphelper/proparrhlp.hxx> #include <comphelper/propertycontainer.hxx> -#include <cppuhelper/weakagg.hxx> #include <cppuhelper/compbase2.hxx> #include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/script/XScriptEventsSupplier.hpp> -#include <com/sun/star/resource/XStringResourceResolver.hpp> -#include <cppuhelper/typeprovider.hxx> #include <comphelper/IdPropArrayHelper.hxx> +namespace com { namespace sun { namespace star { namespace resource { class XStringResourceResolver; } } } } + namespace com { namespace sun { namespace star { - namespace lang { - class XMultiServiceFactory; - } - namespace script { - class XNameContainer; - } namespace uno { class XComponentContext; } diff --git a/include/toolkit/controls/roadmapcontrol.hxx b/include/toolkit/controls/roadmapcontrol.hxx index c5a51a709476..b73916d22c3b 100644 --- a/include/toolkit/controls/roadmapcontrol.hxx +++ b/include/toolkit/controls/roadmapcontrol.hxx @@ -23,8 +23,6 @@ #include <toolkit/controls/unocontrols.hxx> #include <toolkit/controls/unocontrolmodel.hxx> -#include <toolkit/helper/servicenames.hxx> -#include <toolkit/controls/roadmapentry.hxx> #include <com/sun/star/container/XContainer.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/beans/XPropertyChangeListener.hpp> diff --git a/include/toolkit/controls/stdtabcontroller.hxx b/include/toolkit/controls/stdtabcontroller.hxx index c39c2da70871..b6b5b5ef762e 100644 --- a/include/toolkit/controls/stdtabcontroller.hxx +++ b/include/toolkit/controls/stdtabcontroller.hxx @@ -23,15 +23,15 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/awt/XTabController.hpp> -#include <com/sun/star/awt/XControl.hpp> -#include <com/sun/star/awt/XControlContainer.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <cppuhelper/weakagg.hxx> #include <osl/mutex.hxx> -#include <toolkit/helper/macros.hxx> -#include <toolkit/helper/servicenames.hxx> +namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } } +namespace com { namespace sun { namespace star { namespace awt { class XControl; } } } } +namespace com { namespace sun { namespace star { namespace awt { class XControlContainer; } } } } + class StdTabController final : public css::awt::XTabController, public css::lang::XServiceInfo, public css::lang::XTypeProvider, diff --git a/include/toolkit/controls/stdtabcontrollermodel.hxx b/include/toolkit/controls/stdtabcontrollermodel.hxx index 2f73c1c8af56..e930ed159d7c 100644 --- a/include/toolkit/controls/stdtabcontrollermodel.hxx +++ b/include/toolkit/controls/stdtabcontrollermodel.hxx @@ -24,15 +24,10 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/io/XPersistObject.hpp> #include <com/sun/star/awt/XTabControllerModel.hpp> -#include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> #include <cppuhelper/weakagg.hxx> -#include <toolkit/helper/macros.hxx> -#include <toolkit/helper/servicenames.hxx> #include <osl/mutex.hxx> -#include <tools/gen.hxx> #include <vector> struct UnoControlModelEntry; diff --git a/include/toolkit/controls/tabpagecontainer.hxx b/include/toolkit/controls/tabpagecontainer.hxx index 5e85542c99af..e7ace6cd8980 100644 --- a/include/toolkit/controls/tabpagecontainer.hxx +++ b/include/toolkit/controls/tabpagecontainer.hxx @@ -22,17 +22,17 @@ #include <com/sun/star/awt/tab/XTabPageContainer.hpp> #include <com/sun/star/awt/tab/XTabPageContainerModel.hpp> -#include <com/sun/star/awt/tab/XTabPageContainerListener.hpp> -#include <com/sun/star/awt/tab/XTabPage.hpp> -#include <com/sun/star/awt/tab/XTabPageModel.hpp> #include <toolkit/controls/unocontrolbase.hxx> #include <toolkit/controls/unocontrolmodel.hxx> -#include <toolkit/helper/servicenames.hxx> #include <cppuhelper/implbase1.hxx> #include <toolkit/controls/controlmodelcontainerbase.hxx> #include <toolkit/helper/listenermultiplexer.hxx> +namespace com { namespace sun { namespace star { namespace awt { namespace tab { class XTabPage; } } } } } +namespace com { namespace sun { namespace star { namespace awt { namespace tab { class XTabPageContainerListener; } } } } } +namespace com { namespace sun { namespace star { namespace awt { namespace tab { class XTabPageModel; } } } } } + // class css::awt::tab::UnoControlTabPageContainerModel typedef ::cppu::AggImplInheritanceHelper1 < UnoControlModel diff --git a/include/toolkit/controls/tabpagemodel.hxx b/include/toolkit/controls/tabpagemodel.hxx index c4a33337d1fb..a4e76081b5fb 100644 --- a/include/toolkit/controls/tabpagemodel.hxx +++ b/include/toolkit/controls/tabpagemodel.hxx @@ -21,14 +21,8 @@ #define INCLUDED_TOOLKIT_CONTROLS_TABPAGEMODEL_HXX #include <toolkit/controls/controlmodelcontainerbase.hxx> -#include <com/sun/star/awt/tab/XTabPageModel.hpp> #include <com/sun/star/awt/tab/XTabPage.hpp> -#include <com/sun/star/lang/XInitialization.hpp> -#include <toolkit/helper/servicenames.hxx> -#include <toolkit/helper/macros.hxx> #include <toolkit/controls/unocontrolcontainer.hxx> -#include <cppuhelper/basemutex.hxx> -#include <list> #include <cppuhelper/implbase2.hxx> class UnoControlTabPageModel : public ControlModelContainerBase diff --git a/include/toolkit/controls/tkscrollbar.hxx b/include/toolkit/controls/tkscrollbar.hxx index 3682a4e57551..3abd331de396 100644 --- a/include/toolkit/controls/tkscrollbar.hxx +++ b/include/toolkit/controls/tkscrollbar.hxx @@ -20,12 +20,9 @@ #define INCLUDED_TOOLKIT_CONTROLS_TKSCROLLBAR_HXX #include <toolkit/controls/unocontrolmodel.hxx> -#include <toolkit/helper/servicenames.hxx> #include <toolkit/controls/unocontrolbase.hxx> -#include <toolkit/helper/macros.hxx> #include <com/sun/star/awt/XScrollBar.hpp> #include <com/sun/star/awt/XAdjustmentListener.hpp> -#include <com/sun/star/awt/AdjustmentType.hpp> namespace toolkit diff --git a/include/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx index 7bc020140686..94b3f09a1999 100644 --- a/include/toolkit/controls/unocontrol.hxx +++ b/include/toolkit/controls/unocontrol.hxx @@ -26,17 +26,11 @@ #include <com/sun/star/awt/XView.hpp> #include <com/sun/star/beans/XPropertiesChangeListener.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/awt/XUnitConversion.hpp> #include <com/sun/star/awt/XStyleSettingsSupplier.hpp> #include <com/sun/star/accessibility/XAccessible.hpp> -#include <cppuhelper/weakagg.hxx> #include <osl/mutex.hxx> -#include <toolkit/helper/mutexandbroadcasthelper.hxx> #include <toolkit/helper/listenermultiplexer.hxx> -#include <cppuhelper/propshlp.hxx> -#include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/weakref.hxx> #include <cppuhelper/implbase9.hxx> #include <com/sun/star/util/XModeChangeBroadcaster.hpp> diff --git a/include/toolkit/controls/unocontrolcontainer.hxx b/include/toolkit/controls/unocontrolcontainer.hxx index 816632d418db..79da9c09489c 100644 --- a/include/toolkit/controls/unocontrolcontainer.hxx +++ b/include/toolkit/controls/unocontrolcontainer.hxx @@ -26,10 +26,7 @@ #include <com/sun/star/container/XContainer.hpp> #include <com/sun/star/container/XIdentifierContainer.hpp> -#include <toolkit/controls/unocontrol.hxx> #include <toolkit/controls/unocontrolbase.hxx> -#include <toolkit/helper/macros.hxx> -#include <toolkit/helper/servicenames.hxx> #include <cppuhelper/implbase4.hxx> #include <memory> diff --git a/include/toolkit/controls/unocontrolcontainermodel.hxx b/include/toolkit/controls/unocontrolcontainermodel.hxx index b541f275976e..1de5058dc90a 100644 --- a/include/toolkit/controls/unocontrolcontainermodel.hxx +++ b/include/toolkit/controls/unocontrolcontainermodel.hxx @@ -22,8 +22,6 @@ #include <toolkit/controls/unocontrolmodel.hxx> -#include <toolkit/helper/macros.hxx> -#include <toolkit/helper/servicenames.hxx> // class css::awt::UnoControlContainerModel diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx index b736e6db49f1..aa358a927246 100644 --- a/include/toolkit/controls/unocontrolmodel.hxx +++ b/include/toolkit/controls/unocontrolmodel.hxx @@ -25,17 +25,14 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/io/XPersistObject.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/util/XCloneable.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/weakagg.hxx> #include <toolkit/helper/mutexandbroadcasthelper.hxx> #include <toolkit/helper/listenermultiplexer.hxx> #include <cppuhelper/propshlp.hxx> -#include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/implbase7.hxx> #include <comphelper/uno3.hxx> #include <rtl/ref.hxx> @@ -43,6 +40,8 @@ #include <vector> #include <map> +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } + typedef std::map<sal_uInt16, css::uno::Any> ImplPropertyTable; diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx index c7fd44c520f7..5feb07b266c6 100644 --- a/include/toolkit/controls/unocontrols.hxx +++ b/include/toolkit/controls/unocontrols.hxx @@ -42,23 +42,21 @@ #include <com/sun/star/awt/XPatternField.hpp> #include <com/sun/star/awt/XProgressBar.hpp> #include <com/sun/star/awt/XItemList.hpp> -#include <com/sun/star/graphic/XGraphicObject.hpp> #include <toolkit/controls/unocontrolmodel.hxx> #include <toolkit/controls/unocontrolbase.hxx> #include <toolkit/helper/macros.hxx> -#include <toolkit/helper/servicenames.hxx> -#include <vcl/bitmapex.hxx> #include <cppuhelper/implbase5.hxx> #include <cppuhelper/implbase4.hxx> -#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase1.hxx> #include <comphelper/uno3.hxx> +#include <tools/gen.hxx> -#include <list> #include <memory> #include <vector> namespace boost { template <class T> class optional; } +namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } } +namespace com { namespace sun { namespace star { namespace graphic { class XGraphicObject; } } } } class ImageHelper { |