changed: minimize URL.h header pollution

xbmc · Jul 24, 2012 · 52e4d3b · 52e4d3b
1 parent 6dd20c0
commit 52e4d3b
Show file tree

Hide file tree

Showing 57 changed files with 72 additions and 18 deletions.
diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
@@ -55,6 +55,7 @@
 #include "utils/StringUtils.h"
 #include "utils/MathUtils.h"
 #include "utils/SeekHandler.h"
+#include "URL.h"
 
 // stuff for current song
 #include "music/MusicInfoLoader.h"

diff --git a/xbmc/GUIPassword.cpp b/xbmc/GUIPassword.cpp
@@ -29,7 +29,6 @@
 #include "settings/GUIDialogLockSettings.h"
 #include "settings/GUIDialogProfileSettings.h"
 #include "Util.h"
-#include "URL.h"
 #include "settings/Settings.h"
 #include "settings/GUISettings.h"
 #include "guilib/GUIWindowManager.h"

diff --git a/xbmc/TextureCache.cpp b/xbmc/TextureCache.cpp
@@ -28,6 +28,7 @@
 #include "settings/AdvancedSettings.h"
 #include "utils/log.h"
 #include "utils/URIUtils.h"
+#include "URL.h"
 
 using namespace XFILE;
 

diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp
@@ -86,6 +86,7 @@
 #include "cores/dvdplayer/DVDSubtitles/DVDSubtitleTagSami.h"
 #include "cores/dvdplayer/DVDSubtitles/DVDSubtitleStream.h"
 #include "windowing/WindowingFactory.h"
+#include "URL.h"
 #ifdef HAVE_LIBCAP
   #include <sys/capability.h>
 #endif

diff --git a/xbmc/addons/Addon.cpp b/xbmc/addons/Addon.cpp
@@ -34,6 +34,7 @@
 #endif
 #include "utils/log.h"
 #include "utils/URIUtils.h"
+#include "URL.h"
 #include <vector>
 #include <string.h>
 #include <ostream>

diff --git a/xbmc/addons/AddonInstaller.cpp b/xbmc/addons/AddonInstaller.cpp
@@ -39,6 +39,7 @@
 #include "utils/StringUtils.h"
 #include "dialogs/GUIDialogKaiToast.h"
 #include "dialogs/GUIDialogProgress.h"
+#include "URL.h"
 
 using namespace std;
 using namespace XFILE;

diff --git a/xbmc/addons/GUIDialogAddonSettings.cpp b/xbmc/addons/GUIDialogAddonSettings.cpp
@@ -49,6 +49,7 @@
 #include "GUIWindowAddonBrowser.h"
 #include "utils/log.h"
 #include "Util.h"
+#include "URL.h"
 
 using namespace std;
 using namespace ADDON;

diff --git a/xbmc/addons/Repository.cpp b/xbmc/addons/Repository.cpp
@@ -32,6 +32,7 @@
 #include "dialogs/GUIDialogYesNo.h"
 #include "dialogs/GUIDialogKaiToast.h"
 #include "TextureDatabase.h"
+#include "URL.h"
 
 using namespace XFILE;
 using namespace ADDON;

diff --git a/xbmc/addons/Repository.h b/xbmc/addons/Repository.h
@@ -23,7 +23,6 @@
 #include "Addon.h"
 #include "AddonManager.h"
 #include "XBDateTime.h"
-#include "URL.h"
 #include "utils/Job.h"
 #include "threads/CriticalSection.h"
 #include "threads/SingleLock.h"

diff --git a/xbmc/addons/Scraper.cpp b/xbmc/addons/Scraper.cpp
@@ -40,6 +40,7 @@
 #include "music/Album.h"
 #include "music/Artist.h"
 #include "Util.h"
+#include "URL.h"
 
 #include <sstream>
 

diff --git a/xbmc/cores/AudioEngine/Utils/AEWAVLoader.cpp b/xbmc/cores/AudioEngine/Utils/AEWAVLoader.cpp
@@ -27,6 +27,7 @@
 #include "utils/EndianSwap.h"
 #include "filesystem/FileFactory.h"
 #include "filesystem/IFile.h"
+#include "URL.h"
 #include <samplerate.h>
 
 #include "AEConvert.h"

