diff options
| author | Mat M <mathew1800@gmail.com> | 2018-07-09 00:38:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-09 00:38:12 -0400 |
| commit | 9487892c18574730fbcfe033b690f831ec06d262 (patch) | |
| tree | cba3c67f4132525363283da1241ef7a80f44b2b9 /Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp | |
| parent | 8c97fb7cd4b165bc871c727faa249251b2ce8b5f (diff) | |
| parent | 675260b0f7b164dca59d2888ee2c58a921ca02c1 (diff) | |
Merge pull request #7226 from lioncash/netplay
Core: Namespace NetPlay utilities under the NetPlay namespace
Diffstat (limited to 'Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp index c61adc081b..ee03a52429 100644 --- a/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp +++ b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp @@ -285,7 +285,7 @@ void NetPlayDialog::OnStart() return; } - NetSettings settings; + NetPlay::NetSettings settings; // Copy all relevant settings SConfig& instance = SConfig::GetInstance(); @@ -379,7 +379,8 @@ void NetPlayDialog::UpdateGUI() {tr("Player"), tr("Game Status"), tr("Ping"), tr("Mapping"), tr("Revision")}); m_players_list->setRowCount(player_count); - const auto get_mapping_string = [](const Player* player, const PadMappingArray& array) { + const auto get_mapping_string = [](const NetPlay::Player* player, + const NetPlay::PadMappingArray& array) { std::string str; for (size_t i = 0; i < array.size(); i++) { @@ -392,8 +393,10 @@ void NetPlayDialog::UpdateGUI() return '|' + str + '|'; }; - static const std::map<PlayerGameStatus, QString> player_status{ - {PlayerGameStatus::Ok, tr("OK")}, {PlayerGameStatus::NotFound, tr("Not Found")}}; + static const std::map<NetPlay::PlayerGameStatus, QString> player_status{ + {NetPlay::PlayerGameStatus::Ok, tr("OK")}, + {NetPlay::PlayerGameStatus::NotFound, tr("Not Found")}, + }; for (int i = 0; i < player_count; i++) { |