Changeset 8285 for code/branches/kicklib2/src/external/tinyxml

Timestamp:

Apr 21, 2011, 7:43:10 PM (14 years ago)

Author:

rgrieder

Message:

Merged revisions 8098 - 8277 from kicklib to kicklib2.

Location:

code/branches/kicklib2

Files:

• . (modified) (1 prop)
• src/external/tinyxml/CMakeLists.txt (modified) (1 diff)
• src/external/tinyxml/VERSION (modified) (1 diff)
• src/external/tinyxml/changes_orxonox.diff (modified) (1 diff)
• src/external/tinyxml/ticpp.cpp (modified) (4 diffs)
• src/external/tinyxml/ticpp.h (modified) (14 diffs)

code/branches/kicklib2/src/external/tinyxml/CMakeLists.txt

@@ -36 +36 @@
   ORXONOX_EXTERNAL
   NO_DLL_INTERFACE
-  VERSION
-    2.5.3
   SOURCE_FILES
     ${TINYXML_FILES}

code/branches/kicklib2/src/external/tinyxml/VERSION

@@ -1 @@
-TinyXML++ trunk checkout revision 106. Built on top of TinyXML 2.5.3
+TinyXML++ trunk checkout revision 122 (version 0.04a).
+Built with TinyXML 2.5.3.

code/branches/kicklib2/src/external/tinyxml/changes_orxonox.diff

@@ -1 @@
---- ticpp.h     Tue Nov  4 21:55:49 2008
-+++ ticpp.h     Sat Jan 10 14:48:41 2009
-@@ -1229,6 +1229,7 @@
+--- ticpp.h
++++ ticpp.h
+@@ -38,9 +38,7 @@
+ @todo add TYPECOUNT support. See ticpp::NodeFactory.
+ @todo Add a quick reference
+ */
+-#ifndef TIXML_USE_TICPP
+-       #define TIXML_USE_TICPP
+-#endif
++#ifdef TIXML_USE_TICPP
+ 
+ #ifndef TICPP_INCLUDED
+ #define TICPP_INCLUDED
+@@ -1231,6 +1229,7 @@
  
                 T* m_tiXmlPointer;              /**< Internal pointer to the TiXml Class which is being wrapped */
  
-+    public:
++       public:
                 /**
                 @internal
                 Gets the internal TinyXML pointer.
-@@ -1240,6 +1241,7 @@
+@@ -1242,6 +1241,7 @@
                         ValidatePointer();
                         return m_tiXmlPointer;
                 }
-+    protected:
++       protected:
  
                 /**
                 @internal
+@@ -1903,3 +1903,5 @@
+ }
+ 
+ #endif // TICPP_INCLUDED
++
++#endif // TIXML_USE_TICPP

code/branches/kicklib2/src/external/tinyxml/ticpp.cpp

@@ -370 +370 @@
 }
 
-Node* Node::InsertEndChild( Node& addThis )
+Node* Node::InsertEndChild( const Node& addThis )
 {
         if ( addThis.Type() == TiXmlNode::DOCUMENT )
@@ -404 +404 @@
 }
 
-Node* Node::InsertBeforeChild( Node* beforeThis, Node& addThis )
+Node* Node::InsertBeforeChild( Node* beforeThis, const Node& addThis )
 {
         if ( addThis.Type() == TiXmlNode::DOCUMENT )
@@ -423 +423 @@
 }
 
-Node* Node::InsertAfterChild( Node* afterThis, Node& addThis )
+Node* Node::InsertAfterChild( Node* afterThis, const Node& addThis )
 {
         if ( addThis.Type() == TiXmlNode::DOCUMENT )
@@ -442 +442 @@
 }
 
-Node* Node::ReplaceChild( Node* replaceThis, Node& withThis )
+Node* Node::ReplaceChild( Node* replaceThis, const Node& withThis )
 {
         if ( withThis.Type() == TiXmlNode::DOCUMENT )

code/branches/kicklib2/src/external/tinyxml/ticpp.h

@@ -225 +225 @@
                         return ( GetBasePointer() == rhs.GetBasePointer() );
                 }
-                
+
                 /**
                 Compare internal TiXml pointers to determine is both are wrappers around the same node
@@ -233 +233 @@
                         return ( GetBasePointer() != rhs.GetBasePointer() );
                 }
-                
+
                 /**
                 Builds detailed error string using TiXmlDocument::Error() and others
@@ -250 +250 @@
                                         {
                                                 full_message    << "\nDescription: " << doc->ErrorDesc()
-                                                                                << "\nFile: " << (strlen( doc->Value() ) > 0 ? doc->Value() : "<unnamed-file>") 
-                                                                                << "\nLine: " << doc->ErrorRow() 
+                                                                                << "\nFile: " << (strlen( doc->Value() ) > 0 ? doc->Value() : "<unnamed-file>")
+                                                                                << "\nLine: " << doc->ErrorRow()
                                                                                 << "\nColumn: " << doc->ErrorCol();
                                         }
@@ -287 +287 @@
                                 TICPPTHROW( "Internal TiXml Pointer is NULL" );
                         }
-                }               
+                }
 
                 /**
@@ -617 +617 @@
                 @see TiXmlNode::InsertEndChild
                 */
