diff options
| author | comex <comexk@gmail.com> | 2016-07-20 01:23:19 -0400 |
|---|---|---|
| committer | comex <comexk@gmail.com> | 2016-07-20 01:23:19 -0400 |
| commit | 591e10c4ddea4d9e35ea3bac89e8550c4beb6a16 (patch) | |
| tree | bcd5f781bc2f0ee6b9eee76c9e4b99b11c01827c /Source | |
| parent | 3fbd781cb8ee319a99658366bc823035d30d0e49 (diff) | |
trivial warning fixes
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinWX/NetPlay/MD5Dialog.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/NetPlay/MD5Dialog.h | 1 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/NetPlay/NetWindow.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/Source/Core/DolphinWX/NetPlay/MD5Dialog.cpp b/Source/Core/DolphinWX/NetPlay/MD5Dialog.cpp index 1d0f7a0817..2eb8547693 100644 --- a/Source/Core/DolphinWX/NetPlay/MD5Dialog.cpp +++ b/Source/Core/DolphinWX/NetPlay/MD5Dialog.cpp @@ -15,7 +15,7 @@ MD5Dialog::MD5Dialog(wxWindow* parent, NetPlayServer* server, std::vector<const Player*> players, const std::string& game) - : wxDialog(parent, wxID_ANY, _("MD5 Checksum")), m_parent(parent), m_netplay_server(server) + : wxDialog(parent, wxID_ANY, _("MD5 Checksum")), m_netplay_server(server) { Bind(wxEVT_CLOSE_WINDOW, &MD5Dialog::OnClose, this); wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL); diff --git a/Source/Core/DolphinWX/NetPlay/MD5Dialog.h b/Source/Core/DolphinWX/NetPlay/MD5Dialog.h index 82b88714e9..f97bd62c95 100644 --- a/Source/Core/DolphinWX/NetPlay/MD5Dialog.h +++ b/Source/Core/DolphinWX/NetPlay/MD5Dialog.h @@ -31,7 +31,6 @@ private: void OnClose(wxCloseEvent& event); void OnCloseBtnPressed(wxCommandEvent& event); - wxWindow* m_parent; wxStaticText* m_final_result_label; NetPlayServer* m_netplay_server; std::map<int, wxGauge*> m_progress_bars; diff --git a/Source/Core/DolphinWX/NetPlay/NetWindow.h b/Source/Core/DolphinWX/NetPlay/NetWindow.h index 6894f69442..b7fb088b99 100644 --- a/Source/Core/DolphinWX/NetPlay/NetWindow.h +++ b/Source/Core/DolphinWX/NetPlay/NetWindow.h @@ -92,7 +92,7 @@ private: void OnPlayerSelect(wxCommandEvent& event); void GetNetSettings(NetSettings& settings); std::string FindCurrentGame(); - std::string FindGame(const std::string& game); + std::string FindGame(const std::string& game) override; void OnCopyIP(wxCommandEvent&); void OnChoice(wxCommandEvent& event); |