[Orxonox-commit 3075] r7769 - code/branches/presentation/src/libraries/network

[smerkli at orxonox.net]

Author: smerkli
Date: 2010-12-15 19:12:32 +0100 (Wed, 15 Dec 2010)
New Revision: 7769

Modified:
   code/branches/presentation/src/libraries/network/CMakeLists.txt
   code/branches/presentation/src/libraries/network/MasterServerComm.cc
   code/branches/presentation/src/libraries/network/MasterServerComm.h
Log:
fixes 2

Modified: code/branches/presentation/src/libraries/network/CMakeLists.txt
===================================================================
--- code/branches/presentation/src/libraries/network/CMakeLists.txt	2010-12-15 17:53:02 UTC (rev 7768)
+++ code/branches/presentation/src/libraries/network/CMakeLists.txt	2010-12-15 18:12:32 UTC (rev 7769)
@@ -79,7 +79,6 @@
     Client.h
     LANDiscovery.h
     WANDiscovery.h
-    MasterServerComm.h
   PCH_FILE
     NetworkPrecompiledHeaders.h
   LINK_LIBRARIES

Modified: code/branches/presentation/src/libraries/network/MasterServerComm.cc
===================================================================
--- code/branches/presentation/src/libraries/network/MasterServerComm.cc	2010-12-15 17:53:02 UTC (rev 7768)
+++ code/branches/presentation/src/libraries/network/MasterServerComm.cc	2010-12-15 18:12:32 UTC (rev 7769)
@@ -27,19 +27,15 @@
  */
 
 #include "MasterServerComm.h"
-#include "util/ScopedSingletonManager.h"
-#include "core/CoreIncludes.h"
 
 namespace orxonox
 {
-  ManageScopedSingleton(MasterServerComm, ScopeID::Root, true);
 
   MasterServerComm::MasterServerComm()
   { /* nothing anymore, everything's been outsourced to 
      * the initialize method to facilitate debugging
      */
     /* register object in orxonox */
-    RegisterObject(MasterServerComm);
   } 
 
   int MasterServerComm::initialize()

Modified: code/branches/presentation/src/libraries/network/MasterServerComm.h
===================================================================
--- code/branches/presentation/src/libraries/network/MasterServerComm.h	2010-12-15 17:53:02 UTC (rev 7768)
+++ code/branches/presentation/src/libraries/network/MasterServerComm.h	2010-12-15 18:12:32 UTC (rev 7769)
@@ -34,19 +34,12 @@
 #include <string>
 #include <cstring>
 #include <enet/enet.h>
-#include "util/Singleton.h"
-#include "core/OrxonoxClass.h"
-#include "core/CoreIncludes.h"
-#include "NetworkPrereqs.h"
 
-// tolua_begin
+
 namespace orxonox
 {
-  class _NetworkExport MasterServerComm 
-  // tolua_end
-    : public Singleton<MasterServerComm>, public OrxonoxClass
-  { // tolua_export
-    friend class Singleton<MasterServerComm>;
+  class MasterServerComm 
+  { 
     public: 
       /** constructor */
       MasterServerComm();
@@ -96,12 +89,6 @@
        * Poll the master server for new data and act accordingly */
       int pollForReply( int (*callback)( char*, ENetEvent* ), int delayms );
 
-      /** \return an instance of MasterServerComm 
-       * 
-       * Create and return an instance of  MasterServerComm.
-       */
-      static MasterServerComm& getInstance() { return Singleton<MasterServerComm>::getInstance(); } // tolua_export
-
     private:
       /** client handle */
       ENetHost *client;
@@ -114,11 +101,8 @@
 
       /** peer data holder */
       ENetPeer *peer;
+  }; 
 
-      /** Singleton pointer */
-      static MasterServerComm *singletonPtr_s;
-  }; // tolua_export
+} 
 
-} // tolua_export
-
 #endif /* MASTERSERVERCOMM_H */