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

Timestamp:

Apr 27, 2006, 5:49:12 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more exists functions to ClassList, and improved shellcompletion

Location:

trunk/src/lib/lang

Files:

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

trunk/src/lib/lang/class_list.cc

@@ -249 +249 @@
     if (cl != NULL)
     {
-      std::list<BaseObject*>::const_iterator bo = find (cl->objectList.begin(), cl->objectList.end(), object);
+      std::list<BaseObject*>::const_iterator bo = std::find (cl->objectList.begin(), cl->objectList.end(), object);
       return (bo != cl->objectList.end());
     }
@@ -258 +258 @@
     for (cl = ClassList::classList->begin(); cl != ClassList::classList->end(); cl++)
     {
-      std::list<BaseObject*>::const_iterator bo = find ((*cl).objectList.begin(), (*cl).objectList.end(), object);
+      std::list<BaseObject*>::const_iterator bo = std::find ((*cl).objectList.begin(), (*cl).objectList.end(), object);
       if (bo != (*cl).objectList.end())
         return true;
@@ -265 +265 @@
   return false;
 }
+
+bool ClassList::exists(const std::string& className, const std::string& objectName)
+{
+  ClassList* cl = ClassList::getClassList(className);
+  if (likely(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 true;
+  }
+  return false;
+}
+
 
 /**

trunk/src/lib/lang/class_list.h

@@ -47 +47 @@
     static BaseObject*                    getObject(const std::string& name, ClassID classID = CL_NULL);
     static bool                           exists(const BaseObject* object, ClassID classID = CL_NULL);
+    static bool                           exists(const std::string& className, const std::string& objectName);
 
     void                                  sendBack(std::list<BaseObject*>::const_iterator it);