Skip to content

Commit

Permalink
tdf#42949 Fix IWYU warnings in include/toolkit/*
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
kelemeng authored and vmiklos committed Jan 15, 2019
1 parent e69c7cc commit cec7ae9
Show file tree
Hide file tree
Showing 79 changed files with 244 additions and 165 deletions.
1 change: 1 addition & 0 deletions accessibility/source/extended/accessibletabbar.cxx
Expand Up @@ -23,6 +23,7 @@
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/awt/XDevice.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <cppuhelper/supportsservice.hxx>
#include <unotools/accessiblestatesethelper.hxx>
Expand Down
1 change: 1 addition & 0 deletions accessibility/source/standard/accessiblemenucomponent.cxx
Expand Up @@ -25,6 +25,7 @@
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/awt/XDevice.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <unotools/accessiblestatesethelper.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
Expand Down
1 change: 1 addition & 0 deletions canvas/source/directx/dx_spritecanvas.cxx
Expand Up @@ -34,6 +34,7 @@
#include <osl/mutex.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/diagnose_ex.h>
#include <vcl/window.hxx>

#include <canvas/canvastools.hxx>

Expand Down
Expand Up @@ -24,6 +24,7 @@
#include <svx/ShapeTypeHandler.hxx>
#include <svx/AccessibleShape.hxx>
#include <svx/AccessibleShapeInfo.hxx>
#include <vcl/window.hxx>

using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
Expand Down
1 change: 1 addition & 0 deletions dbaccess/source/ui/browser/unodatbr.cxx
Expand Up @@ -52,6 +52,7 @@
#include <com/sun/star/awt/VisualEffect.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/form/XForm.hpp>
#include <com/sun/star/form/XGridColumnFactory.hpp>
Expand Down
1 change: 1 addition & 0 deletions dbaccess/source/ui/control/dbtreelistbox.cxx
Expand Up @@ -28,6 +28,7 @@
#include <com/sun/star/util/URL.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <cppuhelper/implbase.hxx>
#include <comphelper/interfacecontainer2.hxx>
#include <comphelper/processfactory.hxx>
Expand Down
1 change: 1 addition & 0 deletions dbaccess/source/ui/inc/UITools.hxx
Expand Up @@ -70,6 +70,7 @@ namespace svt
}

namespace vcl { class Window; }
namespace weld {class Window; }
class ToolBox;
namespace vcl { class Font; }
class SvNumberFormatter;
Expand Down
1 change: 1 addition & 0 deletions desktop/source/app/app.cxx
Expand Up @@ -123,6 +123,7 @@
#include <svtools/accessibilityoptions.hxx>
#include <svtools/apearcfg.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/window.hxx>

#include "langselect.hxx"

Expand Down
1 change: 1 addition & 0 deletions extensions/source/propctrlr/handlerhelper.cxx
Expand Up @@ -36,6 +36,7 @@
#include <tools/diagnose_ex.h>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>

#include <algorithm>

