Changeset 9684 in orxonox.OLD for branches/new_class_id/src/lib/lang/new_object_list.h

Timestamp:

Aug 22, 2006, 1:34:31 AM (18 years ago)

Author:

bensch

Message:

orxonox/branches/new_class_id: slowly but surely reimplementing to the new groove… way to go

File:

• branches/new_class_id/src/lib/lang/new_object_list.h (modified) (2 diffs)

branches/new_class_id/src/lib/lang/new_object_list.h

@@ -16 +16 @@
 
 #define NewObjectListDeclaration(ClassName) \
-   static NewObjectList<ClassName> objectList
+  public: \
+   static const NewObjectList<ClassName>& objectList() { return ClassName::_objectList; }; \
+  private: \
+   static NewObjectList<ClassName> _objectList
 
 #define NewObjectListDefinitionID(ClassName, ID) \
-   NewObjectList<ClassName> ClassName::objectList(#ClassName, ID)
+   NewObjectList<ClassName> ClassName::_objectList(#ClassName, ID)
 
 
@@ -157 +160 @@
 T* NewObjectList<T>::getObject(const std::string& name) const
 {
-  iterator it = std::find(this->_objects.begin(), this->_objects.end(), name);
-  if (it != this->_objects.end())
-    return *it;
-  else
-    return NULL;
+  const_iterator it;
+  for (it = this->_objects.begin(); it != this->_objects.end(); ++it)
+    if ((*it)->getName() == name)
+      return (*it);
+  return NULL;
 }