Core: Namespace NetPlay utilities under the NetPlay namespace

Previously there was only one function under the NetPlay namespace,
which is kind of silly considering we have all of these other types
and functions existing outside of the namespace.

This moves the rest of them into the namespace.

This gets some general names, like Player, for example, out of the global namespace.

Source/Core/DolphinQt/MainWindow.cpp

@@ -1086,10 +1086,11 @@ bool MainWindow::NetPlayJoin()
   const std::string nickname = Config::Get(Config::NETPLAY_NICKNAME);
 
   // Create Client
-  Settings::Instance().ResetNetPlayClient(new NetPlayClient(
+  const bool is_hosting_netplay = Settings::Instance().GetNetPlayServer() != nullptr;
+  Settings::Instance().ResetNetPlayClient(new NetPlay::NetPlayClient(
       host_ip, host_port, m_netplay_dialog, nickname,
-      NetTraversalConfig{Settings::Instance().GetNetPlayServer() != nullptr ? false : is_traversal,
-                         traversal_host, traversal_port}));
+      NetPlay::NetTraversalConfig{is_hosting_netplay ? false : is_traversal, traversal_host,
+                                  traversal_port}));
 
   if (!Settings::Instance().GetNetPlayClient()->IsConnected())
   {
@@ -1133,8 +1134,9 @@ bool MainWindow::NetPlayHost(const QString& game_id)
     host_port = Config::Get(Config::NETPLAY_LISTEN_PORT);
 
   // Create Server
-  Settings::Instance().ResetNetPlayServer(new NetPlayServer(
-      host_port, use_upnp, NetTraversalConfig{is_traversal, traversal_host, traversal_port}));
+  Settings::Instance().ResetNetPlayServer(new NetPlay::NetPlayServer(
+      host_port, use_upnp,
+      NetPlay::NetTraversalConfig{is_traversal, traversal_host, traversal_port}));
 
   if (!Settings::Instance().GetNetPlayServer()->is_connected)
   {

Source/Core/DolphinQt/MainWindow.h

@@ -34,9 +34,7 @@ class JITWidget;
 class LogConfigWidget;
 class LogWidget;
 class MemoryWidget;
-class NetPlayClient;
 class NetPlayDialog;
-class NetPlayServer;
 class NetPlaySetupDialog;
 class RegisterWidget;
 class SearchBar;

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++)
   {

Source/Core/DolphinQt/NetPlay/NetPlayDialog.h

@@ -11,7 +11,6 @@
 
 class MD5Dialog;
 class GameListModel;
-class NetPlayServer;
 class PadMappingDialog;
 class QCheckBox;
 class QComboBox;
@@ -26,7 +25,7 @@ class QTableWidget;
 class QTextEdit;
 class QToolButton;
 
-class NetPlayDialog : public QDialog, public NetPlayUI
+class NetPlayDialog : public QDialog, public NetPlay::NetPlayUI
 {
   Q_OBJECT
 public:

Source/Core/DolphinQt/NetPlay/PadMappingDialog.cpp

@@ -94,12 +94,13 @@ int PadMappingDialog::exec()
 
   return QDialog::exec();
 }
-PadMappingArray PadMappingDialog::GetGCPadArray()
+
+NetPlay::PadMappingArray PadMappingDialog::GetGCPadArray()
 {
   return m_pad_mapping;
 }
 
-PadMappingArray PadMappingDialog::GetWiimoteArray()
+NetPlay::PadMappingArray PadMappingDialog::GetWiimoteArray()
 {
   return m_wii_mapping;
 }

Source/Core/DolphinQt/NetPlay/PadMappingDialog.h

@@ -8,12 +8,15 @@
 
 #include "Core/NetPlayProto.h"
 
-class NetPlayClient;
-class Player;
 class QGridLayout;
 class QComboBox;
 class QDialogButtonBox;
 
+namespace NetPlay
+{
+class Player;
+}
+
 class PadMappingDialog : public QDialog
 {
   Q_OBJECT
@@ -22,8 +25,8 @@ public:
 
   int exec() override;
 
-  PadMappingArray GetGCPadArray();
-  PadMappingArray GetWiimoteArray();
+  NetPlay::PadMappingArray GetGCPadArray();
+  NetPlay::PadMappingArray GetWiimoteArray();
 
 private:
   void CreateWidgets();
@@ -31,12 +34,12 @@ private:
 
   void OnMappingChanged();
 
-  PadMappingArray m_pad_mapping;
-  PadMappingArray m_wii_mapping;
+  NetPlay::PadMappingArray m_pad_mapping;
+  NetPlay::PadMappingArray m_wii_mapping;
 
   QGridLayout* m_main_layout;
   std::array<QComboBox*, 4> m_gc_boxes;
   std::array<QComboBox*, 4> m_wii_boxes;
-  std::vector<const Player*> m_players;
+  std::vector<const NetPlay::Player*> m_players;
   QDialogButtonBox* m_button_box;
 };

Source/Core/DolphinQt/Settings.cpp

@@ -267,22 +267,22 @@ GameListModel* Settings::GetGameListModel() const
   return model;
 }
 
-NetPlayClient* Settings::GetNetPlayClient()
+NetPlay::NetPlayClient* Settings::GetNetPlayClient()
 {
   return m_client.get();
 }
 
-void Settings::ResetNetPlayClient(NetPlayClient* client)
+void Settings::ResetNetPlayClient(NetPlay::NetPlayClient* client)
 {
   m_client.reset(client);
 }
 
-NetPlayServer* Settings::GetNetPlayServer()
+NetPlay::NetPlayServer* Settings::GetNetPlayServer()
 {
   return m_server.get();
 }
 
-void Settings::ResetNetPlayServer(NetPlayServer* server)
+void Settings::ResetNetPlayServer(NetPlay::NetPlayServer* server)
 {
   m_server.reset(server);
 }

Source/Core/DolphinQt/Settings.h

@@ -93,10 +93,10 @@ public:
   void DecreaseVolume(int volume);
 
   // NetPlay
-  NetPlayClient* GetNetPlayClient();
-  void ResetNetPlayClient(NetPlayClient* client = nullptr);
-  NetPlayServer* GetNetPlayServer();
-  void ResetNetPlayServer(NetPlayServer* server = nullptr);
+  NetPlay::NetPlayClient* GetNetPlayClient();
+  void ResetNetPlayClient(NetPlay::NetPlayClient* client = nullptr);
+  NetPlay::NetPlayServer* GetNetPlayServer();
+  void ResetNetPlayServer(NetPlay::NetPlayServer* server = nullptr);
 
   // Cheats
   bool GetCheatsEnabled() const;
@@ -163,8 +163,8 @@ signals:
 private:
   bool m_batch = false;
   bool m_controller_state_needed = false;
-  std::unique_ptr<NetPlayClient> m_client;
-  std::unique_ptr<NetPlayServer> m_server;
+  std::unique_ptr<NetPlay::NetPlayClient> m_client;
+  std::unique_ptr<NetPlay::NetPlayServer> m_server;
   Settings();
 };