fixed: avoid spurious dependencies for utils/CharsetConverter.h

from 200 files rebuilt to 56 (144 spurious)
xbmc · Mar 31, 2013 · fe8fe93 · fe8fe93
1 parent 37e5300
commit fe8fe93
Show file tree

Hide file tree

Showing 30 changed files with 11 additions and 22 deletions.
diff --git a/xbmc/Application.h b/xbmc/Application.h
@@ -55,7 +55,6 @@ namespace MEDIA_DETECT
 #include "win32/WIN32Util.h"
 #endif
 #include "utils/Stopwatch.h"
-#include "utils/CharsetConverter.h"
 #ifdef HAS_PERFORMANCE_SAMPLE
 #include "utils/PerformanceStats.h"
 #endif

diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
@@ -45,6 +45,7 @@
 #include "settings/AdvancedSettings.h"
 #include "settings/Settings.h"
 #include "guilib/LocalizeStrings.h"
+#include "utils/CharsetConverter.h"
 #include "utils/CPUInfo.h"
 #include "utils/StringUtils.h"
 #include "utils/MathUtils.h"

diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp
@@ -63,6 +63,7 @@
 #include "utils/fstrcmp.h"
 #include "storage/MediaManager.h"
 #ifdef _WIN32
+#include "utils/CharsetConverter.h"
 #include <shlobj.h>
 #include "WIN32Util.h"
 #endif

diff --git a/xbmc/addons/AddonCallbacksAddon.cpp b/xbmc/addons/AddonCallbacksAddon.cpp
@@ -29,6 +29,7 @@
 #include "utils/URIUtils.h"
 #include "FileItem.h"
 #include "network/Network.h"
+#include "utils/CharsetConverter.h"
 
 using namespace XFILE;
 

diff --git a/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp b/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp
@@ -39,6 +39,7 @@
 #include "utils/log.h"
 #include "cores/AudioEngine/AEFactory.h"
 #if defined(_WIN32)
+  #include "utils/CharsetConverter.h"
   #include "Windows.h"
   #ifdef HAS_IRSERVERSUITE
     #include "input/windows/IRServerSuite.h"

diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayText.h b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayText.h
@@ -21,10 +21,8 @@
  */
 
 #include "DVDOverlay.h"
-#ifdef _LINUX
-#include "utils/CharsetConverter.h"
-#endif
 #include <string.h>
