diff --git a/Source/Core/DolphinQt2/Config/InfoWidget.h b/Source/Core/DolphinQt2/Config/InfoWidget.h index 38c73b4a1c..45e8aee05c 100644 --- a/Source/Core/DolphinQt2/Config/InfoWidget.h +++ b/Source/Core/DolphinQt2/Config/InfoWidget.h @@ -19,12 +19,11 @@ class InfoWidget final : public QWidget public: explicit InfoWidget(const GameFile& game); -private slots: +private: void ComputeChecksum(); void ChangeLanguage(); void SaveBanner(); -private: QGroupBox* CreateBannerDetails(); QGroupBox* CreateISODetails(); QLineEdit* CreateValueDisplay() { return CreateValueDisplay(QStringLiteral("")); }; diff --git a/Source/Core/DolphinQt2/GameList/GameList.h b/Source/Core/DolphinQt2/GameList/GameList.h index 3f0584b815..09c8c57d73 100644 --- a/Source/Core/DolphinQt2/GameList/GameList.h +++ b/Source/Core/DolphinQt2/GameList/GameList.h @@ -21,13 +21,17 @@ public: explicit GameList(QWidget* parent = nullptr); QString GetSelectedGame() const; -public slots: void SetTableView() { SetPreferredView(true); } void SetListView() { SetPreferredView(false); } void SetViewColumn(int col, bool view) { m_table->setColumnHidden(col, !view); } void OnColumnVisibilityToggled(const QString& row, bool visible); -private slots: +signals: + void GameSelected(); + void EmulationStarted(); + void EmulationStopped(); + +private: void ShowContextMenu(const QPoint&); void OpenContainingFolder(); void OpenProperties(); @@ -41,12 +45,6 @@ private slots: void CompressISO(); void OnHeaderViewChanged(); -signals: - void GameSelected(); - void EmulationStarted(); - void EmulationStopped(); - -private: void MakeTableView(); void MakeListView(); void MakeEmptyView(); diff --git a/Source/Core/DolphinQt2/GameList/GameListModel.h b/Source/Core/DolphinQt2/GameList/GameListModel.h index bd49c348d3..3f54bfc636 100644 --- a/Source/Core/DolphinQt2/GameList/GameListModel.h +++ b/Source/Core/DolphinQt2/GameList/GameListModel.h @@ -41,7 +41,6 @@ public: NUM_COLS }; -public slots: void UpdateGame(QSharedPointer game); void RemoveGame(const QString& path); diff --git a/Source/Core/DolphinQt2/GameList/GameTracker.h b/Source/Core/DolphinQt2/GameList/GameTracker.h index 60ca290589..5867278b19 100644 --- a/Source/Core/DolphinQt2/GameList/GameTracker.h +++ b/Source/Core/DolphinQt2/GameList/GameTracker.h @@ -29,7 +29,6 @@ public: explicit GameTracker(QObject* parent = nullptr); ~GameTracker(); -public slots: void AddDirectory(const QString& dir); void RemoveDirectory(const QString& dir); @@ -54,7 +53,7 @@ class GameLoader final : public QObject { Q_OBJECT -public slots: +public: void LoadGame(const QString& path) { GameFile* game = new GameFile(path); diff --git a/Source/Core/DolphinQt2/Host.h b/Source/Core/DolphinQt2/Host.h index d779c84b4b..203c81e022 100644 --- a/Source/Core/DolphinQt2/Host.h +++ b/Source/Core/DolphinQt2/Host.h @@ -23,7 +23,6 @@ public: bool GetRenderFocus(); bool GetRenderFullscreen(); -public slots: void SetRenderHandle(void* handle); void SetRenderFocus(bool focus); void SetRenderFullscreen(bool fullscreen); diff --git a/Source/Core/DolphinQt2/MainWindow.h b/Source/Core/DolphinQt2/MainWindow.h index 83ef56368a..245428911a 100644 --- a/Source/Core/DolphinQt2/MainWindow.h +++ b/Source/Core/DolphinQt2/MainWindow.h @@ -36,7 +36,7 @@ signals: void EmulationPaused(); void EmulationStopped(); -private slots: +private: void Open(); void Play(); void Pause(); @@ -63,7 +63,6 @@ private slots: void FullScreen(); void ScreenShot(); -private: void CreateComponents(); void ConnectGameList(); diff --git a/Source/Core/DolphinQt2/MenuBar.h b/Source/Core/DolphinQt2/MenuBar.h index b4cf5309e6..b1093308aa 100644 --- a/Source/Core/DolphinQt2/MenuBar.h +++ b/Source/Core/DolphinQt2/MenuBar.h @@ -16,6 +16,15 @@ class MenuBar final : public QMenuBar public: explicit MenuBar(QWidget* parent = nullptr); + void EmulationStarted(); + void EmulationPaused(); + void EmulationStopped(); + void UpdateStateSlotMenu(); + void UpdateToolsMenu(bool emulation_started); + + // Tools + void InstallWAD(); + signals: // File void Open(); @@ -57,16 +66,6 @@ signals: void ShowAboutDialog(); -public slots: - void EmulationStarted(); - void EmulationPaused(); - void EmulationStopped(); - void UpdateStateSlotMenu(); - void UpdateToolsMenu(bool emulation_started); - - // Tools - void InstallWAD(); - private: void AddFileMenu();