Permalink
Browse files

Use system implementation of tinyxml instead of internal implementation.

Conflicts:

	project/VS2010Express/XBMC.vcxproj.filters
	xbmc/dialogs/GUIDialogPlayEject.cpp
	xbmc/filesystem/LastFMDirectory.h
	xbmc/filesystem/LibraryDirectory.h
	xbmc/guilib/GUIColorManager.cpp
	xbmc/guilib/LocalizeStrings.cpp
	xbmc/utils/LangCodeExpander.cpp
	xbmc/utils/XMLUtils.h
  • Loading branch information...
1 parent 701e543 commit 3e583ecee682670eb8b458b4aaf767de6d3daa11 @amejia1 committed Apr 19, 2012
Showing with 403 additions and 6,269 deletions.
  1. +0 −1 Makefile.in
  2. +3 −0 configure.in
  3. +0 −9 lib/tinyXML/Makefile
  4. +0 −116 lib/tinyXML/tinystr.cpp
  5. +0 −319 lib/tinyXML/tinystr.h
  6. +0 −2,043 lib/tinyXML/tinyxml.cpp
  7. +0 −1,834 lib/tinyXML/tinyxml.h
  8. +0 −53 lib/tinyXML/tinyxmlerror.cpp
  9. +0 −1,683 lib/tinyXML/tinyxmlparser.cpp
  10. +3 −7 project/VS2010Express/XBMC.vcxproj
  11. +1 −22 project/VS2010Express/XBMC.vcxproj.filters
  12. +1 −1 xbmc/Application.cpp
  13. +3 −3 xbmc/Favourites.cpp
  14. +2 −2 xbmc/LangInfo.cpp
  15. +2 −2 xbmc/NfoFile.h
  16. +2 −2 xbmc/PasswordManager.cpp
  17. +4 −4 xbmc/addons/Addon.cpp
  18. +4 −4 xbmc/addons/Addon.h
  19. +1 −1 xbmc/addons/AddonInstaller.cpp
  20. +2 −3 xbmc/addons/AddonManager.cpp
  21. +2 −2 xbmc/addons/Repository.cpp
  22. +12 −12 xbmc/addons/Scraper.cpp
  23. +3 −4 xbmc/cores/dvdplayer/DVDInputStreams/DVDStateSerializer.cpp
  24. +2 −2 xbmc/cores/dvdplayer/Edl.cpp
  25. +1 −1 xbmc/cores/playercorefactory/PlayerCoreConfig.h
  26. +1 −1 xbmc/cores/playercorefactory/PlayerSelectionRule.cpp
  27. +1 −1 xbmc/dialogs/GUIDialogPlayEject.cpp
  28. +1 −1 xbmc/filesystem/DAVDirectory.cpp
  29. +1 −1 xbmc/filesystem/DAVDirectory.h
  30. +2 −2 xbmc/filesystem/DirectoryTuxBox.cpp
  31. +2 −2 xbmc/filesystem/LastFMDirectory.h
  32. +2 −2 xbmc/filesystem/RSSDirectory.cpp
  33. +2 −2 xbmc/filesystem/RTVDirectory.cpp
  34. +1 −1 xbmc/filesystem/Slingbox.cpp
  35. +2 −2 xbmc/guilib/GUIAudioManager.cpp
  36. +1 −1 xbmc/guilib/GUIBaseContainer.cpp
  37. +3 −3 xbmc/guilib/GUIColorManager.cpp
  38. +2 −2 xbmc/guilib/GUIColorManager.h
  39. +2 −2 xbmc/guilib/GUIControlProfiler.cpp
  40. +4 −4 xbmc/guilib/GUIFontManager.cpp
  41. +2 −2 xbmc/guilib/GUIFontManager.h
  42. +4 −4 xbmc/guilib/GUIIncludes.cpp
  43. +1 −1 xbmc/guilib/GUIListItemLayout.cpp
  44. +1 −1 xbmc/guilib/GUITextBox.cpp
  45. +2 −2 xbmc/guilib/GUIWindow.cpp
  46. +2 −2 xbmc/guilib/GUIWindow.h
  47. +1 −1 xbmc/guilib/LocalizeStrings.cpp
  48. +1 −1 xbmc/guilib/Makefile.in
  49. +1 −1 xbmc/guilib/VisibleEffect.cpp
  50. +5 −5 xbmc/input/ButtonTranslator.cpp
  51. +2 −2 xbmc/input/KeyboardLayoutConfiguration.cpp
  52. +2 −2 xbmc/interfaces/http-api/XBMCConfiguration.h
  53. +1 −1 xbmc/interfaces/info/SkinVariable.cpp
  54. +2 −2 xbmc/interfaces/python/xbmcmodule/GUIPythonWindowXML.cpp
  55. +2 −2 xbmc/interfaces/python/xbmcmodule/control.cpp
  56. +2 −2 xbmc/interfaces/python/xbmcmodule/pyutil.cpp
  57. +1 −1 xbmc/music/Album.cpp
  58. +2 −2 xbmc/music/Artist.cpp
  59. +3 −3 xbmc/music/LastFmManager.cpp
  60. +2 −2 xbmc/music/MusicDatabase.cpp
  61. +1 −1 xbmc/music/infoscanner/MusicAlbumInfo.h
  62. +1 −1 xbmc/music/infoscanner/MusicArtistInfo.h
  63. +2 −2 xbmc/network/libscrobbler/scrobbler.cpp
  64. +2 −2 xbmc/peripherals/Peripherals.cpp
  65. +3 −3 xbmc/peripherals/devices/Peripheral.cpp
  66. +2 −2 xbmc/playlists/PlayListB4S.cpp
  67. +3 −3 xbmc/playlists/PlayListPLS.cpp
  68. +2 −2 xbmc/playlists/PlayListWPL.cpp
  69. +1 −1 xbmc/playlists/PlayListXML.cpp
  70. +1 −1 xbmc/playlists/SmartPlayList.cpp
  71. +2 −2 xbmc/playlists/SmartPlayList.h
  72. +3 −3 xbmc/programs/Shortcut.cpp
  73. +1 −1 xbmc/settings/AdvancedSettings.cpp
  74. +1 −1 xbmc/settings/GUISettings.cpp
  75. +1 −1 xbmc/settings/GUIWindowSettingsCategory.cpp
  76. +11 −11 xbmc/settings/Settings.cpp
  77. +3 −3 xbmc/storage/MediaManager.cpp
  78. +2 −2 xbmc/utils/Fanart.cpp
  79. +1 −1 xbmc/utils/LCD.cpp
  80. +1 −1 xbmc/utils/LCD.h
  81. +1 −1 xbmc/utils/LangCodeExpander.cpp
  82. +1 −0 xbmc/utils/Makefile
  83. +2 −2 xbmc/utils/RssReader.h
  84. +3 −3 xbmc/utils/ScraperParser.cpp
  85. +3 −3 xbmc/utils/ScraperParser.h
  86. +2 −2 xbmc/utils/ScraperUrl.cpp
  87. +3 −3 xbmc/utils/TuxBoxUtil.cpp
  88. +1 −1 xbmc/utils/Weather.cpp
  89. +164 −0 xbmc/utils/XBMCTinyXML.cpp
  90. +52 −0 xbmc/utils/XBMCTinyXML.h
  91. +2 −2 xbmc/utils/XMLUtils.cpp
  92. +2 −3 xbmc/utils/XMLUtils.h
  93. +2 −2 xbmc/video/VideoDatabase.cpp
  94. +1 −1 xbmc/video/VideoInfoDownloader.h
  95. +3 −3 xbmc/video/VideoInfoTag.cpp
  96. +3 −3 xbmc/windowing/X11/XRandR.cpp
View
@@ -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
@@ -749,6 +749,9 @@ PKG_CHECK_MODULES([SAMPLERATE], [samplerate],
PKG_CHECK_MODULES([FREETYPE2], [freetype2],
[INCLUDES="$INCLUDES $FREETYPE2_CFLAGS"; LIBS="$LIBS $FREETYPE2_LIBS"],
AC_MSG_ERROR($missing_library))
+PKG_CHECK_MODULES([TINYXML], [tinyxml],
+ [INCLUDES="$INCLUDES $TINYXML_CFLAGS"; LIBS="$LIBS $TINYXML_LIBS"],
+ AC_MSG_ERROR($missing_library))
# check for libbluray
AS_CASE([x$use_libbluray],
@@ -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)))
@@ -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
Oops, something went wrong. Retry.

0 comments on commit 3e583ec

Please sign in to comment.