Changeset 1606 for code/branches/core3

Timestamp:

Jun 16, 2008, 7:53:40 PM (17 years ago)

Author:

rgrieder

Message:

• removed struct ObjectListBase::Export from the forward declarations (not allowed for nested classes, but were possible with the use of a template..)
• moved Error from core to util (since Debug.h has moved too)

Location:

code/branches/core3

Files:

• src/audio/AudioIncludes.h (modified) (1 diff)
• src/audio/AudioManager.cc (modified) (1 diff)
• src/audio/AudioStream.cc (modified) (1 diff)
• src/core/CMakeLists.txt (modified) (1 diff)
• src/core/CorePrereqs.h (modified) (2 diffs)
• src/util/CMakeLists.txt (modified) (1 diff)
• src/util/Error.cc (moved) (moved from code/branches/core3/src/core/Error.cc) (3 diffs)
• src/util/Error.h (moved) (moved from code/branches/core3/src/core/Error.h) (2 diffs)
• src/util/UtilPrereqs.h (modified) (2 diffs)
• visual_studio/vc8/core.vcproj (modified) (2 diffs)
• visual_studio/vc8/util.vcproj (modified) (2 diffs)

code/branches/core3/src/audio/AudioIncludes.h

@@ -47 +47 @@
 #include <vorbis/vorbisfile.h>
 
-#include "core/Error.h"
+#include "util/Error.h"

code/branches/core3/src/audio/AudioManager.cc

@@ -34 +34 @@
 #include "AudioSource.h"
 #include "AudioStream.h"
-#include "core/Error.h"
+#include "util/Error.h"
 #include "util/Debug.h"
 

code/branches/core3/src/audio/AudioStream.cc

@@ -29 +29 @@
 
 #include "util/Debug.h"
-#include "core/Error.h"
+#include "util/Error.h"
 
 namespace audio

code/branches/core3/src/core/CMakeLists.txt

@@ -3 +3 @@
   ConfigValueContainer.cc
   Core.cc
-  Error.cc
   Language.cc
   ObjectListBase.cc

code/branches/core3/src/core/CorePrereqs.h

@@ -111 +111 @@
   class ConsoleCommand;
   class Core;
-  class Error;
   class Executor;
   template <class T>
@@ -158 +157 @@
   class XMLPortParamContainer;
 
-  struct ObjectListBase::Export;
-
   // input
   //class GUIInputHandler;

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

@@ -2 +2 @@
   ArgReader.cc
   Clipboard.cc
+  Error.cc
   ExprParser.cc
   Math.cc

code/branches/core3/src/util/Error.cc

@@ -33 +33 @@
 
 #include "Error.h"
-#include "util/Debug.h"
+#include "Debug.h"
 
 namespace orxonox
@@ -39 +39 @@
         Error::Error(std::string errorMsg, int errorCode)
         {
-                COUT(1) << "############################ "<< std::endl
-                                                        << "#         Error "<<errorCode<< "          #"<< std::endl
-                                                        << "############################ "<< std::endl
-                                                        << "An error occured in Orxonox: "<< std::endl;
+                COUT(1) << "############################ " << std::endl
+                                          << "#         Error " << errorCode << "          #" << std::endl
+                                                << "############################ " << std::endl
+                                                << "An error occured in Orxonox: " << std::endl;
 
-                if (errorMsg=="")
+                if (errorMsg == "")
                 {
                         switch (errorCode)
@@ -51 +51 @@
                                         errorMsg = "Some error!";
                                         break;
+
                                 default:
                                         errorMsg = "Unknown error!";
                         }
                 }
-                COUT(1) << errorMsg << std::endl<< std::endl;
+                COUT(1) << errorMsg << std::endl << std::endl;
         }
 }

code/branches/core3/src/util/Error.h

@@ -35 +35 @@
 #define _Error_H__
 
-#include "CorePrereqs.h"
+#include "UtilPrereqs.h"
 
 #include <string>
@@ -41 +41 @@
 namespace orxonox
 {
-        class _CoreExport Error
+        class _UtilExport Error
         {
         public:

code/branches/core3/src/util/UtilPrereqs.h

@@ -62 +62 @@
 class ArgReader;
 class Convert;
+class ExprParser;
 class MultiTypePrimitive;
 class MultiTypeString;
 class MultiTypeMath;
-class OutputHandler;
 class SubString;
 
@@ -72 +72 @@
     class OutputBuffer;
     class OutputBufferListener;
+    class Error;
+    class OutputHandler;
 }
 

code/branches/core3/visual_studio/vc8/core.vcproj

@@ -161 +161 @@
                         </File>
                         <File
-                                RelativePath="..\..\src\core\Error.cc"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\..\src\core\Language.cc"
                                 >
@@ -347 +343 @@
                         </File>
                         <File
-                                RelativePath="..\..\src\core\Error.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\..\src\core\Language.h"
                                 >

code/branches/core3/visual_studio/vc8/util.vcproj

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