Changeset 7225 in orxonox.OLD for trunk/src/lib/util

Timestamp:

Mar 18, 2006, 12:04:39 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more std::string

Location:

trunk/src/lib/util

Files:

• loading/resource_manager.cc (modified) (1 diff)
• loading/resource_manager.h (modified) (1 diff)
• multi_type.h (modified) (1 diff)

trunk/src/lib/util/loading/resource_manager.cc

@@ -1009 +1009 @@
  * @returns the Number of the Type, or 0 (defautl) if not found.
  */
-ResourceType ResourceManager::stringToResourceType(const char* resourceType)
-{
-  assert(resourceType != NULL);
+ResourceType ResourceManager::stringToResourceType(const std::string& resourceType)
+{
   for (unsigned int i = 0; i < RESOURCE_TYPE_SIZE; i++)
-    if (!strcmp(resourceType, ResourceManager::resourceNames[i]))
+    if (resourceType == ResourceManager::resourceNames[i])
       return (ResourceType)i;
   return (ResourceType)0;

trunk/src/lib/util/loading/resource_manager.h

@@ -141 +141 @@
 
   static const char* ResourceTypeToChar(ResourceType type);
-  static ResourceType stringToResourceType(const char* resourceType);
+  static ResourceType stringToResourceType(const std::string& resourceType);
 
  private:

trunk/src/lib/util/multi_type.h

@@ -48 +48 @@
     MultiType& operator=(float value) { this->setFloat(value); return *this; };
     MultiType& operator=(char value) { this->setChar(value); return *this; };
-    MultiType& operator=(const char* value) { this->setString(value); return *this; };
     MultiType& operator=(const std::string& value) { this->setString(value); return *this; };