From cbb4dd8f22892e2a2bee264940e6db923dd2af60 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sun, 16 Nov 2025 19:10:13 +0100 Subject: [PATCH] Qt: forward declare gui_settings --- rpcs3/rpcs3qt/elf_memory_dumping_dialog.cpp | 5 +++-- rpcs3/rpcs3qt/elf_memory_dumping_dialog.h | 3 ++- rpcs3/rpcs3qt/shortcut_dialog.cpp | 1 + rpcs3/rpcs3qt/shortcut_dialog.h | 4 ++-- rpcs3/rpcs3qt/shortcut_handler.cpp | 1 + rpcs3/rpcs3qt/shortcut_handler.h | 3 ++- rpcs3/rpcs3qt/shortcut_settings.cpp | 1 + rpcs3/rpcs3qt/shortcut_settings.h | 4 +++- rpcs3/rpcs3qt/vfs_dialog_path_widget.cpp | 1 + rpcs3/rpcs3qt/vfs_dialog_path_widget.h | 4 +++- rpcs3/rpcs3qt/vfs_dialog_tab.cpp | 1 + rpcs3/rpcs3qt/vfs_dialog_usb_tab.cpp | 1 + rpcs3/rpcs3qt/vfs_dialog_usb_tab.h | 4 ++-- 13 files changed, 23 insertions(+), 10 deletions(-) diff --git a/rpcs3/rpcs3qt/elf_memory_dumping_dialog.cpp b/rpcs3/rpcs3qt/elf_memory_dumping_dialog.cpp index c191b878de..8a6ce43423 100644 --- a/rpcs3/rpcs3qt/elf_memory_dumping_dialog.cpp +++ b/rpcs3/rpcs3qt/elf_memory_dumping_dialog.cpp @@ -1,8 +1,9 @@ #include "elf_memory_dumping_dialog.h" -#include "Emu/Cell/SPUThread.h" - +#include "gui_settings.h" #include "qt_utils.h" +#include "Emu/Cell/SPUThread.h" + #include #include #include diff --git a/rpcs3/rpcs3qt/elf_memory_dumping_dialog.h b/rpcs3/rpcs3qt/elf_memory_dumping_dialog.h index 3c6d7fe59f..49c85d1f99 100644 --- a/rpcs3/rpcs3qt/elf_memory_dumping_dialog.h +++ b/rpcs3/rpcs3qt/elf_memory_dumping_dialog.h @@ -1,7 +1,6 @@ #pragma once #include "util/types.hpp" -#include "gui_settings.h" #include #include @@ -9,6 +8,8 @@ #include +class gui_settings; + class elf_memory_dumping_dialog : public QDialog { Q_OBJECT diff --git a/rpcs3/rpcs3qt/shortcut_dialog.cpp b/rpcs3/rpcs3qt/shortcut_dialog.cpp index 1f36c69fd8..2f8614a94a 100644 --- a/rpcs3/rpcs3qt/shortcut_dialog.cpp +++ b/rpcs3/rpcs3qt/shortcut_dialog.cpp @@ -1,6 +1,7 @@ #include "shortcut_dialog.h" #include "ui_shortcut_dialog.h" #include "shortcut_settings.h" +#include "gui_settings.h" #include #include diff --git a/rpcs3/rpcs3qt/shortcut_dialog.h b/rpcs3/rpcs3qt/shortcut_dialog.h index b13ddb94ff..f5a9e7b431 100644 --- a/rpcs3/rpcs3qt/shortcut_dialog.h +++ b/rpcs3/rpcs3qt/shortcut_dialog.h @@ -1,9 +1,9 @@ #pragma once -#include "gui_settings.h" - #include +class gui_settings; + namespace Ui { class shortcut_dialog; diff --git a/rpcs3/rpcs3qt/shortcut_handler.cpp b/rpcs3/rpcs3qt/shortcut_handler.cpp index ed1dbecffd..f924cd2a07 100644 --- a/rpcs3/rpcs3qt/shortcut_handler.cpp +++ b/rpcs3/rpcs3qt/shortcut_handler.cpp @@ -1,5 +1,6 @@ #include "stdafx.h" #include "shortcut_handler.h" +#include "gui_settings.h" LOG_CHANNEL(shortcut_log, "Shortcuts"); diff --git a/rpcs3/rpcs3qt/shortcut_handler.h b/rpcs3/rpcs3qt/shortcut_handler.h index d884681563..c8c4ea84af 100644 --- a/rpcs3/rpcs3qt/shortcut_handler.h +++ b/rpcs3/rpcs3qt/shortcut_handler.h @@ -1,6 +1,5 @@ #pragma once -#include "gui_settings.h" #include "shortcut_settings.h" #include @@ -8,6 +7,8 @@ #include +class gui_settings; + class shortcut_handler : public QObject { Q_OBJECT diff --git a/rpcs3/rpcs3qt/shortcut_settings.cpp b/rpcs3/rpcs3qt/shortcut_settings.cpp index e1c4d54038..039f493dae 100644 --- a/rpcs3/rpcs3qt/shortcut_settings.cpp +++ b/rpcs3/rpcs3qt/shortcut_settings.cpp @@ -1,4 +1,5 @@ #include "shortcut_settings.h" +#include "gui_settings.h" using namespace gui::shortcuts; diff --git a/rpcs3/rpcs3qt/shortcut_settings.h b/rpcs3/rpcs3qt/shortcut_settings.h index bc4e95925e..db6458accb 100644 --- a/rpcs3/rpcs3qt/shortcut_settings.h +++ b/rpcs3/rpcs3qt/shortcut_settings.h @@ -1,9 +1,11 @@ #pragma once -#include "gui_settings.h" +#include "gui_save.h" #include +class gui_settings; + namespace gui { namespace shortcuts diff --git a/rpcs3/rpcs3qt/vfs_dialog_path_widget.cpp b/rpcs3/rpcs3qt/vfs_dialog_path_widget.cpp index f7d2f81dd9..f5ceac8aee 100644 --- a/rpcs3/rpcs3qt/vfs_dialog_path_widget.cpp +++ b/rpcs3/rpcs3qt/vfs_dialog_path_widget.cpp @@ -1,4 +1,5 @@ #include "vfs_dialog_path_widget.h" +#include "gui_settings.h" #include #include diff --git a/rpcs3/rpcs3qt/vfs_dialog_path_widget.h b/rpcs3/rpcs3qt/vfs_dialog_path_widget.h index 698d090509..bae3cfa46c 100644 --- a/rpcs3/rpcs3qt/vfs_dialog_path_widget.h +++ b/rpcs3/rpcs3qt/vfs_dialog_path_widget.h @@ -1,12 +1,14 @@ #pragma once -#include "gui_settings.h" +#include "gui_save.h" #include #include #include +class gui_settings; + namespace cfg { class string; diff --git a/rpcs3/rpcs3qt/vfs_dialog_tab.cpp b/rpcs3/rpcs3qt/vfs_dialog_tab.cpp index 93c640b84c..ca96879ea6 100644 --- a/rpcs3/rpcs3qt/vfs_dialog_tab.cpp +++ b/rpcs3/rpcs3qt/vfs_dialog_tab.cpp @@ -1,4 +1,5 @@ #include "vfs_dialog_tab.h" +#include "gui_settings.h" #include "Utilities/Config.h" vfs_dialog_tab::vfs_dialog_tab(const QString& name, gui_save list_location, cfg::string* cfg_node, std::shared_ptr _gui_settings, QWidget* parent) diff --git a/rpcs3/rpcs3qt/vfs_dialog_usb_tab.cpp b/rpcs3/rpcs3qt/vfs_dialog_usb_tab.cpp index 93fadf8ece..a10eef0080 100644 --- a/rpcs3/rpcs3qt/vfs_dialog_usb_tab.cpp +++ b/rpcs3/rpcs3qt/vfs_dialog_usb_tab.cpp @@ -1,6 +1,7 @@ #include "vfs_dialog_usb_tab.h" #include "vfs_dialog_usb_input.h" #include "table_item_delegate.h" +#include "gui_settings.h" #include "Utilities/Config.h" #include diff --git a/rpcs3/rpcs3qt/vfs_dialog_usb_tab.h b/rpcs3/rpcs3qt/vfs_dialog_usb_tab.h index 02d7a25c83..8082083cc6 100644 --- a/rpcs3/rpcs3qt/vfs_dialog_usb_tab.h +++ b/rpcs3/rpcs3qt/vfs_dialog_usb_tab.h @@ -1,12 +1,12 @@ #pragma once -#include "gui_settings.h" - #include #include #include +class gui_settings; + namespace cfg { class device_entry;