diff --git a/xbmc/cores/DllLoader/DllLoaderContainer.cpp b/xbmc/cores/DllLoader/DllLoaderContainer.cpp
@@ -32,6 +32,7 @@
 #include "utils/URIUtils.h"
 #include "utils/StringUtils.h"
 #include "utils/log.h"
+#include "URL.h"
 
 #define ENV_PARTIAL_PATH "special://xbmcbin/system/;" \
                  "special://xbmcbin/system/players/mplayer/;" \

diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.cpp
@@ -32,6 +32,7 @@
 #include "filesystem/File.h"
 #include "filesystem/Directory.h"
 #include "DllLibbluray.h"
+#include "URL.h"
 
 #define LIBBLURAY_BYTESEEK 0
 

diff --git a/xbmc/cores/dvdplayer/Edl.cpp b/xbmc/cores/dvdplayer/Edl.cpp
@@ -28,6 +28,7 @@
 #include "utils/log.h"
 #include "utils/XBMCTinyXML.h"
 #include "PlatformDefs.h"
+#include "URL.h"
 
 extern "C"
 {

diff --git a/xbmc/cores/dvdplayer/Edl.h b/xbmc/cores/dvdplayer/Edl.h
@@ -25,7 +25,6 @@
 #include <vector>
 #include <stdint.h>
 #include "utils/StdString.h"
-#include "URL.h"
 
 class CEdl
 {

diff --git a/xbmc/cores/paplayer/DVDPlayerCodec.cpp b/xbmc/cores/paplayer/DVDPlayerCodec.cpp
@@ -29,6 +29,7 @@
 #include "cores/dvdplayer/DVDCodecs/DVDFactoryCodec.h"
 #include "utils/log.h"
 #include "settings/GUISettings.h"
+#include "URL.h"
 
 #include "AudioDecoder.h"
 

diff --git a/xbmc/cores/paplayer/TimidityCodec.cpp b/xbmc/cores/paplayer/TimidityCodec.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "TimidityCodec.h"
+#include "URL.h"
 #include "../DllLoader/LibraryLoader.h"
 #include "../DllLoader/SoLoader.h"
 #include "../DllLoader/DllLoader.h"

diff --git a/xbmc/dialogs/GUIDialogContextMenu.cpp b/xbmc/dialogs/GUIDialogContextMenu.cpp
@@ -44,6 +44,7 @@
 #include "guilib/LocalizeStrings.h"
 #include "TextureCache.h"
 #include "video/windows/GUIWindowVideoBase.h"
+#include "URL.h"
 
 #ifdef _WIN32
 #include "WIN32Util.h"

diff --git a/xbmc/dialogs/GUIDialogFileBrowser.cpp b/xbmc/dialogs/GUIDialogFileBrowser.cpp
@@ -44,6 +44,7 @@
 #include "settings/GUISettings.h"
 #include "guilib/LocalizeStrings.h"
 #include "utils/log.h"
+#include "URL.h"
 
 using namespace XFILE;
 

diff --git a/xbmc/dialogs/GUIDialogMediaSource.cpp b/xbmc/dialogs/GUIDialogMediaSource.cpp
@@ -34,6 +34,7 @@
 #include "settings/GUISettings.h"
 #include "guilib/LocalizeStrings.h"
 #include "PasswordManager.h"
+#include "URL.h"
 
 using namespace std;
 using namespace XFILE;

diff --git a/xbmc/filesystem/AddonsDirectory.cpp b/xbmc/filesystem/AddonsDirectory.cpp
@@ -32,6 +32,7 @@
 #include "guilib/TextureManager.h"
 #include "File.h"
 #include "utils/URIUtils.h"
+#include "URL.h"
 
 using namespace ADDON;
 

diff --git a/xbmc/filesystem/HTSPDirectory.h b/xbmc/filesystem/HTSPDirectory.h
@@ -23,10 +23,10 @@
 #include "threads/Thread.h"
 #include "threads/CriticalSection.h"
 #include "threads/Event.h"
-#include "URL.h"
 #include "HTSPSession.h"
 #include "boost/shared_ptr.hpp"
 
+class CURL;
 class CFileItem; typedef boost::shared_ptr<CFileItem> CFileItemPtr;
 
 namespace HTSP

diff --git a/xbmc/filesystem/IFile.cpp b/xbmc/filesystem/IFile.cpp
@@ -19,6 +19,7 @@
 */
 
 #include "IFile.h"
+#include "URL.h"
 #include <cstring>
 #include <errno.h>
 
@@ -88,3 +89,13 @@ bool IFile::ReadString(char *szLine, int iLineLength)
   }
   return true;
 }
