Changeset 7207

Timestamp:

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

Author:

landauf

Message:

moved ScopedSingletonManager to util

Location:

code/branches/consolecommands3/src

Files:

• libraries/core/CMakeLists.txt (modified) (1 diff)
• libraries/core/Core.cc (modified) (2 diffs)
• libraries/core/input/KeyBinderManager.cc (modified) (1 diff)
• libraries/core/input/KeyDetector.cc (modified) (1 diff)
• libraries/network/Client.cc (modified) (3 diffs)
• libraries/network/LANDiscovery.cc (modified) (6 diffs)
• libraries/util/CMakeLists.txt (modified) (1 diff)
• libraries/util/ScopedSingletonManager.cc (moved) (moved from code/branches/consolecommands3/src/libraries/core/ScopedSingletonManager.cc)
• libraries/util/ScopedSingletonManager.h (moved) (moved from code/branches/consolecommands3/src/libraries/core/ScopedSingletonManager.h) (2 diffs)
• modules/designtools/ScreenshotManager.cc (modified) (1 diff)
• modules/designtools/SkyboxGenerator.cc (modified) (1 diff)
• modules/notifications/NotificationManager.cc (modified) (1 diff)
• modules/pickup/PickupManager.cc (modified) (1 diff)
• modules/questsystem/QuestManager.cc (modified) (1 diff)
• orxonox/CameraManager.cc (modified) (1 diff)
• orxonox/ChatHistory.cc (modified) (1 diff)
• orxonox/ChatInputHandler.cc (modified) (1 diff)
• orxonox/LevelManager.cc (modified) (2 diffs)
• orxonox/MoodManager.cc (modified) (2 diffs)
• orxonox/PlayerManager.cc (modified) (1 diff)
• orxonox/overlays/InGameConsole.cc (modified) (1 diff)
• orxonox/sound/SoundManager.cc (modified) (1 diff)

code/branches/consolecommands3/src/libraries/core/CMakeLists.txt

@@ -35 +35 @@
   OrxonoxClass.cc
   Resource.cc
-  ScopedSingletonManager.cc
   WindowEventListener.cc
 

code/branches/consolecommands3/src/libraries/core/Core.cc

@@ -52 +52 @@
 #include "util/Exception.h"
 #include "util/Scope.h"
+#include "util/ScopedSingletonManager.h"
 #include "util/SignalHandler.h"
 #include "PathConfig.h"
@@ -65 +66 @@
 #include "Language.h"
 #include "LuaState.h"
-#include "ScopedSingletonManager.h"
 #include "command/CommandExecutor.h"
 #include "command/IOConsole.h"

code/branches/consolecommands3/src/libraries/core/input/KeyBinderManager.cc

@@ -31 +31 @@
 #include "util/Debug.h"
 #include "util/Exception.h"
+#include "util/ScopedSingletonManager.h"
 #include "core/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"
 #include "core/LuaState.h"
-#include "core/ScopedSingletonManager.h"
 #include "core/command/ConsoleCommand.h"
 #include "InputManager.h"

code/branches/consolecommands3/src/libraries/core/input/KeyDetector.cc

@@ -29 +29 @@
 #include "KeyDetector.h"
 
+#include "util/ScopedSingletonManager.h"
 #include "core/CoreIncludes.h"
-#include "core/ScopedSingletonManager.h"
 #include "core/command/ConsoleCommand.h"
 #include "Button.h"

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

code/branches/consolecommands3/src/libraries/util/CMakeLists.txt

@@ -31 +31 @@
   ExprParser.cc
   OutputHandler.cc
+  ScopedSingletonManager.cc
   SignalHandler.cc
   Sleep.cc

code/branches/consolecommands3/src/libraries/util/ScopedSingletonManager.h

@@ -30 +30 @@
 #define __ScopedSingletonManager_H__
 
-#include "CorePrereqs.h"
+#include "UtilPrereqs.h"
 
 #include <cassert>