Expand Down
1 change: 1 addition & 0 deletions extensions/source/propctrlr/propcontroller.cxx
Expand Up @@ -36,6 +36,7 @@
#include <com/sun/star/inspection/PropertyControlType.hpp>
#include <com/sun/star/ucb/AlreadyInitializedException.hpp>
#include <com/sun/star/lang/XSingleComponentFactory.hpp>
#include <com/sun/star/util/VetoException.hpp>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <comphelper/types.hxx>
Expand Down
1 change: 1 addition & 0 deletions forms/source/component/ImageControl.cxx
Expand Up @@ -48,6 +48,7 @@
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <unotools/streamhelper.hxx>
#include <comphelper/guarding.hxx>
#include <comphelper/property.hxx>
Expand Down
140 changes: 140 additions & 0 deletions include/IwyuFilter_include.yaml
Expand Up @@ -287,3 +287,143 @@ blacklist:
# base class has to be a complete type
- com/sun/star/accessibility/XAccessibleRelationSet.hpp
- com/sun/star/accessibility/XAccessible.hpp
include/toolkit/awt/vclxaccessiblecomponent.hxx:
# base class has to be a complete type
- com/sun/star/lang/XServiceInfo.hpp
include/toolkit/awt/animatedimagespeer.hxx:
# base class has to be a complete type
- com/sun/star/awt/XAnimation.hpp
- com/sun/star/container/XContainerListener.hpp
- com/sun/star/util/XModifyListener.hpp
- toolkit/awt/vclxwindow.hxx
include/toolkit/awt/vclxpointer.hxx:
# base class has to be a complete type
- com/sun/star/awt/XPointer.hpp
- com/sun/star/lang/XServiceInfo.hpp
- com/sun/star/lang/XUnoTunnel.hpp
include/toolkit/awt/vclxspinbutton.hxx:
# base class has to be a complete type
- com/sun/star/awt/XSpinValue.hpp
include/toolkit/awt/vclxprinter.hxx:
# base class has to be a complete type
- com/sun/star/awt/XPrinterPropertySet.hpp
- com/sun/star/awt/XInfoPrinter.hpp
- com/sun/star/awt/XPrinterPropertySet.hpp
- com/sun/star/awt/XPrinterServer.hpp
- com/sun/star/lang/XServiceInfo.hpp
include/toolkit/awt/vclxtopwindow.hxx:
# base class has to be a complete type
- com/sun/star/awt/XTopWindow2.hpp
- com/sun/star/awt/XSystemDependentWindowPeer.hpp
include/toolkit/awt/vclxtabpagecontainer.hxx:
# base class has to be a complete type
- com/sun/star/awt/tab/XTabPageContainer.hpp
- com/sun/star/container/XContainerListener.hpp
- toolkit/awt/vclxcontainer.hxx
include/toolkit/awt/vclxwindow.hxx:
# base class has to be a complete type
- toolkit/awt/vclxdevice.hxx
- com/sun/star/awt/XWindow2.hpp
- com/sun/star/awt/XVclWindowPeer.hpp
- com/sun/star/awt/XLayoutConstrains.hpp
- com/sun/star/awt/XView.hpp
- com/sun/star/beans/XPropertySetInfo.hpp
- com/sun/star/accessibility/XAccessible.hpp
- com/sun/star/awt/XDockableWindow.hpp
- com/sun/star/awt/XStyleSettingsSupplier.hpp
include/toolkit/awt/vclxwindows.hxx:
# base class has to be a complete type
- com/sun/star/awt/XListBox.hpp
- com/sun/star/awt/XToggleButton.hpp
- com/sun/star/awt/XComboBox.hpp
- com/sun/star/awt/XItemListListener.hpp
include/toolkit/controls/accessiblecontrolcontext.hxx:
# base class has to be a complete type
- com/sun/star/lang/XEventListener.hpp
include/toolkit/controls/animatedimages.hxx:
# base class has to be a complete type
- com/sun/star/awt/XAnimatedImages.hpp
- toolkit/controls/unocontrolmodel.hxx
include/toolkit/controls/controlmodelcontainerbase.hxx:
# base class has to be a complete type
- com/sun/star/awt/tab/XTabPageModel.hpp
- com/sun/star/awt/XTabControllerModel.hpp
- com/sun/star/beans/XPropertyChangeListener.hpp
- com/sun/star/container/XContainer.hpp
- com/sun/star/container/XNameContainer.hpp
- com/sun/star/lang/XInitialization.hpp
- com/sun/star/lang/XMultiServiceFactory.hpp
- com/sun/star/util/XChangesListener.hpp
- com/sun/star/util/XChangesNotifier.hpp
- toolkit/controls/unocontrolcontainer.hxx
include/toolkit/controls/dialogcontrol.hxx:
# base class has to be a complete type
- com/sun/star/awt/UnoControlDialog.hpp
include/toolkit/controls/eventcontainer.hxx:
# base class has to be a complete type
- com/sun/star/container/XContainer.hpp
- com/sun/star/container/XNameContainer.hpp
include/toolkit/controls/geometrycontrolmodel.hxx:
# base class has to be a complete type
- com/sun/star/script/XScriptEventsSupplier.hpp
- com/sun/star/util/XCloneable.hpp
# Needed for template classes
- toolkit/controls/geometrycontrolmodel_impl.hxx
include/toolkit/controls/roadmapcontrol.hxx:
# base class has to be a complete type
- com/sun/star/awt/XItemEventBroadcaster.hpp
- com/sun/star/awt/XItemListener.hpp
- com/sun/star/beans/XPropertyChangeListener.hpp
- com/sun/star/container/XContainerListener.hpp
include/toolkit/controls/roadmapentry.hxx:
# base class has to be a complete type
- com/sun/star/lang/XServiceInfo.hpp
include/toolkit/controls/tabpagecontainer.hxx:
# base class has to be a complete type
- com/sun/star/awt/tab/XTabPageContainer.hpp
- toolkit/controls/controlmodelcontainerbase.hxx
include/toolkit/controls/tabpagemodel.hxx:
# base class has to be a complete type
- com/sun/star/awt/tab/XTabPage.hpp
- toolkit/controls/unocontrolcontainer.hxx
include/toolkit/controls/unocontrol.hxx:
# base class has to be a complete type
- com/sun/star/awt/XControl.hpp
- com/sun/star/awt/XWindow2.hpp
- com/sun/star/awt/XView.hpp
- com/sun/star/beans/XPropertiesChangeListener.hpp
- com/sun/star/lang/XServiceInfo.hpp
- com/sun/star/awt/XUnitConversion.hpp
- com/sun/star/awt/XStyleSettingsSupplier.hpp
- com/sun/star/accessibility/XAccessible.hpp
- com/sun/star/util/XModeChangeBroadcaster.hpp
include/toolkit/controls/unocontrolcontainer.hxx:
# base class has to be a complete type
- com/sun/star/awt/XControlContainer.hpp
- com/sun/star/awt/XUnoControlContainer.hpp
- com/sun/star/container/XContainer.hpp
- com/sun/star/container/XIdentifierContainer.hpp
- toolkit/controls/unocontrolbase.hxx
include/toolkit/controls/unocontrolmodel.hxx:
# base class has to be a complete type
- com/sun/star/awt/XControlModel.hpp
- com/sun/star/lang/XComponent.hpp
- com/sun/star/lang/XServiceInfo.hpp
- com/sun/star/beans/XPropertyState.hpp
- com/sun/star/io/XPersistObject.hpp
- com/sun/star/lang/XUnoTunnel.hpp
- com/sun/star/util/XCloneable.hpp
include/toolkit/controls/unocontrols.hxx:
# base class has to be a complete type
- com/sun/star/awt/XTextComponent.hpp
- com/sun/star/awt/XTextListener.hpp
- com/sun/star/awt/XTextLayoutConstrains.hpp
- com/sun/star/awt/XButton.hpp
- com/sun/star/awt/XToggleButton.hpp
- com/sun/star/awt/XRadioButton.hpp
- com/sun/star/awt/XCheckBox.hpp
- com/sun/star/awt/XListBox.hpp
- com/sun/star/awt/XItemList.hpp
include/toolkit/helper/macros.hxx:
# Needed for macros
- comphelper/servicehelper.hxx
1 change: 1 addition & 0 deletions include/svx/fmgridif.hxx
Expand Up @@ -23,6 +23,7 @@