+
+CRedirectException::CRedirectException() : 
+  m_pNewFileImp(NULL), m_pNewUrl(NULL)
+{
+}
+
+CRedirectException::CRedirectException(IFile *pNewFileImp, CURL *pNewUrl) :
+  m_pNewFileImp(pNewFileImp), m_pNewUrl(pNewUrl) 
+{
+}
diff --git a/xbmc/filesystem/IFile.h b/xbmc/filesystem/IFile.h
@@ -32,12 +32,14 @@
 #include "PlatformDefs.h" // for __stat64
 #endif
 
-#include "URL.h"
-
 #include <stdio.h>
 #include <stdint.h>
 #include <sys/stat.h>
 
+#include "utils/StdString.h"
+
+class CURL;
+
 namespace XFILE
 {
 
@@ -107,12 +109,9 @@ class CRedirectException
   IFile *m_pNewFileImp;
   CURL  *m_pNewUrl;
 
-  CRedirectException() : m_pNewFileImp(NULL), m_pNewUrl(NULL) { }
+  CRedirectException();
 
-  CRedirectException(IFile *pNewFileImp, CURL *pNewUrl=NULL) 
-  : m_pNewFileImp(pNewFileImp)
-  , m_pNewUrl(pNewUrl) 
-  { }
+  CRedirectException(IFile *pNewFileImp, CURL *pNewUrl=NULL);
 };
 
 }

diff --git a/xbmc/filesystem/PipeFile.cpp b/xbmc/filesystem/PipeFile.cpp
@@ -23,6 +23,7 @@
 #include "threads/SingleLock.h"
 #include "PipesManager.h"
 #include "utils/StringUtils.h"
+#include "URL.h"
 
 using namespace XFILE;
 

diff --git a/xbmc/filesystem/PluginDirectory.cpp b/xbmc/filesystem/PluginDirectory.cpp
@@ -39,6 +39,7 @@
 #include "utils/log.h"
 #include "utils/TimeUtils.h"
 #include "ApplicationMessenger.h"
+#include "URL.h"
 
 using namespace XFILE;
 using namespace std;

diff --git a/xbmc/filesystem/SAPFile.cpp b/xbmc/filesystem/SAPFile.cpp
@@ -20,6 +20,7 @@
 #include "SAPFile.h"
 #include "SAPDirectory.h"
 #include "threads/SingleLock.h"
+#include "URL.h"
 
 #include <sys/stat.h>
 #include <vector>
@@ -175,4 +176,4 @@ int CSAPFile::IoControl(EIoControl request, void* param)
     return 1;
 
   return -1;
-}
+}
diff --git a/xbmc/filesystem/SFTPFile.cpp b/xbmc/filesystem/SFTPFile.cpp
@@ -28,6 +28,7 @@
 #include "utils/TimeUtils.h"
 #include "utils/Variant.h"
 #include "Util.h"
+#include "URL.h"
 #include <fcntl.h>
 #include <sstream>
 

diff --git a/xbmc/filesystem/SFTPFile.h b/xbmc/filesystem/SFTPFile.h
@@ -24,7 +24,6 @@
 #include "system.h"
 #ifdef HAS_FILESYSTEM_SFTP
 #include "IFile.h"
-#include "URL.h"
 #include "FileItem.h"
 #include "threads/CriticalSection.h"
 
@@ -34,6 +33,8 @@
 #include <map>
 #include <boost/shared_ptr.hpp>
 
+class CURL;
+
 #if LIBSSH_VERSION_INT < SSH_VERSION_INT(0,3,2)
 #define ssh_session SSH_SESSION
 #endif

diff --git a/xbmc/filesystem/SlingboxFile.cpp b/xbmc/filesystem/SlingboxFile.cpp
@@ -26,6 +26,7 @@
 #include "settings/Settings.h"
 #include "utils/log.h"
 #include "utils/XMLUtils.h"
