From b011ea9962ec66e9ff1793e278ffb91239324528 Mon Sep 17 00:00:00 2001
From: Andreas Kling <kling@serenityos.org>
Date: Sat, 15 Feb 2020 01:56:30 +0100
Subject: [PATCH] LibGUI: Reduce menu-related header dependencies

---
 Applications/Calculator/main.cpp             |  1 +
 Applications/ChanViewer/main.cpp             |  1 +
 Applications/FileManager/main.cpp            |  1 +
 Applications/FontEditor/main.cpp             |  1 +
 Applications/HexEditor/HexEditorWidget.cpp   |  1 +
 Applications/Piano/main.cpp                  |  1 +
 Applications/SystemMonitor/main.cpp          |  1 +
 Applications/Terminal/main.cpp               |  1 +
 Applications/TextEditor/TextEditorWidget.cpp |  1 +
 DevTools/VisualBuilder/main.cpp              |  1 +
 Libraries/LibGUI/Menu.cpp                    |  1 +
 Libraries/LibGUI/Menu.h                      |  2 +-
 Libraries/LibGUI/MenuBar.cpp                 |  3 +++
 Libraries/LibGUI/MenuBar.h                   |  6 +++---
 Libraries/LibGUI/MenuItem.cpp                | 10 ++++++++++
 Libraries/LibGUI/MenuItem.h                  | 10 ++++------
 16 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/Applications/Calculator/main.cpp b/Applications/Calculator/main.cpp
index 968d26f4fc..111a5318c3 100644
--- a/Applications/Calculator/main.cpp
+++ b/Applications/Calculator/main.cpp
@@ -28,6 +28,7 @@
 #include <LibGUI/AboutDialog.h>
 #include <LibGUI/Action.h>
 #include <LibGUI/Application.h>
+#include <LibGUI/Menu.h>
 #include <LibGUI/MenuBar.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/Bitmap.h>
diff --git a/Applications/ChanViewer/main.cpp b/Applications/ChanViewer/main.cpp
index 63879e65d5..5531747e5d 100644
--- a/Applications/ChanViewer/main.cpp
+++ b/Applications/ChanViewer/main.cpp
@@ -31,6 +31,7 @@
 #include <LibGUI/Application.h>
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/ComboBox.h>
+#include <LibGUI/Menu.h>
 #include <LibGUI/MenuBar.h>
 #include <LibGUI/StatusBar.h>
 #include <LibGUI/TableView.h>
diff --git a/Applications/FileManager/main.cpp b/Applications/FileManager/main.cpp
index 2e3413333f..b2ad4e3cd7 100644
--- a/Applications/FileManager/main.cpp
+++ b/Applications/FileManager/main.cpp
@@ -42,6 +42,7 @@
 #include <LibGUI/FileSystemModel.h>
 #include <LibGUI/InputBox.h>
 #include <LibGUI/Label.h>
+#include <LibGUI/Menu.h>
 #include <LibGUI/MenuBar.h>
 #include <LibGUI/MessageBox.h>
 #include <LibGUI/ProgressBar.h>
diff --git a/Applications/FontEditor/main.cpp b/Applications/FontEditor/main.cpp
index 1183daff39..ff19eb45b7 100644
--- a/Applications/FontEditor/main.cpp
+++ b/Applications/FontEditor/main.cpp
@@ -28,6 +28,7 @@
 #include <LibGUI/AboutDialog.h>
 #include <LibGUI/Action.h>
 #include <LibGUI/Application.h>
+#include <LibGUI/Menu.h>
 #include <LibGUI/MenuBar.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/Bitmap.h>
diff --git a/Applications/HexEditor/HexEditorWidget.cpp b/Applications/HexEditor/HexEditorWidget.cpp
index 16ededb373..0f77a32b76 100644
--- a/Applications/HexEditor/HexEditorWidget.cpp
+++ b/Applications/HexEditor/HexEditorWidget.cpp
@@ -35,6 +35,7 @@
 #include <LibGUI/FilePicker.h>
 #include <LibGUI/FontDatabase.h>
 #include <LibGUI/InputBox.h>