#include <com/sun/star/view/XSelectionSupplier.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/container/XContainer.hpp>
#include <com/sun/star/container/XContainerListener.hpp>
Expand Down
1 change: 1 addition & 0 deletions include/toolkit/awt/animatedimagespeer.hxx
Expand Up @@ -21,6 +21,7 @@
#define INCLUDED_TOOLKIT_AWT_ANIMATEDIMAGESPEER_HXX

#include <toolkit/awt/vclxwindow.hxx>
#include <com/sun/star/container/XContainerListener.hpp>

#include <com/sun/star/awt/XAnimation.hpp>
#include <com/sun/star/util/XModifyListener.hpp>
Expand Down
8 changes: 2 additions & 6 deletions include/toolkit/awt/vclxaccessiblecomponent.hxx
Expand Up @@ -21,11 +21,6 @@
#define INCLUDED_TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX

#include <toolkit/dllapi.h>
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase1.hxx>
#include <comphelper/accimplaccess.hxx>
Expand All @@ -35,9 +30,10 @@
#include <tools/link.hxx>
#include <vcl/vclptr.hxx>

namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } }

namespace vcl { class Window; }
class VCLXWindow;
class VclSimpleEvent;
class VclWindowEvent;

namespace utl {
Expand Down
1 change: 0 additions & 1 deletion include/toolkit/awt/vclxcontainer.hxx
Expand Up @@ -23,7 +23,6 @@

#include <com/sun/star/awt/XVclContainer.hpp>
#include <com/sun/star/awt/XVclContainerPeer.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <cppuhelper/weak.hxx>

#include <toolkit/awt/vclxwindow.hxx>
Expand Down
3 changes: 0 additions & 3 deletions include/toolkit/awt/vclxdevice.hxx
Expand Up @@ -30,9 +30,6 @@

#include <com/sun/star/awt/XUnitConversion.hpp>

class OutputDevice;
class VirtualDevice;

/// An UNO wrapper for the VCL OutputDevice
class TOOLKIT_DLLPUBLIC VCLXDevice :
public css::awt::XDevice,
Expand Down
7 changes: 5 additions & 2 deletions include/toolkit/awt/vclxfont.hxx
Expand Up @@ -23,12 +23,15 @@
#include <memory>
#include <toolkit/dllapi.h>
#include <com/sun/star/awt/XFont2.hpp>
#include <com/sun/star/awt/XDevice.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <cppuhelper/weak.hxx>
#include <osl/mutex.hxx>
#include <vcl/metric.hxx>
#include <vcl/font.hxx>

namespace com { namespace sun { namespace star { namespace awt { class XDevice; } } } }

class FontMetric;


// class VCLXFont
Expand Down
2 changes: 1 addition & 1 deletion include/toolkit/awt/vclxgraphics.hxx
Expand Up @@ -22,7 +22,6 @@


#include <com/sun/star/awt/XGraphics2.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <cppuhelper/weak.hxx>
Expand All @@ -36,6 +35,7 @@

class OutputDevice;
namespace vcl { class Region; }
namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } }


