Skip to content
Browse files

Merge pull request #931 from amejia1/system-tinyxml-Eden

System tinyxml eden
  • Loading branch information...
2 parents 701e543 + 565c88f commit 6f76eeef2a498208659ead18774451328754578d @amejia1 amejia1 committed
Showing with 418 additions and 6,271 deletions.
  1. +0 −1 Makefile.in
  2. +1 −1 README.linux
  3. +1 −1 README.ubuntu
  4. +1 −0 configure.in
  5. +0 −9 lib/tinyXML/Makefile
  6. +0 −116 lib/tinyXML/tinystr.cpp
  7. +0 −319 lib/tinyXML/tinystr.h
  8. +0 −2,043 lib/tinyXML/tinyxml.cpp
  9. +0 −1,834 lib/tinyXML/tinyxml.h
  10. +0 −53 lib/tinyXML/tinyxmlerror.cpp
  11. +0 −1,683 lib/tinyXML/tinyxmlparser.cpp
  12. +13 −0 project/BuildDependencies/scripts/tinyxml_d.bat
  13. +2 −0 project/BuildDependencies/scripts/tinyxml_d.txt
  14. +3 −7 project/VS2010Express/XBMC.vcxproj
  15. +1 −22 project/VS2010Express/XBMC.vcxproj.filters
  16. +1 −1 xbmc/Application.cpp
  17. +3 −3 xbmc/Favourites.cpp
  18. +2 −2 xbmc/LangInfo.cpp
  19. +2 −2 xbmc/NfoFile.h
  20. +2 −2 xbmc/PasswordManager.cpp
  21. +4 −4 xbmc/addons/Addon.cpp
  22. +4 −4 xbmc/addons/Addon.h
  23. +1 −1 xbmc/addons/AddonInstaller.cpp
  24. +2 −3 xbmc/addons/AddonManager.cpp
  25. +2 −2 xbmc/addons/Repository.cpp
  26. +12 −12 xbmc/addons/Scraper.cpp
  27. +3 −4 xbmc/cores/dvdplayer/DVDInputStreams/DVDStateSerializer.cpp
  28. +2 −2 xbmc/cores/dvdplayer/Edl.cpp
  29. +1 −1 xbmc/cores/playercorefactory/PlayerCoreConfig.h
  30. +1 −1 xbmc/cores/playercorefactory/PlayerSelectionRule.cpp
  31. +1 −1 xbmc/dialogs/GUIDialogPlayEject.cpp
  32. +1 −1 xbmc/filesystem/DAVDirectory.cpp
  33. +1 −1 xbmc/filesystem/DAVDirectory.h
  34. +2 −2 xbmc/filesystem/DirectoryTuxBox.cpp
  35. +2 −2 xbmc/filesystem/LastFMDirectory.h
  36. +2 −2 xbmc/filesystem/RSSDirectory.cpp
  37. +2 −2 xbmc/filesystem/RTVDirectory.cpp
  38. +1 −1 xbmc/filesystem/Slingbox.cpp
  39. +2 −2 xbmc/guilib/GUIAudioManager.cpp
  40. +1 −1 xbmc/guilib/GUIBaseContainer.cpp
  41. +3 −3 xbmc/guilib/GUIColorManager.cpp
  42. +2 −2 xbmc/guilib/GUIColorManager.h
  43. +2 −2 xbmc/guilib/GUIControlProfiler.cpp
  44. +4 −4 xbmc/guilib/GUIFontManager.cpp
  45. +2 −2 xbmc/guilib/GUIFontManager.h
  46. +4 −4 xbmc/guilib/GUIIncludes.cpp
  47. +1 −1 xbmc/guilib/GUIListItemLayout.cpp
  48. +1 −1 xbmc/guilib/GUITextBox.cpp
  49. +2 −2 xbmc/guilib/GUIWindow.cpp
  50. +2 −2 xbmc/guilib/GUIWindow.h
  51. +1 −1 xbmc/guilib/LocalizeStrings.cpp
  52. +1 −1 xbmc/guilib/Makefile.in
  53. +1 −1 xbmc/guilib/VisibleEffect.cpp
  54. +5 −5 xbmc/input/ButtonTranslator.cpp
  55. +2 −2 xbmc/input/KeyboardLayoutConfiguration.cpp
  56. +2 −2 xbmc/interfaces/http-api/XBMCConfiguration.h
  57. +1 −1 xbmc/interfaces/info/SkinVariable.cpp
  58. +2 −2 xbmc/interfaces/python/xbmcmodule/GUIPythonWindowXML.cpp
  59. +2 −2 xbmc/interfaces/python/xbmcmodule/control.cpp
  60. +2 −2 xbmc/interfaces/python/xbmcmodule/pyutil.cpp
  61. +1 −1 xbmc/music/Album.cpp
  62. +2 −2 xbmc/music/Artist.cpp
  63. +3 −3 xbmc/music/LastFmManager.cpp
  64. +2 −2 xbmc/music/MusicDatabase.cpp
  65. +1 −1 xbmc/music/infoscanner/MusicAlbumInfo.h
  66. +1 −1 xbmc/music/infoscanner/MusicArtistInfo.h
  67. +2 −2 xbmc/network/libscrobbler/scrobbler.cpp
  68. +2 −2 xbmc/peripherals/Peripherals.cpp
  69. +3 −3 xbmc/peripherals/devices/Peripheral.cpp
  70. +2 −2 xbmc/playlists/PlayListB4S.cpp
  71. +3 −3 xbmc/playlists/PlayListPLS.cpp
  72. +2 −2 xbmc/playlists/PlayListWPL.cpp
  73. +1 −1 xbmc/playlists/PlayListXML.cpp
  74. +1 −1 xbmc/playlists/SmartPlayList.cpp
  75. +2 −2 xbmc/playlists/SmartPlayList.h
  76. +3 −3 xbmc/programs/Shortcut.cpp
  77. +1 −1 xbmc/settings/AdvancedSettings.cpp
  78. +1 −1 xbmc/settings/GUISettings.cpp
  79. +1 −1 xbmc/settings/GUIWindowSettingsCategory.cpp
  80. +11 −11 xbmc/settings/Settings.cpp
  81. +3 −3 xbmc/storage/MediaManager.cpp
  82. +2 −2 xbmc/utils/Fanart.cpp
  83. +1 −1 xbmc/utils/LCD.cpp
  84. +1 −1 xbmc/utils/LCD.h
  85. +1 −1 xbmc/utils/LangCodeExpander.cpp
  86. +1 −0 xbmc/utils/Makefile
  87. +2 −2 xbmc/utils/RssReader.h
  88. +3 −3 xbmc/utils/ScraperParser.cpp
  89. +3 −3 xbmc/utils/ScraperParser.h
  90. +2 −2 xbmc/utils/ScraperUrl.cpp
  91. +3 −3 xbmc/utils/TuxBoxUtil.cpp
  92. +1 −1 xbmc/utils/Weather.cpp
  93. +164 −0 xbmc/utils/XBMCTinyXML.cpp
  94. +52 −0 xbmc/utils/XBMCTinyXML.h
  95. +2 −2 xbmc/utils/XMLUtils.cpp
  96. +2 −3 xbmc/utils/XMLUtils.h
  97. +2 −2 xbmc/video/VideoDatabase.cpp
  98. +1 −1 xbmc/video/VideoInfoDownloader.h
  99. +3 −3 xbmc/video/VideoInfoTag.cpp
  100. +3 −3 xbmc/windowing/X11/XRandR.cpp
