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

NetPlaySetupFrame: Use an anonymous namespace instead of static 

const at file scope links internally by default, so static wasn't necessary.
The namespace gets rid of the other statics
This commit is contained in:
Lioncash 2016-10-03 00:16:56 -04:00
parent 3ec6c9cbc0
commit 99afd9e9d5
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp
View File

@ -23,11 +23,13 @@
#include "DolphinWX/NetPlay/NetWindow.h" #include "DolphinWX/NetPlay/NetWindow.h"
#include "DolphinWX/WxUtils.h" #include "DolphinWX/WxUtils.h"
static const std::string DEFAULT_TRAVERSAL_SERVER = "stun.dolphin-emu.org"; namespace
static const std::string DEFAULT_TRAVERSAL_PORT = "6262"; {
const std::string DEFAULT_TRAVERSAL_SERVER = "stun.dolphin-emu.org";
const std::string DEFAULT_TRAVERSAL_PORT = "6262";
static std::string GetFromINI(IniFile::Section& section, const std::string& key, std::string GetFromINI(IniFile::Section& section, const std::string& key,
const std::string& default_value) const std::string& default_value)
{ {
std::string result; std::string result;
section.Get(key, &result, default_value); section.Get(key, &result, default_value);
@ -37,22 +39,23 @@ static std::string GetFromINI(IniFile::Section& section, const std::string& key,
return result; return result;
} }
static std::string GetTraversalPort(IniFile::Section& section) std::string GetTraversalPort(IniFile::Section& section)
{ {
return GetFromINI(section, "TraversalPort", DEFAULT_TRAVERSAL_PORT); return GetFromINI(section, "TraversalPort", DEFAULT_TRAVERSAL_PORT);
} }
static std::string GetTraversalServer(IniFile::Section& section) std::string GetTraversalServer(IniFile::Section& section)
{ {
return GetFromINI(section, "TraversalServer", DEFAULT_TRAVERSAL_SERVER); return GetFromINI(section, "TraversalServer", DEFAULT_TRAVERSAL_SERVER);
} }
static wxString GetTraversalLabelText(IniFile::Section& section) wxString GetTraversalLabelText(IniFile::Section& section)
{ {
std::string server = GetTraversalServer(section); std::string server = GetTraversalServer(section);
std::string port = GetTraversalPort(section); std::string port = GetTraversalPort(section);
return wxString::Format(_("Traversal Server: %s"), (server + ":" + port).c_str()); return wxString::Format(_("Traversal Server: %s"), (server + ":" + port).c_str());
} }
} // Anonymous namespace
NetPlaySetupFrame::NetPlaySetupFrame(wxWindow* const parent, const CGameListCtrl* const game_list) NetPlaySetupFrame::NetPlaySetupFrame(wxWindow* const parent, const CGameListCtrl* const game_list)
: wxFrame(parent, wxID_ANY, _("Dolphin NetPlay Setup")), m_game_list(game_list) : wxFrame(parent, wxID_ANY, _("Dolphin NetPlay Setup")), m_game_list(game_list)