diff options
author | Gabor Kelemen <kelemeng@ubuntu.com> | 2018-12-18 23:41:35 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2018-12-20 12:36:41 +0100 |
commit | febe0fd100ff0bff33c965b3bcb497e7f2bc4ef9 (patch) | |
tree | 02c2b4132fc90db51bb882432e6ea2fcd7714323 /include | |
parent | a60265f07bdd62d810cae3c7e64b1ad4fb02bbaa (diff) |
tdf#42949 Fix IWYU warnings in include/vcl/[t-u]*
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: Ib32ea54a3fa690a0722fa75ddb4121ec78c0b64f
Reviewed-on: https://gerrit.libreoffice.org/65386
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/IwyuFilter_include.yaml | 10 | ||||
-rw-r--r-- | include/sfx2/unoctitm.hxx | 1 | ||||
-rw-r--r-- | include/vcl/svlbitm.hxx | 1 | ||||
-rw-r--r-- | include/vcl/tabctrl.hxx | 1 | ||||
-rw-r--r-- | include/vcl/tabdlg.hxx | 1 | ||||
-rw-r--r-- | include/vcl/tabpage.hxx | 1 | ||||
-rw-r--r-- | include/vcl/task.hxx | 2 | ||||
-rw-r--r-- | include/vcl/texteng.hxx | 5 | ||||
-rw-r--r-- | include/vcl/textrectinfo.hxx | 3 | ||||
-rw-r--r-- | include/vcl/textview.hxx | 8 | ||||
-rw-r--r-- | include/vcl/threadex.hxx | 2 | ||||
-rw-r--r-- | include/vcl/throbber.hxx | 2 | ||||
-rw-r--r-- | include/vcl/toolbox.hxx | 8 | ||||
-rw-r--r-- | include/vcl/transfer.hxx | 13 | ||||
-rw-r--r-- | include/vcl/treelist.hxx | 4 | ||||
-rw-r--r-- | include/vcl/treelistbox.hxx | 12 | ||||
-rw-r--r-- | include/vcl/txtattr.hxx | 3 | ||||
-rw-r--r-- | include/vcl/uitest/eventdescription.hxx | 3 | ||||
-rw-r--r-- | include/vcl/uitest/logger.hxx | 6 | ||||
-rw-r--r-- | include/vcl/uitest/uiobject.hxx | 3 | ||||
-rw-r--r-- | include/vcl/uitest/uitest.hxx | 2 | ||||
-rw-r--r-- | include/vcl/unohelp.hxx | 7 |
22 files changed, 41 insertions, 57 deletions
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index f2f6169f8a69..d9d8facad6d0 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -270,3 +270,13 @@ blacklist: include/vcl/prntypes.hxx: # Needed for macro - tools/solar.h + include/vcl/transfer.hxx: + # base class has to be a complete type + - com/sun/star/datatransfer/XTransferable2.hpp + - com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp + - com/sun/star/datatransfer/dnd/XDragSourceListener.hpp + - com/sun/star/lang/XUnoTunnel.hpp + - com/sun/star/lang/XServiceInfo.hpp + - com/sun/star/frame/XTerminateListener.hpp + - com/sun/star/datatransfer/dnd/XDragGestureListener.hpp + - com/sun/star/datatransfer/dnd/XDropTargetListener.hpp diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx index 81a9ea1a698a..f78c4316fc6c 100644 --- a/include/sfx2/unoctitm.hxx +++ b/include/sfx2/unoctitm.hxx @@ -29,6 +29,7 @@ #include <com/sun/star/frame/XFrame.hpp> #include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.hxx> +#include <cppuhelper/weakref.hxx> #include <sfx2/ctrlitem.hxx> #include <osl/mutex.hxx> diff --git a/include/vcl/svlbitm.hxx b/include/vcl/svlbitm.hxx index cd8001614195..c5e478a6d539 100644 --- a/include/vcl/svlbitm.hxx +++ b/include/vcl/svlbitm.hxx @@ -29,6 +29,7 @@ #include <o3tl/typed_flags_set.hxx> class SvTreeListEntry; +class SvLBoxButton; enum class SvBmp diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index dbb82b3594ec..332f92abb4e9 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -30,7 +30,6 @@ struct ImplTabItem; struct ImplTabCtrlData; class TabPage; -class PushButton; class ListBox; #ifndef TAB_APPEND diff --git a/include/vcl/tabdlg.hxx b/include/vcl/tabdlg.hxx index 32a34e3767da..7c6c18b473d3 100644 --- a/include/vcl/tabdlg.hxx +++ b/include/vcl/tabdlg.hxx @@ -24,7 +24,6 @@ #include <vcl/dialog.hxx> class FixedLine; -class TabControl; class VCL_DLLPUBLIC TabDialog : public Dialog { diff --git a/include/vcl/tabpage.hxx b/include/vcl/tabpage.hxx index bd8475d81591..29af647d6cd7 100644 --- a/include/vcl/tabpage.hxx +++ b/include/vcl/tabpage.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_VCL_TABPAGE_HXX #define INCLUDED_VCL_TABPAGE_HXX -#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/builder.hxx> #include <vcl/weld.hxx> diff --git a/include/vcl/task.hxx b/include/vcl/task.hxx index 76d2890055fb..f5af890e2f57 100644 --- a/include/vcl/task.hxx +++ b/include/vcl/task.hxx @@ -22,9 +22,7 @@ #include <vcl/dllapi.h> #include <sal/log.hxx> -#include <memory> -class Scheduler; struct ImplSchedulerData; enum class TaskPriority diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx index cd961420261b..7e6c9d452590 100644 --- a/include/vcl/texteng.hxx +++ b/include/vcl/texteng.hxx @@ -47,19 +47,14 @@ class TextAttrib; class TextCharAttrib; class TextUndo; class TextUndoManager; -class EditSelFunctionSet; -class Idle; class IdleFormatter; class TextNode; class OutputDevice; -class SfxUndoAction; class KeyEvent; class Timer; class SfxUndoManager; class TextLine; -class TETextPortion; struct TEIMEInfos; -class SvtCTLOptions; namespace com { namespace sun { diff --git a/include/vcl/textrectinfo.hxx b/include/vcl/textrectinfo.hxx index 8b98e1a37c99..c13d65e80362 100644 --- a/include/vcl/textrectinfo.hxx +++ b/include/vcl/textrectinfo.hxx @@ -20,7 +20,8 @@ #ifndef INCLUDED_VCL_TEXTRECTINFO_HXX #define INCLUDED_VCL_TEXTRECTINFO_HXX -#include <vcl/outdev.hxx> +#include <vcl/dllapi.h> +class OutputDevice; class VCL_DLLPUBLIC TextRectInfo { diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx index 1b30c9904c04..0b10eea1d47a 100644 --- a/include/vcl/textview.hxx +++ b/include/vcl/textview.hxx @@ -26,19 +26,15 @@ #include <vcl/dllapi.h> #include <vcl/dndhelp.hxx> #include <vcl/textdata.hxx> -#include <vcl/window.hxx> +#include <vcl/outdev.hxx> #include <memory> class TextEngine; -class OutputDevice; class KeyEvent; class MouseEvent; class CommandEvent; -class TextSelFunctionSet; -class SelectionEngine; -class VirtualDevice; -struct TextDDInfo; +namespace vcl { class Window; } namespace com { namespace sun { namespace star { namespace datatransfer { namespace clipboard { diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx index 7879536afc9e..b8962f2d0e0b 100644 --- a/include/vcl/threadex.hxx +++ b/include/vcl/threadex.hxx @@ -21,11 +21,9 @@ #define INCLUDED_VCL_THREADEX_HXX #include <osl/conditn.hxx> -#include <osl/thread.h> #include <tools/link.hxx> #include <vcl/dllapi.h> -#include <cppuhelper/exc_hlp.hxx> #include <boost/optional.hpp> #include <memory> diff --git a/include/vcl/throbber.hxx b/include/vcl/throbber.hxx index d079a8d39ea0..b0f49b18c38e 100644 --- a/include/vcl/throbber.hxx +++ b/include/vcl/throbber.hxx @@ -24,8 +24,6 @@ #include <vcl/imgctrl.hxx> #include <vcl/timer.hxx> -#include <com/sun/star/graphic/XGraphic.hpp> - #include <vector> class VCL_DLLPUBLIC Throbber : public ImageControl diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 6e2c7e4b6325..ea6672d12ac8 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_VCL_TOOLBOX_HXX #define INCLUDED_VCL_TOOLBOX_HXX -#include <vcl/vclstatuslistener.hxx> #include <vcl/vclenum.hxx> #include <vcl/dllapi.h> #include <vcl/dockwin.hxx> @@ -31,14 +30,13 @@ #include <memory> #include <vector> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/FeatureStateEvent.hpp> +namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } } +namespace com { namespace sun { namespace star { namespace frame { struct FeatureStateEvent; } } } } +template <class T> class VclStatusListener; class Timer; -class UserDrawEvent; struct ImplToolItem; struct ImplToolBoxPrivateData; -class ImplTrackRect; class PopupMenu; #define TOOLBOX_STYLE_FLAT (sal_uInt16(0x0004)) diff --git a/include/vcl/transfer.hxx b/include/vcl/transfer.hxx index 8da3e4ec7a8a..7b5fb5ea9618 100644 --- a/include/vcl/transfer.hxx +++ b/include/vcl/transfer.hxx @@ -23,8 +23,6 @@ #include <vcl/dllapi.h> #include <tools/globname.hxx> #include <tools/gen.hxx> -#include <tools/link.hxx> -#include <tools/ref.hxx> #include <tools/solar.h> #include <sot/formats.hxx> #include <sot/exchange.hxx> @@ -35,16 +33,21 @@ #include <com/sun/star/datatransfer/XTransferable2.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp> #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp> -#include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp> -#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp> +#include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp> #include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp> #include <com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp> #include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp> #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp> #include <com/sun/star/embed/Aspects.hpp> -#include <com/sun/star/io/XInputStream.hpp> #include <memory> +namespace com { namespace sun { namespace star { namespace datatransfer { namespace dnd { class XDragGestureRecognizer; } } } } } +namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } } +namespace com { namespace sun { namespace star { namespace datatransfer { namespace dnd { class XDropTarget; } } } } } + +namespace tools { template <typename T> class SvRef; } +template <typename Arg, typename Ret> class Link; + class BitmapEx; class GDIMetaFile; class Graphic; diff --git a/include/vcl/treelist.hxx b/include/vcl/treelist.hxx index 3b7eba4a2c36..8b56418bf063 100644 --- a/include/vcl/treelist.hxx +++ b/include/vcl/treelist.hxx @@ -22,15 +22,12 @@ #include <vcl/dllapi.h> #include <vcl/treelistentries.hxx> -#include <vcl/viewdataentry.hxx> #include <tools/solar.h> #include <tools/link.hxx> #include <tools/contnr.hxx> -#include <limits.h> #include <memory> -#include <vector> enum class SvListAction { @@ -50,6 +47,7 @@ enum class SvListAction class SvTreeListEntry; class SvListView; +class SvViewDataEntry; enum SvSortMode { SortAscending, SortDescending, SortNone }; diff --git a/include/vcl/treelistbox.hxx b/include/vcl/treelistbox.hxx index ccda59cda51f..1e3351153ca1 100644 --- a/include/vcl/treelistbox.hxx +++ b/include/vcl/treelistbox.hxx @@ -27,9 +27,6 @@ #include <vector> #include <vcl/ctrl.hxx> -#include <vcl/seleng.hxx> -#include <vcl/edit.hxx> -#include <vcl/timer.hxx> #include <vcl/accel.hxx> #include <vcl/mnemonicengine.hxx> #include <vcl/quickselectionengine.hxx> @@ -39,20 +36,19 @@ #include <vcl/treelist.hxx> #include <vcl/transfer.hxx> #include <vcl/idle.hxx> +#include <vcl/menu.hxx> #include <o3tl/typed_flags_set.hxx> -class Application; class SvTreeListBox; class SvTreeListEntry; struct SvViewDataItem; class SvViewDataEntry; class SvInplaceEdit2; class SvLBoxString; -class SvLBoxButton; -class SvLBoxContextBmp; class SvImpLBox; class SvLBoxButtonData; -struct SvLBoxDDInfo; +class Timer; +class Edit; namespace utl { class AccessibleStateSetHelper; @@ -186,8 +182,6 @@ namespace o3tl } struct SvTreeListBoxImpl; -class SalInstanceTreeView; -class SalInstanceEntryTreeView; class VCL_DLLPUBLIC SvTreeListBox :public Control diff --git a/include/vcl/txtattr.hxx b/include/vcl/txtattr.hxx index 677d5e0c6a5c..13019667ea85 100644 --- a/include/vcl/txtattr.hxx +++ b/include/vcl/txtattr.hxx @@ -20,10 +20,9 @@ #ifndef INCLUDED_VCL_TXTATTR_HXX #define INCLUDED_VCL_TXTATTR_HXX -#include <rtl/ustring.hxx> #include <tools/color.hxx> #include <tools/debug.hxx> -#include <vcl/vclenum.hxx> +#include <tools/fontenum.hxx> #include <vcl/dllapi.h> #include <memory> diff --git a/include/vcl/uitest/eventdescription.hxx b/include/vcl/uitest/eventdescription.hxx index 7c5eec65b2a6..ed2b54f3439b 100644 --- a/include/vcl/uitest/eventdescription.hxx +++ b/include/vcl/uitest/eventdescription.hxx @@ -7,6 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <rtl/ustring.hxx> #include <map> struct EventDescription @@ -15,4 +16,4 @@ struct EventDescription std::map<OUString, OUString> aParameters; }; -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/uitest/logger.hxx b/include/vcl/uitest/logger.hxx index 18fadd77aad2..89f7c72f693b 100644 --- a/include/vcl/uitest/logger.hxx +++ b/include/vcl/uitest/logger.hxx @@ -10,14 +10,16 @@ #include <vcl/dllapi.h> #include <tools/stream.hxx> -#include <vcl/ctrl.hxx> -#include <com/sun/star/uno/Sequence.hxx> +#include <vcl/vclevent.hxx> namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } +namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } } struct EventDescription; +class Control; +class KeyEvent; class UITEST_DLLPUBLIC UITestLogger { diff --git a/include/vcl/uitest/uiobject.hxx b/include/vcl/uitest/uiobject.hxx index e56801af17f4..3a94ffa53bc5 100644 --- a/include/vcl/uitest/uiobject.hxx +++ b/include/vcl/uitest/uiobject.hxx @@ -17,7 +17,6 @@ #include <vcl/window.hxx> #include <vcl/spin.hxx> #include <vcl/button.hxx> -#include <vcl/edit.hxx> #include <vcl/tabpage.hxx> #include <vcl/lstbox.hxx> #include <vcl/combobox.hxx> @@ -29,6 +28,8 @@ #include <set> +class Edit; + typedef std::map<const OUString, OUString> StringMap; /** diff --git a/include/vcl/uitest/uitest.hxx b/include/vcl/uitest/uitest.hxx index 1759ea7656b0..00465b0ee1e8 100644 --- a/include/vcl/uitest/uitest.hxx +++ b/include/vcl/uitest/uitest.hxx @@ -12,11 +12,11 @@ #include <vcl/dllapi.h> #include <memory> -#include <com/sun/star/uno/Sequence.hxx> namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } +namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } } class UIObject; diff --git a/include/vcl/unohelp.hxx b/include/vcl/unohelp.hxx index 7fe34d48a6da..ab00fff5d553 100644 --- a/include/vcl/unohelp.hxx +++ b/include/vcl/unohelp.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/awt/FontSlant.hpp> -#include <rtl/ustring.hxx> #include <tools/fontenum.hxx> #include <vcl/dllapi.h> @@ -32,7 +31,6 @@ namespace star { namespace i18n { class XBreakIterator; class XCharacterClassification; - class XCollator; }}}} namespace com { @@ -43,11 +41,6 @@ namespace accessibility { } }}} -namespace comphelper { - namespace string { - class NaturalStringSorter; -}} - namespace vcl { namespace unohelper |