Changeset 2030 for code/branches/objecthierarchy/src

Timestamp:

Oct 28, 2008, 8:44:52 PM (16 years ago)

Author:

rgrieder

Message:

• Moved SignalHandler from orxonox to util
• Moved CameraHandler from orxonox/objects to orxonox
• updated msvc files

Location:

code/branches/objecthierarchy/src

Files:

• orxonox/CMakeLists.txt (modified) (2 diffs)
• orxonox/CameraHandler.cc (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/CameraHandler.cc) (1 prop)
• orxonox/CameraHandler.h (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/CameraHandler.h) (1 prop)
• orxonox/Main.cc (modified) (1 diff)
• orxonox/gamestates/GSLevel.cc (modified) (1 diff)
• orxonox/objects/worldentities/Camera.cc (modified) (1 diff)
• util/CMakeLists.txt (modified) (1 diff)
• util/SignalHandler.cc (moved) (moved from code/branches/objecthierarchy/src/orxonox/SignalHandler.cc) (1 diff, 1 prop)
• util/SignalHandler.h (moved) (moved from code/branches/objecthierarchy/src/orxonox/SignalHandler.h) (3 diffs, 1 prop)

code/branches/objecthierarchy/src/orxonox/CMakeLists.txt

@@ -1 +1 @@
 SET( ORXONOX_SRC_FILES
+  CameraHandler.cc
   GraphicsEngine.cc
   LevelManager.cc
   Main.cc
   Settings.cc
-  SignalHandler.cc
 
   gamestates/GSClient.cc
@@ -44 +44 @@
   tools/WindowEventListener.cc
 
-  objects/CameraHandler.cc
   objects/Radar.cc
   objects/RadarListener.cc

code/branches/objecthierarchy/src/orxonox/Main.cc

@@ -40 +40 @@
 #include "util/OrxonoxPlatform.h"
 #include "util/Debug.h"
+#include "util/SignalHandler.h"
 #include "core/ConfigFileManager.h"
-#include "SignalHandler.h"
 
 #include "gamestates/GSRoot.h"

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

@@ -41 +41 @@
 #include "core/Core.h"
 //#include "objects/Backlight.h"
-#include "objects/CameraHandler.h"
 #include "objects/Tickable.h"
 #include "objects/Radar.h"
 //#include "tools/ParticleInterface.h"
+#include "CameraHandler.h"
 #include "LevelManager.h"
 #include "Settings.h"

code/branches/objecthierarchy/src/orxonox/objects/worldentities/Camera.cc

@@ -41 +41 @@
 #include "core/ConfigValueIncludes.h"
 #include "objects/Scene.h"
-#include "objects/CameraHandler.h"
+#include "CameraHandler.h"
 
 namespace orxonox

code/branches/objecthierarchy/src/util/CMakeLists.txt

@@ -8 +8 @@
   OutputBuffer.cc
   OutputHandler.cc
+  SignalHandler.cc
   String.cc
   SubString.cc

code/branches/objecthierarchy/src/util/SignalHandler.cc

@@ -28 +28 @@
 
 /**
-    @file SignalHandler.cc
+    @file
     @brief Implementation of the SignalHandler class.
 */
 
-#include "OrxonoxStableHeaders.h"
 #include "SignalHandler.h"
-#include "util/Debug.h"
-
-#include <assert.h>
+#include "Debug.h"
+
+#include <cassert>
 #include <iostream>
 #include <cstdlib>

code/branches/objecthierarchy/src/util/SignalHandler.h

@@ -28 +28 @@
 
 /**
-    @file SignalHandler.h
+    @file
     @brief Declaration of the SignalHandler class.
 */
@@ -35 +35 @@
 #define _SignalHandler_H__
 
-#include "OrxonoxPrereqs.h"
+#include "UtilPrereqs.h"
 
 #include <list>
@@ -93 +93 @@
 #else /* ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32 */
 
-class _OrxonoxExport SignalHandler
+class _UtilExport SignalHandler
 {
   public: