Changeset 1764

Timestamp:

Sep 10, 2008, 1:11:19 PM (16 years ago)

Author:

rgrieder

Message:

Moved Exception to util now that debug has been moved.

Location:

code/trunk

Files:

• src/core/CMakeLists.txt (modified) (1 diff)
• src/core/CommandLine.h (modified) (1 diff)
• src/core/GameState.cc (modified) (1 diff)
• src/core/RootGameState.cc (modified) (1 diff)
• src/core/input/InputManager.cc (modified) (1 diff)
• src/orxonox/gamestates/GSGraphics.cc (modified) (1 diff)
• src/orxonox/gamestates/GSRoot.cc (modified) (2 diffs)
• src/orxonox/gui/GUIManager.cc (modified) (1 diff)
• src/util/CMakeLists.txt (modified) (1 diff)
• src/util/Exception.cc (moved) (moved from code/trunk/src/core/Exception.cc) (1 prop)
• src/util/Exception.h (moved) (moved from code/trunk/src/core/Exception.h) (2 diffs, 1 prop)
• visual_studio/vc8/core.vcproj (modified) (2 diffs)
• visual_studio/vc8/util.vcproj (modified) (2 diffs)

code/trunk/src/core/CMakeLists.txt

@@ -4 +4 @@
   ConfigValueContainer.cc
   Core.cc
-  Exception.cc
   GameState.cc
   Language.cc

code/trunk/src/core/CommandLine.h

@@ -34 +34 @@
 #include "util/Convert.h"
 #include "util/Debug.h"
-#include "Exception.h"
+#include "util/Exception.h"
 
 #define SetCommandLineArgument(name, defaultValue) \

code/trunk/src/core/GameState.cc

@@ -35 +35 @@
 #include "GameState.h"
 #include "util/Debug.h"
-#include "Exception.h"
+#include "util/Exception.h"
 
 namespace orxonox

code/trunk/src/core/RootGameState.cc

@@ -32 +32 @@
 #include "util/SubString.h"
 #include "util/Debug.h"
+#include "util/Exception.h"
 #include "Core.h"
 #include "Clock.h"
-#include "Exception.h"
 #include "CommandLine.h"
 

code/trunk/src/core/input/InputManager.cc

@@ -42 +42 @@
 #include "ois/OISInputManager.h"
 
+#include "util/Exception.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
-#include "core/Exception.h"
 #include "core/CommandExecutor.h"
 #include "core/ConsoleCommand.h"

code/trunk/src/orxonox/gamestates/GSGraphics.cc

@@ -41 +41 @@
 
 #include "util/Debug.h"
+#include "util/Exception.h"
 #include "core/ConsoleCommand.h"
 #include "core/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"
 #include "core/input/InputManager.h"
-#include "core/Exception.h"
 #include "overlays/console/InGameConsole.h"
 #include "gui/GUIManager.h"

code/trunk/src/orxonox/gamestates/GSRoot.cc

@@ -34 +34 @@
 
 //#include "util/SubString.h"
+#include "util/Exception.h"
+#include "util/Debug.h"
 #include "core/Factory.h"
 #include "core/ConfigFileManager.h"
@@ -40 +42 @@
 #include "core/ConsoleCommand.h"
 #include "core/CommandLine.h"
-#include "util/Debug.h"
-#include "core/Exception.h"
 #include "core/TclBind.h"
 #include "core/TclThreadManager.h"

code/trunk/src/orxonox/gui/GUIManager.cc

@@ -40 +40 @@
 #include <CEGUI.h>
 #include <CEGUILua.h>
+#include "util/Exception.h"
 #include "core/input/InputManager.h"
 #include "core/input/SimpleInputState.h"
 #include "core/tolua/tolua_bind.h"
 #include "core/ConsoleCommand.h"
-#include "core/Exception.h"
 #include "core/Core.h"
 #include "tolua/tolua_bind.h"

code/trunk/src/util/CMakeLists.txt

@@ -3 +3 @@
   Error.cc
   CRC32.cc
+  Exception.cc
   ExprParser.cc
   Math.cc

code/trunk/src/util/Exception.h

@@ -36 +36 @@
 #define _Exception_H__
 
-#include "CorePrereqs.h"
+#include "UtilPrereqs.h"
 
 #include <string>
 #include <exception>
 #include <cassert>
-#include "util/Debug.h"
+#include "Debug.h"
 
 // Define some ugly macros to make things more clear
@@ -52 +52 @@
 namespace orxonox
 {
-    class _CoreExport Exception : public std::exception
+    class _UtilExport Exception : public std::exception
     {
     public:

code/trunk/visual_studio/vc8/core.vcproj

@@ -165 +165 @@
                         </File>
                         <File
-                                RelativePath="..\..\src\core\Exception.cc"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\..\src\core\GameState.cc"
                                 >
@@ -396 +392 @@
                         </File>
                         <File
-                                RelativePath="..\..\src\core\Exception.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\..\src\core\GameState.h"
                                 >

code/trunk/visual_studio/vc8/util.vcproj

@@ -161 +161 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\util\Exception.cc"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\util\ExprParser.cc"
                                 >
@@ -215 +219 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\util\Exception.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\util\ExprParser.h"
                                 >