@@ -44 +44 @@
 namespace orxonox
 {
-    class _CoreExport ScopedSingletonManager
+    class OrxonoxClass;
+
+    class _UtilExport ScopedSingletonManager
     {
         public:

code/branches/consolecommands3/src/modules/designtools/ScreenshotManager.cc

@@ -9 +9 @@
 #include <OgreRoot.h>
 
+#include "util/ScopedSingletonManager.h"
 #include "core/GraphicsManager.h"
 #include "core/PathConfig.h"
-#include "core/ScopedSingletonManager.h"
 #include "core/command/ConsoleCommand.h"
 

code/branches/consolecommands3/src/modules/designtools/SkyboxGenerator.cc

@@ -34 +34 @@
 #include <OgreCamera.h>
 
+#include "util/ScopedSingletonManager.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
 #include "core/GraphicsManager.h"
-#include "core/ScopedSingletonManager.h"
 #include "core/command/ConsoleCommand.h"
 #include "core/command/CommandExecutor.h"

code/branches/consolecommands3/src/modules/notifications/NotificationManager.cc

@@ -36 +36 @@
 #include <set>
 
+#include "util/ScopedSingletonManager.h"
 #include "core/CoreIncludes.h"
-#include "core/ScopedSingletonManager.h"
 #include "Notification.h"
 #include "interfaces/NotificationListener.h"

code/branches/consolecommands3/src/modules/pickup/PickupManager.cc

@@ -34 +34 @@
 #include "PickupManager.h"
 
+#include "util/Convert.h"
+#include "util/ScopedSingletonManager.h"
 #include "core/CoreIncludes.h"
 #include "core/LuaState.h"
 #include "core/GUIManager.h"
-#include "core/ScopedSingletonManager.h"
 #include "core/Identifier.h"
-#include "util/Convert.h"
 #include "interfaces/PickupCarrier.h"
 #include "infos/PlayerInfo.h"

code/branches/consolecommands3/src/modules/questsystem/QuestManager.cc

@@ -37 +37 @@
 
 #include "util/Exception.h"
+#include "util/ScopedSingletonManager.h"
 #include "core/CoreIncludes.h"
 #include "core/GUIManager.h"
 #include "core/LuaState.h"
-#include "core/ScopedSingletonManager.h"
 #include "core/command/ConsoleCommand.h"
 #include "infos/PlayerInfo.h"

code/branches/consolecommands3/src/orxonox/CameraManager.cc

@@ -34 +34 @@
 
 #include "util/StringUtils.h"
+#include "util/ScopedSingletonManager.h"
 #include "core/GameMode.h"
 #include "core/GraphicsManager.h"
 #include "core/GUIManager.h"
 #include "core/ObjectList.h"
-#include "core/ScopedSingletonManager.h"
 #include "tools/Shader.h"
 #include "graphics/Camera.h"

code/branches/consolecommands3/src/orxonox/ChatHistory.cc

@@ -28 +28 @@
 
 #include "ChatHistory.h"
-#include <core/ScopedSingletonManager.h>
+#include "util/ScopedSingletonManager.h"
 
 #ifndef CHATTEST

code/branches/consolecommands3/src/orxonox/ChatInputHandler.cc

@@ -28 +28 @@
 
 #include "ChatInputHandler.h"
-#include <core/ScopedSingletonManager.h>
+#include "util/ScopedSingletonManager.h"
 #include "core/CoreIncludes.h"
 #include "core/GUIManager.h"

code/branches/consolecommands3/src/orxonox/LevelManager.cc

@@ -31 +31 @@
 #include <map>
 
+#include "util/ScopedSingletonManager.h"
 #include "core/CommandLineParser.h"
 #include "core/ConfigValueIncludes.h"
@@ -36 +37 @@
 #include "core/Loader.h"
 #include "core/Resource.h"
-#include "core/ScopedSingletonManager.h"
 #include "PlayerManager.h"
 #include "Level.h"

code/branches/consolecommands3/src/orxonox/MoodManager.cc

@@ -29 +29 @@
 #include "MoodManager.h"
 
+#include "util/ScopedSingletonManager.h"
 #include "core/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"
-#include "core/ScopedSingletonManager.h"
 #include "core/Resource.h"
 
@@ -48 +48 @@
         // Need to use a variable to store old data because ResetConfigValues() doesn't seem to work.
         oldMood_ = MoodManager::defaultMood_;
-        
+
         // Checking for the existence of the folder for the default mood
         const std::string& path = "ambient/" + MoodManager::defaultMood_ + "/.";

code/branches/consolecommands3/src/orxonox/PlayerManager.cc

@@ -29 +29 @@
 #include "PlayerManager.h"
 
+#include "util/ScopedSingletonManager.h"
 #include "core/CoreIncludes.h"
 #include "core/GameMode.h"
-#include "core/ScopedSingletonManager.h"
 #include "Level.h"
 #include "infos/HumanPlayer.h"

code/branches/consolecommands3/src/orxonox/overlays/InGameConsole.cc

@@ -45 +45 @@
 #include "util/Math.h"
 #include "util/DisplayStringConversions.h"
+#include "util/ScopedSingletonManager.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
-#include "core/ScopedSingletonManager.h"
 #include "core/command/ConsoleCommand.h"
 #include "core/input/InputManager.h"

code/branches/consolecommands3/src/orxonox/sound/SoundManager.cc

@@ -38 +38 @@
 #include "util/ScopeGuard.h"
 #include "util/Clock.h"
+#include "util/ScopedSingletonManager.h"
 #include "core/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"
 #include "core/GameMode.h"
-#include "core/ScopedSingletonManager.h"
 #include "core/Resource.h"
 #include "SoundBuffer.h"