summaryrefslogtreecommitdiff
path: root/include/vcl
diff options
context:
space:
mode:
authorGabor Kelemen <kelemeng@ubuntu.com>2018-12-26 01:11:42 +0100
committerMiklos Vajna <vmiklos@collabora.com>2019-01-07 09:13:14 +0100
commit6256797dacfafaa573a67643440a3fe4e8128dca (patch)
tree73bb6fb0ba68a3dc15858d3161e20c3e9e0fd921 /include/vcl
parent892a5cfe557edb405ec0037676f02a1c24dd76ec (diff)
tdf#42949 Fix IWYU warnings in include/vcl/[v-x]*
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I98f49765c6b74808dcbd692e0f375dd2848fcfd4 Reviewed-on: https://gerrit.libreoffice.org/65614 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'include/vcl')
-rw-r--r--include/vcl/ITiledRenderable.hxx2
-rw-r--r--include/vcl/layout.hxx2
-rw-r--r--include/vcl/lstbox.hxx4
-rw-r--r--include/vcl/notebookbar.hxx1
-rw-r--r--include/vcl/split.hxx1
-rw-r--r--include/vcl/status.hxx4
-rw-r--r--include/vcl/svtabbx.hxx2
-rw-r--r--include/vcl/taskpanelist.hxx7
-rw-r--r--include/vcl/toolbox.hxx2
-rw-r--r--include/vcl/vclenum.hxx2
-rw-r--r--include/vcl/vcllayout.hxx4
-rw-r--r--include/vcl/vclmedit.hxx1
-rw-r--r--include/vcl/vclptr.hxx4
-rw-r--r--include/vcl/vclreferencebase.hxx5
-rw-r--r--include/vcl/vectorgraphicdata.hxx5
-rw-r--r--include/vcl/weld.hxx31
-rw-r--r--include/vcl/window.hxx30
-rw-r--r--include/vcl/wmf.hxx1
-rw-r--r--include/vcl/wmfexternal.hxx4
-rw-r--r--include/vcl/wrkwin.hxx1
-rw-r--r--include/vcl/xtextedt.hxx8
21 files changed, 67 insertions, 54 deletions
diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index 2064b934b5c2..dcd98b959fc9 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -19,6 +19,8 @@
#include <vcl/ptrstyle.hxx>
#include <map>
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+
namespace vcl
{
/*
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 86a967c66415..da4cb16f5d68 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -17,6 +17,8 @@
#include <vcl/split.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
+#include <vcl/settings.hxx>
+#include <vcl/event.hxx>
#include <vcl/vclptr.hxx>
#include <vcl/IContext.hxx>
#include <vcl/commandevent.hxx>
diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx
index 115645b17ab8..df42d7b6b9d2 100644
--- a/include/vcl/lstbox.hxx
+++ b/include/vcl/lstbox.hxx
@@ -25,6 +25,10 @@
#include <vcl/dllapi.h>
#include <vcl/ctrl.hxx>
+class DataChangedEvent;
+class NotifyEvent;
+class UserDrawEvent;
+
#define LISTBOX_APPEND (SAL_MAX_INT32)
#define LISTBOX_ENTRY_NOTFOUND (SAL_MAX_INT32)
#define LISTBOX_MAX_ENTRIES (SAL_MAX_INT32 - 1)
diff --git a/include/vcl/notebookbar.hxx b/include/vcl/notebookbar.hxx
index 4a031753609a..b2e9b8cf9f28 100644
--- a/include/vcl/notebookbar.hxx
+++ b/include/vcl/notebookbar.hxx
@@ -12,6 +12,7 @@
#include <vcl/builder.hxx>
#include <vcl/ctrl.hxx>
+#include <vcl/settings.hxx>
#include <vector>
namespace com { namespace sun { namespace star { namespace ui { class XContextChangeEventListener; } } } }
diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx
index b205ffe85edb..fcc2fb182532 100644
--- a/include/vcl/split.hxx
+++ b/include/vcl/split.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_VCL_SPLIT_HXX
#include <vcl/dllapi.h>
+#include <vcl/keycod.hxx>
#include <vcl/window.hxx>
#define SPLITTER_DEFAULTSTEPSIZE 0xFFFF
diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx
index da7740af2ba6..c89b5064ff81 100644
--- a/include/vcl/status.hxx
+++ b/include/vcl/status.hxx
@@ -27,6 +27,10 @@
#include <memory>
#include <vector>
+class DataChangedEvent;
+class HelpEvent;
+class MouseEvent;
+class UserDrawEvent;
struct ImplStatusItem;
void VCL_DLLPUBLIC DrawProgress(vcl::Window* pWindow, vcl::RenderContext& rRenderContext, const Point& rPos,
diff --git a/include/vcl/svtabbx.hxx b/include/vcl/svtabbx.hxx
index 75aadf0db8f9..3e5f68bf146c 100644
--- a/include/vcl/svtabbx.hxx
+++ b/include/vcl/svtabbx.hxx
@@ -23,6 +23,8 @@
#include <vcl/treelistbox.hxx>
#include <vcl/accessibletableprovider.hxx>
+#include <tools/debug.hxx>
+
#include <memory>
#include <vector>
diff --git a/include/vcl/taskpanelist.hxx b/include/vcl/taskpanelist.hxx
index 5a6507fcf1e0..c055882e76a1 100644
--- a/include/vcl/taskpanelist.hxx
+++ b/include/vcl/taskpanelist.hxx
@@ -23,7 +23,12 @@
#include <vcl/dllapi.h>
#include <vector>
-#include <vcl/window.hxx>
+#include <vcl/keycod.hxx>
+#include <vcl/vclptr.hxx>
+
+class KeyEvent;
+
+namespace vcl { class Window; }
class VCL_DLLPUBLIC TaskPaneList
{
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index ea6672d12ac8..574501825879 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -24,6 +24,7 @@
#include <vcl/dllapi.h>
#include <vcl/dockwin.hxx>
#include <vcl/image.hxx>
+#include <vcl/keycod.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <limits>
@@ -38,6 +39,7 @@ class Timer;
struct ImplToolItem;
struct ImplToolBoxPrivateData;
class PopupMenu;
+class VclMenuEvent;
#define TOOLBOX_STYLE_FLAT (sal_uInt16(0x0004))
diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx
index a55c5b0ceb35..1e8f59428e3f 100644
--- a/include/vcl/vclenum.hxx
+++ b/include/vcl/vclenum.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_VCL_VCLENUM_HXX
#include <sal/types.h>
-#include <tools/fontenum.hxx>
+#include <o3tl/typed_flags_set.hxx>
enum class SelectionMode { NONE, Single, Range, Multiple };
diff --git a/include/vcl/vcllayout.hxx b/include/vcl/vcllayout.hxx
index 6151785f5480..44752b6e4e06 100644
--- a/include/vcl/vcllayout.hxx
+++ b/include/vcl/vcllayout.hxx
@@ -21,18 +21,18 @@
#define INCLUDED_VCL_VCLLAYOUT_HXX
#include <memory>
-#include <vector>
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <tools/gen.hxx>
#include <vcl/devicecoordinate.hxx>
#include <vcl/dllapi.h>
-#include <vcl/glyphitem.hxx>
class ImplLayoutArgs;
class PhysicalFontFace;
class SalGraphics;
struct GlyphItem;
+class SalLayoutGlyphs;
+
namespace vcl
{
class TextLayoutCache;
diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx
index df57a4767eda..bcf294c87e46 100644
--- a/include/vcl/vclmedit.hxx
+++ b/include/vcl/vclmedit.hxx
@@ -28,7 +28,6 @@
#include <memory>
class ImpVclMEdit;
-class Timer;
class ExtTextEngine;
class TextView;
diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx
index 1308b5d1a68b..9a621fdd0228 100644
--- a/include/vcl/vclptr.hxx
+++ b/include/vcl/vclptr.hxx
@@ -22,9 +22,7 @@
#include <sal/config.h>
-#include <config_global.h>
#include <rtl/ref.hxx>
-#include <vcl/vclreferencebase.hxx>
#include <utility>
#include <type_traits>
@@ -35,6 +33,8 @@
#endif
#endif
+class VclReferenceBase;
+
namespace vcl { namespace detail {
template<typename>
diff --git a/include/vcl/vclreferencebase.hxx b/include/vcl/vclreferencebase.hxx
index f90f579631a8..03b59b360391 100644
--- a/include/vcl/vclreferencebase.hxx
+++ b/include/vcl/vclreferencebase.hxx
@@ -20,13 +20,8 @@
#define INCLUDED_VCL_Reference_HXX
#include <vcl/dllapi.h>
-#include <tools/debug.hxx>
#include <osl/interlck.h>
-#include <cassert>
-
-class VclReferenceBase;
-
class VCL_DLLPUBLIC VclReferenceBase
{
mutable oslInterlockedCount mnRefCnt;
diff --git a/include/vcl/vectorgraphicdata.hxx b/include/vcl/vectorgraphicdata.hxx
index ea7615d2bdf6..113a733e296d 100644
--- a/include/vcl/vectorgraphicdata.hxx
+++ b/include/vcl/vectorgraphicdata.hxx
@@ -21,13 +21,14 @@
#define INCLUDED_VCL_VECTORGRAPHICDATA_HXX
#include <basegfx/range/b2drange.hxx>
-#include <com/sun/star/graphic/XPrimitive2D.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
#include <vcl/bitmapex.hxx>
-#include <vcl/wmfexternal.hxx>
#include <rtl/ustring.hxx>
#include <deque>
#include <memory>
+namespace com { namespace sun { namespace star { namespace graphic { class XPrimitive2D; } } } }
+struct WmfExternal;
typedef css::uno::Sequence<sal_Int8> VectorGraphicDataArray;
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 04af87070d8a..653f83f1dfa3 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -11,20 +11,45 @@
#define INCLUDED_VCL_WELD_HXX
#include <rtl/ustring.hxx>
+#include <tools/color.hxx>
+#include <tools/fldunit.hxx>
#include <tools/gen.hxx>
#include <tools/link.hxx>
+#include <tools/time.hxx>
#include <vcl/dllapi.h>
-#include <vcl/field.hxx>
#include <vcl/vclenum.hxx>
-#include <vcl/virdev.hxx>
-#include <o3tl/make_unique.hxx>
+#include <vcl/font.hxx>
+#include <vcl/menu.hxx>
+#include <vcl/uitest/factory.hxx>
#include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
+#include <com/sun/star/accessibility/XAccessible.hpp>
+
+#include <vector>
+
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace awt
+{
+class XWindow;
+}
+}
+}
+}
typedef css::uno::Reference<css::accessibility::XAccessible> a11yref;
typedef css::uno::Reference<css::accessibility::XAccessibleRelationSet> a11yrelationset;
class SvNumberFormatter;
+class KeyEvent;
+class MouseEvent;
+class OutputDevice;
+class VirtualDevice;
+struct SystemEnvData;
namespace vcl
{
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 02b59375423c..1e9539cf9a2a 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -24,20 +24,14 @@
#include <vcl/dllapi.h>
#include <vcl/outdev.hxx>
#include <vcl/pointr.hxx>
+#include <tools/link.hxx>
#include <tools/wintypes.hxx>
#include <vcl/vclenum.hxx>
-#include <vcl/inputtypes.hxx>
-#include <vcl/cursor.hxx>
-#include <vcl/inputctx.hxx>
#include <vcl/keycodes.hxx>
#include <vcl/region.hxx>
-#include <vcl/salnativewidgets.hxx>
#include <vcl/uitest/factory.hxx>
-#include <vcl/vclevent.hxx>
#include <vcl/IDialogRenderable.hxx>
#include <rtl/ustring.hxx>
-#include <rtl/ref.hxx>
-#include <cppuhelper/weakref.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <memory>
@@ -49,13 +43,10 @@ struct ImplCalcToTopData;
struct SystemEnvData;
struct SystemParentData;
class ImplBorderWindow;
-class Idle;
class Timer;
class DockingManager;
class ScrollBar;
-class Bitmap;
class FixedText;
-class Image;
class MouseEvent;
class KeyEvent;
class CommandEvent;
@@ -69,6 +60,8 @@ class SalFrame;
class MenuFloatingWindow;
class VCLXWindow;
class VclWindowEvent;
+class AllSettings;
+class InputContext;
enum class ImplPaintFlags;
enum class VclEventId;
@@ -76,20 +69,16 @@ namespace com { namespace sun { namespace star {
namespace accessibility {
class XAccessible;
}
-namespace beans {
- struct PropertyValue;
-}
+
namespace rendering {
class XCanvas;
class XSpriteCanvas;
}
namespace awt {
class XWindowPeer;
- class XWindow;
}
namespace uno {
class Any;
- class XInterface;
}
namespace datatransfer { namespace clipboard {
class XClipboard;
@@ -420,16 +409,12 @@ const char* ImplDbgCheckWindow( const void* pObj );
namespace vcl { class Window; }
namespace vcl { class Cursor; }
-namespace vcl { class ILibreOfficeKitNotifier; }
class Dialog;
class WindowImpl;
class PaintHelper;
class VclSizeGroup;
-class OutputDevice;
class Application;
-class SystemWindow;
class WorkWindow;
-class Dialog;
class MessBox;
class MessageDialog;
class DockingWindow;
@@ -438,12 +423,9 @@ class GroupBox;
class PushButton;
class RadioButton;
class SystemChildWindow;
-class ImplBorderWindow;
class ImplDockingWindowWrapper;
class ImplPopupFloatWin;
-class MenuFloatingWindow;
class LifecycleTest;
-namespace svt { class PopupWindowControllerImpl; }
enum class WindowHitTest {
@@ -1595,10 +1577,6 @@ public:
}
-// Only for compatibility - because many people outside haven't included event.hxx
-// These require Window to be defined for VclPtr<Window>
-#include <vcl/event.hxx>
-
#endif // INCLUDED_VCL_WINDOW_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/wmf.hxx b/include/vcl/wmf.hxx
index d17dc7ec7fce..26a1c734425d 100644
--- a/include/vcl/wmf.hxx
+++ b/include/vcl/wmf.hxx
@@ -25,7 +25,6 @@
class FilterConfigItem;
class GDIMetaFile;
class SvStream;
-struct WmfExternal;
VCL_DLLPUBLIC bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF );
diff --git a/include/vcl/wmfexternal.hxx b/include/vcl/wmfexternal.hxx
index fd55c621c060..d428151ecf13 100644
--- a/include/vcl/wmfexternal.hxx
+++ b/include/vcl/wmfexternal.hxx
@@ -21,9 +21,9 @@
#define INCLUDED_VCL_WMFEXTERNAL_HXX
#include <vcl/dllapi.h>
-#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
+
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
struct VCL_DLLPUBLIC WmfExternal
{
diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx
index d1ef8fd70e66..628d476a9a38 100644
--- a/include/vcl/wrkwin.hxx
+++ b/include/vcl/wrkwin.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_VCL_WRKWIN_HXX
#define INCLUDED_VCL_WRKWIN_HXX
-#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <vcl/syswin.hxx>
#include <o3tl/typed_flags_set.hxx>
diff --git a/include/vcl/xtextedt.hxx b/include/vcl/xtextedt.hxx
index bab4ba693654..94ca9d843f38 100644
--- a/include/vcl/xtextedt.hxx
+++ b/include/vcl/xtextedt.hxx
@@ -21,14 +21,8 @@
#include <vcl/dllapi.h>
#include <vcl/texteng.hxx>
-#include <vcl/textview.hxx>
-namespace com {
-namespace sun {
-namespace star {
-namespace util {
- struct SearchOptions;
-}}}}
+namespace i18nutil { struct SearchOptions; }
class VCL_DLLPUBLIC ExtTextEngine : public TextEngine
{