Changeset 1993 for code/branches/objecthierarchy/src/core

Timestamp:

Oct 22, 2008, 5:25:01 AM (16 years ago)

Author:

landauf

Message:

added several new classes

Location:

code/branches/objecthierarchy/src/core

Files:

• BaseObject.cc (modified) (2 diffs)
• Template.cc (modified) (6 diffs)
• Template.h (modified) (3 diffs)

code/branches/objecthierarchy/src/core/BaseObject.cc

@@ -38 +38 @@
 #include "Level.h"
 #include "Template.h"
+#include "util/String.h"
 
 namespace orxonox
@@ -87 +88 @@
     const std::string& BaseObject::getLevelfile() const
     {
-        return this->level_->getFile();
+        if (this->level_)
+            return this->level_->getFile();
+        else
+            return blankString;
     }
 

code/branches/objecthierarchy/src/core/Template.cc

@@ -33 +33 @@
 #include "core/XMLPort.h"
 #include "util/Debug.h"
+#include "tinyxml/ticpp.h"
 
 namespace orxonox
@@ -38 +39 @@
     CreateFactory(Template);
 
-    Template::Template()
+    Template::Template() : xmlelement_("")
     {
         RegisterObject(Template);
@@ -59 +60 @@
         XMLPortParam(Template, "baseclass", setBaseclass, getBaseclass, xmlelement, mode);
 
-        this->setXMLElement(*xmlelement.FirstChildElement(false));
+        this->setXMLElement(*dynamic_cast<TiXmlElement*>(xmlelement.FirstChildElement(false)->GetTiXmlPointer()));
     }
 
@@ -79 +80 @@
     }
 
-    const Element& Template::getXMLElement() const
+    const TiXmlElement& Template::getXMLElement() const
     {
         if (this->bIsLink_)
@@ -89 +90 @@
                 {
                     this->bIsReturningXMLElement_ = true;
-                    const Element& element = temp->getXMLElement();
+                    const TiXmlElement& element = temp->getXMLElement();
                     this->bIsReturningXMLElement_ = false;
                     return element;
@@ -127 +128 @@
         COUT(4) << object->getLoaderIndentation() << " aplying Template \"" << this->getName() << "\"..." << std::endl;
 
-        Element temp = this->getXMLElement();
+        Element temp = ((TiXmlElement*)&this->getXMLElement());
         object->XMLPort(temp, XMLPort::LoadObject);
     }

code/branches/objecthierarchy/src/core/Template.h

@@ -35 +35 @@
 
 #include "BaseObject.h"
-#include "tinyxml/ticpp.h"
+#include "tinyxml/tinyxml.h"
 
 namespace orxonox
@@ -53 +53 @@
                 { return this->link_; }
 
-            inline void setXMLElement(const Element& xmlelement)
+            inline void setXMLElement(const TiXmlElement& xmlelement)
                 { this->xmlelement_ = xmlelement; }
-            const Element& getXMLElement() const;
+            const TiXmlElement& getXMLElement() const;
 
             void setBaseclass(const std::string& baseclass);
@@ -70 +70 @@
 
         private:
-            Element xmlelement_;
+            TiXmlElement xmlelement_;
             std::string link_;
             std::string baseclass_;