From 2369b329eba0ecb21943f2d64ae90cf4d5dfe064 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Wed, 17 Sep 2025 19:36:29 +1000 Subject: [PATCH] Qt: Partially revert "Remove Q_OBJECT where unnecessary" This reverts commit 31c75a2b5a58f063dd2f1d64fc79417e93c5722d. tr()'s context is defined by Q_OBJECT, so removing Q_OBJECT here sadly breaks translations. --- 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 | 8 +++ .../controllerglobalsettingswidget.h | 2 + src/duckstation-qt/debuggermodels.cpp | 7 +-- src/duckstation-qt/debuggermodels.h | 6 +++ src/duckstation-qt/duckstation-qt.vcxproj | 50 +++++++++---------- .../duckstation-qt.vcxproj.filters | 50 +++++++++---------- .../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 + .../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 + 56 files changed, 186 insertions(+), 53 deletions(-) diff --git a/src/duckstation-qt/aboutdialog.cpp b/src/duckstation-qt/aboutdialog.cpp index f91cc7ddd..6ec9b149a 100644 --- a/src/duckstation-qt/aboutdialog.cpp +++ b/src/duckstation-qt/aboutdialog.cpp @@ -17,6 +17,8 @@ #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 2bd2d052f..4247c3455 100644 --- a/src/duckstation-qt/aboutdialog.h +++ b/src/duckstation-qt/aboutdialog.h @@ -8,6 +8,8 @@ class AboutDialog final : public QDialog { + Q_OBJECT + public: explicit AboutDialog(QWidget* parent = nullptr); ~AboutDialog(); @@ -16,4 +18,5 @@ public: private: Ui::AboutDialog m_ui; + }; diff --git a/src/duckstation-qt/achievementlogindialog.cpp b/src/duckstation-qt/achievementlogindialog.cpp index bad56f0fe..69880581a 100644 --- a/src/duckstation-qt/achievementlogindialog.cpp +++ b/src/duckstation-qt/achievementlogindialog.cpp @@ -10,6 +10,8 @@ #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 ed1d4a947..e769598a4 100644 --- a/src/duckstation-qt/achievementlogindialog.h +++ b/src/duckstation-qt/achievementlogindialog.h @@ -12,6 +12,8 @@ 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 6ba159cb5..342c772c7 100644 --- a/src/duckstation-qt/achievementsettingswidget.cpp +++ b/src/duckstation-qt/achievementsettingswidget.cpp @@ -16,6 +16,8 @@ #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 bb10a1045..00c69e58b 100644 --- a/src/duckstation-qt/achievementsettingswidget.h +++ b/src/duckstation-qt/achievementsettingswidget.h @@ -11,6 +11,8 @@ 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 d6666ba1c..18c91e2e4 100644 --- a/src/duckstation-qt/audiosettingswidget.cpp +++ b/src/duckstation-qt/audiosettingswidget.cpp @@ -14,6 +14,8 @@ #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 666d22214..e5405eac0 100644 --- a/src/duckstation-qt/audiosettingswidget.h +++ b/src/duckstation-qt/audiosettingswidget.h @@ -15,6 +15,8 @@ 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 e5ede5b7f..b4e544003 100644 --- a/src/duckstation-qt/biossettingswidget.cpp +++ b/src/duckstation-qt/biossettingswidget.cpp @@ -14,6 +14,8 @@ #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 8b34c4b45..2a65744a0 100644 --- a/src/duckstation-qt/biossettingswidget.h +++ b/src/duckstation-qt/biossettingswidget.h @@ -16,6 +16,8 @@ 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 3081af9ac..55d6d4e9b 100644 --- a/src/duckstation-qt/consolesettingswidget.cpp +++ b/src/duckstation-qt/consolesettingswidget.cpp @@ -14,6 +14,8 @@ #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 c0c8cde1b..4078b3a75 100644 --- a/src/duckstation-qt/consolesettingswidget.h +++ b/src/duckstation-qt/consolesettingswidget.h @@ -11,6 +11,8 @@ 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 e42e69b35..54a1cb8b7 100644 --- a/src/duckstation-qt/controllerbindingwidgets.cpp +++ b/src/duckstation-qt/controllerbindingwidgets.cpp @@ -40,6 +40,8 @@ #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 8060d2a0e..b4eb341da 100644 --- a/src/duckstation-qt/controllerbindingwidgets.h +++ b/src/duckstation-qt/controllerbindingwidgets.h @@ -26,6 +26,8 @@ class ControllerMacroEditWidget; class ControllerBindingWidget final : public QWidget { + Q_OBJECT + public: ControllerBindingWidget(QWidget* parent, ControllerSettingsWindow* dialog, u32 port); ~ControllerBindingWidget(); @@ -73,6 +75,8 @@ private: class ControllerMacroWidget : public QWidget { + Q_OBJECT + public: explicit ControllerMacroWidget(ControllerBindingWidget* parent); ~ControllerMacroWidget(); @@ -92,6 +96,8 @@ private: class ControllerMacroEditWidget : public QWidget { + Q_OBJECT + public: ControllerMacroEditWidget(ControllerMacroWidget* parent, ControllerBindingWidget* bwidget, u32 index); ~ControllerMacroEditWidget(); @@ -122,6 +128,8 @@ private: class ControllerCustomSettingsWidget : public QWidget { + Q_OBJECT + public: explicit ControllerCustomSettingsWidget(ControllerBindingWidget* parent); ~ControllerCustomSettingsWidget(); diff --git a/src/duckstation-qt/controllerglobalsettingswidget.h b/src/duckstation-qt/controllerglobalsettingswidget.h index ba2bbdc38..8599cb085 100644 --- a/src/duckstation-qt/controllerglobalsettingswidget.h +++ b/src/duckstation-qt/controllerglobalsettingswidget.h @@ -39,6 +39,8 @@ 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 88acace07..e7e3ae196 100644 --- a/src/duckstation-qt/debuggermodels.cpp +++ b/src/duckstation-qt/debuggermodels.cpp @@ -16,6 +16,8 @@ #include #include +#include "moc_debuggermodels.cpp" + static constexpr int STACK_RANGE = 128; static constexpr u32 STACK_VALUE_SIZE = sizeof(u32); @@ -199,9 +201,8 @@ void DebuggerAddBreakpointDialog::okClicked() if (!ok) { - QMessageBox::critical( - this, qApp->translate("DebuggerWindow", "Error"), - qApp->translate("DebuggerWindow", "Invalid address. It should be in hex (0x12345678 or 12345678)")); + QMessageBox::critical(this, tr("Error"), + tr("DebuggerWindow", "Invalid address. It should be in hex (0x12345678 or 12345678)")); return; } diff --git a/src/duckstation-qt/debuggermodels.h b/src/duckstation-qt/debuggermodels.h index 1fe82ff0a..39ce57d31 100644 --- a/src/duckstation-qt/debuggermodels.h +++ b/src/duckstation-qt/debuggermodels.h @@ -17,6 +17,8 @@ class DebuggerRegistersModel final : public QAbstractListModel { + Q_OBJECT + public: explicit DebuggerRegistersModel(QObject* parent = nullptr); ~DebuggerRegistersModel() override; @@ -36,6 +38,8 @@ private: class DebuggerStackModel final : public QAbstractListModel { + Q_OBJECT + public: explicit DebuggerStackModel(QObject* parent = nullptr); ~DebuggerStackModel() override; @@ -50,6 +54,8 @@ public: class DebuggerAddBreakpointDialog final : public QDialog { + Q_OBJECT + public: explicit DebuggerAddBreakpointDialog(QWidget* parent = nullptr); ~DebuggerAddBreakpointDialog() override; diff --git a/src/duckstation-qt/duckstation-qt.vcxproj b/src/duckstation-qt/duckstation-qt.vcxproj index a2bba94f5..824567dd5 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 b901b6dbe..dd09949ab 100644 --- a/src/duckstation-qt/duckstation-qt.vcxproj.filters +++ b/src/duckstation-qt/duckstation-qt.vcxproj.filters @@ -55,32 +55,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - @@ -91,22 +66,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/duckstation-qt/emulationsettingswidget.cpp b/src/duckstation-qt/emulationsettingswidget.cpp index d298d2317..c8df45793 100644 --- a/src/duckstation-qt/emulationsettingswidget.cpp +++ b/src/duckstation-qt/emulationsettingswidget.cpp @@ -10,6 +10,8 @@ #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 7ec14077b..9b99b492d 100644 --- a/src/duckstation-qt/emulationsettingswidget.h +++ b/src/duckstation-qt/emulationsettingswidget.h @@ -11,6 +11,8 @@ 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 8726dcce4..fb5f723c3 100644 --- a/src/duckstation-qt/foldersettingswidget.cpp +++ b/src/duckstation-qt/foldersettingswidget.cpp @@ -8,6 +8,8 @@ #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 6fd0e5044..2bbd85bb1 100644 --- a/src/duckstation-qt/foldersettingswidget.h +++ b/src/duckstation-qt/foldersettingswidget.h @@ -11,6 +11,8 @@ 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 89f7201f0..d18fa1be5 100644 --- a/src/duckstation-qt/gamecheatsettingswidget.cpp +++ b/src/duckstation-qt/gamecheatsettingswidget.cpp @@ -23,6 +23,8 @@ #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 fbd1ffd5c..35d692737 100644 --- a/src/duckstation-qt/gamecheatsettingswidget.h +++ b/src/duckstation-qt/gamecheatsettingswidget.h @@ -30,6 +30,8 @@ class QStandardItemModel; class GameCheatSettingsWidget : public QWidget { + Q_OBJECT + public: GameCheatSettingsWidget(SettingsWindow* dialog, QWidget* parent); ~GameCheatSettingsWidget() override; @@ -88,6 +90,8 @@ private: class CheatCodeEditorDialog : public QDialog { + Q_OBJECT + public: CheatCodeEditorDialog(GameCheatSettingsWidget* parent, Cheats::CodeInfo* code, const QStringList& group_names); ~CheatCodeEditorDialog() override; @@ -113,6 +117,8 @@ 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 990fda6b4..746b3a6bc 100644 --- a/src/duckstation-qt/gamelistsettingswidget.cpp +++ b/src/duckstation-qt/gamelistsettingswidget.cpp @@ -22,6 +22,8 @@ #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 c667b7e86..c658345dc 100644 --- a/src/duckstation-qt/gamelistsettingswidget.h +++ b/src/duckstation-qt/gamelistsettingswidget.h @@ -11,6 +11,8 @@ 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 c0aeae478..15039c1ef 100644 --- a/src/duckstation-qt/gamelistwidget.h +++ b/src/duckstation-qt/gamelistwidget.h @@ -167,6 +167,8 @@ private: class GameListListView final : public QTableView { + Q_OBJECT + public: GameListListView(GameListModel* model, GameListSortModel* sort_model, QWidget* parent); ~GameListListView() override; @@ -196,6 +198,8 @@ 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 10cbef19d..a9e72ab94 100644 --- a/src/duckstation-qt/gamepatchsettingswidget.cpp +++ b/src/duckstation-qt/gamepatchsettingswidget.cpp @@ -13,6 +13,8 @@ #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 c3c536bd0..a7da120e3 100644 --- a/src/duckstation-qt/gamepatchsettingswidget.h +++ b/src/duckstation-qt/gamepatchsettingswidget.h @@ -16,6 +16,8 @@ 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); @@ -31,6 +33,8 @@ 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 c365db0ff..5674fbe2c 100644 --- a/src/duckstation-qt/gamesummarywidget.cpp +++ b/src/duckstation-qt/gamesummarywidget.cpp @@ -25,6 +25,8 @@ #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 6dc32565a..061d25701 100644 --- a/src/duckstation-qt/gamesummarywidget.h +++ b/src/duckstation-qt/gamesummarywidget.h @@ -17,6 +17,8 @@ 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 a5401355f..f9d6a6f9d 100644 --- a/src/duckstation-qt/graphicssettingswidget.cpp +++ b/src/duckstation-qt/graphicssettingswidget.cpp @@ -24,6 +24,8 @@ #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 f70016fc4..3abcf559c 100644 --- a/src/duckstation-qt/graphicssettingswidget.h +++ b/src/duckstation-qt/graphicssettingswidget.h @@ -15,6 +15,8 @@ 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 17205db36..526e3bc2a 100644 --- a/src/duckstation-qt/hotkeysettingswidget.cpp +++ b/src/duckstation-qt/hotkeysettingswidget.cpp @@ -17,6 +17,8 @@ #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 1c558d973..93f7273c1 100644 --- a/src/duckstation-qt/hotkeysettingswidget.h +++ b/src/duckstation-qt/hotkeysettingswidget.h @@ -18,6 +18,8 @@ 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 243572834..56302afd0 100644 --- a/src/duckstation-qt/inputbindingdialog.cpp +++ b/src/duckstation-qt/inputbindingdialog.cpp @@ -16,6 +16,8 @@ #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 3bd385076..d3bce5cb8 100644 --- a/src/duckstation-qt/inputbindingdialog.h +++ b/src/duckstation-qt/inputbindingdialog.h @@ -14,6 +14,8 @@ 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 5718f15ea..6bfba77b0 100644 --- a/src/duckstation-qt/isobrowserwindow.cpp +++ b/src/duckstation-qt/isobrowserwindow.cpp @@ -18,6 +18,8 @@ #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 93f9f8404..c417a174f 100644 --- a/src/duckstation-qt/isobrowserwindow.h +++ b/src/duckstation-qt/isobrowserwindow.h @@ -9,6 +9,8 @@ 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 ae82df06f..43324b227 100644 --- a/src/duckstation-qt/logwindow.cpp +++ b/src/duckstation-qt/logwindow.cpp @@ -14,6 +14,8 @@ #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 f1de8a784..d3b467e9d 100644 --- a/src/duckstation-qt/logwindow.h +++ b/src/duckstation-qt/logwindow.h @@ -13,6 +13,8 @@ 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 d66ddaeef..386abdd59 100644 --- a/src/duckstation-qt/mainwindow.cpp +++ b/src/duckstation-qt/mainwindow.cpp @@ -54,6 +54,8 @@ #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 b38f0b257..0972b1d94 100644 --- a/src/duckstation-qt/mainwindow.h +++ b/src/duckstation-qt/mainwindow.h @@ -48,6 +48,8 @@ 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 84e8008b3..6d1a62865 100644 --- a/src/duckstation-qt/memorycardeditorwindow.cpp +++ b/src/duckstation-qt/memorycardeditorwindow.cpp @@ -21,6 +21,8 @@ #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 418e03959..8a19d5b01 100644 --- a/src/duckstation-qt/memorycardeditorwindow.h +++ b/src/duckstation-qt/memorycardeditorwindow.h @@ -20,6 +20,8 @@ class Error; class MemoryCardEditorWindow : public QWidget { + Q_OBJECT + public: MemoryCardEditorWindow(); ~MemoryCardEditorWindow(); @@ -104,6 +106,7 @@ 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 037cb9bac..8382835be 100644 --- a/src/duckstation-qt/memorycardsettingswidget.cpp +++ b/src/duckstation-qt/memorycardsettingswidget.cpp @@ -27,6 +27,8 @@ #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 0aa904d2e..ddccbd9ce 100644 --- a/src/duckstation-qt/memorycardsettingswidget.h +++ b/src/duckstation-qt/memorycardsettingswidget.h @@ -21,6 +21,8 @@ class SettingsWindow; class MemoryCardSettingsWidget : public QWidget { + Q_OBJECT + public: MemoryCardSettingsWidget(SettingsWindow* dialog, QWidget* parent); ~MemoryCardSettingsWidget(); diff --git a/src/duckstation-qt/postprocessingsettingswidget.cpp b/src/duckstation-qt/postprocessingsettingswidget.cpp index 6eaad6ff7..19e695f3c 100644 --- a/src/duckstation-qt/postprocessingsettingswidget.cpp +++ b/src/duckstation-qt/postprocessingsettingswidget.cpp @@ -22,6 +22,8 @@ #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 2373ec318..1d388eae8 100644 --- a/src/duckstation-qt/postprocessingsettingswidget.h +++ b/src/duckstation-qt/postprocessingsettingswidget.h @@ -16,6 +16,8 @@ class PostProcessingShaderConfigWidget; class PostProcessingSettingsWidget final : public QTabWidget { + Q_OBJECT + public: PostProcessingSettingsWidget(SettingsWindow* dialog, QWidget* parent); ~PostProcessingSettingsWidget(); @@ -23,6 +25,8 @@ public: class PostProcessingChainConfigWidget : public QWidget { + Q_OBJECT + friend PostProcessingShaderConfigWidget; public: @@ -60,6 +64,8 @@ private: class PostProcessingShaderConfigWidget final : public QWidget { + Q_OBJECT + public: PostProcessingShaderConfigWidget(QWidget* parent, PostProcessingChainConfigWidget* widget, const char* section, u32 stage_index, std::vector options); @@ -83,6 +89,8 @@ 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 5f2f951ae..3ffac06c4 100644 --- a/src/duckstation-qt/qthost.h +++ b/src/duckstation-qt/qthost.h @@ -266,6 +266,8 @@ 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 5f510f3fa..872f82039 100644 --- a/src/duckstation-qt/qtprogresscallback.h +++ b/src/duckstation-qt/qtprogresscallback.h @@ -13,6 +13,8 @@ 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 721a270ec..f865fbdd7 100644 --- a/src/duckstation-qt/selectdiscdialog.cpp +++ b/src/duckstation-qt/selectdiscdialog.cpp @@ -11,6 +11,8 @@ #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 ce89f3697..62f6cf7a3 100644 --- a/src/duckstation-qt/selectdiscdialog.h +++ b/src/duckstation-qt/selectdiscdialog.h @@ -15,6 +15,8 @@ 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 9be05db58..2cb0299d6 100644 --- a/src/duckstation-qt/setupwizarddialog.cpp +++ b/src/duckstation-qt/setupwizarddialog.cpp @@ -24,6 +24,8 @@ #include +#include "moc_setupwizarddialog.cpp" + SetupWizardDialog::SetupWizardDialog() { setupUi(); diff --git a/src/duckstation-qt/setupwizarddialog.h b/src/duckstation-qt/setupwizarddialog.h index 150e40294..577e166bb 100644 --- a/src/duckstation-qt/setupwizarddialog.h +++ b/src/duckstation-qt/setupwizarddialog.h @@ -19,6 +19,8 @@ class SetupWizardDialog final : public QDialog { + Q_OBJECT + public: SetupWizardDialog(); ~SetupWizardDialog();