Changeset 7207 for code/branches/consolecommands3/src/orxonox

Timestamp:

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

Author:

landauf

Message:

moved ScopedSingletonManager to util

Location:

code/branches/consolecommands3/src/orxonox

Files:

• CameraManager.cc (modified) (1 diff)
• ChatHistory.cc (modified) (1 diff)
• ChatInputHandler.cc (modified) (1 diff)
• LevelManager.cc (modified) (2 diffs)
• MoodManager.cc (modified) (2 diffs)
• PlayerManager.cc (modified) (1 diff)
• overlays/InGameConsole.cc (modified) (1 diff)
• sound/SoundManager.cc (modified) (1 diff)

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"