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

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

@@ -52 +52 @@
 #define _Identifier_H__
 
-#include <string>
 #include <map>
 
 #include "CorePrereqs.h"
 
+#include "misc/String.h"
 #include "ObjectList.h"
 #include "IdentifierList.h"
@@ -112 +112 @@
 
             /** @returns the name of the class the Identifier belongs to. */
-            inline const std::string& getName() const { return this->name_; }
+            inline const String& getName() const { return this->name_; }
 
             /** @returns the parents of the class the Identifier belongs to. */
@@ -130 +130 @@
 
             /** @returns the ConfigValueContainer of a variable, given by the string of its name. @param varname The name of the variable */
-            inline ConfigValueContainer* getConfigValueContainer(const std::string& varname)
+            inline ConfigValueContainer* getConfigValueContainer(const String& varname)
                 { return this->configValues_[varname]; }
 
             /** @brief Sets the ConfigValueContainer of a variable, given by the string of its name. @param varname The name of the variablee @param container The container */
-            inline void setConfigValueContainer(const std::string& varname, ConfigValueContainer* container)
+            inline void setConfigValueContainer(const String& varname, ConfigValueContainer* container)
                 { this->configValues_[varname] = container; }
 
-            static std::map<std::string, Identifier*>& getIdentifierMap();
+            static std::map<String, Identifier*>& getIdentifierMap();
 
         private:
@@ -166 +166 @@
             IdentifierList* children_;                                  //!< The Children of the class the Identifier belongs to
 
-            std::string name_;                                          //!< The name of the class the Identifier belongs to
+            String name_;                                          //!< The name of the class the Identifier belongs to
 
             BaseFactory* factory_;                                      //!< The Factory, able to create new objects of the given class (if available)
@@ -172 +172 @@
             static int hierarchyCreatingCounter_s;                      //!< Bigger than zero if at least one Identifier stores its parents (its an int instead of a bool to avoid conflicts with multithreading)
             unsigned int classID_;                                      //!< The network ID to identify a class through the network
-            std::map<std::string, ConfigValueContainer*> configValues_; //!< A map to link the string of configurable variables with their ConfigValueContainer
+            std::map<String, ConfigValueContainer*> configValues_; //!< A map to link the string of configurable variables with their ConfigValueContainer
     };
 
@@ -189 +189 @@
     {
         public:
-            static ClassIdentifier<T>* registerClass(const IdentifierList* parents, const std::string& name, bool bRootClass);
+            static ClassIdentifier<T>* registerClass(const IdentifierList* parents, const String& name, bool bRootClass);
             static void addObject(T* object);
             static ClassIdentifier<T>* getIdentifier();
-            void setName(const std::string& name);
+            void setName(const String& name);
 
         private:
@@ -221 +221 @@
     */
     template <class T>
-    ClassIdentifier<T>* ClassIdentifier<T>::registerClass(const IdentifierList* parents, const std::string& name, bool bRootClass)
+    ClassIdentifier<T>* ClassIdentifier<T>::registerClass(const IdentifierList* parents, const String& name, bool bRootClass)
     {
         COUT(4) << "*** Register Class in " << name << "-Singleton." << std::endl;
@@ -265 +265 @@
     */
     template <class T>
-    void ClassIdentifier<T>::setName(const std::string& name)
+    void ClassIdentifier<T>::setName(const String& name)
     {
         // Make sure we didn't already set the name, to avoid duplicate entries in the Identifier map
@@ -271 +271 @@
         {
             this->name_ = name;
-            this->getIdentifierMap().insert(std::pair<std::string, Identifier*>(name, this));
+            this->getIdentifierMap().insert(std::pair<String, Identifier*>(name, this));
             this->bSetName_ = true;
         }