Changeset 708 for code/branches/FICN/src/orxonox/core/OutputHandler.h

Timestamp:

Dec 28, 2007, 10:30:29 PM (16 years ago)

Author:

rgrieder

Message:

• added Vector2, Vector3, Matrix3, ColourValue, Quaternion and String to the misc folder as header files (each of them contains #include <string> … typedef std::string String , etc.)
• please use String from now on by including <misc/String.h"
• removed #include <OgreVector3.h", etc. from "CoreIncludes.h" (adjusted all source files)
• adjusted all the source files (except network, that keeps <string> for the moment) (what a mess..)
• moved usleep hack to misc/Sleep.h
• relative include paths for files from other root directories (like misc, network, etc.) (but it stills writes "../Orxonox.h" when in folder orxonox/objects)
• "OgreSceneManager.h" —> <OgreSceneManager.h>
• included OrxonoxPrereqs in every file in folder orxonox
• moved HUD and ParticleInterface to namespace orxonox
• removed some using namespace Ogre/std when appropriate
• I hope I haven't forgotten important points..

File:

• code/branches/FICN/src/orxonox/core/OutputHandler.h (modified) (2 diffs)

code/branches/FICN/src/orxonox/core/OutputHandler.h

@@ -37 +37 @@
 #define _OutputHandler_H__
 
-#include "CorePrereqs.h"
-
 #include <iostream>
 #include <fstream>
-#include <string>
+
+#include "misc/String.h"
+#include "CorePrereqs.h"
 
 namespace orxonox
@@ -108 +108 @@
 
         private:
-            explicit OutputHandler(const std::string& logfilename);
+            explicit OutputHandler(const String& logfilename);
             OutputHandler(const OutputHandler& oh) {}; // don't copy
             virtual ~OutputHandler();
             std::ofstream logfile_;     //!< The logfile where the output is logged
-            std::string logfilename_;   //!< The name of the logfile
+            String logfilename_;   //!< The name of the logfile
             int outputLevel_;           //!< The level of the incoming output
     };