Changeset 2509 for code/branches/buildsystem2/src/tinyxml/ticpp.cc

Timestamp:

Dec 17, 2008, 8:59:48 PM (16 years ago)

Author:

rgrieder

Message:

Merged revisions 1875-2278 of the buildsystem branch to buildsystem2.

Location:

code/branches/buildsystem2

Files:

• . (modified) (2 props)
• src/tinyxml/ticpp.cc (modified) (22 diffs)

code/branches/buildsystem2/src/tinyxml/ticpp.cc

@@ -1 @@
-#define TIXML_USE_TICPP
-
 /*
 http://code.google.com/p/ticpp/
@@ -23 +21 @@
 */
 
-/*
-Modifications by the orxonox team:
-In function: void Document::Parse( const std::string& xml, bool throwIfParseError, TiXmlEncoding encoding )
-     change: Added row and column number to the error description.
-     author: Reto Grieder
-*/
-
 #ifdef TIXML_USE_TICPP
 
@@ -164 +155 @@
 
         Attribute* temp = new Attribute( attribute );
-        m_spawnedWrappers.push_back( temp );
+        attribute->m_spawnedWrappers.push_back( temp );
 
         return temp;
@@ -186 +177 @@
 
         Attribute* temp = new Attribute( attribute );
-        m_spawnedWrappers.push_back( temp );
+        attribute->m_spawnedWrappers.push_back( temp );
 
         return temp;
@@ -262 +253 @@
         if ( rememberSpawnedWrapper )
         {
-                m_spawnedWrappers.push_back( temp );
+                tiXmlNode->m_spawnedWrappers.push_back( temp );
         }
         return temp;
@@ -386 +377 @@
         }
 
+        TiXmlNode* pointer = GetTiXmlPointer()->InsertEndChild( *addThis.GetTiXmlPointer() );
+        if ( 0 == pointer )
+        {
+                TICPPTHROW( "Node can't be inserted" );
+        }
+
+        return NodeFactory( pointer );
+}
+
+Node* Node::LinkEndChild( Node* childNode )
+{
+        if ( childNode->Type() == TiXmlNode::DOCUMENT )
+        {
+                TICPPTHROW( "Node is a Document and can't be linked" );
+        }
+
+        // Increment reference count when adding to the tree
+        childNode->m_impRC->IncRef();
+
+        if ( 0 == GetTiXmlPointer()->LinkEndChild( childNode->GetTiXmlPointer() ) )
+        {
+                TICPPTHROW( "Node can't be linked" );
+        }
+
+        return childNode;
+}
+
+Node* Node::InsertBeforeChild( Node* beforeThis, Node& addThis )
+{
+        if ( addThis.Type() == TiXmlNode::DOCUMENT )
+        {
+                TICPPTHROW( "Node is a Document and can't be inserted" );
+        }
+
         // Increment reference count when adding to the tree
         addThis.m_impRC->IncRef();
 
-        TiXmlNode* pointer = GetTiXmlPointer()->InsertEndChild( *addThis.GetTiXmlPointer() );
+        TiXmlNode* pointer = GetTiXmlPointer()->InsertBeforeChild( beforeThis->GetTiXmlPointer(), *addThis.GetTiXmlPointer() );
         if ( 0 == pointer )
         {
@@ -398 +423 @@
 }
 
-Node* Node::LinkEndChild( Node* childNode )
-{
-        if ( childNode->Type() == TiXmlNode::DOCUMENT )
-        {
-                TICPPTHROW( "Node is a Document and can't be linked" );
-        }
-
-        // Increment reference count when adding to the tree
-        childNode->m_impRC->IncRef();
-
-        if ( 0 == GetTiXmlPointer()->LinkEndChild( childNode->GetTiXmlPointer() ) )
-        {
-                TICPPTHROW( "Node can't be linked" );
-        }
-
-        return childNode;
-}
-
-Node* Node::InsertBeforeChild( Node* beforeThis, Node& addThis )
+Node* Node::InsertAfterChild( Node* afterThis, Node& addThis )
 {
         if ( addThis.Type() == TiXmlNode::DOCUMENT )
@@ -426 +433 @@
         addThis.m_impRC->IncRef();
 
-        TiXmlNode* pointer = GetTiXmlPointer()->InsertBeforeChild( beforeThis->GetTiXmlPointer(), *addThis.GetTiXmlPointer() );
-        if ( 0 == pointer )
-        {
-                TICPPTHROW( "Node can't be inserted" );
-        }
-
-        return NodeFactory( pointer );
-}
-
-Node* Node::InsertAfterChild( Node* afterThis, Node& addThis )
-{
-        if ( addThis.Type() == TiXmlNode::DOCUMENT )
-        {
-                TICPPTHROW( "Node is a Document and can't be inserted" );
-        }
-
-        // Increment reference count when adding to the tree
-        addThis.m_impRC->IncRef();
-
         TiXmlNode* pointer = GetTiXmlPointer()->InsertAfterChild( afterThis->GetTiXmlPointer(), *addThis.GetTiXmlPointer() );
         if ( 0 == pointer )
@@ -576 +564 @@
 
         Element* temp = new Element( sibling );
-        m_spawnedWrappers.push_back( temp );
+        sibling->m_spawnedWrappers.push_back( temp );
 
         return temp;
@@ -616 +604 @@
 
         Element* temp = new Element( element );
-        m_spawnedWrappers.push_back( temp );
+        element->m_spawnedWrappers.push_back( temp );
 
         return temp;
@@ -641 +629 @@
         }
         Document* temp = new Document( doc );
-        m_spawnedWrappers.push_back( temp );
+        doc->m_spawnedWrappers.push_back( temp );
 
         return temp;
@@ -659 +647 @@
         }
         Document* temp = new Document( doc );
