ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

trivial warning fixes

This commit is contained in:
comex 2016-07-20 01:23:19 -04:00
parent 3fbd781cb8
commit 591e10c4dd
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/NetPlay/MD5Dialog.cpp
View File

@ -15,7 +15,7 @@
MD5Dialog::MD5Dialog(wxWindow* parent, NetPlayServer* server, std::vector<const Player*> players, MD5Dialog::MD5Dialog(wxWindow* parent, NetPlayServer* server, std::vector<const Player*> players,
const std::string& game) 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); Bind(wxEVT_CLOSE_WINDOW, &MD5Dialog::OnClose, this);
wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL);

1
Source/Core/DolphinWX/NetPlay/MD5Dialog.h
View File

@ -31,7 +31,6 @@ private:
void OnClose(wxCloseEvent& event); void OnClose(wxCloseEvent& event);
void OnCloseBtnPressed(wxCommandEvent& event); void OnCloseBtnPressed(wxCommandEvent& event);
wxWindow* m_parent;
wxStaticText* m_final_result_label; wxStaticText* m_final_result_label;
NetPlayServer* m_netplay_server; NetPlayServer* m_netplay_server;
std::map<int, wxGauge*> m_progress_bars; std::map<int, wxGauge*> m_progress_bars;

2
Source/Core/DolphinWX/NetPlay/NetWindow.h
View File

@ -92,7 +92,7 @@ private:
void OnPlayerSelect(wxCommandEvent& event); void OnPlayerSelect(wxCommandEvent& event);
void GetNetSettings(NetSettings& settings); void GetNetSettings(NetSettings& settings);
std::string FindCurrentGame(); std::string FindCurrentGame();
std::string FindGame(const std::string& game); std::string FindGame(const std::string& game) override;
void OnCopyIP(wxCommandEvent&); void OnCopyIP(wxCommandEvent&);
void OnChoice(wxCommandEvent& event); void OnChoice(wxCommandEvent& event);