Changeset 708 for code/branches/FICN/src/orxonox/core/ArgReader.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/ArgReader.h (modified) (3 diffs)

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

@@ -35 +35 @@
 #define _ArgReader_H__
 
-#include <string>
+#include "CorePrereqs.h"
 
-#include "CorePrereqs.h"
+#include "misc/String.h"
 
 namespace orxonox {
@@ -45 +45 @@
     public:
       ArgReader(int argc, char **argv);
-      void checkArgument(std::string option, std::string& string, bool must=false);
-      void checkArgument(std::string option, int& integer, bool must=false);
-      void checkArgument(std::string option, float& floating, bool must=false);
+      void checkArgument(String option, String& string, bool must=false);
+      void checkArgument(String option, int& integer, bool must=false);
+      void checkArgument(String option, float& floating, bool must=false);
       bool errorHandling();
     private:
-      int checkOption(std::string option);
+      int checkOption(String option);
 
     private:
@@ -56 +56 @@
       char **arguments_;
       bool fail_;
-      std::string errorStr_;
+      String errorStr_;
   };