Changeset 715 for code/branches/FICN/src/orxonox/core/Factory.h

Timestamp:

Dec 28, 2007, 11:33:10 PM (16 years ago)

Author:

rgrieder

Message:

• the master has spoken…
• misc/String.h is not anymore..

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
@@ -61 +60 @@
     {
         public:
-            static Identifier* getIdentifier(const String& name);
+            static Identifier* getIdentifier(const std::string& name);
             static Identifier* getIdentifier(const unsigned int id);
-            static void add(const String& name, Identifier* identifier);
+            static void add(const std::string& name, Identifier* identifier);
             static void changeNetworkID(Identifier* identifier, const unsigned int oldID, const unsigned int newID);
             static void createClassHierarchy();
@@ -74 +73 @@
             ~Factory() {}                           // don't delete
 
-            std::map<String, Identifier*> identifierStringMap_;            //!< The map, mapping the name with the Identifier
+            std::map<std::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
     };