Changeset 2664 for code/branches/buildsystem3/src/tinyxml

Timestamp:

Feb 14, 2009, 10:53:45 PM (16 years ago)

Author:

rgrieder

Message:

Merged buildsystem2 to buildsystem3.

Note: Bare merge, just resolved conflicts. To testing, no nothing.

Location:

code/branches/buildsystem3

Files:

• . (modified) (2 props)
• src/tinyxml/CMakeLists.txt (modified) (1 diff)
• src/tinyxml/VERSION (copied) (copied from code/branches/buildsystem2/src/tinyxml/VERSION)
• src/tinyxml/changes.txt (copied) (copied from code/branches/buildsystem2/src/tinyxml/changes.txt)
• src/tinyxml/changes_orxonox.diff (copied) (copied from code/branches/buildsystem2/src/tinyxml/changes_orxonox.diff)
• src/tinyxml/readme.txt (copied) (copied from code/branches/buildsystem2/src/tinyxml/readme.txt)
• src/tinyxml/ticpp.cc (deleted)
• src/tinyxml/ticpp.cpp (copied) (copied from code/branches/buildsystem2/src/tinyxml/ticpp.cpp)
• src/tinyxml/ticpp.h (modified) (20 diffs)
• src/tinyxml/ticpprc.h (modified) (3 diffs)
• src/tinyxml/tinystr.cc (deleted)
• src/tinyxml/tinystr.cpp (copied) (copied from code/branches/buildsystem2/src/tinyxml/tinystr.cpp)
• src/tinyxml/tinyxml.cc (deleted)
• src/tinyxml/tinyxml.cpp (copied) (copied from code/branches/buildsystem2/src/tinyxml/tinyxml.cpp)
• src/tinyxml/tinyxml.h (modified) (1 diff)
• src/tinyxml/tinyxmlerror.cc (deleted)
• src/tinyxml/tinyxmlerror.cpp (copied) (copied from code/branches/buildsystem2/src/tinyxml/tinyxmlerror.cpp)
• src/tinyxml/tinyxmlparser.cc (deleted)
• src/tinyxml/tinyxmlparser.cpp (copied) (copied from code/branches/buildsystem2/src/tinyxml/tinyxmlparser.cpp)

code/branches/buildsystem3/src/tinyxml/CMakeLists.txt

