Reduce includes by using unique_ptr and fwd declarations

Author: kblaschke

src/RenderLoop.cpp

@@ -4,6 +4,7 @@
 
 #include "gui/ProjectMGUI.h"
 
+#include <Poco/File.h>
 #include <Poco/NotificationCenter.h>
 
 #include <Poco/Util/Application.h>

src/gui/ProjectMGUI.cpp

@@ -3,10 +3,16 @@
 #include "ProjectMWrapper.h"
 #include "SDLRenderingWindow.h"
 
+#include "AboutWindow.h"
 #include "AnonymousProFont.h"
 #include "FontAwesomeIconsRegular7.h"
 #include "FontAwesomeIconsSolid7.h"
+#include "HelpWindow.h"
 #include "LiberationSansFont.h"
+#include "MainMenu.h"
+#include "PresetEditorGUI.h"
+#include "SettingsWindow.h"
+#include "ToastMessage.h"
 
 #include "imgui.h"
 #include "imgui_impl_opengl3.h"
@@ -18,6 +24,17 @@
 
 #include <utility>
 
+ProjectMGUI::ProjectMGUI()
+    : _mainMenu(std::make_unique<MainMenu>(*this))
+    , _presetEditorGUI(std::make_unique<Editor::PresetEditorGUI>(*this))
+    , _settingsWindow(std::make_unique<SettingsWindow>(*this))
+    , _aboutWindow(std::make_unique<AboutWindow>(*this))
+    , _helpWindow(std::make_unique<HelpWindow>())
+{
+}
+
+ProjectMGUI::~ProjectMGUI() = default;
+
 const char* ProjectMGUI::name() const
 {
     return "Preset Selection GUI";
@@ -171,12 +188,12 @@ void ProjectMGUI::Draw()
 
     if (_visible)
     {
-        if (!_presetEditorGUI.Draw())
+        if (!_presetEditorGUI->Draw())
         {
-            _mainMenu.Draw();
-            _settingsWindow.Draw();
-            _aboutWindow.Draw();
-            _helpWindow.Draw();
+            _mainMenu->Draw();
+            _settingsWindow->Draw();
+            _aboutWindow->Draw();
+            _helpWindow->Draw();
         }
     }
 
@@ -223,22 +240,22 @@ void ProjectMGUI::PopFont()
 
 void ProjectMGUI::ShowPresetEditor(const std::string& presetFileName)
 {
-    _presetEditorGUI.Show(presetFileName);
+    _presetEditorGUI->Show(presetFileName);
 }
 
 void ProjectMGUI::ShowSettingsWindow()
 {
-    _settingsWindow.Show();
+    _settingsWindow->Show();
 }
 
 void ProjectMGUI::ShowAboutWindow()
 {
-    _aboutWindow.Show();
+    _aboutWindow->Show();
 }
 
 void ProjectMGUI::ShowHelpWindow()
 {
-    _helpWindow.Show();
+    _helpWindow->Show();
 }
 
 float ProjectMGUI::GetScalingFactor()

src/gui/ProjectMGUI.h

@@ -1,12 +1,5 @@
 #pragma once
 
-#include "AboutWindow.h"
-#include "HelpWindow.h"
-#include "MainMenu.h"
-#include "PresetEditorGUI.h"
-#include "SettingsWindow.h"
-#include "ToastMessage.h"
-
 #include "notifications/DisplayToastNotification.h"
 
 #include <SDL2/SDL.h>
@@ -16,13 +9,28 @@
 
 #include <Poco/Util/Subsystem.h>
 
+#include <memory>
+
+namespace Editor {
+class PresetEditorGUI;
+}
+
 struct ImFont;
 class ProjectMWrapper;
 class SDLRenderingWindow;
+class MainMenu;
+class SettingsWindow;
+class AboutWindow;
+class HelpWindow;
+class ToastMessage;
 
 class ProjectMGUI : public Poco::Util::Subsystem
 {
 public:
+    ProjectMGUI();
+
+    ~ProjectMGUI() override;
+
     const char* name() const override;
 
     void initialize(Poco::Util::Application& app) override;
@@ -146,11 +154,11 @@ class ProjectMGUI : public Poco::Util::Subsystem
     float _userScalingFactor{1.0f}; //!< The user-defined UI scaling factor.
     float _textScalingFactor{0.0f}; //!< The text scaling factor.
 
-    MainMenu _mainMenu{*this};
-    Editor::PresetEditorGUI _presetEditorGUI{*this}; //!< The preset editor GUI.
-    SettingsWindow _settingsWindow{*this}; //!< The settings window.
-    AboutWindow _aboutWindow{*this}; //!< The about window.
-    HelpWindow _helpWindow; //!< Help window with shortcuts and tips.
+    std::unique_ptr<MainMenu> _mainMenu;
+    std::unique_ptr<Editor::PresetEditorGUI> _presetEditorGUI; //!< The preset editor GUI.
+    std::unique_ptr<SettingsWindow> _settingsWindow; //!< The settings window.
+    std::unique_ptr<AboutWindow> _aboutWindow; //!< The about window.
+    std::unique_ptr<HelpWindow> _helpWindow; //!< Help window with shortcuts and tips.
 
     std::unique_ptr<ToastMessage> _toast; //!< Current toast to be displayed.
 

src/gui/preset_editor/EditorMenu.cpp

@@ -7,6 +7,8 @@
 
 #include "notifications/QuitNotification.h"
 
+#include "imgui.h"
+
 #include <Poco/NotificationCenter.h>
 
 namespace Editor {

src/gui/preset_editor/PresetEditorGUI.cpp

@@ -1,8 +1,8 @@
 #include "PresetEditorGUI.h"
 
 #include "CodeContextInformation.h"
+#include "CodeEditorWindow.h"
 #include "IconsFontAwesome7.h"
-#include "ProjectMGUI.h"
 
 #include "ProjectMSDLApplication.h"
 #include "ProjectMWrapper.h"
@@ -27,6 +27,10 @@ PresetEditorGUI::PresetEditorGUI(ProjectMGUI& gui)
 {
 }
 
+PresetEditorGUI::~PresetEditorGUI()
+{
+}
+
 void PresetEditorGUI::Show(const std::string& presetFile)
 {
     if (presetFile.empty())
@@ -55,6 +59,7 @@ void PresetEditorGUI::Show(const std::string& presetFile)
     }
 
     _editorPreset.FromParsedFile(_presetFile);
+    _codeEditorWindow = std::make_unique<CodeEditorWindow>();
 
     _visible = true;
 }
@@ -86,7 +91,7 @@ bool PresetEditorGUI::Draw()
 
         ImGui::SameLine();
 
-        _codeEditorWindow.Draw();
+        _codeEditorWindow->Draw();
     }
     ImGui::End();
 
@@ -100,6 +105,8 @@ bool PresetEditorGUI::Draw()
 
         _visible = false;
         _wantClose = false;
+
+        _codeEditorWindow.reset();
     }
 
     return true;
