DolphinQt2: Remove 'slots:' syntax from headers

With Qt5's new connection syntax, method pointers and functors are
connected directly. There's no need to declare slots.
This commit is contained in:
Michael Maltese 2017-06-30 02:24:26 -07:00
parent f0fd38698e
commit aafb61c187
7 changed files with 18 additions and 26 deletions

View File

@ -19,12 +19,11 @@ class InfoWidget final : public QWidget
public: public:
explicit InfoWidget(const GameFile& game); explicit InfoWidget(const GameFile& game);
private slots: private:
void ComputeChecksum(); void ComputeChecksum();
void ChangeLanguage(); void ChangeLanguage();
void SaveBanner(); void SaveBanner();
private:
QGroupBox* CreateBannerDetails(); QGroupBox* CreateBannerDetails();
QGroupBox* CreateISODetails(); QGroupBox* CreateISODetails();
QLineEdit* CreateValueDisplay() { return CreateValueDisplay(QStringLiteral("")); }; QLineEdit* CreateValueDisplay() { return CreateValueDisplay(QStringLiteral("")); };

View File

@ -21,13 +21,17 @@ public:
explicit GameList(QWidget* parent = nullptr); explicit GameList(QWidget* parent = nullptr);
QString GetSelectedGame() const; QString GetSelectedGame() const;
public slots:
void SetTableView() { SetPreferredView(true); } void SetTableView() { SetPreferredView(true); }
void SetListView() { SetPreferredView(false); } void SetListView() { SetPreferredView(false); }
void SetViewColumn(int col, bool view) { m_table->setColumnHidden(col, !view); } void SetViewColumn(int col, bool view) { m_table->setColumnHidden(col, !view); }
void OnColumnVisibilityToggled(const QString& row, bool visible); void OnColumnVisibilityToggled(const QString& row, bool visible);
private slots: signals:
void GameSelected();
void EmulationStarted();
void EmulationStopped();
private:
void ShowContextMenu(const QPoint&); void ShowContextMenu(const QPoint&);
void OpenContainingFolder(); void OpenContainingFolder();
void OpenProperties(); void OpenProperties();
@ -41,12 +45,6 @@ private slots:
void CompressISO(); void CompressISO();
void OnHeaderViewChanged(); void OnHeaderViewChanged();
signals:
void GameSelected();
void EmulationStarted();
void EmulationStopped();
private:
void MakeTableView(); void MakeTableView();
void MakeListView(); void MakeListView();
void MakeEmptyView(); void MakeEmptyView();

View File

@ -41,7 +41,6 @@ public:
NUM_COLS NUM_COLS
}; };
public slots:
void UpdateGame(QSharedPointer<GameFile> game); void UpdateGame(QSharedPointer<GameFile> game);
void RemoveGame(const QString& path); void RemoveGame(const QString& path);

View File

@ -29,7 +29,6 @@ public:
explicit GameTracker(QObject* parent = nullptr); explicit GameTracker(QObject* parent = nullptr);
~GameTracker(); ~GameTracker();
public slots:
void AddDirectory(const QString& dir); void AddDirectory(const QString& dir);
void RemoveDirectory(const QString& dir); void RemoveDirectory(const QString& dir);
@ -54,7 +53,7 @@ class GameLoader final : public QObject
{ {
Q_OBJECT Q_OBJECT
public slots: public:
void LoadGame(const QString& path) void LoadGame(const QString& path)
{ {
GameFile* game = new GameFile(path); GameFile* game = new GameFile(path);

View File

@ -23,7 +23,6 @@ public:
bool GetRenderFocus(); bool GetRenderFocus();
bool GetRenderFullscreen(); bool GetRenderFullscreen();
public slots:
void SetRenderHandle(void* handle); void SetRenderHandle(void* handle);
void SetRenderFocus(bool focus); void SetRenderFocus(bool focus);
void SetRenderFullscreen(bool fullscreen); void SetRenderFullscreen(bool fullscreen);

View File

@ -36,7 +36,7 @@ signals:
void EmulationPaused(); void EmulationPaused();
void EmulationStopped(); void EmulationStopped();
private slots: private:
void Open(); void Open();
void Play(); void Play();
void Pause(); void Pause();
@ -63,7 +63,6 @@ private slots:
void FullScreen(); void FullScreen();
void ScreenShot(); void ScreenShot();
private:
void CreateComponents(); void CreateComponents();
void ConnectGameList(); void ConnectGameList();

View File

@ -16,6 +16,15 @@ class MenuBar final : public QMenuBar
public: public:
explicit MenuBar(QWidget* parent = nullptr); explicit MenuBar(QWidget* parent = nullptr);
void EmulationStarted();
void EmulationPaused();
void EmulationStopped();
void UpdateStateSlotMenu();
void UpdateToolsMenu(bool emulation_started);
// Tools
void InstallWAD();
signals: signals:
// File // File
void Open(); void Open();
@ -57,16 +66,6 @@ signals:
void ShowAboutDialog(); void ShowAboutDialog();
public slots:
void EmulationStarted();
void EmulationPaused();
void EmulationStopped();
void UpdateStateSlotMenu();
void UpdateToolsMenu(bool emulation_started);
// Tools
void InstallWAD();
private: private:
void AddFileMenu(); void AddFileMenu();