@@ -1 @@
-SET( TINYXML_SRC_FILES
-  ticpp.cc
-  tinystr.cc
-  tinyxml.cc
-  tinyxmlerror.cc
-  tinyxmlparser.cc
+ #
+ #             ORXONOX - the hottest 3D action shooter ever to exist
+ #                             > www.orxonox.net <
+ #
+ #        This program is free software; you can redistribute it and/or
+ #         modify it under the terms of the GNU General Public License
+ #        as published by the Free Software Foundation; either version 2
+ #            of the License, or (at your option) any later version.
+ #
+ #       This program is distributed in the hope that it will be useful,
+ #        but WITHOUT ANY WARRANTY; without even the implied warranty of
+ #        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ #                 GNU General Public License for more details.
+ #
+ #   You should have received a copy of the GNU General Public License along
+ #      with this program; if not, write to the Free Software Foundation,
+ #     Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ #
+
+SET(TINYXML++_FILES
+  ticpp.h
+  ticpprc.h
+  tinystr.h
+  tinyxml.h
+
+  ticpp.cpp
+  tinystr.cpp
+  tinyxml.cpp
+  tinyxmlerror.cpp
+  tinyxmlparser.cpp
 )
+GENERATE_SOURCE_GROUPS(${TINYXML++_FILES})
 
-ADD_LIBRARY(tinyxml_orxonox SHARED ${TINYXML_SRC_FILES})
+IF(MSVC)
+  ADD_LIBRARY(tinyxml++_orxonox STATIC ${TINYXML++_FILES})
+ELSE()
+  ADD_LIBRARY(tinyxml++_orxonox SHARED ${TINYXML++_FILES})
+  ORXONOX_INSTALL(tinyxml++_orxonox)
+ENDIF()

code/branches/buildsystem3/src/tinyxml/ticpp.h

@@ -1 @@
-#define TIXML_USE_TICPP
-
 /*
 http://code.google.com/p/ticpp/
@@ -30 +28 @@
 @date           04/11/2006
 
-@version  0.04b by nico@orxonox.net: gcc-4.3 compilation hotfixes
 @version        0.04a by edam@waxworlds.org: based Exception based on std::exception; added stream
                                         << and >> support; added Document::Parse(); bug fix; improved THROW() macro.
@@ -94 +91 @@
                 file = file.substr( file.find_last_of( "\\/" ) + 1 );                           \
                 full_message << message << " <" << file << "@" << __LINE__ << ">";      \
+                full_message << BuildDetailedErrorString();                                                     \
                 throw Exception( full_message.str() );                                                          \
         }
@@ -221 +219 @@
 
                 /**
+                Compare internal TiXml pointers to determine is both are wrappers around the same node
+                */
+                bool operator == ( const Base& rhs ) const
+                {
+                        return ( GetBasePointer() == rhs.GetBasePointer() );
+                }
+                
+                /**
+                Compare internal TiXml pointers to determine is both are wrappers around the same node
+                */
+                bool operator != ( const Base& rhs ) const
+                {
+                        return ( GetBasePointer() != rhs.GetBasePointer() );
+                }
+                
+                /**
+                Builds detailed error string using TiXmlDocument::Error() and others
+                */
+                std::string BuildDetailedErrorString() const
+                {
+                        std::ostringstream full_message;
+                        #ifndef TICPP_NO_RTTI
+                        TiXmlNode* node = dynamic_cast< TiXmlNode* >( GetBasePointer() );
+                        if ( node != 0 )
+                        {
+                                TiXmlDocument* doc = node->GetDocument();
+                                if ( doc != 0 )
+                                {
+                                        if ( doc->Error() )
+                                        {
+                                                full_message    << "\nDescription: " << doc->ErrorDesc()
+                                                                                << "\nFile: " << (strlen( doc->Value() ) > 0 ? doc->Value() : "<unnamed-file>") 
+                                                                                << "\nLine: " << doc->ErrorRow() 
+                                                                                << "\nColumn: " << doc->ErrorCol();
+                                        }
+                                }
+                        }
+                        #endif
+                        return full_message.str();
+                }
+
+                /**
                 Destructor
                 */
                 virtual ~Base()
                 {
-                        DeleteSpawnedWrappers();
                 }
 
@@ -231 +270 @@
                 mutable TiCppRCImp* m_impRC;    /**< Holds status of internal TiXmlPointer - use this to determine if object has been deleted already */
 
-                mutable std::vector< Base* > m_spawnedWrappers; /**< Remember all wrappers that we've created with 'new' - ( e.g. NodeFactory, FirstChildElement, etc. )*/
-
                 /**
                 @internal
@@ -250 +287 @@
                                 TICPPTHROW( "Internal TiXml Pointer is NULL" );
                         }
-                }
-
-                /**
-                @internal
-                Delete all container objects we've spawned with 'new'.
-                */
-                void DeleteSpawnedWrappers()
-                {
-                        std::vector< Base* >::reverse_iterator wrapper;
-                        for ( wrapper = m_spawnedWrappers.rbegin(); wrapper != m_spawnedWrappers.rend(); ++wrapper )
-                        {
-                                delete *wrapper;
-                        }
-                        m_spawnedWrappers.clear();
-                }
+                }               
 
                 /**
@@ -875 +898 @@
                 bool NoChildren() const;
 
+                #ifndef TICPP_NO_RTTI
                 /**
                 Pointer conversion ( NOT OBJECT CONVERSION ) - replaces TiXmlNode::ToElement, TiXmlNode::ToDocument, TiXmlNode::ToComment, etc.
@@ -895 +919 @@
                         return pointer;
                 }
+                #endif
 
                 /**
@@ -1085 +1110 @@
 
                 /// Constructor
-                Iterator( const Iterator& it, const std::string& value  = "" )
-                        : m_p( it.m_p ), m_value( value )
+                Iterator( const Iterator& it )
+                        : m_p( it.m_p ), m_value( it.m_value )
                 {
                 }
@@ -1103 +1128 @@
                 {
                         m_p = it.m_p;
+                        m_value = it.m_value;
                         return *this;
                 }
@@ -1121 +1147 @@
 
                 /** Sets internal pointer to the Next Sibling, or Iterator::END, if there are no more siblings */
