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

Timestamp:

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

Author:

bensch

Message:

merge

File:

• trunk/src/lib/lang/class_list.h (modified) (1 diff)

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);