From c02696d7f9e4f56954e1c37452949762872f1f8e Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 22 Feb 2021 16:35:25 +0000
Subject: forward declare some things and avoid includes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I8bf6e23904c932de646aa84fffab1b5549dbdf31
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111349
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
---
 accessibility/source/standard/accessiblemenubasecomponent.cxx | 1 +
 include/vcl/menu.hxx                                          | 4 +++-
 include/vcl/toolkit/edit.hxx                                  | 2 +-
 include/vcl/toolkit/treelistbox.hxx                           | 1 -
 reportdesign/source/ui/inc/ReportControllerObserver.hxx       | 3 ++-
 svx/source/fmcomp/fmgridcl.cxx                                | 1 -
 toolkit/source/controls/tree/treecontrolpeer.cxx              | 3 ++-
 vcl/inc/jsdialog/jsdialogbuilder.hxx                          | 1 +
 vcl/source/control/combobox.cxx                               | 1 +
 vcl/source/control/roadmap.cxx                                | 1 +
 vcl/source/edit/vclmedit.cxx                                  | 2 ++
 vcl/source/uitest/uiobject.cxx                                | 1 +
 vcl/source/window/builder.cxx                                 | 1 +
 13 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx
index 7d5d2eebdd3e..e873322f9c56 100644
--- a/accessibility/source/standard/accessiblemenubasecomponent.cxx
+++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx
@@ -29,6 +29,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <vcl/menu.hxx>
+#include <vcl/vclevent.hxx>
 
 #include <array>
 
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 01bf9bc1f80b..55b4ca10ed71 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -28,8 +28,8 @@
 #include <tools/long.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/keycod.hxx>
+#include <vcl/vclptr.hxx>
 #include <vcl/vclreferencebase.hxx>
-#include <vcl/vclevent.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <list>
@@ -49,8 +49,10 @@ class CommandEvent;
 class MenuFloatingWindow;
 class SalMenu;
 class MenuBarWindow;
+class VclMenuEvent;
 struct SystemMenuData;
 enum class FloatWinPopupFlags;
+enum class VclEventId;
 
 namespace com::sun::star::awt { class XPopupMenu; }
 namespace com::sun::star::accessibility { class XAccessible;  }
diff --git a/include/vcl/toolkit/edit.hxx b/include/vcl/toolkit/edit.hxx
index 6cad804c208e..b622c4bc2e65 100644
--- a/include/vcl/toolkit/edit.hxx
+++ b/include/vcl/toolkit/edit.hxx
@@ -31,7 +31,6 @@
 #include <rtl/ustrbuf.hxx>
 #include <o3tl/deleter.hxx>
 #include <vcl/dllapi.h>
-#include <vcl/menu.hxx>
 #include <vcl/dndhelp.hxx>
 #include <vcl/vclptr.hxx>
 #include <com/sun/star/uno/Reference.h>
@@ -44,6 +43,7 @@ namespace weld {
     class Widget;
 }
 
+class PopupMenu;
 class VclBuilder;
 struct DDInfo;
 struct Impl_IMEInfos;
diff --git a/include/vcl/toolkit/treelistbox.hxx b/include/vcl/toolkit/treelistbox.hxx
index 895c6c15d860..3cd50dddee65 100644
--- a/include/vcl/toolkit/treelistbox.hxx
+++ b/include/vcl/toolkit/treelistbox.hxx
@@ -36,7 +36,6 @@
 #include <tools/contnr.hxx>
 #include <vcl/toolkit/treelist.hxx>
 #include <vcl/transfer.hxx>
-#include <vcl/menu.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
 class SvTreeListBox;
diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
index ec6be058bf9b..d77fb3f2ef78 100644
--- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx
+++ b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
@@ -25,12 +25,13 @@
 
 #include <memory>
 
-#include <vcl/vclevent.hxx>
 #include <tools/link.hxx>
 
 #include "FormattedFieldBeautifier.hxx"
 #include "FixedTextColor.hxx"
 
+class VclSimpleEvent;
+
 namespace rptui
 {
     class OReportController;
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 817d642a19a9..10e5e980a74f 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -60,7 +60,6 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svl/eitem.hxx>
-#include <vcl/builder.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/debug.hxx>
diff --git a/toolkit/source/controls/tree/treecontrolpeer.cxx b/toolkit/source/controls/tree/treecontrolpeer.cxx
index 1b302d551db9..1f7a22a5217e 100644
--- a/toolkit/source/controls/tree/treecontrolpeer.cxx
+++ b/toolkit/source/controls/tree/treecontrolpeer.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <memory>
 #include <com/sun/star/graphic/GraphicProvider.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/view/SelectionType.hpp>
@@ -41,6 +40,8 @@
 #include <vcl/toolkit/svlbitm.hxx>
 
 #include <map>
+#include <memory>
+#include <list>
 
 using namespace ::com::sun::star;
 using namespace css::uno;
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index a06d8850496e..8c9e2789fedf 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -25,6 +25,7 @@
 #include <cppuhelper/compbase.hxx>
 
 #include <deque>
+#include <list>
 
 class ToolBox;
 class ComboBox;
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index f9c96478c9b8..acf3a0c26d36 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -27,6 +27,7 @@
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/vclevent.hxx>
 #include <vcl/uitest/uiobject.hxx>
 #include <sal/log.hxx>
 
diff --git a/vcl/source/control/roadmap.cxx b/vcl/source/control/roadmap.cxx
index bc6a9c125de8..ad9531430b50 100644
--- a/vcl/source/control/roadmap.cxx
+++ b/vcl/source/control/roadmap.cxx
@@ -22,6 +22,7 @@
 #include <vcl/event.hxx>
 #include <vcl/toolkit/roadmap.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/vclevent.hxx>
 #include <hyperlabel.hxx>
 #include <tools/color.hxx>
 #include <rtl/ustring.hxx>
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 1bedc444f2f0..7e90c4b59de3 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -23,9 +23,11 @@
 #include <vcl/builder.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/event.hxx>
+#include <vcl/menu.hxx>
 #include <vcl/specialchars.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/toolkit/vclmedit.hxx>
+#include <vcl/vclevent.hxx>
 #include <vcl/xtextedt.hxx>
 #include <vcl/textview.hxx>
 #include <vcl/ptrstyle.hxx>
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index ad514636fbd8..be619a77d53d 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -15,6 +15,7 @@
 #include <vcl/toolkit/combobox.hxx>
 #include <vcl/event.hxx>
 #include <vcl/floatwin.hxx>
+#include <vcl/menu.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/toolkit/lstbox.hxx>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index b644343dc0a0..62681345ca6b 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -24,6 +24,7 @@
 #include <unotools/resmgr.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/dialoghelper.hxx>
+#include <vcl/menu.hxx>
 #include <vcl/toolkit/button.hxx>
 #include <vcl/toolkit/dialog.hxx>
 #include <vcl/toolkit/edit.hxx>
-- 
cgit