+#include <stdlib.h>
 
 class CDVDOverlayText : public CDVDOverlay
 {

diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleTagMicroDVD.cpp b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleTagMicroDVD.cpp
@@ -20,6 +20,7 @@
 
 #include "DVDSubtitleTagMicroDVD.h"
 #include "DVDCodecs/Overlay/DVDOverlayText.h"
+#include "utils/StdString.h"
 
 void CDVDSubtitleTagMicroDVD::ConvertLine(CDVDOverlayText* pOverlay, const char* line, int len)
 {

diff --git a/xbmc/filesystem/DAVDirectory.cpp b/xbmc/filesystem/DAVDirectory.cpp
@@ -27,7 +27,6 @@
 #include "FileItem.h"
 #include "utils/RegExp.h"
 #include "utils/StringUtils.h"
-#include "utils/CharsetConverter.h"
 #include "utils/log.h"
 #include "utils/URIUtils.h"
 

diff --git a/xbmc/guilib/GUIButtonControl.cpp b/xbmc/guilib/GUIButtonControl.cpp
@@ -21,7 +21,6 @@
 #include "GUIButtonControl.h"
 #include "GUIWindowManager.h"
 #include "GUIDialog.h"
-#include "utils/CharsetConverter.h"
 #include "GUIFontManager.h"
 #include "Key.h"
 

diff --git a/xbmc/guilib/GUICheckMarkControl.cpp b/xbmc/guilib/GUICheckMarkControl.cpp
@@ -19,7 +19,6 @@
  */
 
 #include "GUICheckMarkControl.h"
-#include "utils/CharsetConverter.h"
 #include "GUIFontManager.h"
 #include "Key.h"
 

diff --git a/xbmc/guilib/GUIFadeLabelControl.cpp b/xbmc/guilib/GUIFadeLabelControl.cpp
@@ -19,7 +19,6 @@
  */
 
 #include "GUIFadeLabelControl.h"
-#include "utils/CharsetConverter.h"
 
 using namespace std;
 

diff --git a/xbmc/guilib/GUIInfoTypes.cpp b/xbmc/guilib/GUIInfoTypes.cpp
@@ -19,7 +19,6 @@
  */
 
 #include "GUIInfoTypes.h"
-#include "utils/CharsetConverter.h"
 #include "GUIInfoManager.h"
 #include "addons/AddonManager.h"
 #include "utils/log.h"

diff --git a/xbmc/guilib/GUILabel.cpp b/xbmc/guilib/GUILabel.cpp
@@ -19,7 +19,6 @@
  */
 
 #include "GUILabel.h"
-#include "utils/CharsetConverter.h"
 #include <limits>
 
 CGUILabel::CGUILabel(float posX, float posY, float width, float height, const CLabelInfo& labelInfo, CGUILabel::OVER_FLOW overflow)

diff --git a/xbmc/guilib/GUIListLabel.cpp b/xbmc/guilib/GUIListLabel.cpp
@@ -19,7 +19,6 @@
  */
 
 #include "GUIListLabel.h"
-#include "utils/CharsetConverter.h"
 #include <limits>
 
 CGUIListLabel::CGUIListLabel(int parentID, int controlID, float posX, float posY, float width, float height, const CLabelInfo& labelInfo, const CGUIInfoLabel &info, bool alwaysScroll)

diff --git a/xbmc/guilib/GUISelectButtonControl.cpp b/xbmc/guilib/GUISelectButtonControl.cpp
@@ -20,7 +20,6 @@
 
 #include "GUISelectButtonControl.h"
 #include "GUIWindowManager.h"
-#include "utils/CharsetConverter.h"
 #include "utils/TimeUtils.h"
 #include "Key.h"
 

diff --git a/xbmc/guilib/GUISpinControl.cpp b/xbmc/guilib/GUISpinControl.cpp
@@ -19,7 +19,6 @@
  */
 
 #include "GUISpinControl.h"
-#include "utils/CharsetConverter.h"
 #include "Key.h"
 
 using namespace std;

diff --git a/xbmc/guilib/GUITextBox.cpp b/xbmc/guilib/GUITextBox.cpp
@@ -19,7 +19,6 @@
  */
 
 #include "GUITextBox.h"
-#include "utils/CharsetConverter.h"
 #include "GUIInfoManager.h"
 #include "utils/XBMCTinyXML.h"
 #include "utils/MathUtils.h"

diff --git a/xbmc/guilib/GUIToggleButtonControl.cpp b/xbmc/guilib/GUIToggleButtonControl.cpp
@@ -21,7 +21,6 @@
 #include "GUIToggleButtonControl.h"
 #include "GUIWindowManager.h"
 #include "GUIDialog.h"
-#include "utils/CharsetConverter.h"
 #include "GUIInfoManager.h"
 #include "Key.h"
 

diff --git a/xbmc/guilib/TextureManager.cpp b/xbmc/guilib/TextureManager.cpp
@@ -23,7 +23,6 @@
 #include "AnimatedGif.h"
 #include "GraphicContext.h"
 #include "threads/SingleLock.h"
-#include "utils/CharsetConverter.h"
 #include "utils/log.h"
 #include "utils/URIUtils.h"
 #include "addons/Skin.h"

diff --git a/xbmc/interfaces/json-rpc/InputOperations.cpp b/xbmc/interfaces/json-rpc/InputOperations.cpp
@@ -28,7 +28,6 @@
 #include "input/XBMC_keyboard.h"
 #include "input/XBMC_vkeys.h"
 #include "threads/SingleLock.h"
-#include "utils/CharsetConverter.h"
 
 using namespace JSONRPC;
 

diff --git a/xbmc/music/infoscanner/MusicInfoScraper.cpp b/xbmc/music/infoscanner/MusicInfoScraper.cpp
@@ -19,7 +19,6 @@
  */
 
 #include "MusicInfoScraper.h"
-#include "utils/CharsetConverter.h"
 #include "utils/log.h"
 #include "filesystem/CurlFile.h"
 

diff --git a/xbmc/network/websocket/WebSocketV13.cpp b/xbmc/network/websocket/WebSocketV13.cpp
@@ -24,7 +24,6 @@
 #include "WebSocketV13.h"
 #include "WebSocket.h"
 #include "utils/Base64.h"
-#include "utils/CharsetConverter.h"
 #include "utils/HttpParser.h"
 #include "utils/HttpResponse.h"
 #include "utils/log.h"

diff --git a/xbmc/network/websocket/WebSocketV8.cpp b/xbmc/network/websocket/WebSocketV8.cpp
@@ -25,7 +25,6 @@
 #include "WebSocketV8.h"
 #include "WebSocket.h"
 #include "utils/Base64.h"
-#include "utils/CharsetConverter.h"
 #include "utils/EndianSwap.h"
 #include "utils/HttpParser.h"
 #include "utils/HttpResponse.h"

diff --git a/xbmc/settings/GUISettings.cpp b/xbmc/settings/GUISettings.cpp
@@ -31,6 +31,7 @@
 #include "Application.h"
 #include "AdvancedSettings.h"
 #include "guilib/LocalizeStrings.h"
+#include "utils/CharsetConverter.h"
 #include "utils/StringUtils.h"
 #include "utils/SystemInfo.h"
 #include "utils/log.h"

diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp
@@ -27,6 +27,7 @@
 #include "URL.h"
 #include "guilib/GUIFontManager.h"
 #include "input/ButtonTranslator.h"
+#include "utils/CharsetConverter.h"
 #include "utils/XMLUtils.h"
 #include "PasswordManager.h"
 #include "utils/RegExp.h"

diff --git a/xbmc/settings/windows/GUIWindowSettingsCategory.cpp b/xbmc/settings/windows/GUIWindowSettingsCategory.cpp
@@ -95,6 +95,7 @@
 #endif
 #include "guilib/LocalizeStrings.h"
 #include "LangInfo.h"
+#include "utils/CharsetConverter.h"
 #include "utils/StringUtils.h"
 #include "utils/URIUtils.h"
 #include "utils/SystemInfo.h"

diff --git a/xbmc/utils/HTMLUtil.cpp b/xbmc/utils/HTMLUtil.cpp
@@ -18,7 +18,6 @@
  *
  */
 
-#include "CharsetConverter.h"
 #include "HTMLUtil.h"
 
 using namespace std;

diff --git a/xbmc/utils/Weather.cpp b/xbmc/utils/Weather.cpp
@@ -42,6 +42,7 @@
 #include "log.h"
 #include "addons/AddonManager.h"
 #include "interfaces/python/XBPython.h"
+#include "CharsetConverter.h"
 
 using namespace std;
 using namespace ADDON;

diff --git a/xbmc/video/VideoInfoTag.cpp b/xbmc/video/VideoInfoTag.cpp
@@ -26,7 +26,6 @@
 #include "utils/log.h"
 #include "utils/StringUtils.h"
 #include "utils/Variant.h"
-#include "utils/CharsetConverter.h"
 #include "TextureCache.h"
 #include "filesystem/File.h"
 

diff --git a/xbmc/win32/WIN32Util.cpp b/xbmc/win32/WIN32Util.cpp
@@ -35,6 +35,7 @@
 #include "storage/MediaManager.h"
 #include "windowing/WindowingFactory.h"
 #include "guilib/LocalizeStrings.h"
+#include "utils/CharsetConverter.h"
 #include "utils/log.h"
 #include "utils/StringUtils.h"
 #include "DllPaths_win32.h"