Merge pull request #11753 from lioncash/upnp

Common/UPnP: Move interface into Common namespace
dolphin-emu · Apr 12, 2023 · 1e4b0d0 · 1e4b0d0
2 parents c5bbe0a + f5bdfdd
commit 1e4b0d0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Source/Core/Common/UPnP.cpp b/Source/Core/Common/UPnP.cpp
@@ -164,14 +164,14 @@ static void UnmapPortThread()
     UnmapPort(s_mapped);
 }
 
-void UPnP::TryPortmapping(u16 port)
+void Common::UPnP::TryPortmapping(u16 port)
 {
   if (s_thread.joinable())
     s_thread.join();
   s_thread = std::thread(&MapPortThread, port);
 }
 
-void UPnP::StopPortmapping()
+void Common::UPnP::StopPortmapping()
 {
   if (s_thread.joinable())
     s_thread.join();

diff --git a/Source/Core/Common/UPnP.h b/Source/Core/Common/UPnP.h
@@ -7,10 +7,10 @@
 
 #include "Common/CommonTypes.h"
 
-namespace UPnP
+namespace Common::UPnP
 {
 void TryPortmapping(u16 port);
 void StopPortmapping();
-}  // namespace UPnP
+}  // namespace Common::UPnP
 
 #endif
diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp
@@ -111,7 +111,7 @@ NetPlayServer::~NetPlayServer()
   }
 
 #ifdef USE_UPNP
-  UPnP::StopPortmapping();
+  Common::UPnP::StopPortmapping();
 #endif
 }
 
@@ -168,7 +168,7 @@ NetPlayServer::NetPlayServer(const u16 port, const bool forward_port, NetPlayUI*
 
 #ifdef USE_UPNP
     if (forward_port)
-      UPnP::TryPortmapping(port);
+      Common::UPnP::TryPortmapping(port);
 #endif
   }
 }