Changeset 9869 in orxonox.OLD for trunk/src/world_entities/elements/text_element.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/world_entities/elements/text_element.cc (modified) (2 diffs)

trunk/src/world_entities/elements/text_element.cc

@@ -27 +27 @@
 
 
-
-CREATE_FACTORY(TextElement, CL_TEXT_ELEMENT);
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(TextElement, CL_TEXT_ELEMENT);
+CREATE_FACTORY(TextElement);
 
 
@@ -36 +37 @@
 TextElement::TextElement (const TiXmlElement* root)
 {
-  this->setClassID(CL_TEXT_ELEMENT, "TextElement");
+  this->registerObject(this, TextElement::_objectList);
   this->setName("TextElement");