Changeset 5855

Timestamp:

Oct 2, 2009, 8:36:25 AM (15 years ago)

Author:

rgrieder

Message:

Moved Clock from core to util (used in Scope anyway).

Location:

code/branches/core5/src

Files:

• libraries/core/CMakeLists.txt (modified) (1 diff)
• libraries/core/Core.cc (modified) (1 diff)
• libraries/core/CorePrereqs.h (modified) (1 diff)
• libraries/core/GUIManager.cc (modified) (1 diff)
• libraries/core/Game.cc (modified) (2 diffs)
• libraries/core/GraphicsManager.cc (modified) (1 diff)
• libraries/core/TclThreadManager.cc (modified) (1 diff)
• libraries/core/input/InputDevice.h (modified) (1 diff)
• libraries/core/input/InputManager.cc (modified) (1 diff)
• libraries/network/Client.cc (modified) (1 diff)
• libraries/network/Server.cc (modified) (1 diff)
• libraries/tools/Timer.cc (modified) (1 diff)
• libraries/util/CMakeLists.txt (modified) (1 diff)
• libraries/util/Clock.cc (moved) (moved from code/branches/core5/src/libraries/core/Clock.cc) (1 diff)
• libraries/util/Clock.h (moved) (moved from code/branches/core5/src/libraries/core/Clock.h) (1 diff)
• libraries/util/UtilPrereqs.h (modified) (1 diff)
• orxonox/gamestates/GSClient.cc (modified) (1 diff)
• orxonox/gamestates/GSDedicated.cc (modified) (1 diff)
• orxonox/gamestates/GSDedicatedClient.cc (modified) (1 diff)
• orxonox/gamestates/GSGraphics.cc (modified) (1 diff)
• orxonox/gamestates/GSLevel.cc (modified) (1 diff)
• orxonox/gamestates/GSMainMenu.cc (modified) (1 diff)
• orxonox/gamestates/GSRoot.cc (modified) (1 diff)
• orxonox/overlays/InGameConsole.cc (modified) (1 diff)

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