+#include <LibGUI/Menu.h>
 #include <LibGUI/MenuBar.h>
 #include <LibGUI/MessageBox.h>
 #include <LibGUI/StatusBar.h>
diff --git a/Applications/Piano/main.cpp b/Applications/Piano/main.cpp
index 6778f809d5..22d12ec6ac 100644
--- a/Applications/Piano/main.cpp
+++ b/Applications/Piano/main.cpp
@@ -34,6 +34,7 @@
 #include <LibGUI/Action.h>
 #include <LibGUI/Application.h>
 #include <LibGUI/FilePicker.h>
+#include <LibGUI/Menu.h>
 #include <LibGUI/MenuBar.h>
 #include <LibGUI/MessageBox.h>
 #include <LibGUI/Window.h>
diff --git a/Applications/SystemMonitor/main.cpp b/Applications/SystemMonitor/main.cpp
index 15c19376d1..84b1da70f8 100644
--- a/Applications/SystemMonitor/main.cpp
+++ b/Applications/SystemMonitor/main.cpp
@@ -44,6 +44,7 @@
 #include <LibGUI/JsonArrayModel.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/LazyWidget.h>
+#include <LibGUI/Menu.h>
 #include <LibGUI/MenuBar.h>
 #include <LibGUI/Painter.h>
 #include <LibGUI/SortingProxyModel.h>
diff --git a/Applications/Terminal/main.cpp b/Applications/Terminal/main.cpp
index f4fcfed401..8241e8070c 100644
--- a/Applications/Terminal/main.cpp
+++ b/Applications/Terminal/main.cpp
@@ -34,6 +34,7 @@
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/FontDatabase.h>
 #include <LibGUI/GroupBox.h>
+#include <LibGUI/Menu.h>
 #include <LibGUI/MenuBar.h>
 #include <LibGUI/RadioButton.h>
 #include <LibGUI/Slider.h>
diff --git a/Applications/TextEditor/TextEditorWidget.cpp b/Applications/TextEditor/TextEditorWidget.cpp
index 4bfba22bab..b33717569d 100644
--- a/Applications/TextEditor/TextEditorWidget.cpp
+++ b/Applications/TextEditor/TextEditorWidget.cpp
@@ -37,6 +37,7 @@
 #include <LibGUI/CppSyntaxHighlighter.h>
 #include <LibGUI/FilePicker.h>
 #include <LibGUI/FontDatabase.h>
+#include <LibGUI/Menu.h>
 #include <LibGUI/MenuBar.h>
 #include <LibGUI/MessageBox.h>
 #include <LibGUI/StatusBar.h>
diff --git a/DevTools/VisualBuilder/main.cpp b/DevTools/VisualBuilder/main.cpp
index 090eca3b81..098e03c5e4 100644
--- a/DevTools/VisualBuilder/main.cpp
+++ b/DevTools/VisualBuilder/main.cpp
@@ -33,6 +33,7 @@
 #include <LibGUI/Application.h>
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Button.h>
+#include <LibGUI/Menu.h>
 #include <LibGUI/MenuBar.h>
 #include <LibGUI/TableView.h>
 #include <LibGUI/Widget.h>
diff --git a/Libraries/LibGUI/Menu.cpp b/Libraries/LibGUI/Menu.cpp
index cc5455a6b0..45a8485e77 100644
--- a/Libraries/LibGUI/Menu.cpp
+++ b/Libraries/LibGUI/Menu.cpp
@@ -29,6 +29,7 @@
 #include <LibGUI/Action.h>
 #include <LibGUI/ActionGroup.h>
 #include <LibGUI/Menu.h>
+#include <LibGUI/MenuItem.h>
 #include <LibGUI/WindowServerConnection.h>
 #include <LibGfx/Bitmap.h>
 
