Added Server and ServersManager to the online namespace and edited everything that uses those.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13279 178a84e3-b1eb-0310-8ba1-8eac791a3b58

src/online/server.cpp

@@ -24,6 +24,7 @@
 #include "utils/constants.hpp"
 #include "utils/string_utils.hpp"
 
+namespace online{
     Server::SortOrder Server::m_sort_order=Server::SO_NAME; //FIXME change to some other default
 
     Server::Server(const XMLNode & xml)
@@ -70,3 +71,4 @@ bool Server::filterByWords(const core::stringw words) const
 
         return false;
     } // filterByWords
+} // namespace online

src/online/server.hpp

@@ -31,6 +31,7 @@
 
 class XMLNode;
 
+namespace online{
     /**
       * \ingroup online
       */
@@ -129,6 +130,6 @@ public:
         }   // operator>
 
     };   // Server
-
+} // namespace online
 
 #endif

src/online/servers_manager.cpp

@@ -26,6 +26,8 @@
 #include "config/user_config.hpp"
 #include "utils/translation.hpp"
 
+namespace online{
+
     static ServersManager* user_singleton = NULL;
 
     ServersManager* ServersManager::get()
@@ -77,3 +79,4 @@ Server * ServersManager::getQuickPlay()
             return m_servers->get(0);
         return NULL;
     }
+} // namespace online

src/online/servers_manager.hpp

@@ -23,7 +23,7 @@
 #include "online/server.hpp"
 
 
-// ============================================================================
+namespace online {
 
     /**
       * \brief
@@ -53,6 +53,10 @@ class ServersManager
             Server * getQuickPlay();
     };   // class ServersManager
 
+
+} // namespace online
+
+
 #endif
 
 /*EOF*/

src/states_screens/dialogs/server_info_dialog.cpp

@@ -34,6 +34,7 @@
 using namespace GUIEngine;
 using namespace irr;
 using namespace irr::gui;
+using namespace online;
 
 // -----------------------------------------------------------------------------
 

src/states_screens/dialogs/server_info_dialog.hpp

@@ -26,6 +26,8 @@
 #include "guiengine/widgets/ribbon_widget.hpp"
 #include "guiengine/widgets/label_widget.hpp"
 #include "online/server.hpp"
+
+
 /**
  * \brief Dialog that allows a user to sign in
  * \ingroup states_screens
@@ -38,7 +40,7 @@ private:
     bool m_self_destroy;
     bool m_enter_lobby;
 
-    Server * m_server;
+    online::Server * m_server;
 
     GUIEngine::LabelWidget * m_name_widget;
     GUIEngine::LabelWidget * m_info_widget;
@@ -50,7 +52,7 @@ private:
     void requestJoin();
 
 public:
-    ServerInfoDialog(Server * server);
+    ServerInfoDialog(online::Server * server);
     ~ServerInfoDialog();
 
     void onEnterPressedInternal();

src/states_screens/networking_lobby.cpp

@@ -37,7 +37,7 @@
 #include "utils/translation.hpp"
 #include "online/servers_manager.hpp"
 
-
+using namespace online;
 using namespace GUIEngine;
 
 DEFINE_SCREEN_SINGLETON( NetworkingLobby );

src/states_screens/networking_lobby.hpp

@@ -36,7 +36,7 @@ class NetworkingLobby :     public GUIEngine::Screen,
 private:
     friend class GUIEngine::ScreenSingleton<NetworkingLobby>;
 
-    Server * m_server;
+    online::Server * m_server;
 
     NetworkingLobby();
 

src/states_screens/online_screen.cpp

@@ -44,6 +44,7 @@
 
 
 using namespace GUIEngine;
+using namespace online;
 
 DEFINE_SCREEN_SINGLETON( OnlineScreen );
 

src/states_screens/server_selection.cpp

@@ -29,6 +29,8 @@
 #include "utils/string_utils.hpp"
 #include "online/servers_manager.hpp"
 
+using namespace online;
+
 DEFINE_SCREEN_SINGLETON( ServerSelection );
 
 // ----------------------------------------------------------------------------