Changeset 8271 in orxonox.OLD for trunk/src/lib/lang

Timestamp:

Jun 8, 2006, 4:50:50 PM (19 years ago)

Author:

bensch

Message:

merge

Location:

trunk/src/lib/lang

Files:

• class_list.cc (modified) (1 diff)
• class_list.h (modified) (1 diff)

trunk/src/lib/lang/class_list.cc

@@ -221 +221 @@
           return (*bo);
     }
+  }
+  return NULL;
+}
+
+
+/**
+ * @brief checks if the BaseObject* object exists.
+ * @param objectName the name of the BaseObject to look for
+ * @param classID if not CL_NULL it will only search through a specific type of Objects. Otherwise it will be searched everywhere.
+ * @return true, if the Object Exists in the specified ClassID, false otherwise
+ * @todo: speed this up!!
+ */
+BaseObject* ClassList::getObject(const std::string& objectName, const std::string& className)
+{
+  ClassList* cl = ClassList::getClassList(className);
+  if (cl != NULL)
+  {
+    std::list<BaseObject*>::iterator bo;
+    for (bo = cl->objectList.begin(); bo != cl->objectList.end(); bo++)
+      if ((*bo)->getName() != NULL && objectName == (*bo)->getName())
+        return (*bo);
   }
   return NULL;

trunk/src/lib/lang/class_list.h

@@ -42 +42 @@
     static const std::list<BaseObject*>*  getList(const std::string& className); // { return (ClassList* fl = ClassList::getClassList(className) != NULL)? &(fl->objectList) : NULL;  };
     static const std::list<std::string>*  getClassNames();
-    static BaseObject*                    getObject(const std::string& name, ClassID classID = CL_NULL);
+    static BaseObject*                    getObject(const std::string& objectName, ClassID classID = CL_NULL);
+    static BaseObject*                    getObject(const std::string& objectName, const std::string& className);
     static bool                           exists(const BaseObject* object, ClassID classID = CL_NULL);
     static bool                           exists(const std::string& className, const std::string& objectName);