Changeset 9698 in orxonox.OLD

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:

• new_class_id.cc (modified) (1 diff)
• new_class_id.h (modified) (2 diffs)
• new_object_list.h (modified) (1 diff)

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

@@ -17 +17 @@
 
 #include "new_class_id.h"
+
+
+NewClassID::NewClassID()
+{
+  *this = NullClass::classID();
+};
+
+NewClassID NullClass::_classID;

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

@@ -14 +14 @@
 {
 public:
-  NewClassID() : _id(-1), _name("") { };
+  NewClassID();
   NewClassID(int id, const std::string& name) : _id(id), _name(name) { };
   // the copy constructor is also defined.
@@ -28 +28 @@
 
 private:
-  int            _id;
-  std::string    _name;
+  int                _id;
+  std::string        _name;
 };
+
+class NullClass
+{
+public:
+  static NewClassID classID() { return NullClass::_classID; }
+private:
+  NullClass();
+private:
+  static NewClassID _classID;
+};
+
 #endif /* _NEW_CLASS_ID_H */

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

@@ -120 +120 @@
   static const NewObjectListBase* const getObjectList(const NewClassID& classID);
 
-  static BaseObject* getObject(int classID, const std::string& objectName);
-  static BaseObject* getObject(const std::string& className, const std::string& objectName);
-  static BaseObject* getObject(const NewClassID& classID, const std::string& objectName);
+  static BaseObject* getBaseObject(int classID, const std::string& objectName);
+  static BaseObject* getBaseObject(const std::string& className, const std::string& objectName);
+  static BaseObject* getBaseObject(const NewClassID& classID, const std::string& objectName);
 
   virtual BaseObject* getBaseObject(const std::string& name) const = 0;