Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9757 in orxonox.OLD for branches/new_class_id/src/lib/lang


Ignore:
Timestamp:
Sep 18, 2006, 10:06:19 PM (18 years ago)
Author:
bensch
Message:

new_class_id: hups… this was bad naming… confusing too.

Location:
branches/new_class_id/src/lib/lang
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/new_class_id/src/lib/lang/class_id.h

    r9716 r9757  
    6161public:
    6262  /** @returns the NullClass' ID. */
    63   static const ClassID& classID() { return NullClass::_classID; }
     63  static const ClassID& staticClassID() { return NullClass::_classID; }
    6464  /** @param id the ID to acquire @param name the name to acquire @brief acquires the ID of this Class */
    6565  static void acquireID(const int*& id, const std::string*& name) { id = &_nullID; name = &_nullName; };
    … …  
    6969
    7070private:
    71   static ClassID         _classID;      //!< The NullClass' ID
     71  static ClassID            _classID;      //!< The NullClass' ID
    7272  static const std::string  _nullName;     //!< The NullClass' Name ("NullClass")
    7373  static int                _nullID;       //!< The NullClass' ID

  • branches/new_class_id/src/lib/lang/object_list.cc

    r9726 r9757  
    125125    return base->_identity;
    126126  else
    127     return NullClass::classID();
     127    return NullClass::staticClassID();
    128128}
    129129
    … …  
    141141    return base->_identity;
    142142  else
    143     return NullClass::classID();
     143    return NullClass::staticClassID();
    144144}
    145145

  • branches/new_class_id/src/lib/lang/object_list.h

    r9726 r9757  
    2525  public: \
    2626   static inline const ObjectList<ClassName>& objectList() { return ClassName::_objectList; }; \
    27    static inline const ClassID& classID() { return ClassName::_objectList.identity(); }; \
     27   static inline const ClassID& staticClassID() { return ClassName::_objectList.identity(); }; \
    2828  private: \
    2929   static ObjectList<ClassName> _objectList
Note: See TracChangeset for help on using the changeset viewer.