From 31c75a2b5a58f063dd2f1d64fc79417e93c5722d Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sun, 14 Sep 2025 17:55:01 +1000 Subject: [PATCH] Qt: Remove Q_OBJECT where unnecessary Shaves another 20KB off the binary, and more importantly improves compile time since moc doesn't need to run for as many files. --- src/duckstation-qt/aboutdialog.cpp | 2 - src/duckstation-qt/aboutdialog.h | 3 -- src/duckstation-qt/achievementlogindialog.cpp | 2 - src/duckstation-qt/achievementlogindialog.h | 2 - .../achievementsettingswidget.cpp | 2 - .../achievementsettingswidget.h | 2 - src/duckstation-qt/audiosettingswidget.cpp | 2 - src/duckstation-qt/audiosettingswidget.h | 2 - src/duckstation-qt/biossettingswidget.cpp | 2 - src/duckstation-qt/biossettingswidget.h | 2 - src/duckstation-qt/consolesettingswidget.cpp | 2 - src/duckstation-qt/consolesettingswidget.h | 2 - .../controllerbindingwidgets.cpp | 2 - src/duckstation-qt/controllerbindingwidgets.h | 10 ---- .../controllerglobalsettingswidget.h | 2 - src/duckstation-qt/debuggermodels.cpp | 2 - src/duckstation-qt/debuggermodels.h | 6 --- src/duckstation-qt/displaywidget.h | 4 -- src/duckstation-qt/duckstation-qt.vcxproj | 52 +++++++++---------- .../duckstation-qt.vcxproj.filters | 52 +++++++++---------- .../emulationsettingswidget.cpp | 2 - src/duckstation-qt/emulationsettingswidget.h | 2 - src/duckstation-qt/foldersettingswidget.cpp | 2 - src/duckstation-qt/foldersettingswidget.h | 2 - .../gamecheatsettingswidget.cpp | 2 - src/duckstation-qt/gamecheatsettingswidget.h | 6 --- src/duckstation-qt/gamelistsettingswidget.cpp | 2 - src/duckstation-qt/gamelistsettingswidget.h | 2 - src/duckstation-qt/gamelistwidget.h | 4 -- .../gamepatchsettingswidget.cpp | 2 - src/duckstation-qt/gamepatchsettingswidget.h | 4 -- src/duckstation-qt/gamesummarywidget.cpp | 2 - src/duckstation-qt/gamesummarywidget.h | 2 - src/duckstation-qt/graphicssettingswidget.cpp | 2 - src/duckstation-qt/graphicssettingswidget.h | 2 - src/duckstation-qt/hotkeysettingswidget.cpp | 2 - src/duckstation-qt/hotkeysettingswidget.h | 2 - src/duckstation-qt/inputbindingdialog.cpp | 2 - src/duckstation-qt/inputbindingdialog.h | 2 - src/duckstation-qt/isobrowserwindow.cpp | 2 - src/duckstation-qt/isobrowserwindow.h | 2 - src/duckstation-qt/logwindow.cpp | 2 - src/duckstation-qt/logwindow.h | 2 - src/duckstation-qt/mainwindow.cpp | 2 - src/duckstation-qt/mainwindow.h | 2 - src/duckstation-qt/memorycardeditorwindow.cpp | 2 - src/duckstation-qt/memorycardeditorwindow.h | 3 -- .../memorycardsettingswidget.cpp | 2 - src/duckstation-qt/memorycardsettingswidget.h | 2 - src/duckstation-qt/memoryviewwidget.cpp | 2 - src/duckstation-qt/memoryviewwidget.h | 2 - .../postprocessingsettingswidget.cpp | 2 - .../postprocessingsettingswidget.h | 8 --- src/duckstation-qt/qthost.h | 2 - src/duckstation-qt/qtprogresscallback.h | 2 - src/duckstation-qt/selectdiscdialog.cpp | 2 - src/duckstation-qt/selectdiscdialog.h | 2 - src/duckstation-qt/setupwizarddialog.cpp | 2 - src/duckstation-qt/setupwizarddialog.h | 2 - 59 files changed, 52 insertions(+), 196 deletions(-) diff --git a/src/duckstation-qt/aboutdialog.cpp b/src/duckstation-qt/aboutdialog.cpp index 6ec9b149a..f91cc7ddd 100644 --- a/src/duckstation-qt/aboutdialog.cpp +++ b/src/duckstation-qt/aboutdialog.cpp @@ -17,8 +17,6 @@ #include #include -#include "moc_aboutdialog.cpp" - AboutDialog::AboutDialog(QWidget* parent /* = nullptr */) : QDialog(parent) { m_ui.setupUi(this); diff --git a/src/duckstation-qt/aboutdialog.h b/src/duckstation-qt/aboutdialog.h index 4247c3455..2bd2d052f 100644 --- a/src/duckstation-qt/aboutdialog.h +++ b/src/duckstation-qt/aboutdialog.h @@ -8,8 +8,6 @@ class AboutDialog final : public QDialog { - Q_OBJECT - public: explicit AboutDialog(QWidget* parent = nullptr); ~AboutDialog(); @@ -18,5 +16,4 @@ public: private: Ui::AboutDialog m_ui; - }; diff --git a/src/duckstation-qt/achievementlogindialog.cpp b/src/duckstation-qt/achievementlogindialog.cpp index f0e5fe0d1..ef334e47e 100644 --- a/src/duckstation-qt/achievementlogindialog.cpp +++ b/src/duckstation-qt/achievementlogindialog.cpp @@ -10,8 +10,6 @@ #include -#include "moc_achievementlogindialog.cpp" - AchievementLoginDialog::AchievementLoginDialog(QWidget* parent, Achievements::LoginRequestReason reason) : QDialog(parent), m_reason(reason) { diff --git a/src/duckstation-qt/achievementlogindialog.h b/src/duckstation-qt/achievementlogindialog.h index e769598a4..ed1d4a947 100644 --- a/src/duckstation-qt/achievementlogindialog.h +++ b/src/duckstation-qt/achievementlogindialog.h @@ -12,8 +12,6 @@ enum class LoginRequestReason; class AchievementLoginDialog : public QDialog { - Q_OBJECT - public: AchievementLoginDialog(QWidget* parent, Achievements::LoginRequestReason reason); ~AchievementLoginDialog(); diff --git a/src/duckstation-qt/achievementsettingswidget.cpp b/src/duckstation-qt/achievementsettingswidget.cpp index 0fd25a468..b5dcb15e5 100644 --- a/src/duckstation-qt/achievementsettingswidget.cpp +++ b/src/duckstation-qt/achievementsettingswidget.cpp @@ -16,8 +16,6 @@ #include #include -#include "moc_achievementsettingswidget.cpp" - AchievementSettingsWidget::AchievementSettingsWidget(SettingsWindow* dialog, QWidget* parent) : QWidget(parent), m_dialog(dialog) { diff --git a/src/duckstation-qt/achievementsettingswidget.h b/src/duckstation-qt/achievementsettingswidget.h index 8d1678658..495123d14 100644 --- a/src/duckstation-qt/achievementsettingswidget.h +++ b/src/duckstation-qt/achievementsettingswidget.h @@ -11,8 +11,6 @@ class SettingsWindow; class AchievementSettingsWidget : public QWidget { - Q_OBJECT - public: explicit AchievementSettingsWidget(SettingsWindow* dialog, QWidget* parent); ~AchievementSettingsWidget(); diff --git a/src/duckstation-qt/audiosettingswidget.cpp b/src/duckstation-qt/audiosettingswidget.cpp index 18c91e2e4..d6666ba1c 100644 --- a/src/duckstation-qt/audiosettingswidget.cpp +++ b/src/duckstation-qt/audiosettingswidget.cpp @@ -14,8 +14,6 @@ #include #include -#include "moc_audiosettingswidget.cpp" - AudioSettingsWidget::AudioSettingsWidget(SettingsWindow* dialog, QWidget* parent) : QWidget(parent), m_dialog(dialog) { SettingsInterface* sif = dialog->getSettingsInterface(); diff --git a/src/duckstation-qt/audiosettingswidget.h b/src/duckstation-qt/audiosettingswidget.h index e5405eac0..666d22214 100644 --- a/src/duckstation-qt/audiosettingswidget.h +++ b/src/duckstation-qt/audiosettingswidget.h @@ -15,8 +15,6 @@ class SettingsWindow; class AudioSettingsWidget : public QWidget { - Q_OBJECT - public: AudioSettingsWidget(SettingsWindow* dialog, QWidget* parent); ~AudioSettingsWidget(); diff --git a/src/duckstation-qt/biossettingswidget.cpp b/src/duckstation-qt/biossettingswidget.cpp index b4e544003..e5ede5b7f 100644 --- a/src/duckstation-qt/biossettingswidget.cpp +++ b/src/duckstation-qt/biossettingswidget.cpp @@ -14,8 +14,6 @@ #include #include -#include "moc_biossettingswidget.cpp" - BIOSSettingsWidget::BIOSSettingsWidget(SettingsWindow* dialog, QWidget* parent) : QWidget(parent), m_dialog(dialog) { SettingsInterface* sif = dialog->getSettingsInterface(); diff --git a/src/duckstation-qt/biossettingswidget.h b/src/duckstation-qt/biossettingswidget.h index 2a65744a0..8b34c4b45 100644 --- a/src/duckstation-qt/biossettingswidget.h +++ b/src/duckstation-qt/biossettingswidget.h @@ -16,8 +16,6 @@ struct ImageInfo; class BIOSSettingsWidget : public QWidget { - Q_OBJECT - public: explicit BIOSSettingsWidget(SettingsWindow* dialog, QWidget* parent); ~BIOSSettingsWidget(); diff --git a/src/duckstation-qt/consolesettingswidget.cpp b/src/duckstation-qt/consolesettingswidget.cpp index 78b3066c3..7bb8a3710 100644 --- a/src/duckstation-qt/consolesettingswidget.cpp +++ b/src/duckstation-qt/consolesettingswidget.cpp @@ -14,8 +14,6 @@ #include #include -#include "moc_consolesettingswidget.cpp" - static constexpr const int CDROM_SPEEDUP_VALUES[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 0}; ConsoleSettingsWidget::ConsoleSettingsWidget(SettingsWindow* dialog, QWidget* parent) diff --git a/src/duckstation-qt/consolesettingswidget.h b/src/duckstation-qt/consolesettingswidget.h index 4078b3a75..c0c8cde1b 100644 --- a/src/duckstation-qt/consolesettingswidget.h +++ b/src/duckstation-qt/consolesettingswidget.h @@ -11,8 +11,6 @@ class SettingsWindow; class ConsoleSettingsWidget : public QWidget { - Q_OBJECT - public: explicit ConsoleSettingsWidget(SettingsWindow* dialog, QWidget* parent); ~ConsoleSettingsWidget(); diff --git a/src/duckstation-qt/controllerbindingwidgets.cpp b/src/duckstation-qt/controllerbindingwidgets.cpp index 54a1cb8b7..e42e69b35 100644 --- a/src/duckstation-qt/controllerbindingwidgets.cpp +++ b/src/duckstation-qt/controllerbindingwidgets.cpp @@ -40,8 +40,6 @@ #include #include -#include "moc_controllerbindingwidgets.cpp" - LOG_CHANNEL(Host); ControllerBindingWidget::ControllerBindingWidget(QWidget* parent, ControllerSettingsWindow* dialog, u32 port) diff --git a/src/duckstation-qt/controllerbindingwidgets.h b/src/duckstation-qt/controllerbindingwidgets.h index cce69ee0c..737bb3749 100644 --- a/src/duckstation-qt/controllerbindingwidgets.h +++ b/src/duckstation-qt/controllerbindingwidgets.h @@ -26,8 +26,6 @@ class ControllerMacroEditWidget; class ControllerBindingWidget final : public QWidget { - Q_OBJECT - public: ControllerBindingWidget(QWidget* parent, ControllerSettingsWindow* dialog, u32 port); ~ControllerBindingWidget(); @@ -75,8 +73,6 @@ private: class ControllerMacroWidget : public QWidget { - Q_OBJECT - public: explicit ControllerMacroWidget(ControllerBindingWidget* parent); ~ControllerMacroWidget(); @@ -97,8 +93,6 @@ private: class ControllerMacroEditWidget : public QWidget { - Q_OBJECT - public: ControllerMacroEditWidget(ControllerMacroWidget* parent, ControllerBindingWidget* bwidget, u32 index); ~ControllerMacroEditWidget(); @@ -129,8 +123,6 @@ private: class ControllerCustomSettingsWidget : public QWidget { - Q_OBJECT - public: explicit ControllerCustomSettingsWidget(ControllerBindingWidget* parent); ~ControllerCustomSettingsWidget(); @@ -145,8 +137,6 @@ private: class ControllerCustomSettingsDialog : public QDialog { - Q_OBJECT - public: explicit ControllerCustomSettingsDialog(QWidget* parent, SettingsInterface* sif, const std::string& section, std::span settings, const char* tr_context, diff --git a/src/duckstation-qt/controllerglobalsettingswidget.h b/src/duckstation-qt/controllerglobalsettingswidget.h index 8599cb085..ba2bbdc38 100644 --- a/src/duckstation-qt/controllerglobalsettingswidget.h +++ b/src/duckstation-qt/controllerglobalsettingswidget.h @@ -39,8 +39,6 @@ private: class ControllerLEDSettingsDialog : public QDialog { - Q_OBJECT - public: ControllerLEDSettingsDialog(QWidget* parent, ControllerSettingsWindow* dialog); ~ControllerLEDSettingsDialog(); diff --git a/src/duckstation-qt/debuggermodels.cpp b/src/duckstation-qt/debuggermodels.cpp index eede77360..88acace07 100644 --- a/src/duckstation-qt/debuggermodels.cpp +++ b/src/duckstation-qt/debuggermodels.cpp @@ -16,8 +16,6 @@ #include #include -#include "moc_debuggermodels.cpp" - static constexpr int STACK_RANGE = 128; static constexpr u32 STACK_VALUE_SIZE = sizeof(u32); diff --git a/src/duckstation-qt/debuggermodels.h b/src/duckstation-qt/debuggermodels.h index 39ce57d31..1fe82ff0a 100644 --- a/src/duckstation-qt/debuggermodels.h +++ b/src/duckstation-qt/debuggermodels.h @@ -17,8 +17,6 @@ class DebuggerRegistersModel final : public QAbstractListModel { - Q_OBJECT - public: explicit DebuggerRegistersModel(QObject* parent = nullptr); ~DebuggerRegistersModel() override; @@ -38,8 +36,6 @@ private: class DebuggerStackModel final : public QAbstractListModel { - Q_OBJECT - public: explicit DebuggerStackModel(QObject* parent = nullptr); ~DebuggerStackModel() override; @@ -54,8 +50,6 @@ public: class DebuggerAddBreakpointDialog final : public QDialog { - Q_OBJECT - public: explicit DebuggerAddBreakpointDialog(QWidget* parent = nullptr); ~DebuggerAddBreakpointDialog() override; diff --git a/src/duckstation-qt/displaywidget.h b/src/duckstation-qt/displaywidget.h index 1bf32cbb3..11caf6716 100644 --- a/src/duckstation-qt/displaywidget.h +++ b/src/duckstation-qt/displaywidget.h @@ -76,8 +76,6 @@ private: class DisplayContainer final : public QStackedWidget { - Q_OBJECT - public: DisplayContainer(); ~DisplayContainer(); @@ -96,8 +94,6 @@ private: class AuxiliaryDisplayWidget final : public QWidget { - Q_OBJECT - public: explicit AuxiliaryDisplayWidget(QWidget* parent, u32 width, u32 height, const QString& title, void* userdata); ~AuxiliaryDisplayWidget(); diff --git a/src/duckstation-qt/duckstation-qt.vcxproj b/src/duckstation-qt/duckstation-qt.vcxproj index 34eac411b..a2bba94f5 100644 --- a/src/duckstation-qt/duckstation-qt.vcxproj +++ b/src/duckstation-qt/duckstation-qt.vcxproj @@ -53,52 +53,52 @@ - - - - + + + + - - + + - + - + - + - - - + + + - - - + + + - - - + + + - + - - - + + + - - - + + + - + diff --git a/src/duckstation-qt/duckstation-qt.vcxproj.filters b/src/duckstation-qt/duckstation-qt.vcxproj.filters index e3875c175..b901b6dbe 100644 --- a/src/duckstation-qt/duckstation-qt.vcxproj.filters +++ b/src/duckstation-qt/duckstation-qt.vcxproj.filters @@ -55,6 +55,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -65,48 +91,22 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/duckstation-qt/emulationsettingswidget.cpp b/src/duckstation-qt/emulationsettingswidget.cpp index c8df45793..d298d2317 100644 --- a/src/duckstation-qt/emulationsettingswidget.cpp +++ b/src/duckstation-qt/emulationsettingswidget.cpp @@ -10,8 +10,6 @@ #include #include -#include "moc_emulationsettingswidget.cpp" - EmulationSettingsWidget::EmulationSettingsWidget(SettingsWindow* dialog, QWidget* parent) : QWidget(parent), m_dialog(dialog) { diff --git a/src/duckstation-qt/emulationsettingswidget.h b/src/duckstation-qt/emulationsettingswidget.h index 9b99b492d..7ec14077b 100644 --- a/src/duckstation-qt/emulationsettingswidget.h +++ b/src/duckstation-qt/emulationsettingswidget.h @@ -11,8 +11,6 @@ class SettingsWindow; class EmulationSettingsWidget : public QWidget { - Q_OBJECT - public: explicit EmulationSettingsWidget(SettingsWindow* dialog, QWidget* parent); ~EmulationSettingsWidget(); diff --git a/src/duckstation-qt/foldersettingswidget.cpp b/src/duckstation-qt/foldersettingswidget.cpp index fb5f723c3..8726dcce4 100644 --- a/src/duckstation-qt/foldersettingswidget.cpp +++ b/src/duckstation-qt/foldersettingswidget.cpp @@ -8,8 +8,6 @@ #include "settingswindow.h" #include "settingwidgetbinder.h" -#include "moc_foldersettingswidget.cpp" - FolderSettingsWidget::FolderSettingsWidget(SettingsWindow* dialog, QWidget* parent) : QWidget(parent) { SettingsInterface* sif = dialog->getSettingsInterface(); diff --git a/src/duckstation-qt/foldersettingswidget.h b/src/duckstation-qt/foldersettingswidget.h index 2bbd85bb1..6fd0e5044 100644 --- a/src/duckstation-qt/foldersettingswidget.h +++ b/src/duckstation-qt/foldersettingswidget.h @@ -11,8 +11,6 @@ class SettingsWindow; class FolderSettingsWidget : public QWidget { - Q_OBJECT - public: FolderSettingsWidget(SettingsWindow* dialog, QWidget* parent); ~FolderSettingsWidget(); diff --git a/src/duckstation-qt/gamecheatsettingswidget.cpp b/src/duckstation-qt/gamecheatsettingswidget.cpp index d18fa1be5..89f7201f0 100644 --- a/src/duckstation-qt/gamecheatsettingswidget.cpp +++ b/src/duckstation-qt/gamecheatsettingswidget.cpp @@ -23,8 +23,6 @@ #include #include -#include "moc_gamecheatsettingswidget.cpp" - LOG_CHANNEL(Cheats); namespace { diff --git a/src/duckstation-qt/gamecheatsettingswidget.h b/src/duckstation-qt/gamecheatsettingswidget.h index 35d692737..fbd1ffd5c 100644 --- a/src/duckstation-qt/gamecheatsettingswidget.h +++ b/src/duckstation-qt/gamecheatsettingswidget.h @@ -30,8 +30,6 @@ class QStandardItemModel; class GameCheatSettingsWidget : public QWidget { - Q_OBJECT - public: GameCheatSettingsWidget(SettingsWindow* dialog, QWidget* parent); ~GameCheatSettingsWidget() override; @@ -90,8 +88,6 @@ private: class CheatCodeEditorDialog : public QDialog { - Q_OBJECT - public: CheatCodeEditorDialog(GameCheatSettingsWidget* parent, Cheats::CodeInfo* code, const QStringList& group_names); ~CheatCodeEditorDialog() override; @@ -117,8 +113,6 @@ private: class GameCheatCodeChoiceEditorDialog : public QDialog { - Q_OBJECT - public: GameCheatCodeChoiceEditorDialog(QWidget* parent, const Cheats::CodeOptionList& options); ~GameCheatCodeChoiceEditorDialog() override; diff --git a/src/duckstation-qt/gamelistsettingswidget.cpp b/src/duckstation-qt/gamelistsettingswidget.cpp index 746b3a6bc..990fda6b4 100644 --- a/src/duckstation-qt/gamelistsettingswidget.cpp +++ b/src/duckstation-qt/gamelistsettingswidget.cpp @@ -22,8 +22,6 @@ #include #include -#include "moc_gamelistsettingswidget.cpp" - GameListSettingsWidget::GameListSettingsWidget(SettingsWindow* dialog, QWidget* parent) : QWidget(parent) { m_ui.setupUi(this); diff --git a/src/duckstation-qt/gamelistsettingswidget.h b/src/duckstation-qt/gamelistsettingswidget.h index c658345dc..c667b7e86 100644 --- a/src/duckstation-qt/gamelistsettingswidget.h +++ b/src/duckstation-qt/gamelistsettingswidget.h @@ -11,8 +11,6 @@ class SettingsWindow; class GameListSettingsWidget : public QWidget { - Q_OBJECT - public: GameListSettingsWidget(SettingsWindow* dialog, QWidget* parent); ~GameListSettingsWidget(); diff --git a/src/duckstation-qt/gamelistwidget.h b/src/duckstation-qt/gamelistwidget.h index 15039c1ef..c0aeae478 100644 --- a/src/duckstation-qt/gamelistwidget.h +++ b/src/duckstation-qt/gamelistwidget.h @@ -167,8 +167,6 @@ private: class GameListListView final : public QTableView { - Q_OBJECT - public: GameListListView(GameListModel* model, GameListSortModel* sort_model, QWidget* parent); ~GameListListView() override; @@ -198,8 +196,6 @@ private: class GameListGridView final : public QListView { - Q_OBJECT - public: GameListGridView(GameListModel* model, GameListSortModel* sort_model, QWidget* parent); ~GameListGridView() override; diff --git a/src/duckstation-qt/gamepatchsettingswidget.cpp b/src/duckstation-qt/gamepatchsettingswidget.cpp index a9e72ab94..10cbef19d 100644 --- a/src/duckstation-qt/gamepatchsettingswidget.cpp +++ b/src/duckstation-qt/gamepatchsettingswidget.cpp @@ -13,8 +13,6 @@ #include -#include "moc_gamepatchsettingswidget.cpp" - GamePatchDetailsWidget::GamePatchDetailsWidget(std::string name, const std::string& author, const std::string& description, bool disallowed_for_achievements, bool enabled, SettingsWindow* dialog, QWidget* parent) diff --git a/src/duckstation-qt/gamepatchsettingswidget.h b/src/duckstation-qt/gamepatchsettingswidget.h index a7da120e3..c3c536bd0 100644 --- a/src/duckstation-qt/gamepatchsettingswidget.h +++ b/src/duckstation-qt/gamepatchsettingswidget.h @@ -16,8 +16,6 @@ class SettingsWindow; class GamePatchDetailsWidget : public QWidget { - Q_OBJECT - public: GamePatchDetailsWidget(std::string name, const std::string& author, const std::string& description, bool disallowed_for_achievements, bool enabled, SettingsWindow* dialog, QWidget* parent); @@ -33,8 +31,6 @@ private: class GamePatchSettingsWidget : public QWidget { - Q_OBJECT - public: GamePatchSettingsWidget(SettingsWindow* dialog, QWidget* parent); ~GamePatchSettingsWidget(); diff --git a/src/duckstation-qt/gamesummarywidget.cpp b/src/duckstation-qt/gamesummarywidget.cpp index bf51e194f..9be577c46 100644 --- a/src/duckstation-qt/gamesummarywidget.cpp +++ b/src/duckstation-qt/gamesummarywidget.cpp @@ -25,8 +25,6 @@ #include #include -#include "moc_gamesummarywidget.cpp" - GameSummaryWidget::GameSummaryWidget(const GameList::Entry* entry, SettingsWindow* dialog, QWidget* parent) : m_dialog(dialog) { diff --git a/src/duckstation-qt/gamesummarywidget.h b/src/duckstation-qt/gamesummarywidget.h index 061d25701..6dc32565a 100644 --- a/src/duckstation-qt/gamesummarywidget.h +++ b/src/duckstation-qt/gamesummarywidget.h @@ -17,8 +17,6 @@ class SettingsWindow; class GameSummaryWidget : public QWidget { - Q_OBJECT - public: GameSummaryWidget(const GameList::Entry* entry, SettingsWindow* dialog, QWidget* parent); ~GameSummaryWidget(); diff --git a/src/duckstation-qt/graphicssettingswidget.cpp b/src/duckstation-qt/graphicssettingswidget.cpp index f9d6a6f9d..a5401355f 100644 --- a/src/duckstation-qt/graphicssettingswidget.cpp +++ b/src/duckstation-qt/graphicssettingswidget.cpp @@ -24,8 +24,6 @@ #include #include -#include "moc_graphicssettingswidget.cpp" - static QVariant GetMSAAModeValue(uint multisamples, bool ssaa) { const uint userdata = (multisamples & 0x7FFFFFFFu) | (static_cast(ssaa) << 31); diff --git a/src/duckstation-qt/graphicssettingswidget.h b/src/duckstation-qt/graphicssettingswidget.h index 3abcf559c..f70016fc4 100644 --- a/src/duckstation-qt/graphicssettingswidget.h +++ b/src/duckstation-qt/graphicssettingswidget.h @@ -15,8 +15,6 @@ class SettingsWindow; class GraphicsSettingsWidget : public QWidget { - Q_OBJECT - public: GraphicsSettingsWidget(SettingsWindow* dialog, QWidget* parent); ~GraphicsSettingsWidget(); diff --git a/src/duckstation-qt/hotkeysettingswidget.cpp b/src/duckstation-qt/hotkeysettingswidget.cpp index 526e3bc2a..17205db36 100644 --- a/src/duckstation-qt/hotkeysettingswidget.cpp +++ b/src/duckstation-qt/hotkeysettingswidget.cpp @@ -17,8 +17,6 @@ #include #include -#include "moc_hotkeysettingswidget.cpp" - HotkeySettingsWidget::HotkeySettingsWidget(QWidget* parent, ControllerSettingsWindow* dialog) : QWidget(parent), m_dialog(dialog) { diff --git a/src/duckstation-qt/hotkeysettingswidget.h b/src/duckstation-qt/hotkeysettingswidget.h index 308b2ec14..ac18d5b40 100644 --- a/src/duckstation-qt/hotkeysettingswidget.h +++ b/src/duckstation-qt/hotkeysettingswidget.h @@ -18,8 +18,6 @@ class ControllerSettingsWindow; class HotkeySettingsWidget : public QWidget { - Q_OBJECT - public: HotkeySettingsWidget(QWidget* parent, ControllerSettingsWindow* dialog); ~HotkeySettingsWidget(); diff --git a/src/duckstation-qt/inputbindingdialog.cpp b/src/duckstation-qt/inputbindingdialog.cpp index 56302afd0..243572834 100644 --- a/src/duckstation-qt/inputbindingdialog.cpp +++ b/src/duckstation-qt/inputbindingdialog.cpp @@ -16,8 +16,6 @@ #include #include -#include "moc_inputbindingdialog.cpp" - InputBindingDialog::InputBindingDialog(SettingsInterface* sif, InputBindingInfo::Type bind_type, std::string section_name, std::string key_name, std::vector bindings, QWidget* parent) diff --git a/src/duckstation-qt/inputbindingdialog.h b/src/duckstation-qt/inputbindingdialog.h index d3bce5cb8..3bd385076 100644 --- a/src/duckstation-qt/inputbindingdialog.h +++ b/src/duckstation-qt/inputbindingdialog.h @@ -14,8 +14,6 @@ class SettingsInterface; class InputBindingDialog : public QDialog { - Q_OBJECT - public: InputBindingDialog(SettingsInterface* sif, InputBindingInfo::Type bind_type, std::string section_name, std::string key_name, std::vector bindings, QWidget* parent); diff --git a/src/duckstation-qt/isobrowserwindow.cpp b/src/duckstation-qt/isobrowserwindow.cpp index 6bfba77b0..5718f15ea 100644 --- a/src/duckstation-qt/isobrowserwindow.cpp +++ b/src/duckstation-qt/isobrowserwindow.cpp @@ -18,8 +18,6 @@ #include #include -#include "moc_isobrowserwindow.cpp" - LOG_CHANNEL(Host); ISOBrowserWindow::ISOBrowserWindow(QWidget* parent) : QWidget(parent) diff --git a/src/duckstation-qt/isobrowserwindow.h b/src/duckstation-qt/isobrowserwindow.h index c417a174f..93f9f8404 100644 --- a/src/duckstation-qt/isobrowserwindow.h +++ b/src/duckstation-qt/isobrowserwindow.h @@ -9,8 +9,6 @@ class ISOBrowserWindow : public QWidget { - Q_OBJECT - public: explicit ISOBrowserWindow(QWidget* parent = nullptr); ~ISOBrowserWindow(); diff --git a/src/duckstation-qt/logwindow.cpp b/src/duckstation-qt/logwindow.cpp index 43324b227..ae82df06f 100644 --- a/src/duckstation-qt/logwindow.cpp +++ b/src/duckstation-qt/logwindow.cpp @@ -14,8 +14,6 @@ #include #include -#include "moc_logwindow.cpp" - // TODO: Since log callbacks are synchronized, no mutex is needed here. // But once I get rid of that, there will be. LogWindow* g_log_window; diff --git a/src/duckstation-qt/logwindow.h b/src/duckstation-qt/logwindow.h index d3b467e9d..f1de8a784 100644 --- a/src/duckstation-qt/logwindow.h +++ b/src/duckstation-qt/logwindow.h @@ -13,8 +13,6 @@ class ALIGN_TO_CACHE_LINE LogWindow : public QMainWindow { - Q_OBJECT - public: LogWindow(bool attach_to_main); ~LogWindow(); diff --git a/src/duckstation-qt/mainwindow.cpp b/src/duckstation-qt/mainwindow.cpp index 778c0cc20..1b0d0145b 100644 --- a/src/duckstation-qt/mainwindow.cpp +++ b/src/duckstation-qt/mainwindow.cpp @@ -54,8 +54,6 @@ #include #include -#include "moc_mainwindow.cpp" - #ifdef _WIN32 #include "common/windows_headers.h" #include diff --git a/src/duckstation-qt/mainwindow.h b/src/duckstation-qt/mainwindow.h index 71e6db4f0..c22a0614e 100644 --- a/src/duckstation-qt/mainwindow.h +++ b/src/duckstation-qt/mainwindow.h @@ -48,8 +48,6 @@ struct Entry; class MainWindow final : public QMainWindow { - Q_OBJECT - public: /// This class is a scoped lock on the system, which prevents it from running while /// the object exists. Its purpose is to be used for blocking/modal popup boxes, diff --git a/src/duckstation-qt/memorycardeditorwindow.cpp b/src/duckstation-qt/memorycardeditorwindow.cpp index 6d1a62865..84e8008b3 100644 --- a/src/duckstation-qt/memorycardeditorwindow.cpp +++ b/src/duckstation-qt/memorycardeditorwindow.cpp @@ -21,8 +21,6 @@ #include #include -#include "moc_memorycardeditorwindow.cpp" - LOG_CHANNEL(Host); static constexpr char MEMORY_CARD_IMAGE_FILTER[] = diff --git a/src/duckstation-qt/memorycardeditorwindow.h b/src/duckstation-qt/memorycardeditorwindow.h index 8a19d5b01..418e03959 100644 --- a/src/duckstation-qt/memorycardeditorwindow.h +++ b/src/duckstation-qt/memorycardeditorwindow.h @@ -20,8 +20,6 @@ class Error; class MemoryCardEditorWindow : public QWidget { - Q_OBJECT - public: MemoryCardEditorWindow(); ~MemoryCardEditorWindow(); @@ -106,7 +104,6 @@ private: class MemoryCardRenameFileDialog final : public QDialog { - Q_OBJECT public: MemoryCardRenameFileDialog(QWidget* parent, std::string_view old_name); ~MemoryCardRenameFileDialog() override; diff --git a/src/duckstation-qt/memorycardsettingswidget.cpp b/src/duckstation-qt/memorycardsettingswidget.cpp index 8382835be..037cb9bac 100644 --- a/src/duckstation-qt/memorycardsettingswidget.cpp +++ b/src/duckstation-qt/memorycardsettingswidget.cpp @@ -27,8 +27,6 @@ #include -#include "moc_memorycardsettingswidget.cpp" - static constexpr char MEMORY_CARD_IMAGE_FILTER[] = QT_TRANSLATE_NOOP("MemoryCardSettingsWidget", "All Memory Card Types (*.mcd *.mcr *.mc)"); diff --git a/src/duckstation-qt/memorycardsettingswidget.h b/src/duckstation-qt/memorycardsettingswidget.h index ddccbd9ce..0aa904d2e 100644 --- a/src/duckstation-qt/memorycardsettingswidget.h +++ b/src/duckstation-qt/memorycardsettingswidget.h @@ -21,8 +21,6 @@ class SettingsWindow; class MemoryCardSettingsWidget : public QWidget { - Q_OBJECT - public: MemoryCardSettingsWidget(SettingsWindow* dialog, QWidget* parent); ~MemoryCardSettingsWidget(); diff --git a/src/duckstation-qt/memoryviewwidget.cpp b/src/duckstation-qt/memoryviewwidget.cpp index 442c89c08..b657eec32 100644 --- a/src/duckstation-qt/memoryviewwidget.cpp +++ b/src/duckstation-qt/memoryviewwidget.cpp @@ -6,8 +6,6 @@ #include #include -#include "moc_memoryviewwidget.cpp" - MemoryViewWidget::MemoryViewWidget(QWidget* parent /* = nullptr */, size_t address_offset /* = 0 */, void* data_ptr /* = nullptr */, size_t data_size /* = 0 */, bool data_editable /* = false */, EditCallback edit_callback /* = nullptr */) diff --git a/src/duckstation-qt/memoryviewwidget.h b/src/duckstation-qt/memoryviewwidget.h index 23f874e4e..f74970790 100644 --- a/src/duckstation-qt/memoryviewwidget.h +++ b/src/duckstation-qt/memoryviewwidget.h @@ -9,8 +9,6 @@ class MemoryViewWidget : public QAbstractScrollArea { - Q_OBJECT - public: using EditCallback = void (*)(size_t offset, size_t bytes); diff --git a/src/duckstation-qt/postprocessingsettingswidget.cpp b/src/duckstation-qt/postprocessingsettingswidget.cpp index 19e695f3c..6eaad6ff7 100644 --- a/src/duckstation-qt/postprocessingsettingswidget.cpp +++ b/src/duckstation-qt/postprocessingsettingswidget.cpp @@ -22,8 +22,6 @@ #include #include -#include "moc_postprocessingsettingswidget.cpp" - PostProcessingSettingsWidget::PostProcessingSettingsWidget(SettingsWindow* dialog, QWidget* parent) : QTabWidget(parent) { addTab(new PostProcessingChainConfigWidget(dialog, this, PostProcessing::Config::DISPLAY_CHAIN_SECTION), diff --git a/src/duckstation-qt/postprocessingsettingswidget.h b/src/duckstation-qt/postprocessingsettingswidget.h index 1d388eae8..2373ec318 100644 --- a/src/duckstation-qt/postprocessingsettingswidget.h +++ b/src/duckstation-qt/postprocessingsettingswidget.h @@ -16,8 +16,6 @@ class PostProcessingShaderConfigWidget; class PostProcessingSettingsWidget final : public QTabWidget { - Q_OBJECT - public: PostProcessingSettingsWidget(SettingsWindow* dialog, QWidget* parent); ~PostProcessingSettingsWidget(); @@ -25,8 +23,6 @@ public: class PostProcessingChainConfigWidget : public QWidget { - Q_OBJECT - friend PostProcessingShaderConfigWidget; public: @@ -64,8 +60,6 @@ private: class PostProcessingShaderConfigWidget final : public QWidget { - Q_OBJECT - public: PostProcessingShaderConfigWidget(QWidget* parent, PostProcessingChainConfigWidget* widget, const char* section, u32 stage_index, std::vector options); @@ -89,8 +83,6 @@ private: class PostProcessingOverlayConfigWidget final : public QWidget { - Q_OBJECT - public: PostProcessingOverlayConfigWidget(SettingsWindow* dialog, QWidget* parent); ~PostProcessingOverlayConfigWidget(); diff --git a/src/duckstation-qt/qthost.h b/src/duckstation-qt/qthost.h index 3ffac06c4..5f2f951ae 100644 --- a/src/duckstation-qt/qthost.h +++ b/src/duckstation-qt/qthost.h @@ -266,8 +266,6 @@ private: class InputDeviceListModel final : public QAbstractListModel { - Q_OBJECT - public: struct Device { diff --git a/src/duckstation-qt/qtprogresscallback.h b/src/duckstation-qt/qtprogresscallback.h index 872f82039..5f510f3fa 100644 --- a/src/duckstation-qt/qtprogresscallback.h +++ b/src/duckstation-qt/qtprogresscallback.h @@ -13,8 +13,6 @@ class QtModalProgressCallback final : public QObject, public ProgressCallback { - Q_OBJECT - public: explicit QtModalProgressCallback(QWidget* parent_widget, float show_delay = 0.0f); ~QtModalProgressCallback(); diff --git a/src/duckstation-qt/selectdiscdialog.cpp b/src/duckstation-qt/selectdiscdialog.cpp index f865fbdd7..721a270ec 100644 --- a/src/duckstation-qt/selectdiscdialog.cpp +++ b/src/duckstation-qt/selectdiscdialog.cpp @@ -11,8 +11,6 @@ #include -#include "moc_selectdiscdialog.cpp" - SelectDiscDialog::SelectDiscDialog(const GameDatabase::DiscSetEntry* dsentry, bool localized_titles, QWidget* parent /* = nullptr */) : QDialog(parent) diff --git a/src/duckstation-qt/selectdiscdialog.h b/src/duckstation-qt/selectdiscdialog.h index 62f6cf7a3..ce89f3697 100644 --- a/src/duckstation-qt/selectdiscdialog.h +++ b/src/duckstation-qt/selectdiscdialog.h @@ -15,8 +15,6 @@ struct DiscSetEntry; class SelectDiscDialog final : public QDialog { - Q_OBJECT - public: explicit SelectDiscDialog(const GameDatabase::DiscSetEntry* dsentry, bool localized_titles, QWidget* parent = nullptr); diff --git a/src/duckstation-qt/setupwizarddialog.cpp b/src/duckstation-qt/setupwizarddialog.cpp index 5757e06d9..9daac0a2f 100644 --- a/src/duckstation-qt/setupwizarddialog.cpp +++ b/src/duckstation-qt/setupwizarddialog.cpp @@ -24,8 +24,6 @@ #include -#include "moc_setupwizarddialog.cpp" - SetupWizardDialog::SetupWizardDialog() { setupUi(); diff --git a/src/duckstation-qt/setupwizarddialog.h b/src/duckstation-qt/setupwizarddialog.h index e486c1718..1878b5663 100644 --- a/src/duckstation-qt/setupwizarddialog.h +++ b/src/duckstation-qt/setupwizarddialog.h @@ -19,8 +19,6 @@ class SetupWizardDialog final : public QDialog { - Q_OBJECT - public: SetupWizardDialog(); ~SetupWizardDialog();