@@ -19 +19 @@
 
 SET_SOURCE_FILES(CORE_SRC_FILES
-  Clock.cc
   ConfigFileManager.cc
   ConfigValueContainer.cc

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

@@ -48 +48 @@
 #endif
 
+#include "util/Clock.h"
 #include "util/Debug.h"
 #include "util/Exception.h"
 #include "util/SignalHandler.h"
 #include "PathConfig.h"
-#include "Clock.h"
 #include "CommandExecutor.h"
 #include "CommandLine.h"

code/branches/core5/src/libraries/core/CorePrereqs.h

@@ -97 +97 @@
     class ClassTreeMaskNode;
     class ClassTreeMaskObjectIterator;
-    class Clock;
     class CommandEvaluation;
     class CommandExecutor;

code/branches/core5/src/libraries/core/GUIManager.cc

@@ -49 +49 @@
 #endif
 
+#include "util/Clock.h"
 #include "util/Debug.h"
 #include "util/Exception.h"
 #include "util/OrxAssert.h"
 #include "Core.h"
-#include "Clock.h"
 #include "LuaState.h"
 #include "PathConfig.h"

code/branches/core5/src/libraries/core/Game.cc

@@ -38 +38 @@
 #include <boost/weak_ptr.hpp>
 
+#include "util/Clock.h"
 #include "util/Debug.h"
 #include "util/Exception.h"
@@ -43 +44 @@
 #include "util/Sleep.h"
 #include "util/SubString.h"
-#include "Clock.h"
 #include "CommandLine.h"
 #include "ConsoleCommand.h"

code/branches/core5/src/libraries/core/GraphicsManager.cc

@@ -48 +48 @@
 
 #include "SpecialConfig.h"
+#include "util/Clock.h"
 #include "util/Exception.h"
 #include "util/StringUtils.h"
 #include "util/SubString.h"
-#include "Clock.h"
 #include "ConsoleCommand.h"
 #include "ConfigValueIncludes.h"

code/branches/core5/src/libraries/core/TclThreadManager.cc

@@ -36 +36 @@
 #include <cpptcl/cpptcl.h>
 
+#include "util/Clock.h"
 #include "util/Convert.h"
 #include "util/Exception.h"
-#include "Clock.h"
 #include "CommandExecutor.h"
 #include "ConsoleCommand.h"

code/branches/core5/src/libraries/core/input/InputDevice.h

@@ -41 +41 @@
 #include <ois/OISInputManager.h>
 
+#include "util/Clock.h"
 #include "util/Debug.h"
 #include "util/Exception.h"
-#include "core/Clock.h"
 #include "InputState.h"
 

code/branches/core5/src/libraries/core/input/InputManager.cc

@@ -41 +41 @@
 #include <boost/foreach.hpp>
 
+#include "util/Clock.h"
 #include "util/Convert.h"
 #include "util/Exception.h"
 #include "util/ScopeGuard.h"
-#include "core/Clock.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"

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

@@ -43 +43 @@
 #include <cassert>
 
+#include "util/Clock.h"
 #include "util/Debug.h"
-#include "core/Clock.h"
 #include "synchronisable/Synchronisable.h"
 #include "packet/Chat.h"

code/branches/core5/src/libraries/network/Server.cc

@@ -46 +46 @@
 #include <string>
 
+#include "util/Clock.h"
 #include "util/Debug.h"
-#include "core/Clock.h"
 #include "core/ObjectList.h"
 #include "core/Executor.h"

code/branches/core5/src/libraries/tools/Timer.cc

@@ -31 +31 @@
 #include <set>
 
+#include "util/Clock.h"
 #include "core/CoreIncludes.h"
 #include "core/ConsoleCommand.h"
 #include "core/CommandExecutor.h"
-#include "core/Clock.h"
 #include "core/Functor.h"
 

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

@@ -20 +20 @@
 SET_SOURCE_FILES(UTIL_SRC_FILES
   Clipboard.cc
+  Clock.cc
   CRC32.cc
   Exception.cc

code/branches/core5/src/libraries/util/Clock.cc

@@ -26 +26 @@
  *
  */
-
-/**
-    @file
-    @brief
-*/
 
 #include "Clock.h"

code/branches/core5/src/libraries/util/Clock.h

@@ -30 +30 @@
 #define _Clock_H__
 
-#include "CorePrereqs.h"
-#include "util/OgreForwardRefs.h"
+#include "UtilPrereqs.h"
+#include "OgreForwardRefs.h"
 
 namespace orxonox
 {
-    class _CoreExport Clock
+    class _UtilExport Clock
     {
     public:

code/branches/core5/src/libraries/util/UtilPrereqs.h

@@ -63 +63 @@
 namespace orxonox
 {
+    class Clock;
     class Exception;
     class ExprParser;

code/branches/core5/src/orxonox/gamestates/GSClient.cc

@@ -29 +29 @@
 #include "GSClient.h"
 
+#include "util/Clock.h"
 #include "util/Exception.h"
-#include "core/Clock.h"
 #include "core/CommandLine.h"
 #include "core/Game.h"

code/branches/core5/src/orxonox/gamestates/GSDedicated.cc

@@ -33 +33 @@
 #include <boost/bind.hpp>
 
+#include "util/Clock.h"
 #include "util/Debug.h"
 #include "util/Sleep.h"
-#include "core/Clock.h"
 #include "core/CommandLine.h"
 #include "core/CommandExecutor.h"

code/branches/core5/src/orxonox/gamestates/GSDedicatedClient.cc

@@ -33 +33 @@
 #include <boost/bind.hpp>
 
+#include "util/Clock.h"
 #include "util/Debug.h"
 #include "util/Exception.h"
 #include "util/Sleep.h"
-#include "core/Clock.h"
 #include "core/CommandLine.h"
 #include "core/CommandExecutor.h"

code/branches/core5/src/orxonox/gamestates/GSGraphics.cc

@@ -35 +35 @@
 #include "GSGraphics.h"
 
+#include "util/Clock.h"
 #include "util/Convert.h"
-#include "core/Clock.h"
 #include "core/CommandExecutor.h"
 #include "core/ConsoleCommand.h"

code/branches/core5/src/orxonox/gamestates/GSLevel.cc

@@ -32 +32 @@
 #include <OgreCompositorManager.h>
 
+#include "util/Clock.h"
 #include "core/input/InputManager.h"
 #include "core/input/InputState.h"
 #include "core/input/KeyBinder.h"
-#include "core/Clock.h"
 #include "core/ConsoleCommand.h"
 #include "core/ConfigValueIncludes.h"

code/branches/core5/src/orxonox/gamestates/GSMainMenu.cc

@@ -31 +31 @@
 #include <OgreSceneManager.h>
 
+#include "util/Clock.h"
 #include "core/input/InputManager.h"
 #include "core/input/InputState.h"
 #include "core/Game.h"
-#include "core/Clock.h"
 #include "core/ConsoleCommand.h"
 #include "core/GraphicsManager.h"

code/branches/core5/src/orxonox/gamestates/GSRoot.cc

@@ -29 +29 @@
 #include "GSRoot.h"
 
-#include "core/Clock.h"
+#include "util/Clock.h"
 #include "core/ConsoleCommand.h"
 #include "core/Game.h"

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

@@ -41 +41 @@
 #include <OgreFont.h>
 
+#include "util/Clock.h"
+#include "util/Convert.h"
 #include "util/Math.h"
-#include "util/Convert.h"
 #include "util/UTFStringConversions.h"
-#include "core/Clock.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"