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,10 +24,11 @@
 #include "utils/constants.hpp"
 #include "utils/string_utils.hpp"
 
-Server::SortOrder Server::m_sort_order=Server::SO_NAME; //FIXME change to some other default
+namespace online{
+    Server::SortOrder Server::m_sort_order=Server::SO_NAME; //FIXME change to some other default
 
-Server::Server(const XMLNode & xml)
-{
+    Server::Server(const XMLNode & xml)
+    {
         assert(xml.getName() == "server");
         m_name                      = "";
         m_satisfaction_score        = 0;
@@ -43,16 +44,16 @@ Server::Server(const XMLNode & xml)
         xml.get("max_players",      &m_max_players);
         xml.get("current_players",  &m_current_players);
 
-};   // Server(const XML&)
+    };   // Server(const XML&)
 
-// ----------------------------------------------------------------------------
-/** 
+    // ----------------------------------------------------------------------------
+    /**
      * \brief Filter the add-on with a list of words.
      * \param words A list of words separated by ' '.
      * \return true if the add-on contains one of the words, otherwise false.
      */
-bool Server::filterByWords(const core::stringw words) const
-{
+    bool Server::filterByWords(const core::stringw words) const
+    {
         if (words == NULL || words.empty())
             return true;
 
@@ -69,4 +70,5 @@ bool Server::filterByWords(const core::stringw words) const
         }
 
         return false;
-} // filterByWords
+    } // filterByWords
+} // namespace online

src/online/server.hpp

@@ -31,12 +31,13 @@
 
 class XMLNode;
 
-/**
+namespace online{
+    /**
       * \ingroup online
       */
-class Server
-{
-public:
+    class Server
+    {
+    public:
 
         /** Set the sort order used in the comparison function. */
         enum SortOrder { SO_SCORE   = 1,    // Sorted on satisfaction score
@@ -44,7 +45,7 @@ public:
                          SO_PLAYERS = 4
         };
 
-protected:
+    protected:
         /** The name to be displayed. */
         irr::core::stringw m_name;
         std::string m_lower_case_name; //Used for comparison
@@ -62,7 +63,7 @@ protected:
 
         Server() {};
 
-public:
+    public:
     
          /** Initialises the object from an XML node. */
          Server(const XMLNode & xml);
@@ -128,7 +129,7 @@ public:
             return true;
         }   // operator>
 
-};   // Server
-
+    };   // Server
+} // namespace online
 
 #endif

src/online/servers_manager.cpp

@@ -26,30 +26,32 @@
 #include "config/user_config.hpp"
 #include "utils/translation.hpp"
 
-static ServersManager* user_singleton = NULL;
+namespace online{
 
-ServersManager* ServersManager::get()
-{
+    static ServersManager* user_singleton = NULL;
+
+    ServersManager* ServersManager::get()
+    {
         if (user_singleton == NULL)
             user_singleton = new ServersManager();
         return user_singleton;
-}   // get
+    }   // get
 
-void ServersManager::deallocate()
-{
+    void ServersManager::deallocate()
+    {
         delete user_singleton;
         user_singleton = NULL;
-}   // deallocate
+    }   // deallocate
 
-// ============================================================================
-ServersManager::ServersManager(){
+    // ============================================================================
+    ServersManager::ServersManager(){
         m_servers = new PtrVector<Server>;
         refresh();
-}
+    }
 
-// ============================================================================
-void ServersManager::refresh()
-{
+    // ============================================================================
+    void ServersManager::refresh()
+    {
         HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
         connector->setParameter("action",std::string("get_server_list"));
 
@@ -68,12 +70,13 @@ void ServersManager::refresh()
             }
         }
         //FIXME error message
-}
+    }
 
-// ============================================================================
-Server * ServersManager::getQuickPlay()
-{
+    // ============================================================================
+    Server * ServersManager::getQuickPlay()
+    {
         if(m_servers->size() > 0)
             return m_servers->get(0);
         return NULL;
-}
+    }
+} // namespace online

src/online/servers_manager.hpp

@@ -23,14 +23,14 @@
 #include "online/server.hpp"
 
 
-// ============================================================================
+namespace online {
 
-/**
+    /**
       * \brief
       * \ingroup online
       */
-class ServersManager
-{
+    class ServersManager
+    {
         private:
             ServersManager();
             PtrVector<Server> * m_servers;
@@ -51,7 +51,11 @@ class ServersManager
             Server * getJoinedServer(){ return m_joined_server;};
             //Returns the best server to join
             Server * getQuickPlay();
-};   // class ServersManager
+    };   // class ServersManager
+
+
+} // namespace online
+
 
 #endif
 

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 );
 
 // ----------------------------------------------------------------------------