Changeset 7221 in orxonox.OLD for trunk/src/util/object_manager.cc

Timestamp:

Mar 15, 2006, 3:10:45 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge ​https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

File:

• trunk/src/util/object_manager.cc (modified) (3 diffs)

trunk/src/util/object_manager.cc

@@ -97 +97 @@
  * this function also does a transformation from omList as char* to OM_LIST.
  */
-void ObjectManager::toList (WorldEntity* entity, const char* omList)
+void ObjectManager::toList (WorldEntity* entity, const std::string& omList)
 {
   this->toList(entity, ObjectManager::StringToOMList(omList));
@@ -153 +153 @@
  * @param level: level 0: only show list info; level 1: also show entities and their names.
  */
-void ObjectManager::debug(const char* listName, unsigned int level)
+void ObjectManager::debug(const std::string& listName, unsigned int level)
 {
   PRINT(0)("=================================\n");
   PRINT(0)("=ObjectManager-DEBUG=============\n");
   PRINT(0)("=================================\n");
-  if (listName == NULL || listName[0] == '\0')
+  if (listName.empty())
     for (unsigned int i = 0; i < OM_SIZE; ++i)
       debug((OM_LIST) i, level);
@@ -189 +189 @@
  * @returns the OM_LIST transformed from listName. or the default, if not found or NULL.
  */
-OM_LIST ObjectManager::StringToOMList(const char* listName)
-{
-  if (unlikely(listName == NULL)) return OM_DEFAULT_LIST;
+OM_LIST ObjectManager::StringToOMList(const std::string& listName)
+{
+  if (unlikely(listName.empty())) return OM_DEFAULT_LIST;
 
   for(unsigned int i = 0; i < OM_SIZE; ++i) {
-    if(!strcmp(listName, ObjectManager::objectManagerListNames[i])) {
+    if(listName == ObjectManager::objectManagerListNames[i]) {
       return (OM_LIST)i;
     }