diff --git a/Libraries/LibGUI/Menu.h b/Libraries/LibGUI/Menu.h
index a1e8b094ce..9d7c537e3d 100644
--- a/Libraries/LibGUI/Menu.h
+++ b/Libraries/LibGUI/Menu.h
@@ -30,12 +30,12 @@
 #include <AK/NonnullOwnPtrVector.h>
 #include <AK/NonnullRefPtr.h>
 #include <LibCore/Object.h>
-#include <LibGUI/MenuItem.h>
 #include <LibGfx/Forward.h>
 
 namespace GUI {
 
 class Action;
+class MenuItem;
 
 class Menu final : public Core::Object {
     C_OBJECT(Menu)
diff --git a/Libraries/LibGUI/MenuBar.cpp b/Libraries/LibGUI/MenuBar.cpp
index c674c77443..7cb671b5f5 100644
--- a/Libraries/LibGUI/MenuBar.cpp
+++ b/Libraries/LibGUI/MenuBar.cpp
@@ -24,7 +24,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <AK/Badge.h>
+#include <LibGUI/Menu.h>
 #include <LibGUI/MenuBar.h>
+#include <LibGUI/MenuItem.h>
 #include <LibGUI/WindowServerConnection.h>
 
 namespace GUI {
diff --git a/Libraries/LibGUI/MenuBar.h b/Libraries/LibGUI/MenuBar.h
index 2e94696d5a..751903f15d 100644
--- a/Libraries/LibGUI/MenuBar.h
+++ b/Libraries/LibGUI/MenuBar.h
@@ -26,13 +26,13 @@
 
 #pragma once
 
-#include <AK/Badge.h>
-#include <AK/NonnullOwnPtrVector.h>
-#include <LibGUI/Menu.h>
+#include <AK/Forward.h>
+#include <AK/NonnullRefPtrVector.h>
 
 namespace GUI {
 
 class Application;
+class Menu;
 
 class MenuBar {
 public:
diff --git a/Libraries/LibGUI/MenuItem.cpp b/Libraries/LibGUI/MenuItem.cpp
index 1a5dd05eec..8b75a45e69 100644
--- a/Libraries/LibGUI/MenuItem.cpp
+++ b/Libraries/LibGUI/MenuItem.cpp
@@ -88,4 +88,14 @@ void MenuItem::update_window_server()
     WindowServerConnection::the().send_sync<Messages::WindowServer::UpdateMenuItem>(m_menu_id, m_identifier, -1, action.text(), action.is_enabled(), action.is_checkable(), action.is_checkable() ? action.is_checked() : false, shortcut_text);
 }
 
+void MenuItem::set_menu_id(Badge<Menu>, unsigned int menu_id)
+{
+    m_menu_id = menu_id;
+}
+
+void MenuItem::set_identifier(Badge<Menu>, unsigned identifier)
+{
+    m_identifier = identifier;
+}
+
 }
diff --git a/Libraries/LibGUI/MenuItem.h b/Libraries/LibGUI/MenuItem.h
index d243dba7b4..f8c7a439ae 100644
--- a/Libraries/LibGUI/MenuItem.h
+++ b/Libraries/LibGUI/MenuItem.h
@@ -26,10 +26,8 @@
 
 #pragma once
 
-#include <AK/Badge.h>
-#include <AK/NonnullOwnPtr.h>
-#include <AK/OwnPtr.h>
-#include <AK/String.h>
+#include <AK/Forward.h>
+#include <AK/RefPtr.h>
 
 namespace GUI {
 
@@ -68,8 +66,8 @@ public:
     bool is_enabled() const { return m_enabled; }
     void set_enabled(bool);
 
-    void set_menu_id(Badge<Menu>, unsigned menu_id) { m_menu_id = menu_id; }
-    void set_identifier(Badge<Menu>, unsigned identifier) { m_identifier = identifier; }
+    void set_menu_id(Badge<Menu>, unsigned menu_id);
+    void set_identifier(Badge<Menu>, unsigned identifier);
 
 private:
     void update_window_server();