View
1 Makefile.in
@@ -26,7 +26,6 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
lib/libXDAAP/libxdaap.a \
lib/libhts/libhts.a \
lib/libsquish/libsquish.a \
- lib/tinyXML/tinyxml.a \
lib/xbmc-dll-symbols/dll-symbols.a \
xbmc/addons/addons.a \
xbmc/cdrip/cdrip.a \
View
2 README.linux
@@ -55,7 +55,7 @@ Build-Depends: debhelper (>= 7.0.50~), python-support, cmake,
libbluetooth-dev, zlib1g-dev, libsmbclient-dev, libboost-thread-dev
libiso9660-dev, libssl-dev, lsb-release, libvdpau-dev, libmicrohttpd-dev,
libmodplug-dev, librtmp-dev, libcrystalhd-dev, curl, python-dev, libyajl-dev,
- libplist-dev, libusb-dev, libudev-dev, libltdl-dev
+ libplist-dev, libusb-dev, libudev-dev, libltdl-dev, libtinyxml-dev
*** For developers and anyone else who compiles frequently it is recommended to
use ccache
View
2 README.ubuntu
@@ -44,7 +44,7 @@ Two methods exist to install the required Ubuntu packages:
For Ubuntu (all versions >= 7.04):
- # sudo apt-get install git-core make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound2-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmpeg3-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs python-dev libyajl-dev libboost-thread-dev libplist-dev libusb-dev libudev-dev
+ # sudo apt-get install git-core make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound2-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmpeg3-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs python-dev libyajl-dev libboost-thread-dev libplist-dev libusb-dev libudev-dev libtinyxml-dev
For >= 10.10:
# sudo apt-get install autopoint libltdl-dev
View
1 configure.in
@@ -719,6 +719,7 @@ AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([ssh], [sftp_tell64],, AC_MSG_RESULT([Could not find suitable version of libssh]))
AC_CHECK_LIB([bluetooth], [hci_devid],, AC_MSG_RESULT([Could not find suitable version of libbluetooth]))
AC_CHECK_LIB([yajl], [main],, AC_MSG_ERROR($missing_library))
+AC_CHECK_LIB([tinyxml], [main],, AC_MSG_ERROR($missing_library))
PKG_CHECK_MODULES([FONTCONFIG], [fontconfig],
[INCLUDES="$INCLUDES $FONTCONFIG_CFLAGS"; LIBS="$LIBS $FONTCONFIG_LIBS"],
View
9 lib/tinyXML/Makefile
@@ -1,9 +0,0 @@
-INCLUDES=-I. -I../../xbmc -I../../xbmc/linux
-SRCS=tinystr.cpp \
- tinyxml.cpp \
- tinyxmlerror.cpp \
- tinyxmlparser.cpp
-LIB=tinyxml.a
-
-include ../../Makefile.include
--include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
View
116 lib/tinyXML/tinystr.cpp
@@ -1,116 +0,0 @@
-/*
-www.sourceforge.net/projects/tinyxml
-Original file by Yves Berquin.
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any
-purpose, including commercial applications, and to alter it and
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must
-not claim that you wrote the original software. If you use this
-software in a product, an acknowledgment in the product documentation
-would be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and
-must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-distribution.
-*/
-
-/*
- * THIS FILE WAS ALTERED BY Tyge Løvset, 7. April 2005.
- */
-
-
-#ifndef TIXML_USE_STL
-
-#include "tinystr.h"
-
-// Error value for find primitive
-const TiXmlString::size_type TiXmlString::npos = static_cast< TiXmlString::size_type >(-1);
-
-
-// Null rep.
-TiXmlString::Rep TiXmlString::nullrep_ = { 0, 0, { '\0' } };
-
-
-void TiXmlString::reserve (size_type cap)
-{
- if (cap > capacity())
- {
- TiXmlString tmp;
- tmp.init(length(), cap);
- memcpy(tmp.start(), data(), length());
- swap(tmp);
- }
-}
-
-
-TiXmlString& TiXmlString::assign(const char* str, size_type len)
-{
- size_type cap = capacity();
- if (len > cap || cap > 3*(len + 8))
- {
- TiXmlString tmp;
- tmp.init(len);
- memcpy(tmp.start(), str, len);
- swap(tmp);
- }
- else
- {
- memmove(start(), str, len);
- set_size(len);
- }
- return *this;
-}
-
-
-TiXmlString& TiXmlString::append(const char* str, size_type len)
-{
- size_type newsize = length() + len;
- if (newsize > capacity())
- {
- reserve (newsize + capacity());
- }
- memmove(finish(), str, len);
- set_size(newsize);
- return *this;
-}
-
-
-TiXmlString operator + (const TiXmlString & a, const TiXmlString & b)
-{
- TiXmlString tmp;
- tmp.reserve(a.length() + b.length());
- tmp += a;
- tmp += b;
- return tmp;
-}
-
-TiXmlString operator + (const TiXmlString & a, const char* b)
-{
- TiXmlString tmp;
- TiXmlString::size_type b_len = static_cast<TiXmlString::size_type>( strlen(b) );
- tmp.reserve(a.length() + b_len);
- tmp += a;
- tmp.append(b, b_len);
- return tmp;
-}
-
-TiXmlString operator + (const char* a, const TiXmlString & b)
-{
- TiXmlString tmp;
- TiXmlString::size_type a_len = static_cast<TiXmlString::size_type>( strlen(a) );
- tmp.reserve(a_len + b.length());
- tmp.append(a, a_len);
- tmp += b;
- return tmp;
-}
-
-
-#endif // TIXML_USE_STL
View
319 lib/tinyXML/tinystr.h
@@ -1,319 +0,0 @@
-/*
-www.sourceforge.net/projects/tinyxml
-Original file by Yves Berquin.
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any
-purpose, including commercial applications, and to alter it and
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must
-not claim that you wrote the original software. If you use this
-software in a product, an acknowledgment in the product documentation
-would be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and
-must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-distribution.
-*/
-
-/*
- * THIS FILE WAS ALTERED BY Tyge Lovset, 7. April 2005.
- *
- * - completely rewritten. compact, clean, and fast implementation.
- * - sizeof(TiXmlString) = pointer size (4 bytes on 32-bit systems)
- * - fixed reserve() to work as per specification.
- * - fixed buggy compares operator==(), operator<(), and operator>()
- * - fixed operator+=() to take a const ref argument, following spec.
- * - added "copy" constructor with length, and most compare operators.
- * - added swap(), clear(), size(), capacity(), operator+().
- */
-
-#ifndef TIXML_USE_STL
-
-#ifndef TIXML_STRING_INCLUDED
-#define TIXML_STRING_INCLUDED
-
-#include <assert.h>
-#include <string.h>
-
-/* The support for explicit isn't that universal, and it isn't really
- required - it is used to check that the TiXmlString class isn't incorrectly
- used. Be nice to old compilers and macro it here:
-*/
-#if defined(_MSC_VER) && (_MSC_VER >= 1200 )
- // Microsoft visual studio, version 6 and higher.
- #define TIXML_EXPLICIT explicit
-#elif defined(__GNUC__) && (__GNUC__ >= 3 )
- // GCC version 3 and higher.s
- #define TIXML_EXPLICIT explicit
-#else
- #define TIXML_EXPLICIT
-#endif
-
-
-/*
- TiXmlString is an emulation of a subset of the std::string template.
- Its purpose is to allow compiling TinyXML on compilers with no or poor STL support.
- Only the member functions relevant to the TinyXML project have been implemented.
- The buffer allocation is made by a simplistic power of 2 like mechanism : if we increase
- a string and there's no more room, we allocate a buffer twice as big as we need.
-*/
-class TiXmlString
-{
- public :
- // The size type used
- typedef size_t size_type;
-
- // Error value for find primitive
- static const size_type npos; // = -1;
-
-
- // TiXmlString empty constructor
- TiXmlString () : rep_(&nullrep_)
- {
- }
-
- // TiXmlString copy constructor
- TiXmlString ( const TiXmlString & copy) : rep_(0)
- {
- init(copy.length());
- memcpy(start(), copy.data(), length());
- }
-
- // TiXmlString constructor, based on a string
- TIXML_EXPLICIT TiXmlString ( const char * copy) : rep_(0)
- {
- init( static_cast<size_type>( strlen(copy) ));
- memcpy(start(), copy, length());
- }
-
- // TiXmlString constructor, based on a string
- TIXML_EXPLICIT TiXmlString ( const char * str, size_type len) : rep_(0)
- {
- init(len);
- memcpy(start(), str, len);
- }
-
- // TiXmlString destructor
- ~TiXmlString ()
- {
- quit();
- }
-
- // = operator
- TiXmlString& operator = (const char * copy)
- {
- return assign( copy, (size_type)strlen(copy));
- }
-
- // = operator
- TiXmlString& operator = (const TiXmlString & copy)
- {
- return assign(copy.start(), copy.length());
- }
-
-
- // += operator. Maps to append
- TiXmlString& operator += (const char * suffix)
- {
- return append(suffix, static_cast<size_type>( strlen(suffix) ));
- }
-
- // += operator. Maps to append
- TiXmlString& operator += (char single)
- {
- return append(&single, 1);
- }
-
- // += operator. Maps to append
- TiXmlString& operator += (const TiXmlString & suffix)
- {
- return append(suffix.data(), suffix.length());
- }
-
-
- // Convert a TiXmlString into a null-terminated char *
- const char * c_str () const { return rep_->str; }
-
- // Convert a TiXmlString into a char * (need not be null terminated).
- const char * data () const { return rep_->str; }
-
- // Return the length of a TiXmlString
- size_type length () const { return rep_->size; }
-
- // Alias for length()
- size_type size () const { return rep_->size; }
-
- // Checks if a TiXmlString is empty
- bool empty () const { return rep_->size == 0; }
-
- // Return capacity of string
- size_type capacity () const { return rep_->capacity; }
-
-
- // single char extraction
- const char& at (size_type index) const
- {
- assert( index < length() );
- return rep_->str[ index ];
- }
-
- // [] operator
- char& operator [] (size_type index) const
- {
- assert( index < length() );
- return rep_->str[ index ];
- }
-
- // find a char in a string. Return TiXmlString::npos if not found
- size_type find (char lookup) const
- {
- return find(lookup, 0);
- }
-
- // find a char in a string from an offset. Return TiXmlString::npos if not found
- size_type find (char tofind, size_type offset) const
- {
- if (offset >= length()) return npos;
-
- for (const char* p = c_str() + offset; *p != '\0'; ++p)
- {
- if (*p == tofind) return static_cast< size_type >( p - c_str() );
- }
- return npos;
- }
-
- void clear ()
- {
- //Lee:
- //The original was just too strange, though correct:
- // TiXmlString().swap(*this);
- //Instead use the quit & re-init:
- quit();
- init(0,0);
- }
-
- /* Function to reserve a big amount of data when we know we'll need it. Be aware that this
- function DOES NOT clear the content of the TiXmlString if any exists.
- */
- void reserve (size_type cap);
-
- TiXmlString& assign (const char* str, size_type len);
-
- TiXmlString& append (const char* str, size_type len);
-
- void swap (TiXmlString& other)
- {
- Rep* r = rep_;
- rep_ = other.rep_;
- other.rep_ = r;
- }
-
- private:
-
- void init(size_type sz) { init(sz, sz); }
- void set_size(size_type sz) { rep_->str[ rep_->size = sz ] = '\0'; }
- char* start() const { return rep_->str; }
- char* finish() const { return rep_->str + rep_->size; }
-
- struct Rep
- {
- size_type size, capacity;
- char str[1];
- };
-
- void init(size_type sz, size_type cap)
- {
- if (cap)
- {
- // Lee: the original form:
- // rep_ = static_cast<Rep*>(operator new(sizeof(Rep) + cap));
- // doesn't work in some cases of new being overloaded. Switching
- // to the normal allocation, although use an 'int' for systems
- // that are overly picky about structure alignment.
- const size_type bytesNeeded = sizeof(Rep) + cap;
- const size_type intsNeeded = ( bytesNeeded + sizeof(int) - 1 ) / sizeof( int );
- rep_ = reinterpret_cast<Rep*>( new int[ intsNeeded ] );
-
- rep_->str[ rep_->size = sz ] = '\0';
- rep_->capacity = cap;
- }
- else
- {
- rep_ = &nullrep_;
- }
- }
-
- void quit()
- {
- if (rep_ != &nullrep_)
- {
- // The rep_ is really an array of ints. (see the allocator, above).
- // Cast it back before delete, so the compiler won't incorrectly call destructors.
- delete [] ( reinterpret_cast<int*>( rep_ ) );
- }
- }
-
- Rep * rep_;
- static Rep nullrep_;
-
-} ;
-
-
-inline bool operator == (const TiXmlString & a, const TiXmlString & b)
-{
- return ( a.length() == b.length() ) // optimization on some platforms
- && ( strcmp(a.c_str(), b.c_str()) == 0 ); // actual compare
-}
-inline bool operator < (const TiXmlString & a, const TiXmlString & b)
-{
- return strcmp(a.c_str(), b.c_str()) < 0;
-}
-
-inline bool operator != (const TiXmlString & a, const TiXmlString & b) { return !(a == b); }
-inline bool operator > (const TiXmlString & a, const TiXmlString & b) { return b < a; }
-inline bool operator <= (const TiXmlString & a, const TiXmlString & b) { return !(b < a); }
-inline bool operator >= (const TiXmlString & a, const TiXmlString & b) { return !(a < b); }
-
-inline bool operator == (const TiXmlString & a, const char* b) { return strcmp(a.c_str(), b) == 0; }
-inline bool operator == (const char* a, const TiXmlString & b) { return b == a; }
-inline bool operator != (const TiXmlString & a, const char* b) { return !(a == b); }
-inline bool operator != (const char* a, const TiXmlString & b) { return !(b == a); }
-
-TiXmlString operator + (const TiXmlString & a, const TiXmlString & b);
-TiXmlString operator + (const TiXmlString & a, const char* b);
-TiXmlString operator + (const char* a, const TiXmlString & b);
-
-
-/*
- TiXmlOutStream is an emulation of std::ostream. It is based on TiXmlString.
- Only the operators that we need for TinyXML have been developped.
-*/
-class TiXmlOutStream : public TiXmlString
-{
-public :
-
- // TiXmlOutStream << operator.
- TiXmlOutStream & operator << (const TiXmlString & in)
- {
- *this += in;
- return *this;
- }
-
- // TiXmlOutStream << operator.
- TiXmlOutStream & operator << (const char * in)
- {
- *this += in;
- return *this;
- }
-
-} ;
-
-#endif // TIXML_STRING_INCLUDED
-#endif // TIXML_USE_STL
View
2,043 lib/tinyXML/tinyxml.cpp
0 additions, 2,043 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
1,834 lib/tinyXML/tinyxml.h
0 additions, 1,834 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
53 lib/tinyXML/tinyxmlerror.cpp
@@ -1,53 +0,0 @@
-/*
-www.sourceforge.net/projects/tinyxml
-Original code (2.0 and earlier )copyright (c) 2000-2006 Lee Thomason (www.grinninglizard.com)
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any
-purpose, including commercial applications, and to alter it and
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must
-not claim that you wrote the original software. If you use this
-software in a product, an acknowledgment in the product documentation
-would be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and
-must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-distribution.
-*/
-
-#include "tinyxml.h"
-
-// The goal of the seperate error file is to make the first
-// step towards localization. tinyxml (currently) only supports
-// english error messages, but the could now be translated.
-//
-// It also cleans up the code a bit.
-//
-
-const char* TiXmlBase::errorString[ TIXML_ERROR_STRING_COUNT ] =
-{
- "No error",
- "Error",
- "Failed to open file",
- "Memory allocation failed.",
- "Error parsing Element.",
- "Failed to read Element name",
- "Error reading Element value.",
- "Error reading Attributes.",
- "Error: empty tag.",
- "Error reading end tag.",
- "Error parsing Unknown.",
- "Error parsing Comment.",
- "Error parsing Declaration.",
- "Error document empty.",
- "Error null (0) or unexpected EOF found in input stream.",
- "Error parsing CDATA.",
- "Error when TiXmlDocument added to document, because TiXmlDocument can only be at the root.",
-};
View
1,683 lib/tinyXML/tinyxmlparser.cpp
0 additions, 1,683 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
13 project/BuildDependencies/scripts/tinyxml_d.bat
@@ -0,0 +1,13 @@
+@ECHO ON
+
+SET LOC_PATH=%CD%
+SET FILES=%LOC_PATH%\tinyxml_d.txt
+
+CALL dlextract.bat tinyxml %FILES%
+
+cd %TMP_PATH%
+
+xcopy tinyxml-2.6.2-win32\include\tinyxml\* "%CUR_PATH%\include\" /E /Q /I /Y
+copy tinyxml-2.6.2-win32\lib\* "%CUR_PATH%\lib\" /Y
+
+cd %LOC_PATH%
View
2 project/BuildDependencies/scripts/tinyxml_d.txt
@@ -0,0 +1,2 @@
+; filename mirror of the file
+tinyxml-2.6.2-win32.7z http://mirrors.xbmc.org/build-deps/win32/
View
10 project/VS2010Express/XBMC.vcxproj
@@ -281,10 +281,6 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\lib\SlingboxLib\SlingboxLib.cpp" />
- <ClCompile Include="..\..\lib\tinyXML\tinystr.cpp" />
- <ClCompile Include="..\..\lib\tinyXML\tinyxml.cpp" />
- <ClCompile Include="..\..\lib\tinyXML\tinyxmlerror.cpp" />
- <ClCompile Include="..\..\lib\tinyXML\tinyxmlparser.cpp" />
<ClCompile Include="..\..\xbmc\addons\AddonDatabase.cpp" />
<ClCompile Include="..\..\xbmc\addons\AddonInstaller.cpp" />
<ClCompile Include="..\..\xbmc\addons\AddonVersion.cpp" />
@@ -825,6 +821,7 @@
<ClCompile Include="..\..\xbmc\utils\Variant.cpp" />
<ClCompile Include="..\..\xbmc\utils\Weather.cpp" />
<ClCompile Include="..\..\xbmc\utils\Win32Exception.cpp" />
+ <ClCompile Include="..\..\xbmc\utils\XBMCTinyXML.cpp" />
<ClCompile Include="..\..\xbmc\utils\XMLUtils.cpp" />
<ClCompile Include="..\..\xbmc\video\Bookmark.cpp" />
<ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogAudioSubtitleSettings.cpp" />
@@ -1202,8 +1199,6 @@
<ClInclude Include="..\..\lib\DllAvFilter.h" />
<ClInclude Include="..\..\lib\ffmpeg\include-xbmc-win32\libavutil\avconfig.h" />
<ClInclude Include="..\..\lib\SlingboxLib\SlingboxLib.h" />
- <ClInclude Include="..\..\lib\tinyXML\tinystr.h" />
- <ClInclude Include="..\..\lib\tinyXML\tinyxml.h" />
<ClInclude Include="..\..\xbmc\addons\AddonDatabase.h" />
<ClInclude Include="..\..\xbmc\addons\AddonInstaller.h" />
<ClInclude Include="..\..\xbmc\addons\AddonVersion.h" />
@@ -1699,6 +1694,7 @@
<ClInclude Include="..\..\xbmc\utils\Variant.h" />
<ClInclude Include="..\..\xbmc\utils\Weather.h" />
<ClInclude Include="..\..\xbmc\utils\Win32Exception.h" />
+ <ClInclude Include="..\..\xbmc\utils\XBMCTinyXML.h" />
<ClInclude Include="..\..\xbmc\utils\XMLUtils.h" />
<ClInclude Include="..\..\xbmc\video\Bookmark.h" />
<ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogAudioSubtitleSettings.h" />
@@ -2123,4 +2119,4 @@
</VisualStudio>
</ProjectExtensions>
<Import Project="$(SolutionDir)\$(ProjectFileName).targets.user" Condition="Exists('$(SolutionDir)\$(ProjectFileName).targets.user')" />
-</Project>
+</Project>
View
23 project/VS2010Express/XBMC.vcxproj.filters
@@ -199,9 +199,6 @@
<Filter Include="libs\sqlite">
<UniqueIdentifier>{c9d35dd5-e25d-4b76-bcbe-e8c855de58e7}</UniqueIdentifier>
</Filter>
- <Filter Include="libs\tinyxml">
- <UniqueIdentifier>{b084bece-821c-445c-951d-0aa4ea804076}</UniqueIdentifier>
- </Filter>
<Filter Include="windows">
<UniqueIdentifier>{910f98b6-acfa-4b29-a589-21fd2544d142}</UniqueIdentifier>
</Filter>
@@ -2072,18 +2069,6 @@
<ClCompile Include="..\..\xbmc\windowing\windows\WinSystemWin32GL.cpp">
<Filter>windowing\windows</Filter>
</ClCompile>
- <ClCompile Include="..\..\lib\tinyXML\tinystr.cpp">
- <Filter>libs\tinyxml</Filter>
- </ClCompile>
- <ClCompile Include="..\..\lib\tinyXML\tinyxml.cpp">
- <Filter>libs\tinyxml</Filter>
- </ClCompile>
- <ClCompile Include="..\..\lib\tinyXML\tinyxmlerror.cpp">
- <Filter>libs\tinyxml</Filter>
- </ClCompile>
- <ClCompile Include="..\..\lib\tinyXML\tinyxmlparser.cpp">
- <Filter>libs\tinyxml</Filter>
- </ClCompile>
<ClCompile Include="..\..\xbmc\addons\GUIViewStateAddonBrowser.cpp">
<Filter>addons</Filter>
</ClCompile>
@@ -4669,12 +4654,6 @@
<ClInclude Include="..\..\xbmc\windowing\windows\WinSystemWin32GL.h">
<Filter>windowing\windows</Filter>
</ClInclude>
- <ClInclude Include="..\..\lib\tinyXML\tinystr.h">
- <Filter>libs\tinyxml</Filter>
- </ClInclude>
- <ClInclude Include="..\..\lib\tinyXML\tinyxml.h">
- <Filter>libs\tinyxml</Filter>
- </ClInclude>
<ClInclude Include="..\..\xbmc\addons\GUIViewStateAddonBrowser.h">
<Filter>addons</Filter>
</ClInclude>
@@ -5171,4 +5150,4 @@
<Filter>win32</Filter>
</CustomBuild>
</ItemGroup>
-</Project>
+</Project>
View
2 xbmc/Application.cpp
@@ -1830,7 +1830,7 @@ bool CApplication::LoadUserWindows()
CStdString skinFile = URIUtils::GetFileName(items[i]->GetPath());
if (skinFile.Left(6).CompareNoCase("custom") == 0)
{
- TiXmlDocument xmlDoc;
+ CXBMCTinyXML xmlDoc;
if (!xmlDoc.LoadFile(items[i]->GetPath()))
{
CLog::Log(LOGERROR, "unable to load:%s, Line %d\n%s", items[i]->GetPath().c_str(), xmlDoc.ErrorRow(), xmlDoc.ErrorDesc());
View
6 xbmc/Favourites.cpp
@@ -25,7 +25,7 @@
#include "guilib/Key.h"
#include "settings/Settings.h"
#include "FileItem.h"
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
#include "utils/log.h"
#include "utils/URIUtils.h"
#include "settings/AdvancedSettings.h"
@@ -52,7 +52,7 @@ bool CFavourites::Load(CFileItemList &items)
bool CFavourites::LoadFavourites(CStdString& strPath, CFileItemList& items)
{
- TiXmlDocument doc;
+ CXBMCTinyXML doc;
if (!doc.LoadFile(strPath))
{
CLog::Log(LOGERROR, "Unable to load %s (row %i column %i)", strPath.c_str(), doc.Row(), doc.Column());
@@ -92,7 +92,7 @@ bool CFavourites::LoadFavourites(CStdString& strPath, CFileItemList& items)
bool CFavourites::Save(const CFileItemList &items)
{
CStdString favourites;
- TiXmlDocument doc;
+ CXBMCTinyXML doc;
TiXmlElement xmlRootElement("favourites");
TiXmlNode *rootNode = doc.InsertEndChild(xmlRootElement);
if (!rootNode) return false;
View
4 xbmc/LangInfo.cpp
@@ -24,7 +24,7 @@
#include "settings/GUISettings.h"
#include "guilib/LocalizeStrings.h"
#include "utils/log.h"
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
#ifdef _WIN32
#include "utils/LangCodeExpander.h"
#endif
@@ -201,7 +201,7 @@ bool CLangInfo::Load(const CStdString& strFileName)
{
SetDefaults();
- TiXmlDocument xmlDoc;
+ CXBMCTinyXML xmlDoc;
if (!xmlDoc.LoadFile(strFileName))
{
CLog::Log(LOGERROR, "unable to load %s: %s at line %d", strFileName.c_str(), xmlDoc.ErrorDesc(), xmlDoc.ErrorRow());
View
4 xbmc/NfoFile.h
@@ -29,7 +29,7 @@
#pragma once
#endif // _MSC_VER > 1000
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
#include "addons/Scraper.h"
#include "utils/CharsetConverter.h"
@@ -53,7 +53,7 @@ class CNfoFile
template<class T>
bool GetDetails(T& details,const char* document=NULL, bool prioritise=false)
{
- TiXmlDocument doc;
+ CXBMCTinyXML doc;
CStdString strDoc;
if (document)
strDoc = document;
View
4 xbmc/PasswordManager.cpp
@@ -109,7 +109,7 @@ void CPasswordManager::Load()
CStdString passwordsFile = g_settings.GetUserDataItem("passwords.xml");
if (XFILE::CFile::Exists(passwordsFile))
{
- TiXmlDocument doc;
+ CXBMCTinyXML doc;
if (!doc.LoadFile(passwordsFile))
{
CLog::Log(LOGERROR, "%s - Unable to load: %s, Line %d\n%s",
@@ -141,7 +141,7 @@ void CPasswordManager::Save() const
if (!m_permanentCache.size())
return;
- TiXmlDocument doc;
+ CXBMCTinyXML doc;
TiXmlElement rootElement("passwords");
TiXmlNode *root = doc.InsertEndChild(rootElement);
if (!root)
View
8 xbmc/addons/Addon.cpp
@@ -413,7 +413,7 @@ bool CAddon::ReloadSettings()
bool CAddon::LoadUserSettings()
{
m_userSettingsLoaded = false;
- TiXmlDocument doc;
+ CXBMCTinyXML doc;
if (doc.LoadFile(m_userSettingsPath))
m_userSettingsLoaded = SettingsFromXML(doc);
return m_userSettingsLoaded;
@@ -438,7 +438,7 @@ void CAddon::SaveSettings(void)
CDirectory::Create(strAddon);
// create the XML file
- TiXmlDocument doc;
+ CXBMCTinyXML doc;
SettingsToXML(doc);
doc.SaveFile(m_userSettingsPath);
@@ -463,7 +463,7 @@ void CAddon::UpdateSetting(const CStdString& key, const CStdString& value)
m_settings[key] = value;
}
-bool CAddon::SettingsFromXML(const TiXmlDocument &doc, bool loadDefaults /*=false */)
+bool CAddon::SettingsFromXML(const CXBMCTinyXML &doc, bool loadDefaults /*=false */)
{
if (!doc.RootElement())
return false;
@@ -495,7 +495,7 @@ bool CAddon::SettingsFromXML(const TiXmlDocument &doc, bool loadDefaults /*=fals
return foundSetting;
}
-void CAddon::SettingsToXML(TiXmlDocument &doc) const
+void CAddon::SettingsToXML(CXBMCTinyXML &doc) const
{
TiXmlElement node("settings");
doc.InsertEndChild(node);
View
8 xbmc/addons/Addon.h
@@ -22,7 +22,7 @@
#include "IAddon.h"
#include "addons/AddonVersion.h"
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
#include "Util.h"
#include "URL.h"
#include "guilib/LocalizeStrings.h"
@@ -195,15 +195,15 @@ class CAddon : public IAddon
\return true if settings are loaded, false otherwise
\sa SettingsToXML
*/
- bool SettingsFromXML(const TiXmlDocument &doc, bool loadDefaults = false);
+ bool SettingsFromXML(const CXBMCTinyXML &doc, bool loadDefaults = false);
/*! \brief Parse settings into an XML document
\param doc XML document to receive the settings
\sa SettingsFromXML
*/
- void SettingsToXML(TiXmlDocument &doc) const;
+ void SettingsToXML(CXBMCTinyXML &doc) const;
- TiXmlDocument m_addonXmlDoc;
+ CXBMCTinyXML m_addonXmlDoc;
CStdString m_strLibName;
bool m_settingsLoaded;
bool m_userSettingsLoaded;
View
2 xbmc/addons/AddonInstaller.cpp
@@ -283,7 +283,7 @@ bool CAddonInstaller::InstallFromZip(const CStdString &path)
// TODO: possibly add support for github generated zips here?
CStdString archive = URIUtils::AddFileToFolder(items[0]->GetPath(), "addon.xml");
- TiXmlDocument xml;
+ CXBMCTinyXML xml;
AddonPtr addon;
if (xml.LoadFile(archive) && CAddonMgr::Get().LoadAddonDescriptionFromMemory(xml.RootElement(), addon))
{
View
5 xbmc/addons/AddonManager.cpp
@@ -30,9 +30,8 @@
#include "settings/GUISettings.h"
#include "settings/AdvancedSettings.h"
#include "utils/log.h"
-#include "tinyXML/tinyxml.h"
-
-
+#include "utils/XBMCTinyXML.h"
+#include "dialogs/GUIDialogYesNo.h"
#ifdef HAS_VISUALISATION
#include "Visualisation.h"
#endif
View
4 xbmc/addons/Repository.cpp
@@ -20,7 +20,7 @@
*/
#include "Repository.h"
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
#include "filesystem/File.h"
#include "AddonDatabase.h"
#include "settings/Settings.h"
@@ -130,7 +130,7 @@ VECADDONS CRepository::Parse()
CSingleLock lock(m_critSection);
VECADDONS result;
- TiXmlDocument doc;
+ CXBMCTinyXML doc;
CStdString file = m_info;
if (m_compressed)
View
24 xbmc/addons/Scraper.cpp
@@ -182,7 +182,7 @@ bool CScraper::SetPathSettings(CONTENT_TYPE content, const CStdString& xml)
if (xml.IsEmpty())
return true;
- TiXmlDocument doc;
+ CXBMCTinyXML doc;
doc.Parse(xml.c_str());
m_userSettingsLoaded = SettingsFromXML(doc);
@@ -195,7 +195,7 @@ CStdString CScraper::GetPathSettings()
return "";
stringstream stream;
- TiXmlDocument doc;
+ CXBMCTinyXML doc;
SettingsToXML(doc);
if (doc.RootElement())
stream << *doc.RootElement();
@@ -254,7 +254,7 @@ vector<CStdString> CScraper::Run(const CStdString& function,
if (!XMLUtils::HasUTF8Declaration(strXML))
g_charsetConverter.unknownToUTF8(strXML);
- TiXmlDocument doc;
+ CXBMCTinyXML doc;
doc.Parse(strXML.c_str(),0,TIXML_ENCODING_UTF8);
if (!doc.RootElement())
{
@@ -364,7 +364,7 @@ bool CScraper::Load()
if (CAddonMgr::Get().GetAddon((*itr).first, dep))
{
- TiXmlDocument doc;
+ CXBMCTinyXML doc;
if (dep->Type() == ADDON_SCRAPER_LIBRARY && doc.LoadFile(dep->LibPath()))
m_parser.AddDocument(&doc);
}
@@ -423,7 +423,7 @@ CScraperUrl CScraper::NfoUrl(const CStdString &sNfoContent)
// or <url>...</url> or <url>...</url><id>...</id> on success
for (unsigned int i=0; i < vcsOut.size(); ++i)
{
- TiXmlDocument doc;
+ CXBMCTinyXML doc;
doc.Parse(vcsOut[i], 0, TIXML_ENCODING_UTF8);
CheckScraperError(doc.RootElement());
@@ -517,7 +517,7 @@ std::vector<CScraperUrl> CScraper::FindMovie(XFILE::CFileCurl &fcurl, const CStd
bool fResults(false);
for (CStdStringArray::const_iterator i = vcsOut.begin(); i != vcsOut.end(); ++i)
{
- TiXmlDocument doc;
+ CXBMCTinyXML doc;
doc.Parse(*i, 0, TIXML_ENCODING_UTF8);
if (!doc.RootElement())
{
@@ -640,7 +640,7 @@ std::vector<CMusicAlbumInfo> CScraper::FindAlbum(CFileCurl &fcurl, const CStdStr
// parse the returned XML into a vector of album objects
for (CStdStringArray::const_iterator i = vcsOut.begin(); i != vcsOut.end(); ++i)
{
- TiXmlDocument doc;
+ CXBMCTinyXML doc;
doc.Parse(*i, 0, TIXML_ENCODING_UTF8);
TiXmlHandle xhDoc(&doc);
@@ -729,7 +729,7 @@ std::vector<CMusicArtistInfo> CScraper::FindArtist(CFileCurl &fcurl,
// parse the returned XML into a vector of artist objects
for (CStdStringArray::const_iterator i = vcsOut.begin(); i != vcsOut.end(); ++i)
{
- TiXmlDocument doc;
+ CXBMCTinyXML doc;
doc.Parse(*i, 0, TIXML_ENCODING_UTF8);
if (!doc.RootElement())
{
@@ -784,7 +784,7 @@ EPISODELIST CScraper::GetEpisodeList(XFILE::CFileCurl &fcurl, const CScraperUrl
// parse the XML response
for (CStdStringArray::const_iterator i = vcsOut.begin(); i != vcsOut.end(); ++i)
{
- TiXmlDocument doc;
+ CXBMCTinyXML doc;
doc.Parse(*i);
if (!doc.RootElement())
{
@@ -865,7 +865,7 @@ bool CScraper::GetVideoDetails(XFILE::CFileCurl &fcurl, const CScraperUrl &scurl
bool fRet(false);
for (CStdStringArray::const_iterator i = vcsOut.begin(); i != vcsOut.end(); ++i)
{
- TiXmlDocument doc;
+ CXBMCTinyXML doc;
doc.Parse(*i, 0, TIXML_ENCODING_UTF8);
if (!doc.RootElement())
{
@@ -900,7 +900,7 @@ bool CScraper::GetAlbumDetails(CFileCurl &fcurl, const CScraperUrl &scurl, CAlbu
bool fRet(false);
for (CStdStringArray::const_iterator i = vcsOut.begin(); i != vcsOut.end(); ++i)
{
- TiXmlDocument doc;
+ CXBMCTinyXML doc;
doc.Parse(*i, 0, TIXML_ENCODING_UTF8);
if (!doc.RootElement())
{
@@ -936,7 +936,7 @@ bool CScraper::GetArtistDetails(CFileCurl &fcurl, const CScraperUrl &scurl,
bool fRet(false);
for (vector<CStdString>::const_iterator i = vcsOut.begin(); i != vcsOut.end(); ++i)
{
- TiXmlDocument doc;
+ CXBMCTinyXML doc;
doc.Parse(*i, 0, TIXML_ENCODING_UTF8);
if (!doc.RootElement())
{
View
7 xbmc/cores/dvdplayer/DVDInputStreams/DVDStateSerializer.cpp
@@ -27,8 +27,7 @@
#endif
#include "DllDvdNav.h"
-#include "tinyXML/tinyxml.h"
-
+#include "utils/XBMCTinyXML.h"
#include "DVDStateSerializer.h"
#include <sstream>
@@ -50,7 +49,7 @@ bool CDVDStateSerializer::test( const dvd_state_t *state )
bool CDVDStateSerializer::DVDToXMLState( std::string &xmlstate, const dvd_state_t *state )
{
char buffer[256];
- TiXmlDocument xmlDoc("navstate");
+ CXBMCTinyXML xmlDoc("navstate");
TiXmlElement eRoot("navstate");
eRoot.SetAttribute("version", 1);
@@ -212,7 +211,7 @@ bool CDVDStateSerializer::DVDToXMLState( std::string &xmlstate, const dvd_state_
bool CDVDStateSerializer::XMLToDVDState( dvd_state_t *state, const std::string &xmlstate )
{
- TiXmlDocument xmlDoc;
+ CXBMCTinyXML xmlDoc;
xmlDoc.Parse(xmlstate.c_str());
View
4 xbmc/cores/dvdplayer/Edl.cpp
@@ -26,7 +26,7 @@
#include "filesystem/MythFile.h"
#include "settings/AdvancedSettings.h"
#include "utils/log.h"
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
#include "PlatformDefs.h"
extern "C"
@@ -504,7 +504,7 @@ bool CEdl::ReadBeyondTV(const CStdString& strMovie)
if (!CFile::Exists(beyondTVFilename))
return false;
- TiXmlDocument xmlDoc;
+ CXBMCTinyXML xmlDoc;
if (!xmlDoc.LoadFile(beyondTVFilename))
{
CLog::Log(LOGERROR, "%s - Could not load Beyond TV file: %s. %s", __FUNCTION__, beyondTVFilename.c_str(),
View
2 xbmc/cores/playercorefactory/PlayerCoreConfig.h
@@ -20,7 +20,7 @@
*
*/
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
#include "cores/IPlayer.h"
#include "PlayerCoreFactory.h"
#include "cores/dvdplayer/DVDPlayer.h"
View
2 xbmc/cores/playercorefactory/PlayerSelectionRule.cpp
@@ -26,7 +26,7 @@
#include "settings/GUISettings.h"
#include "utils/log.h"
#include "utils/RegExp.h"
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
CPlayerSelectionRule::CPlayerSelectionRule(TiXmlElement* pRule)
{
View
2 xbmc/dialogs/GUIDialogPlayEject.cpp
@@ -115,7 +115,7 @@ bool CGUIDialogPlayEject::ShowAndGetInput(const CFileItem & item,
// Figure out Line 2 of the dialog
CStdString strLine2;
- TiXmlDocument discStubXML;
+ CXBMCTinyXML discStubXML;
if (discStubXML.LoadFile(item.GetPath()))
{
TiXmlElement * pRootElement = discStubXML.RootElement();
View
2 xbmc/filesystem/DAVDirectory.cpp
@@ -197,7 +197,7 @@ bool CDAVDirectory::GetDirectory(const CStdString& strPath, CFileItemList &items
CStdString strResponse;
dav.ReadData(strResponse);
- TiXmlDocument davResponse;
+ CXBMCTinyXML davResponse;
davResponse.Parse(strResponse.c_str());
if (!davResponse.Parse(strResponse))
View
2 xbmc/filesystem/DAVDirectory.h
@@ -21,7 +21,7 @@
*/
#include "IDirectory.h"
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
#include "FileItem.h"
namespace XFILE
View
4 xbmc/filesystem/DirectoryTuxBox.cpp
@@ -26,7 +26,7 @@
#include "utils/HttpHeader.h"
#include "utils/TuxBoxUtil.h"
#include "URL.h"
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
#include "settings/AdvancedSettings.h"
#include "FileItem.h"
#include "utils/log.h"
@@ -131,7 +131,7 @@ bool CDirectoryTuxBox::GetDirectory(const CStdString& strPath, CFileItemList &it
http.Close();
// parse returned xml
- TiXmlDocument doc;
+ CXBMCTinyXML doc;
data.Replace("></",">-</"); //FILL EMPTY ELEMENTS WITH "-"!
doc.Parse(data.c_str());
TiXmlElement *root = doc.RootElement();
View
4 xbmc/filesystem/LastFMDirectory.h
@@ -22,7 +22,7 @@
#include "IDirectory.h"
#include "FileCurl.h"
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
#include "threads/Thread.h"
class CGUIDialogProgress;
@@ -60,7 +60,7 @@ class CLastFMDirectory :
bool m_Error;
bool m_Downloaded;
- TiXmlDocument m_xmlDoc;
+ CXBMCTinyXML m_xmlDoc;
XFILE::CFileCurl m_http;
View
4 xbmc/filesystem/RSSDirectory.cpp
@@ -24,7 +24,7 @@
#include "FileCurl.h"
#include "settings/Settings.h"
#include "utils/URIUtils.h"
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
#include "utils/HTMLUtil.h"
#include "utils/StringUtils.h"
#include "video/VideoInfoTag.h"
@@ -601,7 +601,7 @@ bool CRSSDirectory::GetDirectory(const CStdString& path, CFileItemList &items)
}
lock.Leave();
- TiXmlDocument xmlDoc;
+ CXBMCTinyXML xmlDoc;
if (!xmlDoc.LoadFile(strPath))
{
CLog::Log(LOGERROR,"failed to load xml from <%s>. error: <%d>", strPath.c_str(), xmlDoc.ErrorId());
View
4 xbmc/filesystem/RTVDirectory.cpp
@@ -27,7 +27,7 @@
#include "utils/URIUtils.h"
#include "SectionLoader.h"
#include "URL.h"
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
#include "FileItem.h"
using namespace XFILE;
@@ -135,7 +135,7 @@ bool CRTVDirectory::GetDirectory(const CStdString& strPath, CFileItemList &items
rtv_get_guide_xml(&data, strHostAndPort.c_str());
// Begin parsing the XML data
- TiXmlDocument xmlDoc;
+ CXBMCTinyXML xmlDoc;
xmlDoc.Parse( (const char *) data );
if ( xmlDoc.Error() )
{
View
2 xbmc/filesystem/Slingbox.cpp
@@ -521,7 +521,7 @@ void CSlingboxFile::LoadSettings(const CStdString& strHostname)
}
// Load the XML file
- TiXmlDocument slingboxXML;
+ CXBMCTinyXML slingboxXML;
if (!slingboxXML.LoadFile(slingboxXMLFile))
{
CLog::Log(LOGERROR, "%s - Error loading %s - line %d\n%s", __FUNCTION__,
View
4 xbmc/guilib/GUIAudioManager.cpp
@@ -29,7 +29,7 @@
#include "input/ButtonTranslator.h"
#include "threads/SingleLock.h"
#include "utils/URIUtils.h"
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
#include "addons/Skin.h"
#ifdef HAS_SDL_AUDIO
#include <SDL/SDL_mixer.h>
@@ -312,7 +312,7 @@ bool CGUIAudioManager::Load()
CStdString strSoundsXml = URIUtils::AddFileToFolder(m_strMediaDir, "sounds.xml");
// Load our xml file
- TiXmlDocument xmlDoc;
+ CXBMCTinyXML xmlDoc;
CLog::Log(LOGINFO, "Loading %s", strSoundsXml.c_str());
View
2 xbmc/guilib/GUIBaseContainer.cpp
@@ -30,7 +30,7 @@
#include "GUIStaticItem.h"
#include "Key.h"
#include "utils/MathUtils.h"
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
using namespace std;
View
6 xbmc/guilib/GUIColorManager.cpp
@@ -24,7 +24,7 @@
#include "addons/Skin.h"
#include "utils/log.h"
#include "utils/URIUtils.h"
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
CGUIColorManager g_colorManager;
@@ -48,7 +48,7 @@ void CGUIColorManager::Load(const CStdString &colorFile)
Clear();
// load the global color map if it exists
- TiXmlDocument xmlDoc;
+ CXBMCTinyXML xmlDoc;
if (xmlDoc.LoadFile(PTH_IC("special://xbmc/system/colors.xml")))
LoadXML(xmlDoc);
@@ -71,7 +71,7 @@ void CGUIColorManager::Load(const CStdString &colorFile)
LoadXML(xmlDoc);
}
-bool CGUIColorManager::LoadXML(TiXmlDocument &xmlDoc)
+bool CGUIColorManager::LoadXML(CXBMCTinyXML &xmlDoc)
{
TiXmlElement* pRootElement = xmlDoc.RootElement();
View
4 xbmc/guilib/GUIColorManager.h
@@ -38,7 +38,7 @@
#include <map>
-class TiXmlDocument;
+class CXBMCTinyXML;
typedef uint32_t color_t;
@@ -55,7 +55,7 @@ class CGUIColorManager
void Clear();
protected:
- bool LoadXML(TiXmlDocument &xmlDoc);
+ bool LoadXML(CXBMCTinyXML &xmlDoc);
std::map<CStdString, color_t> m_colors;
typedef std::map<CStdString, color_t>::iterator iColor;
View
4 xbmc/guilib/GUIControlProfiler.cpp
@@ -20,7 +20,7 @@
*/
#include "GUIControlProfiler.h"
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
#include "utils/TimeUtils.h"
bool CGUIControlProfiler::m_bIsRunning = false;
@@ -340,7 +340,7 @@ bool CGUIControlProfiler::SaveResults(void)
if (m_strOutputFile.IsEmpty())
return false;
- TiXmlDocument doc;
+ CXBMCTinyXML doc;
TiXmlDeclaration decl("1.0", "", "yes");
doc.InsertEndChild(decl);
View
8 xbmc/guilib/GUIFontManager.cpp
@@ -339,7 +339,7 @@ void GUIFontManager::Clear()
void GUIFontManager::LoadFonts(const CStdString& strFontSet)
{
- TiXmlDocument xmlDoc;
+ CXBMCTinyXML xmlDoc;
if (!OpenFontFile(xmlDoc))
return;
@@ -454,7 +454,7 @@ void GUIFontManager::LoadFonts(const TiXmlNode* fontNode)
}
}
-bool GUIFontManager::OpenFontFile(TiXmlDocument& xmlDoc)
+bool GUIFontManager::OpenFontFile(CXBMCTinyXML& xmlDoc)
{
// Get the file to load fonts from:
CStdString strPath = g_SkinInfo->GetSkinPath("Font.xml", &m_skinResolution);
@@ -483,7 +483,7 @@ bool GUIFontManager::GetFirstFontSetUnicode(CStdString& strFontSet)
strFontSet.Empty();
// Load our font file
- TiXmlDocument xmlDoc;
+ CXBMCTinyXML xmlDoc;
if (!OpenFontFile(xmlDoc))
return false;
@@ -529,7 +529,7 @@ bool GUIFontManager::GetFirstFontSetUnicode(CStdString& strFontSet)
bool GUIFontManager::IsFontSetUnicode(const CStdString& strFontSet)
{
- TiXmlDocument xmlDoc;
+ CXBMCTinyXML xmlDoc;
if (!OpenFontFile(xmlDoc))
return false;
View
4 xbmc/guilib/GUIFontManager.h
@@ -35,7 +35,7 @@
// Forward
class CGUIFont;
class CGUIFontTTFBase;
-class TiXmlDocument;
+class CXBMCTinyXML;
class TiXmlNode;
struct OrigFontInfo
@@ -84,7 +84,7 @@ class GUIFontManager : public IMsgTargetCallback
void ReloadTTFFonts();
void LoadFonts(const TiXmlNode* fontNode);
CGUIFontTTFBase* GetFontFile(const CStdString& strFontFile);
- bool OpenFontFile(TiXmlDocument& xmlDoc);
+ bool OpenFontFile(CXBMCTinyXML& xmlDoc);
std::vector<CGUIFont*> m_vecFonts;
std::vector<CGUIFontTTFBase*> m_vecFontFiles;
View
8 xbmc/guilib/GUIIncludes.cpp
@@ -23,7 +23,7 @@
#include "addons/Skin.h"
#include "GUIInfoManager.h"
#include "utils/log.h"
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
#include "utils/StringUtils.h"
#include "interfaces/info/SkinVariable.h"
@@ -95,7 +95,7 @@ bool CGUIIncludes::LoadIncludes(const CStdString &includeFile)
if (HasIncludeFile(includeFile))
return true;
- TiXmlDocument doc;
+ CXBMCTinyXML doc;
if (!doc.LoadFile(includeFile))
{
CLog::Log(LOGINFO, "Error loading includes.xml file (%s): %s (row=%i, col=%i)", includeFile.c_str(), doc.ErrorDesc(), doc.ErrorRow(), doc.ErrorCol());
@@ -260,12 +260,12 @@ void CGUIIncludes::ResolveIncludesForNode(TiXmlElement *node)
TiXmlAttribute *attribute = node->FirstAttribute();
while (attribute)
{ // check the attribute against our set
- if (m_constantAttributes.count(attribute->NameStr()))
+ if (m_constantAttributes.count(attribute->Name()))
attribute->SetValue(ResolveConstant(attribute->ValueStr()));
attribute = attribute->Next();
}
// also do the value
- if (node->FirstChild() && node->FirstChild()->Type() == TiXmlNode::TEXT && m_constantNodes.count(node->ValueStr()))
+ if (node->FirstChild() && node->FirstChild()->Type() == TiXmlNode::TINYXML_TEXT && m_constantNodes.count(node->ValueStr()))
node->FirstChild()->SetValue(ResolveConstant(node->FirstChild()->ValueStr()));
}
View
2 xbmc/guilib/GUIListItemLayout.cpp
@@ -25,7 +25,7 @@
#include "GUIInfoManager.h"
#include "GUIListLabel.h"
#include "GUIImage.h"
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
using namespace std;
View
2 xbmc/guilib/GUITextBox.cpp
@@ -22,7 +22,7 @@
#include "GUITextBox.h"
#include "utils/CharsetConverter.h"
#include "GUIInfoManager.h"
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
#include "utils/MathUtils.h"
using namespace std;
View
4 xbmc/guilib/GUIWindow.cpp
@@ -114,7 +114,7 @@ bool CGUIWindow::Load(const CStdString& strFileName, bool bContainsPath)
bool CGUIWindow::LoadXML(const CStdString &strPath, const CStdString &strLowerPath)
{
- TiXmlDocument xmlDoc;
+ CXBMCTinyXML xmlDoc;
if ( !xmlDoc.LoadFile(strPath) && !xmlDoc.LoadFile(CStdString(strPath).ToLower()) && !xmlDoc.LoadFile(strLowerPath))
{
CLog::Log(LOGERROR, "unable to load:%s, Line %d\n%s", strPath.c_str(), xmlDoc.ErrorRow(), xmlDoc.ErrorDesc());
@@ -125,7 +125,7 @@ bool CGUIWindow::LoadXML(const CStdString &strPath, const CStdString &strLowerPa
return Load(xmlDoc);
}
-bool CGUIWindow::Load(TiXmlDocument &xmlDoc)
+bool CGUIWindow::Load(CXBMCTinyXML &xmlDoc)
{
TiXmlElement* pRootElement = xmlDoc.RootElement();
if (strcmpi(pRootElement->Value(), "window"))
View
4 xbmc/guilib/GUIWindow.h
@@ -55,7 +55,7 @@ class CFileItem; typedef boost::shared_ptr<CFileItem> CFileItemPtr;
// forward
class TiXmlNode;
class TiXmlElement;
-class TiXmlDocument;
+class CXBMCTinyXML;
class CVariant;
class COrigin
@@ -194,7 +194,7 @@ class CGUIWindow : public CGUIControlGroup, protected CCriticalSection
protected:
virtual EVENT_RESULT OnMouseEvent(const CPoint &point, const CMouseEvent &event);
virtual bool LoadXML(const CStdString& strPath, const CStdString &strLowerPath); ///< Loads from the given file
- bool Load(TiXmlDocument &xmlDoc); ///< Loads from the given XML document
+ bool Load(CXBMCTinyXML &xmlDoc); ///< Loads from the given XML document
virtual void LoadAdditionalTags(TiXmlElement *root) {}; ///< Load additional information from the XML document
virtual void SetDefaults();
View
2 xbmc/guilib/LocalizeStrings.cpp
@@ -72,7 +72,7 @@ bool CLocalizeStrings::LoadSkinStrings(const CStdString& path, const CStdString&
bool CLocalizeStrings::LoadXML(const CStdString &filename, CStdString &encoding, uint32_t offset /* = 0 */)
{
- TiXmlDocument xmlDoc;
+ CXBMCTinyXML xmlDoc;
if (!xmlDoc.LoadFile(PTH_IC(filename)))
{
CLog::Log(LOGDEBUG, "unable to load %s: %s at line %d", filename.c_str(), xmlDoc.ErrorDesc(), xmlDoc.ErrorRow());
View
2 xbmc/guilib/Makefile.in
@@ -97,6 +97,6 @@ include @abs_top_srcdir@/Makefile.include
-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
try : try.o TextureBundle.o DirectXGraphics.o GUIFontTTF.o
- g++ -o try try.o TextureBundle.o DirectXGraphics.o GraphicContext.o GUIIncludes.o ../utils/CriticalSection.o ../XBVideoConfig.o SkinInfo.o ../../lib/tinyXML/tinyxml.a ../linux/CriticalSection.o GUIFontTTF.o GUIFontBase.o GUIFontManager.o GUIFont.o ../utils/XMLUtils.o GUIImage.o GUIControl.o TextureManager.o GUIMessage.o ../utils/SingleLock.o VisibleEffect.o GUIWindowManager.o AnimatedGif.o -lSDL_image -lSDL_gfx -lSDL -llzo -lfreetype
+ g++ -o try try.o TextureBundle.o DirectXGraphics.o GraphicContext.o GUIIncludes.o ../utils/CriticalSection.o ../XBVideoConfig.o SkinInfo.o ../linux/CriticalSection.o GUIFontTTF.o GUIFontBase.o GUIFontManager.o GUIFont.o ../utils/XMLUtils.o GUIImage.o GUIControl.o TextureManager.o GUIMessage.o ../utils/SingleLock.o VisibleEffect.o GUIWindowManager.o AnimatedGif.o -lSDL_image -lSDL_gfx -lSDL -llzo -lfreetype
View
2 xbmc/guilib/VisibleEffect.cpp
@@ -25,7 +25,7 @@
#include "addons/Skin.h" // for the effect time adjustments
#include "utils/StringUtils.h"
#include "Tween.h"
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
using namespace std;
View
10 xbmc/input/ButtonTranslator.cpp
@@ -32,7 +32,7 @@
#include "FileItem.h"
#include "utils/StringUtils.h"
#include "utils/log.h"
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
#include "XBIRRemote.h"
using namespace std;
@@ -503,7 +503,7 @@ bool CButtonTranslator::Load(bool AlwaysLoad)
bool CButtonTranslator::LoadKeymap(const CStdString &keymapPath)
{
- TiXmlDocument xmlDoc;
+ CXBMCTinyXML xmlDoc;
CLog::Log(LOGINFO, "Loading %s", keymapPath.c_str());
if (!xmlDoc.LoadFile(keymapPath))
@@ -522,7 +522,7 @@ bool CButtonTranslator::LoadKeymap(const CStdString &keymapPath)
TiXmlNode* pWindow = pRoot->FirstChild();
while (pWindow)
{
- if (pWindow->Type() == TiXmlNode::ELEMENT)
+ if (pWindow->Type() == TiXmlNode::TINYXML_ELEMENT)
{
int windowID = WINDOW_INVALID;
const char *szWindow = pWindow->Value();
@@ -550,7 +550,7 @@ bool CButtonTranslator::LoadLircMap(const CStdString &lircmapPath)
#define REMOTEMAPTAG "irssmap"
#endif
// load our xml file, and fill up our mapping tables
- TiXmlDocument xmlDoc;
+ CXBMCTinyXML xmlDoc;
// Load the config file
CLog::Log(LOGINFO, "Loading %s", lircmapPath.c_str());
@@ -572,7 +572,7 @@ bool CButtonTranslator::LoadLircMap(const CStdString &lircmapPath)
TiXmlNode* pRemote = pRoot->FirstChild();
while (pRemote)
{
- if (pRemote->Type() == TiXmlNode::ELEMENT)
+ if (pRemote->Type() == TiXmlNode::TINYXML_ELEMENT)
{
const char *szRemote = pRemote->Value();
if (szRemote)
View
4 xbmc/input/KeyboardLayoutConfiguration.cpp
@@ -21,7 +21,7 @@
#include "KeyboardLayoutConfiguration.h"
#include "utils/CharsetConverter.h"
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
using namespace std;
CKeyboardLayoutConfiguration g_keyboardLayoutConfiguration;
@@ -50,7 +50,7 @@ bool CKeyboardLayoutConfiguration::Load(const CStdString& strFileName)
{
SetDefaults();
- TiXmlDocument xmlDoc;
+ CXBMCTinyXML xmlDoc;
if (!xmlDoc.LoadFile(strFileName))
{
CLog::Log(LOGINFO, "unable to load %s: %s at line %d", strFileName.c_str(), xmlDoc.ErrorDesc(), xmlDoc.ErrorRow());
View
4 xbmc/interfaces/http-api/XBMCConfiguration.h
@@ -3,7 +3,7 @@
#undef min
#undef max
#include <algorithm>
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
typedef char char_t;
typedef struct websRec *webs_t;
@@ -26,7 +26,7 @@ class CXbmcConfiguration
int Load();
bool IsValidOption(char* option);
- TiXmlDocument xbmcCfg;
+ CXBMCTinyXML xbmcCfg;
bool xbmcCfgLoaded;
};
View
2 xbmc/interfaces/info/SkinVariable.cpp
@@ -21,7 +21,7 @@
#include "SkinVariable.h"
#include "GUIInfoManager.h"
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
using namespace std;
using namespace INFO;
View
4 xbmc/interfaces/python/xbmcmodule/GUIPythonWindowXML.cpp
@@ -33,7 +33,7 @@
#include "settings/GUISettings.h"
#include "guilib/LocalizeStrings.h"
#include "utils/log.h"
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
using namespace std;
@@ -346,7 +346,7 @@ bool CGUIPythonWindowXML::LoadXML(const CStdString &strPath, const CStdString &s
}
delete[] buffer;
- TiXmlDocument xmlDoc;
+ CXBMCTinyXML xmlDoc;
xmlDoc.Parse(xml.c_str());
if (xmlDoc.Error())
View
4 xbmc/interfaces/python/xbmcmodule/control.cpp
@@ -25,7 +25,7 @@
#include "guilib/GUIControlFactory.h"
#include "guilib/GUITexture.h"
#include "utils/StringUtils.h"
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
using namespace std;
@@ -242,7 +242,7 @@ namespace PYXBMC
return NULL;
}
- TiXmlDocument xmlDoc;
+ CXBMCTinyXML xmlDoc;
TiXmlElement xmlRootElement("control");
TiXmlNode *pRoot = xmlDoc.InsertEndChild(xmlRootElement);
if (!pRoot)
View
4 xbmc/interfaces/python/xbmcmodule/pyutil.cpp
@@ -25,7 +25,7 @@
#include <vector>
#include "addons/Skin.h"
#include "utils/log.h"
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
#include "utils/CharsetConverter.h"
#include "threads/CriticalSection.h"
#include "threads/SingleLock.h"
@@ -33,7 +33,7 @@
using namespace std;
-static TiXmlDocument pySkinReferences;
+static CXBMCTinyXML pySkinReferences;
namespace PYXBMC
View
2 xbmc/music/Album.cpp
@@ -143,7 +143,7 @@ bool CAlbum::Save(TiXmlNode *node, const CStdString &tag, const CStdString& strP
XMLUtils::SetString(album, "type", strType);
if (!thumbURL.m_xml.empty())
{
- TiXmlDocument doc;
+ CXBMCTinyXML doc;
doc.Parse(thumbURL.m_xml);
const TiXmlNode* thumb = doc.FirstChild("thumb");
while (thumb)
View
4 xbmc/music/Artist.cpp
@@ -130,7 +130,7 @@ bool CArtist::Save(TiXmlNode *node, const CStdString &tag, const CStdString& str
XMLUtils::SetString(artist, "disbanded", strDisbanded);
if (!thumbURL.m_xml.empty())
{
- TiXmlDocument doc;
+ CXBMCTinyXML doc;
doc.Parse(thumbURL.m_xml);
const TiXmlNode* thumb = doc.FirstChild("thumb");
while (thumb)
@@ -142,7 +142,7 @@ bool CArtist::Save(TiXmlNode *node, const CStdString &tag, const CStdString& str
XMLUtils::SetString(artist, "path", strPath);
if (fanart.m_xml.size())
{
- TiXmlDocument doc;
+ CXBMCTinyXML doc;
doc.Parse(fanart.m_xml);
artist->InsertEndChild(*doc.RootElement());
}
View
6 xbmc/music/LastFmManager.cpp
@@ -47,7 +47,7 @@
#include "settings/Settings.h"
#include "utils/StringUtils.h"
#include "guilib/LocalizeStrings.h"
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
#include "utils/TimeUtils.h"
#include "threads/SingleLock.h"