Changeset 9715 in orxonox.OLD for branches/new_class_id/src/lib/lang/base_object.h

Timestamp:

Sep 1, 2006, 8:06:39 PM (19 years ago)

Author:

bensch

Message:

renamed newclassid to classid and newobjectlist to objectlist

File:

• branches/new_class_id/src/lib/lang/base_object.h (modified) (6 diffs)

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

@@ -26 +26 @@
 class BaseObject : public sigslot::has_slots<>
 {
-  NewObjectListDeclaration(BaseObject);
+  ObjectListDeclaration(BaseObject);
 public:
   BaseObject (const std::string& objectName = "");
@@ -48 +48 @@
   inline const std::string& getClassName() const { return _classes.front()._objectList->name(); };
 
-  inline const NewClassID& getClassID() const { return *_leafClassID; }
+  inline const ClassID& getClassID() const { return *_leafClassID; }
   /** @returns the ID of the Topmost object of the ClassStack */
   inline const int& getLeafClassID() const { return _leafClassID->id(); }
 
-  bool isA(const NewObjectListBase& objectList) const;
-  bool isA(const NewClassID& classID) const;
+  bool isA(const ObjectListBase& objectList) const;
+  bool isA(const ClassID& classID) const;
   bool isA(int classID) const;
   bool isA(const std::string& className) const;
@@ -65 +65 @@
 
 protected:
-  template<class T> void registerObject(T* object, NewObjectList<T>& list);
+  template<class T> void registerObject(T* object, ObjectList<T>& list);
 
 protected:
@@ -80 +80 @@
   struct ClassEntry
   {
-    /** Simple Constuctor @param objectList the NewObjectList, @param iterator the (intrusive) Iterator inside of the ObjectList */
-    inline ClassEntry (NewObjectListBase* objectList, NewObjectListBase::IteratorBase* iterator) : _objectList(objectList), _iterator(iterator) {}
-    NewObjectListBase*                _objectList;  //!< A ObjectList this Object is part of
-    NewObjectListBase::IteratorBase*  _iterator;    //!< An iterator pointing to the position of the Object inside of the List.
+    /** Simple Constuctor @param objectList the ObjectList, @param iterator the (intrusive) Iterator inside of the ObjectList */
+    inline ClassEntry (ObjectListBase* objectList, ObjectListBase::IteratorBase* iterator) : _objectList(objectList), _iterator(iterator) {}
+    ObjectListBase*                _objectList;  //!< A ObjectList this Object is part of
+    ObjectListBase::IteratorBase*  _iterator;    //!< An iterator pointing to the position of the Object inside of the List.
   };
   typedef std::list<ClassEntry>        ClassList;   //!< Type definition for the List.
@@ -89 +89 @@
   std::string                         className;    //!< the name of the class
   ClassList                           _classes;     //!< All Classes this object is part of.
-  const NewClassID*                       _leafClassID;  //!< Topmost ClassID.
+  const ClassID*                       _leafClassID;  //!< Topmost ClassID.
 };
 
@@ -103 +103 @@
  */
 template<class T>
-inline void BaseObject::registerObject(T* object, NewObjectList<T>& objectList)
+inline void BaseObject::registerObject(T* object, ObjectList<T>& objectList)
 {
   this->_leafClassID = &objectList.identity();