-                Iterator& operator++(int)
-                {
-                        return this->operator ++();
+                Iterator operator++(int)
+                {
+                        Iterator tmp(*this);
+                        ++(*this);
+                        return tmp;
                 }
 
@@ -1134 +1162 @@
 
                 /** Sets internal pointer to the Previous Sibling, or Iterator::END, if there are no prior siblings */
-                Iterator& operator--(int)
-                {
-                        return this->operator --();
+                Iterator operator--(int)
+                {                       
+                        Iterator tmp(*this);
+                        --(*this);
+                        return tmp;
                 }
 
                 /** Compares internal pointer */
-                bool operator!=( T* p ) const
-                {
-                        return m_p != p;
+                bool operator!=( const T* p ) const
+                {
+                        if ( m_p == p )
+                        {
+                                return false;
+                        }
+                        if ( 0 == m_p || 0 == p )
+                        {
+                                return true;
+                        }
+                        return *m_p != *p;
                 }
 
@@ -1148 +1186 @@
                 bool operator!=( const Iterator& it ) const
                 {
-                        return m_p != it.m_p;
+                        return operator!=( it.m_p );
                 }
 
@@ -1154 +1192 @@
                 bool operator==( T* p ) const
                 {
-                        return m_p == p;
+                        if ( m_p == p )
+                        {
+                                return true;
+                        }
+                        if ( 0 == m_p || 0 == p )
+                        {
+                                return false;
+                        }
+                        return *m_p == *p;
                 }
 
@@ -1160 +1206 @@
                 bool operator==( const Iterator& it ) const
                 {
-                        return m_p == it.m_p;
+                        return operator==( it.m_p );
                 }
 
@@ -1220 +1266 @@
                         if ( 0 == tiXmlPointer )
                         {
-                                TICPPTHROW( "Can not create a " << typeid( T ).name() );
+                                #ifdef TICPP_NO_RTTI
+                                        TICPPTHROW( "Can not create TinyXML objext" );
+                                #else
+                                        TICPPTHROW( "Can not create a " << typeid( T ).name() );
+                                #endif
                         }
                         SetTiXmlPointer( tiXmlPointer );
@@ -1233 +1283 @@
                 virtual void operator=( const NodeImp<T>& copy )
                 {
-                        DeleteSpawnedWrappers();
-
                         // Dropping the reference to the old object
                         this->m_impRC->DecRef();
@@ -1267 +1315 @@
                 virtual ~NodeImp()
                 {
-                        // The spawnedWrappers need to be deleted before m_tiXmlPointer
-                        DeleteSpawnedWrappers();
                         m_impRC->DecRef();
                 }
@@ -1685 +1731 @@
 
                 /**
+                Returns an attribute of @a name from an element.
+                Uses FromString to convert the string to the type of choice.
+
+                @param name                             The name of the attribute you are querying.
+                @param throwIfNotFound  [DEF]   If true, will throw an exception if the attribute doesn't exist
+                @throws Exception When the attribute doesn't exist and throwIfNotFound is true
+                @see GetAttributeOrDefault
+                */
+                template < class T >
+                        T GetAttribute( const std::string& name, bool throwIfNotFound = true ) const
+                {
+                        // Get the attribute's value as a std::string
+                        std::string temp;
+                        T value;
+                        if ( !GetAttributeImp( name, &temp ) )
+                        {
+                                if ( throwIfNotFound )
+                                {
+                                        TICPPTHROW( "Attribute does not exist" );
+                                }
+                        }
+                        else
+                        {
+                                // Stream the value from the string to T
+                                FromString( temp, &value );
+                        }
+
+                        return value;
+                }
+
+                /**
                 Gets an attribute of @a name from an element.
                 Uses FromString to convert the string to the type of choice.
@@ -1727 +1804 @@
                 std::string GetAttribute( const std::string& name ) const;
 
+                /**
+                Returns true, if attribute exists
+
+                @param name The name of the attribute you are checking.
+                @return Existence of attribute
+                */
+                bool HasAttribute( const std::string& name ) const;
+
+                /**
+                Removes attribute from element.
+
+                @param name The name of the attribute to remove.
+                */
+                void RemoveAttribute( const std::string& name );
+
         private:
 

code/branches/buildsystem3/src/tinyxml/ticpprc.h

@@ -1 @@
-#define TIXML_USE_TICPP
-
 /*
 http://code.google.com/p/ticpp/
@@ -28 +26 @@
 #define TICPPRC_INCLUDED
 
+#include <vector>
 
 // Forward declare ticpp::Node, so it can be made a friend of TiCppRC
@@ -64 +63 @@
         */
         virtual ~TiCppRC();
+        
+        std::vector< ticpp::Base* > m_spawnedWrappers; /**< Remember all wrappers that we've created with 'new' - ( e.g. NodeFactory, FirstChildElement, etc. )*/
+
+        /**
+        Delete all container objects we've spawned with 'new'.
+        */
+        void DeleteSpawnedWrappers();
 };
 

code/branches/buildsystem3/src/tinyxml/tinyxml.h

@@ -1 @@
-#define TIXML_USE_TICPP
-
 /*
 www.sourceforge.net/projects/tinyxml