@@ -164,7 +171,7 @@ void PresetEditorGUI::ReleaseProjectMControl()
 
 void PresetEditorGUI::EditCode(ExpressionCodeTypes type, std::string& code, int index)
 {
-    _codeEditorWindow.OpenCodeInTab(type, code, index);
+    _codeEditorWindow->OpenCodeInTab(type, code, index);
 }
 
 unsigned long PresetEditorGUI::GetLoC(const std::string& code)

src/gui/preset_editor/PresetEditorGUI.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include "CodeEditorWindow.h"
 #include "EditorMenu.h"
 #include "EditorPreset.h"
 #include "ExpressionCodeTypes.h"
 #include "PresetFile.h"
 
+#include <memory>
 #include <string>
 
 class ProjectMGUI;
@@ -14,12 +14,14 @@ class ProjectMWrapper;
 
 namespace Editor {
 
+class CodeEditorWindow;
+
 class PresetEditorGUI
 {
 public:
     explicit PresetEditorGUI(ProjectMGUI& gui);
 
-    ~PresetEditorGUI() = default;
+    ~PresetEditorGUI();
 
     /**
      * @brief Displays the preset editor screen and associated windows.
@@ -84,7 +86,7 @@ class PresetEditorGUI
     PresetFile _presetFile; //!< The raw preset data.
     EditorPreset _editorPreset; //!< The preset data in a parsed, strongly-typed container.
 
-    CodeEditorWindow _codeEditorWindow; //!< The code editor window.
+    std::unique_ptr<CodeEditorWindow> _codeEditorWindow; //!< The code editor window.
 
 };