enum class InitOutDevFlags
Expand Down
1 change: 0 additions & 1 deletion include/toolkit/awt/vclxmenu.hxx
Expand Up @@ -39,7 +39,6 @@

class Menu;
class MenuBar;
class VclSimpleEvent;
class PopupMenu;
class VclMenuEvent;

Expand Down
9 changes: 5 additions & 4 deletions include/toolkit/awt/vclxprinter.hxx
Expand Up @@ -22,19 +22,20 @@


#include <com/sun/star/awt/XPrinterPropertySet.hpp>
#include <com/sun/star/awt/XPrinter.hpp>
#include <com/sun/star/awt/XPrinterServer.hpp>
#include <com/sun/star/awt/XInfoPrinter.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <cppuhelper/weak.hxx>

#include <toolkit/helper/mutexandbroadcasthelper.hxx>
#include <cppuhelper/propshlp.hxx>
#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
#include <vcl/vclptr.hxx>
#include <vcl/jobset.hxx>

#include <vcl/oldprintadaptor.hxx>
namespace com { namespace sun { namespace star { namespace awt { class XPrinter; } } } }
namespace vcl { class OldStylePrintAdaptor; }
class Printer;

// relevant properties for the printer:
/*
Expand Down
1 change: 0 additions & 1 deletion include/toolkit/awt/vclxsystemdependentwindow.hxx
Expand Up @@ -22,7 +22,6 @@


#include <com/sun/star/awt/XSystemDependentWindowPeer.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <cppuhelper/weak.hxx>

#include <toolkit/awt/vclxwindow.hxx>
Expand Down
7 changes: 0 additions & 7 deletions include/toolkit/awt/vclxtabpagecontainer.hxx
Expand Up @@ -20,14 +20,7 @@
#ifndef INCLUDED_TOOLKIT_AWT_VCLXTABPAGECONTAINER_HXX
#define INCLUDED_TOOLKIT_AWT_VCLXTABPAGECONTAINER_HXX

#include <toolkit/dllapi.h>
#include <com/sun/star/beans/PropertyValues.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/PropertyState.hpp>
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/container/XContainerListener.hpp>
#include <toolkit/awt/vclxwindow.hxx>
#include <com/sun/star/awt/tab/XTabPageContainer.hpp>
#include <cppuhelper/implbase.hxx>
#include <toolkit/helper/listenermultiplexer.hxx>
Expand Down
3 changes: 2 additions & 1 deletion include/toolkit/awt/vclxtopwindow.hxx
Expand Up @@ -22,13 +22,14 @@

#include <com/sun/star/awt/XSystemDependentWindowPeer.hpp>
#include <com/sun/star/awt/XTopWindow2.hpp>
#include <com/sun/star/awt/XMenuBar.hpp>
#include <cppuhelper/weak.hxx>

#include <cppuhelper/implbase1.hxx>

#include <toolkit/awt/vclxcontainer.hxx>

namespace com { namespace sun { namespace star { namespace awt { class XMenuBar; } } } }

typedef ::cppu::ImplHelper1 < css::awt::XTopWindow2
> VCLXTopWindow_XBase;
typedef ::cppu::ImplHelper1 < css::awt::XSystemDependentWindowPeer
Expand Down

0 comments on commit cec7ae9

Please sign in to comment.