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

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

@@ -45 +45 @@
 
 #include <map>
-#include <string>
 
 #include "CorePrereqs.h"
+
+#include "misc/String.h"
 
 namespace orxonox
@@ -60 +61 @@
     {
         public:
-            static Identifier* getIdentifier(const std::string& name);
+            static Identifier* getIdentifier(const String& name);
             static Identifier* getIdentifier(const unsigned int id);
-            static void add(const std::string& name, Identifier* identifier);
+            static void add(const String& name, Identifier* identifier);
             static void changeNetworkID(Identifier* identifier, const unsigned int oldID, const unsigned int newID);
             static void createClassHierarchy();
 
-            static Factory* getFactoryPointer();// avoid overriding pointer_s in the static intialisation process
+            static Factory* getFactoryPointer();    // avoid overriding order problem in the static intialisation process
 
         private:
@@ -73 +74 @@
             ~Factory() {}                           // don't delete
 
-            std::map<std::string, Identifier*> identifierStringMap_;            //!< The map, mapping the name with the Identifier
+            std::map<String, Identifier*> identifierStringMap_;            //!< The map, mapping the name with the Identifier
             std::map<unsigned int, Identifier*> identifierNetworkIDMap_;        //!< The map, mapping the network ID with the Identifier
     };