Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9698 in orxonox.OLD for branches


Ignore:
Timestamp:
Aug 25, 2006, 12:03:30 AM (18 years ago)
Author:
bensch
Message:

adapted lang again

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

Legend:

Unmodified
Added
Removed
  • branches/new_class_id/src/lib/lang/new_class_id.cc

    r9685 r9698  
    1717
    1818#include "new_class_id.h"
     19
     20
     21NewClassID::NewClassID()
     22{
     23  *this = NullClass::classID();
     24};
     25
     26NewClassID NullClass::_classID;
  • branches/new_class_id/src/lib/lang/new_class_id.h

    r9691 r9698  
    1414{
    1515public:
    16   NewClassID() : _id(-1), _name("") { };
     16  NewClassID();
    1717  NewClassID(int id, const std::string& name) : _id(id), _name(name) { };
    1818  // the copy constructor is also defined.
     
    2828
    2929private:
    30   int            _id;
    31   std::string    _name;
     30  int                _id;
     31  std::string        _name;
    3232};
     33
     34class NullClass
     35{
     36public:
     37  static NewClassID classID() { return NullClass::_classID; }
     38private:
     39  NullClass();
     40private:
     41  static NewClassID _classID;
     42};
     43
    3344#endif /* _NEW_CLASS_ID_H */
  • branches/new_class_id/src/lib/lang/new_object_list.h

    r9696 r9698  
    120120  static const NewObjectListBase* const getObjectList(const NewClassID& classID);
    121121
    122   static BaseObject* getObject(int classID, const std::string& objectName);
    123   static BaseObject* getObject(const std::string& className, const std::string& objectName);
    124   static BaseObject* getObject(const NewClassID& classID, const std::string& objectName);
     122  static BaseObject* getBaseObject(int classID, const std::string& objectName);
     123  static BaseObject* getBaseObject(const std::string& className, const std::string& objectName);
     124  static BaseObject* getBaseObject(const NewClassID& classID, const std::string& objectName);
    125125
    126126  virtual BaseObject* getBaseObject(const std::string& name) const = 0;
Note: See TracChangeset for help on using the changeset viewer.