+#include "URL.h"
 
 using namespace XFILE;
 using namespace std;

diff --git a/xbmc/filesystem/UPnPFile.cpp b/xbmc/filesystem/UPnPFile.cpp
@@ -24,6 +24,7 @@
 #include "FileFactory.h"
 #include "FileItem.h"
 #include "utils/log.h"
+#include "URL.h"
 
 using namespace XFILE;
 

diff --git a/xbmc/guilib/GUIFontManager.cpp b/xbmc/guilib/GUIFontManager.cpp
@@ -33,6 +33,7 @@
 #include "utils/URIUtils.h"
 #include "utils/StringUtils.h"
 #include "windowing/WindowingFactory.h"
+#include "URL.h"
 
 using namespace std;
 

diff --git a/xbmc/guilib/TextureManager.cpp b/xbmc/guilib/TextureManager.cpp
@@ -33,6 +33,7 @@
 #endif
 #include "filesystem/File.h"
 #include "filesystem/Directory.h"
+#include "URL.h"
 #include <assert.h>
 
 using namespace std;

diff --git a/xbmc/interfaces/Builtins.cpp b/xbmc/interfaces/Builtins.cpp
@@ -54,6 +54,7 @@
 #include "utils/StringUtils.h"
 #include "utils/URIUtils.h"
 #include "Util.h"
+#include "URL.h"
 
 #include "filesystem/PluginDirectory.h"
 #ifdef HAS_FILESYSTEM_RAR

diff --git a/xbmc/interfaces/http-api/XBMChttp.cpp b/xbmc/interfaces/http-api/XBMChttp.cpp
@@ -52,6 +52,7 @@
 #include "utils/log.h"
 #include "TextureCache.h"
 #include "ThumbLoader.h"
+#include "URL.h"
 
 #ifdef _WIN32
 extern "C" FILE *fopen_utf8(const char *_Filename, const char *_Mode);

diff --git a/xbmc/interfaces/python/xbmcmodule/xbmcmodule.cpp b/xbmc/interfaces/python/xbmcmodule/xbmcmodule.cpp
@@ -56,6 +56,7 @@
 #include "utils/log.h"
 #include "pyrendercapture.h"
 #include "monitor.h"
+#include "URL.h"
 
 // include for constants
 #include "pyutil.h"

diff --git a/xbmc/music/MusicDatabase.cpp b/xbmc/music/MusicDatabase.cpp
@@ -62,6 +62,7 @@
 #include "interfaces/AnnouncementManager.h"
 #include "dbwrappers/dataset.h"
 #include "utils/XMLUtils.h"
+#include "URL.h"
 
 using namespace std;
 using namespace AUTOPTR;

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

diff --git a/xbmc/music/windows/GUIWindowMusicBase.cpp b/xbmc/music/windows/GUIWindowMusicBase.cpp
@@ -66,6 +66,7 @@
 #include "video/VideoInfoTag.h"
 #include "utils/StringUtils.h"
 #include "ThumbLoader.h"
+#include "URL.h"
 
 using namespace std;
 using namespace XFILE;

diff --git a/xbmc/music/windows/GUIWindowMusicNav.cpp b/xbmc/music/windows/GUIWindowMusicNav.cpp
@@ -51,6 +51,7 @@
 #include "utils/StringUtils.h"
 #include "TextureCache.h"
 #include "Util.h"
+#include "URL.h"
 
 using namespace std;
 using namespace XFILE;

diff --git a/xbmc/network/AirPlayServer.cpp b/xbmc/network/AirPlayServer.cpp
@@ -35,6 +35,7 @@
 #include "utils/md5.h"
 #include "utils/Variant.h"
 #include "guilib/GUIWindowManager.h"
+#include "URL.h"
 
 #ifdef TARGET_WINDOWS
 #define close closesocket

diff --git a/xbmc/network/AirTunesServer.cpp b/xbmc/network/AirTunesServer.cpp
@@ -43,6 +43,7 @@
 #include "utils/Variant.h"
 #include "settings/AdvancedSettings.h"
 #include "utils/EndianSwap.h"
+#include "URL.h"
 
 #include <map>
 #include <string>