From 071df4770dfe421d96d3df748af751eaae6982c3 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 10 Mar 2021 20:48:37 +0000
Subject: use some forward declares to reduce includes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ic3a6d9a9569f909a7480d9da09709dbd60259e97
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112323
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
---
 include/sfx2/ipclient.hxx               |  3 ++-
 include/sfx2/lokcharthelper.hxx         |  3 ++-
 include/sfx2/tbxctrl.hxx                |  3 ++-
 include/svx/AccessibleShapeTreeInfo.hxx |  3 ++-
 include/svx/ImageMapInfo.hxx            |  2 +-
 include/vcl/vclenum.hxx                 | 13 +++++++++++++
 include/vcl/waitobj.hxx                 |  9 ++-------
 include/vcl/window.hxx                  | 13 -------------
 8 files changed, 24 insertions(+), 25 deletions(-)

(limited to 'include')

diff --git a/include/sfx2/ipclient.hxx b/include/sfx2/ipclient.hxx
index 438807a0020d..180f67b54588 100644
--- a/include/sfx2/ipclient.hxx
+++ b/include/sfx2/ipclient.hxx
@@ -26,11 +26,12 @@
 
 #include <tools/gen.hxx>
 
-#include <vcl/window.hxx>
 #include <vcl/errcode.hxx>
+#include <vcl/vclptr.hxx>
 
 namespace com::sun::star::embed { class XEmbeddedObject; }
 namespace com::sun::star::uno { template <typename > class Reference; }
+namespace vcl { class Window; }
 
 class SfxInPlaceClient_Impl;
 class SfxViewShell;
diff --git a/include/sfx2/lokcharthelper.hxx b/include/sfx2/lokcharthelper.hxx
index 020abad111f0..319af8c35da5 100644
--- a/include/sfx2/lokcharthelper.hxx
+++ b/include/sfx2/lokcharthelper.hxx
@@ -12,10 +12,11 @@
 
 #include <sfx2/dllapi.h>
 #include <tools/gen.hxx>
-#include <vcl/window.hxx>
+#include <vcl/vclptr.hxx>
 
 namespace com::sun::star::frame { class XController; }
 namespace com::sun::star::frame { class XDispatch; }
+namespace vcl { class Window; }
 
 class SfxViewShell;
 class VirtualDevice;
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index 65d44088629e..7150d64adbcf 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -25,11 +25,12 @@
 #include <sal/types.h>
 #include <svl/poolitem.hxx>
 #include <svtools/toolboxcontroller.hxx>
-#include <vcl/window.hxx>
 #include <rtl/ref.hxx>
+#include <vcl/vclptr.hxx>
 
 namespace com::sun::star::frame { class XDispatchProvider; }
 namespace com::sun::star::frame { class XFrame; }
+namespace vcl { class Window; }
 
 class InterimItemWindow;
 class SfxToolBoxControl;
diff --git a/include/svx/AccessibleShapeTreeInfo.hxx b/include/svx/AccessibleShapeTreeInfo.hxx
index f9da042b63d8..f50061ad47f4 100644
--- a/include/svx/AccessibleShapeTreeInfo.hxx
+++ b/include/svx/AccessibleShapeTreeInfo.hxx
@@ -22,13 +22,14 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <svx/svxdllapi.h>
-#include <vcl/window.hxx>
+#include <vcl/vclptr.hxx>
 
 namespace com::sun::star {
     namespace accessibility { class XAccessibleComponent; }
     namespace document { class XShapeEventBroadcaster; }
     namespace frame { class XController; }
 }
+namespace vcl { class Window; }
 
 class SdrView;
 
diff --git a/include/svx/ImageMapInfo.hxx b/include/svx/ImageMapInfo.hxx
index 7cd8f4f1780a..0e12df24dd6d 100644
--- a/include/svx/ImageMapInfo.hxx
+++ b/include/svx/ImageMapInfo.hxx
@@ -49,7 +49,7 @@ public:
 
     static SvxIMapInfo* GetIMapInfo(const SdrObject* pObject);
     static IMapObject* GetHitIMapObject(const SdrObject* pObj, const Point& rWinPoint,
-                                        const vcl::Window* rCmpWnd = nullptr);
+                                        const OutputDevice* pCmpWnd = nullptr);
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx
index 251b5bdba1ea..d0c56ea43090 100644
--- a/include/vcl/vclenum.hxx
+++ b/include/vcl/vclenum.hxx
@@ -387,6 +387,19 @@ namespace o3tl
     template<> struct typed_flags<FloatWinPopupFlags> : is_typed_flags<FloatWinPopupFlags, 0x0fff> {};
 }
 
+// Flags for Window::Show()
+enum class ShowFlags
+{
+    NONE                       = 0x0000,
+    NoFocusChange              = 0x0002,
+    NoActivate                 = 0x0004,
+    ForegroundTask             = 0x0008,
+};
+namespace o3tl
+{
+    template<> struct typed_flags<ShowFlags> : is_typed_flags<ShowFlags, 0x000e> {};
+}
+
 #endif // INCLUDED_VCL_VCLENUM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/waitobj.hxx b/include/vcl/waitobj.hxx
index 682153a1e892..cd6b0c5cfe95 100644
--- a/include/vcl/waitobj.hxx
+++ b/include/vcl/waitobj.hxx
@@ -33,13 +33,8 @@ class VCL_DLLPUBLIC WaitObject
 private:
     VclPtr<vcl::Window>  mpWindow;
 public:
-                WaitObject( vcl::Window* pWindow )
-                {
-                    mpWindow = pWindow;
-                    if ( mpWindow )
-                        mpWindow->EnterWait();
-                }
-                ~WaitObject();
+    WaitObject(vcl::Window* pWindow);
+    ~WaitObject();
 };
 
 class VCL_DLLPUBLIC TopLevelWindowLocker
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 51d6a7767c86..000d64ffcb4a 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -155,19 +155,6 @@ namespace o3tl
     template<> struct typed_flags<PosSizeFlags> : is_typed_flags<PosSizeFlags, 0x000f> {};
 }
 
-// Flags for Show()
-enum class ShowFlags
-{
-    NONE                       = 0x0000,
-    NoFocusChange              = 0x0002,
-    NoActivate                 = 0x0004,
-    ForegroundTask             = 0x0008,
-};
-namespace o3tl
-{
-    template<> struct typed_flags<ShowFlags> : is_typed_flags<ShowFlags, 0x000e> {};
-}
-
 // Flags for SetZOrder()
 enum class ZOrderFlags
 {
-- 
cgit