Changeset 925 for code/branches/core2/src/util/MultiTypeString.cc

Timestamp:

Mar 26, 2008, 1:36:35 AM (16 years ago)

Author:

landauf

Message:

• the MultiTypes can now handle pointers and xml-elements
• added a const keyword in the ticpp.h file (TinyXML++)

File:

• code/branches/core2/src/util/MultiTypeString.cc (modified) (6 diffs)

code/branches/core2/src/util/MultiTypeString.cc

@@ -46 +46 @@
         else if (this->type_ == MT_string)
             return (this->string_ == mts.string_);
+        else if (this->type_ == MT_xmlelement)
+            return (&this->xmlelement_ == &mts.xmlelement_);
     }
 
@@ -59 +61 @@
         else if (this->type_ == MT_string)
             return (this->string_ != mts.string_);
+        else if (this->type_ == MT_xmlelement)
+            return (&this->xmlelement_ != &mts.xmlelement_);
     }
 
@@ -64 +68 @@
 }
 
+MultiTypeString::operator orxonox::BaseObject*() const
+{ return (this->type_ == MT_void) ? (orxonox::BaseObject*)this->value_.void_ : (orxonox::BaseObject*)ConvertValueAndReturn<MultiTypeString, void*>(*this); }
+MultiTypeString::operator void*() const
+{ return (this->type_ == MT_void) ? this->value_.void_ : ConvertValueAndReturn<MultiTypeString, void*>(*this); }
 MultiTypeString::operator int() const
 { return (this->type_ == MT_int) ? this->value_.int_ : ConvertValueAndReturn<MultiTypeString, int>(*this); }
@@ -92 +100 @@
 MultiTypeString::operator const char*() const
 { return ((this->type_ == MT_constchar) ? this->string_ : ConvertValueAndReturn<MultiTypeString, std::string>(*this)).c_str(); }
+MultiTypeString::operator orxonox::Element() const
+{ return (this->type_ == MT_xmlelement) ? this->xmlelement_ : ConvertValueAndReturn<MultiTypeString, orxonox::Element>(*this); }
 
 void MultiTypeString::setValue(const MultiTypeString& mts)
@@ -101 +111 @@
 std::string MultiTypeString::toString() const
 {
+    std::string output;
+
     if (this->type_ == MT_constchar)
         return this->string_;
     else if (this->type_ == MT_string)
         return this->string_;
+    else if (this->type_ == MT_xmlelement)
+        ConvertValue(&output, this->xmlelement_);
     else
         return MultiTypePrimitive::toString();
+
+    return output;
 }
 
@@ -115 +131 @@
     else if (this->type_ == MT_string)
         this->string_ = value;
+    else if (this->type_ == MT_xmlelement)
+        return ConvertValue(&this->xmlelement_, value, orxonox::Element());
     else
         return MultiTypePrimitive::fromString(value);