-        m_spawnedWrappers.push_back( temp );
+        doc->m_spawnedWrappers.push_back( temp );
 
         return temp;
@@ -672 +660 @@
         }
         Element* temp = new Element( doc );
-        m_spawnedWrappers.push_back( temp );
+        doc->m_spawnedWrappers.push_back( temp );
 
         return temp;
@@ -685 +673 @@
         }
         Comment* temp = new Comment( doc );
-        m_spawnedWrappers.push_back( temp );
+        doc->m_spawnedWrappers.push_back( temp );
 
         return temp;
@@ -698 +686 @@
         }
         Text* temp = new Text( doc );
-        m_spawnedWrappers.push_back( temp );
+        doc->m_spawnedWrappers.push_back( temp );
 
         return temp;
@@ -711 +699 @@
         }
         Declaration* temp = new Declaration( doc );
-        m_spawnedWrappers.push_back( temp );
+        doc->m_spawnedWrappers.push_back( temp );
 
         return temp;
@@ -724 +712 @@
         }
         StylesheetReference* temp = new StylesheetReference( doc );
-        m_spawnedWrappers.push_back( temp );
+        doc->m_spawnedWrappers.push_back( temp );
 
         return temp;
@@ -860 +848 @@
         if( throwIfParseError && m_tiXmlPointer->Error() )
         {
-                TICPPTHROW( "Error parsing xml: " << m_tiXmlPointer->ErrorDesc()
-            << " In row " << m_tiXmlPointer->ErrorRow() << ", column " << m_tiXmlPointer->ErrorCol() << ".");
+                TICPPTHROW( "Error parsing xml." );
         }
 }
@@ -912 +899 @@
 
         Attribute* temp = new Attribute( attribute );
-        m_spawnedWrappers.push_back( temp );
+        attribute->m_spawnedWrappers.push_back( temp );
 
         return temp;
@@ -939 +926 @@
 
         Attribute* temp = new Attribute( attribute );
-        m_spawnedWrappers.push_back( temp );
+        attribute->m_spawnedWrappers.push_back( temp );
 
         return temp;
@@ -957 +944 @@
 {
         return GetAttributeOrDefault( name, std::string() );
+}
+
+bool Element::HasAttribute( const std::string& name ) const
+{
+        ValidatePointer();
+        return ( 0 != m_tiXmlPointer->Attribute( name.c_str() ) );
+}
+
+void Element::RemoveAttribute( const std::string& name )
+{
+        ValidatePointer();
+        m_tiXmlPointer->RemoveAttribute( name.c_str() );
 }
 
@@ -1086 +1085 @@
 }
 
+void TiCppRC::DeleteSpawnedWrappers()
+{
+        std::vector< Base* >::reverse_iterator wrapper;
+        for ( wrapper = m_spawnedWrappers.rbegin(); wrapper != m_spawnedWrappers.rend(); ++wrapper )
+        {
+                delete *wrapper;
+        }
+        m_spawnedWrappers.clear();
+}
+                
 TiCppRC::~TiCppRC()
-{
+{       
+        DeleteSpawnedWrappers();
+        
         // Set pointer held by reference counter to NULL
         this->m_tiRC->Nullify();