Changeset 7207 for code/branches/consolecommands3/src/libraries/network

Timestamp:

Aug 23, 2010, 6:50:22 PM (14 years ago)

Author:

landauf

Message:

moved ScopedSingletonManager to util

Location:

code/branches/consolecommands3/src/libraries/network

Files:

• Client.cc (modified) (3 diffs)
• LANDiscovery.cc (modified) (6 diffs)

code/branches/consolecommands3/src/libraries/network/Client.cc

@@ -45 +45 @@
 #include "util/Clock.h"
 #include "util/Debug.h"
+#include "util/ScopedSingletonManager.h"
 #include "synchronisable/Synchronisable.h"
 #include "packet/Chat.h"
@@ -52 +53 @@
 #include "core/CommandLineParser.h"
 #include "core/Game.h"
-#include "core/ScopedSingletonManager.h"
 
 namespace orxonox
@@ -107 +107 @@
     return ClientConnection::closeConnection();
   }
-  
+
   void Client::setDestination(const std::string& serverAddress, unsigned int port)
   {

code/branches/consolecommands3/src/libraries/network/LANDiscovery.cc

@@ -32 +32 @@
 #include <cstring>
 
+#include "util/ScopedSingletonManager.h"
 #include "core/CoreIncludes.h"
-#include "core/ScopedSingletonManager.h"
 
 
 namespace orxonox
-{ 
+{
   ManageScopedSingleton(LANDiscovery, ScopeID::Root, true);
-  
+
   LANDiscovery::LANDiscovery()
   {
@@ -49 +49 @@
     enet_host_destroy(this->host_);
   }
-  
+
   void LANDiscovery::discover()
   {
@@ -56 +56 @@
     enet_address_set_host(&address, "255.255.255.255");
     address.port = LAN_DISCOVERY_PORT;
-    
+
     ENetPeer* peer;
     peer = enet_host_connect(this->host_, &address, 0);
-    
+
     ENetEvent event;
     while( enet_host_service(this->host_, &event, 1000 ) )
@@ -93 +93 @@
     }
   }
-  
+
   std::string LANDiscovery::getServerListItemName(unsigned int index)
   {
@@ -101 +101 @@
       return this->servers_[index].getServerName();
   }
-  
+
   std::string LANDiscovery::getServerListItemIP(unsigned int index)
   {
@@ -109 +109 @@
       return this->servers_[index].getServerIP();
   }
-  
-  
+
+
 } // namespace orxonox