From dfa1126946a4f5e905444ca99408d48bf52af010 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 17 May 2018 16:15:59 -0400 Subject: [PATCH 1/3] DolphinQt2: Add missing override specifiers --- Source/Core/DolphinQt2/Debugger/NewBreakpointDialog.h | 2 +- Source/Core/DolphinQt2/NetPlay/GameListDialog.h | 2 +- Source/Core/DolphinQt2/NetPlay/PadMappingDialog.h | 2 +- Source/Core/DolphinQt2/QtUtils/AspectRatioWidget.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/DolphinQt2/Debugger/NewBreakpointDialog.h b/Source/Core/DolphinQt2/Debugger/NewBreakpointDialog.h index 7dd1d34837..681dfa9656 100644 --- a/Source/Core/DolphinQt2/Debugger/NewBreakpointDialog.h +++ b/Source/Core/DolphinQt2/Debugger/NewBreakpointDialog.h @@ -22,7 +22,7 @@ class NewBreakpointDialog : public QDialog public: explicit NewBreakpointDialog(BreakpointWidget* parent); - void accept(); + void accept() override; private: void CreateWidgets(); diff --git a/Source/Core/DolphinQt2/NetPlay/GameListDialog.h b/Source/Core/DolphinQt2/NetPlay/GameListDialog.h index d3be480680..824fe3ee21 100644 --- a/Source/Core/DolphinQt2/NetPlay/GameListDialog.h +++ b/Source/Core/DolphinQt2/NetPlay/GameListDialog.h @@ -17,7 +17,7 @@ class GameListDialog : public QDialog public: explicit GameListDialog(QWidget* parent); - int exec(); + int exec() override; const QString& GetSelectedUniqueID(); private: diff --git a/Source/Core/DolphinQt2/NetPlay/PadMappingDialog.h b/Source/Core/DolphinQt2/NetPlay/PadMappingDialog.h index ebf2c2f48b..71779f6520 100644 --- a/Source/Core/DolphinQt2/NetPlay/PadMappingDialog.h +++ b/Source/Core/DolphinQt2/NetPlay/PadMappingDialog.h @@ -20,7 +20,7 @@ class PadMappingDialog : public QDialog public: explicit PadMappingDialog(QWidget* widget); - int exec(); + int exec() override; PadMappingArray GetGCPadArray(); PadMappingArray GetWiimoteArray(); diff --git a/Source/Core/DolphinQt2/QtUtils/AspectRatioWidget.h b/Source/Core/DolphinQt2/QtUtils/AspectRatioWidget.h index 516c1a6b62..06fc12f6f0 100644 --- a/Source/Core/DolphinQt2/QtUtils/AspectRatioWidget.h +++ b/Source/Core/DolphinQt2/QtUtils/AspectRatioWidget.h @@ -13,7 +13,7 @@ class AspectRatioWidget : public QWidget Q_OBJECT public: AspectRatioWidget(QWidget* widget, float width, float height, QWidget* parent = nullptr); - void resizeEvent(QResizeEvent* event); + void resizeEvent(QResizeEvent* event) override; private: QBoxLayout* m_layout; From c98a8b59d57f46ae6cd0e5838ebf24e9cb81bf34 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 17 May 2018 16:33:05 -0400 Subject: [PATCH 2/3] DolphinQt2/NetPlay: Mark constructors explicit where applicable --- Source/Core/DolphinQt2/NetPlay/MD5Dialog.h | 2 +- Source/Core/DolphinQt2/NetPlay/NetPlayDialog.h | 2 +- Source/Core/DolphinQt2/NetPlay/NetPlaySetupDialog.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/DolphinQt2/NetPlay/MD5Dialog.h b/Source/Core/DolphinQt2/NetPlay/MD5Dialog.h index 30d163163a..8701f44d40 100644 --- a/Source/Core/DolphinQt2/NetPlay/MD5Dialog.h +++ b/Source/Core/DolphinQt2/NetPlay/MD5Dialog.h @@ -17,7 +17,7 @@ class MD5Dialog : public QDialog { Q_OBJECT public: - MD5Dialog(QWidget* parent); + explicit MD5Dialog(QWidget* parent); void show(const QString& title); void SetProgress(int pid, int progress); diff --git a/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.h b/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.h index 61ecc2de85..2f121c88f0 100644 --- a/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.h +++ b/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.h @@ -30,7 +30,7 @@ class NetPlayDialog : public QDialog, public NetPlayUI { Q_OBJECT public: - NetPlayDialog(QWidget* parent); + explicit NetPlayDialog(QWidget* parent); ~NetPlayDialog(); void show(std::string nickname, bool use_traversal); diff --git a/Source/Core/DolphinQt2/NetPlay/NetPlaySetupDialog.h b/Source/Core/DolphinQt2/NetPlay/NetPlaySetupDialog.h index a73eccf8b1..af718c5afb 100644 --- a/Source/Core/DolphinQt2/NetPlay/NetPlaySetupDialog.h +++ b/Source/Core/DolphinQt2/NetPlay/NetPlaySetupDialog.h @@ -22,7 +22,7 @@ class NetPlaySetupDialog : public QDialog { Q_OBJECT public: - NetPlaySetupDialog(QWidget* parent); + explicit NetPlaySetupDialog(QWidget* parent); void accept() override; void show(); From c1f92d304f5762bfea107c39ba732d28c20ed853 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 17 May 2018 16:35:45 -0400 Subject: [PATCH 3/3] DolphinQt2/NetPlay/GameListDialog: Make GetSelectedUniqueID() const qualified Given this member function returns a const reference to a QString, it can be made const qualified, since it doesn't modify internal state. --- Source/Core/DolphinQt2/NetPlay/GameListDialog.cpp | 2 +- Source/Core/DolphinQt2/NetPlay/GameListDialog.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinQt2/NetPlay/GameListDialog.cpp b/Source/Core/DolphinQt2/NetPlay/GameListDialog.cpp index 52ce85b345..a85c55f697 100644 --- a/Source/Core/DolphinQt2/NetPlay/GameListDialog.cpp +++ b/Source/Core/DolphinQt2/NetPlay/GameListDialog.cpp @@ -59,7 +59,7 @@ void GameListDialog::PopulateGameList() m_game_list->sortItems(); } -const QString& GameListDialog::GetSelectedUniqueID() +const QString& GameListDialog::GetSelectedUniqueID() const { return m_game_id; } diff --git a/Source/Core/DolphinQt2/NetPlay/GameListDialog.h b/Source/Core/DolphinQt2/NetPlay/GameListDialog.h index 824fe3ee21..da04bd4996 100644 --- a/Source/Core/DolphinQt2/NetPlay/GameListDialog.h +++ b/Source/Core/DolphinQt2/NetPlay/GameListDialog.h @@ -18,7 +18,7 @@ public: explicit GameListDialog(QWidget* parent); int exec() override; - const QString& GetSelectedUniqueID(); + const QString& GetSelectedUniqueID() const; private: void CreateWidgets();