-                Node* InsertEndChild( Node& addThis );
+                Node* InsertEndChild( const Node& addThis );
 
                 /**
@@ -642 +642 @@
                 @see TiXmlNode::InsertBeforeChild
                 */
-                Node* InsertBeforeChild( Node* beforeThis, Node& addThis );
+                Node* InsertBeforeChild( Node* beforeThis, const Node& addThis );
 
                 /**
@@ -655 +655 @@
                 @see TiXmlNode::InsertAfterChild
                 */
-                Node* InsertAfterChild( Node* afterThis, Node& addThis );
+                Node* InsertAfterChild( Node* afterThis, const Node& addThis );
 
                 /**
@@ -667 +667 @@
                 @see TiXmlNode::ReplaceChild
                 */
-                Node* ReplaceChild( Node* replaceThis, Node& withThis );
+                Node* ReplaceChild( Node* replaceThis, const Node& withThis );
 
                 /**
@@ -1163 +1163 @@
                 /** Sets internal pointer to the Previous Sibling, or Iterator::END, if there are no prior siblings */
                 Iterator operator--(int)
-                {                       
+                {
                         Iterator tmp(*this);
                         --(*this);
@@ -1230 +1230 @@
                 T* m_tiXmlPointer;              /**< Internal pointer to the TiXml Class which is being wrapped */
 
-    public:
+        public:
                 /**
                 @internal
@@ -1242 +1242 @@
                         return m_tiXmlPointer;
                 }
-    protected:
+        protected:
 
                 /**
@@ -1400 +1400 @@
 
                 /**
-                Constructor.
-                Create a document with a name. The name of the document is also the filename of the xml.
-
-                @param documentName Name to set in the Document.
-                */
+                 * Constructor.
+                 * Create a document with a name. The name of the document is also the filename of the xml.
+                 * @param documentName Name to set in the Document.
+                 * @note LoadFile() needs to be called to actually load the data from the file specified by documentName
+                 *               SaveFile() needs to be called to save data to file specified by documentName.
+                 */
                 Document( const std::string& documentName );
 
@@ -1749 +1750 @@
                                 if ( throwIfNotFound )
                                 {
-                                        TICPPTHROW( "Attribute does not exist" );
+                                        const std::string error( std::string( "Attribute '" ) + name + std::string( "' does not exist" ) );
+                                        TICPPTHROW( error );
                                 }
                         }
@@ -1781 +1783 @@
                                 if ( throwIfNotFound )
                                 {
-                                        TICPPTHROW( "Attribute does not exist" );
+                                        const std::string error( std::string( "Attribute '" ) + name + std::string( "' does not exist" ) );
+                                        TICPPTHROW( error );
                                 }
                                 else