Changeset 9726 in orxonox.OLD for branches/new_class_id/src/lib/lang/object_list.cc

Timestamp:

Sep 9, 2006, 7:42:16 PM (18 years ago)

Author:

bensch

Message:

stuff from yesterday

File:

• branches/new_class_id/src/lib/lang/object_list.cc (modified) (8 diffs)

branches/new_class_id/src/lib/lang/object_list.cc

@@ -19 +19 @@
 #include <cassert>
 
-
-#include <stdio.h>
-
 /**
  * @brief Constructor, that creates an ObjectList while checking (development mode) for uniqueness of all Keys (names and ID's)
@@ -33 +30 @@
   if (ObjectListBase::_classesByID == NULL)
   {
-    ObjectListBase::_classesByID = new classIDMap;
+    ObjectListBase::_classesByID = new IDMap;
     assert (ObjectListBase::_classesByName == NULL);
-    ObjectListBase::_classesByName = new classNameMap;
+    ObjectListBase::_classesByName = new NameMap;
   }
   assert(!ObjectListBase::classNameExists(className) && "Classes should only be included once, and no two classes should have the same name (key value)");
@@ -83 +80 @@
 }
 
-ObjectListBase::classIDMap* ObjectListBase::_classesByID = NULL;
-ObjectListBase::classNameMap* ObjectListBase::_classesByName = NULL;
+ObjectListBase::IDMap* ObjectListBase::_classesByID = NULL;
+ObjectListBase::NameMap* ObjectListBase::_classesByName = NULL;
 std::list<std::string> ObjectListBase::_classNames;
 
@@ -156 +153 @@
 {
   assert (ObjectListBase::_classesByID != NULL);
-  ObjectListBase::classIDMap::iterator it = ObjectListBase::_classesByID->find(classID);
+  ObjectListBase::IDMap::iterator it = ObjectListBase::_classesByID->find(classID);
   if (it != ObjectListBase::_classesByID->end())
     return (*it).second;
@@ -171 +168 @@
 {
   assert (ObjectListBase::_classesByName != NULL);
-  ObjectListBase::classNameMap::iterator it = ObjectListBase::_classesByName->find(className);
+  ObjectListBase::NameMap::iterator it = ObjectListBase::_classesByName->find(className);
   if (it != ObjectListBase::_classesByName->end())
     return (*it).second;
@@ -243 +240 @@
     ObjectListBase::_classNames.clear();
 
-    for (classNameMap::const_iterator it = ObjectListBase::_classesByName->begin();
-         it != ObjectListBase::_classesByName->end();
-         ++it)
-    {
+    for (NameMap::const_iterator it = ObjectListBase::_classesByName->begin();
+         it != ObjectListBase::_classesByName->end();
+         ++it)
       ObjectListBase::_classNames.push_back((*it).second->name());
-    }
   }
   return ObjectListBase::_classNames;
@@ -294 +289 @@
   printf("Listing all %d ObjectLists \n", ObjectListBase::_classesByID->size());
 
-  for (classNameMap::const_iterator it = ObjectListBase::_classesByName->begin();
+  for (NameMap::const_iterator it = ObjectListBase::_classesByName->begin();
        it != ObjectListBase::_classesByName->end();
        ++it)
-  {
     (*it).second->debug(level);
-
-  }
-
 }
 
@@ -339 +330 @@
     return -1;
 }
-