cosmetics: cleanup unused Settings.h includes

diff --git a/xbmc/AutoSwitch.cpp b/xbmc/AutoSwitch.cpp
index 76eec91..13b9541 100644 (file)
--- a/xbmc/AutoSwitch.cpp
+++ b/xbmc/AutoSwitch.cpp
@@ -19,7 +19,6 @@
  */
 
 #include "AutoSwitch.h"
-#include "settings/Settings.h"
 #include "settings/GUISettings.h"
 #include "guilib/GUIWindowManager.h"
 #include "FileItem.h"

diff --git a/xbmc/Favourites.cpp b/xbmc/Favourites.cpp
index 4e70738..a692545 100644 (file)
--- a/xbmc/Favourites.cpp
+++ b/xbmc/Favourites.cpp
@@ -22,7 +22,6 @@
 #include "filesystem/File.h"
 #include "Util.h"
 #include "profiles/ProfilesManager.h"
-#include "settings/Settings.h"
 #include "FileItem.h"
 #include "utils/XBMCTinyXML.h"
 #include "utils/log.h"

diff --git a/xbmc/GUIPassword.cpp b/xbmc/GUIPassword.cpp
index 4862a3a..161edff 100644 (file)
--- a/xbmc/GUIPassword.cpp
+++ b/xbmc/GUIPassword.cpp
@@ -29,7 +29,6 @@
 #include "profiles/dialogs/GUIDialogLockSettings.h"
 #include "profiles/dialogs/GUIDialogProfileSettings.h"
 #include "Util.h"
-#include "settings/Settings.h"
 #include "settings/GUISettings.h"
 #include "settings/MediaSourceSettings.h"
 #include "guilib/GUIWindowManager.h"

diff --git a/xbmc/PartyModeManager.cpp b/xbmc/PartyModeManager.cpp
index a8607a9..56ff460 100644 (file)
--- a/xbmc/PartyModeManager.cpp
+++ b/xbmc/PartyModeManager.cpp
@@ -31,7 +31,6 @@
 #include "guilib/GUIWindowManager.h"
 #include "dialogs/GUIDialogOK.h"
 #include "playlists/PlayList.h"
-#include "settings/Settings.h"
 #include "utils/TimeUtils.h"
 #include "utils/log.h"
 #include "Application.h"

diff --git a/xbmc/PasswordManager.cpp b/xbmc/PasswordManager.cpp
index 81f4db8..eb2cde3 100644 (file)
--- a/xbmc/PasswordManager.cpp
+++ b/xbmc/PasswordManager.cpp
@@ -22,7 +22,6 @@
 #include "profiles/ProfilesManager.h"
 #include "profiles/dialogs/GUIDialogLockSettings.h"
 #include "URL.h"
-#include "settings/Settings.h"
 #include "utils/XMLUtils.h"
 #include "threads/SingleLock.h"
 #include "utils/log.h"

diff --git a/xbmc/TextureCache.cpp b/xbmc/TextureCache.cpp
index f611b67..7d1fefe 100644 (file)
--- a/xbmc/TextureCache.cpp
+++ b/xbmc/TextureCache.cpp
@@ -24,7 +24,6 @@
 #include "profiles/ProfilesManager.h"
 #include "threads/SingleLock.h"
 #include "utils/Crc32.h"
-#include "settings/Settings.h"
 #include "settings/AdvancedSettings.h"
 #include "utils/log.h"
 #include "utils/URIUtils.h"

diff --git a/xbmc/TextureCacheJob.cpp b/xbmc/TextureCacheJob.cpp
index 0fe7eec..6f062c1 100644 (file)
--- a/xbmc/TextureCacheJob.cpp
+++ b/xbmc/TextureCacheJob.cpp
@@ -22,7 +22,6 @@
 #include "TextureCache.h"
 #include "guilib/Texture.h"
 #include "guilib/DDSImage.h"
-#include "settings/Settings.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/GUISettings.h"
 #include "utils/log.h"

diff --git a/xbmc/ThumbnailCache.cpp b/xbmc/ThumbnailCache.cpp
index ffaa1d8..3e8c465 100644 (file)
--- a/xbmc/ThumbnailCache.cpp
+++ b/xbmc/ThumbnailCache.cpp
@@ -28,7 +28,6 @@
 #include "music/tags/MusicInfoTag.h"
 #include "music/Album.h"
 #include "music/Artist.h"
-#include "settings/Settings.h"
 #include "utils/URIUtils.h"
 #include "utils/Crc32.h"
 #include "utils/StringUtils.h"

diff --git a/xbmc/addons/Addon.cpp b/xbmc/addons/Addon.cpp
index 7315ab0..1fbc274 100644 (file)
--- a/xbmc/addons/Addon.cpp
+++ b/xbmc/addons/Addon.cpp
@@ -20,7 +20,6 @@
 
 #include "Addon.h"
 #include "AddonManager.h"
-#include "settings/Settings.h"
 #include "settings/GUISettings.h"
 #include "filesystem/Directory.h"
 #include "filesystem/File.h"

diff --git a/xbmc/addons/AddonManager.cpp b/xbmc/addons/AddonManager.cpp
index dff0917..38c304b 100644 (file)
--- a/xbmc/addons/AddonManager.cpp
+++ b/xbmc/addons/AddonManager.cpp
@@ -25,7 +25,6 @@
 #include "threads/SingleLock.h"
 #include "FileItem.h"
 #include "LangInfo.h"
-#include "settings/Settings.h"
 #include "settings/GUISettings.h"
 #include "settings/AdvancedSettings.h"
 #include "utils/log.h"

diff --git a/xbmc/addons/GUIViewStateAddonBrowser.cpp b/xbmc/addons/GUIViewStateAddonBrowser.cpp
index 626bada..1a1d75a 100644 (file)
--- a/xbmc/addons/GUIViewStateAddonBrowser.cpp
+++ b/xbmc/addons/GUIViewStateAddonBrowser.cpp
@@ -20,9 +20,9 @@
 
 #include "GUIViewStateAddonBrowser.h"
 #include "FileItem.h"
+#include "guilib/GraphicContext.h"
 #include "guilib/WindowIDs.h"
 #include "view/ViewState.h"
-#include "settings/Settings.h"
 #include "addons/Addon.h"
 #include "addons/AddonManager.h"
 #include "AddonDatabase.h"

diff --git a/xbmc/addons/ScreenSaver.cpp b/xbmc/addons/ScreenSaver.cpp
index cab3bbd..2d44e99 100644 (file)
--- a/xbmc/addons/ScreenSaver.cpp
+++ b/xbmc/addons/ScreenSaver.cpp
@@ -19,7 +19,6 @@
  */
 #include "ScreenSaver.h"
 #include "settings/DisplaySettings.h"
-#include "settings/Settings.h"
 #include "windowing/WindowingFactory.h"
 
 #ifdef HAS_PYTHON

diff --git a/xbmc/addons/Skin.cpp b/xbmc/addons/Skin.cpp
index 60a1a6b..1ca4350 100644 (file)
--- a/xbmc/addons/Skin.cpp
+++ b/xbmc/addons/Skin.cpp
@@ -24,7 +24,6 @@
 #include "filesystem/SpecialProtocol.h"
 #include "guilib/WindowIDs.h"
 #include "utils/URIUtils.h"
-#include "settings/Settings.h"
 #include "utils/log.h"
 #include "utils/StringUtils.h"
 #include "settings/GUISettings.h"

diff --git a/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp b/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp
index 3e23487..87991f1 100644 (file)
--- a/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp
+++ b/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp
@@ -31,7 +31,6 @@
 #include "FileItem.h"
 #include "profiles/ProfilesManager.h"
 #include "settings/AdvancedSettings.h"
-#include "settings/Settings.h"
 #include "utils/AutoPtrHandle.h"
 #include "cores/ExternalPlayer/ExternalPlayer.h"
 #include "PlayerCoreConfig.h"

diff --git a/xbmc/dbwrappers/Database.cpp b/xbmc/dbwrappers/Database.cpp
index 2227155..05566e7 100644 (file)
--- a/xbmc/dbwrappers/Database.cpp
+++ b/xbmc/dbwrappers/Database.cpp
@@ -19,7 +19,6 @@
  */
 
 #include "Database.h"
-#include "settings/Settings.h"
 #include "settings/AdvancedSettings.h"
 #include "utils/Crc32.h"
 #include "filesystem/SpecialProtocol.h"

diff --git a/xbmc/dialogs/GUIDialogFavourites.cpp b/xbmc/dialogs/GUIDialogFavourites.cpp
index 1a37bc6..9f147fa 100644 (file)
--- a/xbmc/dialogs/GUIDialogFavourites.cpp
+++ b/xbmc/dialogs/GUIDialogFavourites.cpp
@@ -28,7 +28,6 @@
 #include "filesystem/File.h"
 #include "FileItem.h"
 #include "guilib/LocalizeStrings.h"
-#include "settings/Settings.h"
 #include "storage/MediaManager.h"
 
 using namespace XFILE;

diff --git a/xbmc/dialogs/GUIDialogFileBrowser.cpp b/xbmc/dialogs/GUIDialogFileBrowser.cpp
index 7af2561..31d2ef5 100644 (file)
--- a/xbmc/dialogs/GUIDialogFileBrowser.cpp
+++ b/xbmc/dialogs/GUIDialogFileBrowser.cpp
@@ -40,7 +40,6 @@
 #include "filesystem/MultiPathDirectory.h"
 #include "profiles/ProfilesManager.h"
 #include "settings/AdvancedSettings.h"
-#include "settings/Settings.h"
 #include "settings/GUISettings.h"
 #include "settings/MediaSourceSettings.h"
 #include "guilib/Key.h"

diff --git a/xbmc/dialogs/GUIDialogMediaSource.cpp b/xbmc/dialogs/GUIDialogMediaSource.cpp
index 3ca567e..0c8f39b 100644 (file)
--- a/xbmc/dialogs/GUIDialogMediaSource.cpp
+++ b/xbmc/dialogs/GUIDialogMediaSource.cpp
@@ -31,7 +31,6 @@
 #include "filesystem/PVRDirectory.h"
 #include "GUIDialogYesNo.h"
 #include "FileItem.h"
-#include "settings/Settings.h"
 #include "settings/GUISettings.h"
 #include "settings/MediaSourceSettings.h"
 #include "guilib/LocalizeStrings.h"

diff --git a/xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp b/xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
index fbfcfca..3afb882 100644 (file)
--- a/xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
+++ b/xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
@@ -27,7 +27,6 @@
 #include "filesystem/File.h"
 #include "profiles/ProfilesManager.h"
 #include "settings/GUISettings.h"
-#include "settings/Settings.h"
 #include "FileItem.h"
 #include "guilib/Key.h"
 #include "guilib/LocalizeStrings.h"

diff --git a/xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp b/xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp
index f39d7d1..9d606ec 100644 (file)
--- a/xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp
+++ b/xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp
@@ -28,7 +28,6 @@
 #include "FileItem.h"
 #include "guilib/GUIEditControl.h"
 #include "guilib/LocalizeStrings.h"
-#include "settings/Settings.h"
 #include "settings/MediaSourceSettings.h"
 #include "storage/MediaManager.h"
 #include "utils/LabelFormatter.h"

diff --git a/xbmc/filesystem/DirectoryCache.cpp b/xbmc/filesystem/DirectoryCache.cpp
index 8449543..b37a3ad 100644 (file)
--- a/xbmc/filesystem/DirectoryCache.cpp
+++ b/xbmc/filesystem/DirectoryCache.cpp
@@ -19,7 +19,6 @@
  */
 
 #include "DirectoryCache.h"
-#include "settings/Settings.h"
 #include "FileItem.h"
 #include "threads/SingleLock.h"
 #include "utils/log.h"

diff --git a/xbmc/filesystem/LibraryDirectory.cpp b/xbmc/filesystem/LibraryDirectory.cpp
index 3e96585..6e47c5d 100644 (file)
--- a/xbmc/filesystem/LibraryDirectory.cpp
+++ b/xbmc/filesystem/LibraryDirectory.cpp
@@ -30,7 +30,6 @@
 #include "guilib/TextureManager.h"
 #include "FileItem.h"
 #include "File.h"
-#include "settings/Settings.h"
 #include "URL.h"
 #include "GUIInfoManager.h"
 #include "utils/log.h"

diff --git a/xbmc/filesystem/SlingboxFile.cpp b/xbmc/filesystem/SlingboxFile.cpp
index cc96007..5e3ee76 100644 (file)
--- a/xbmc/filesystem/SlingboxFile.cpp
+++ b/xbmc/filesystem/SlingboxFile.cpp
@@ -23,7 +23,6 @@
 #include "filesystem/File.h"
 #include "lib/SlingboxLib/SlingboxLib.h"
 #include "profiles/ProfilesManager.h"
-#include "settings/Settings.h"
 #include "utils/log.h"
 #include "utils/XMLUtils.h"
 #include "URL.h"

diff --git a/xbmc/filesystem/SourcesDirectory.cpp b/xbmc/filesystem/SourcesDirectory.cpp
index d55b5d9..73218a5 100644 (file)
--- a/xbmc/filesystem/SourcesDirectory.cpp
+++ b/xbmc/filesystem/SourcesDirectory.cpp
@@ -25,7 +25,6 @@
 #include "FileItem.h"
 #include "File.h"
 #include "profiles/ProfilesManager.h"
-#include "settings/Settings.h"
 #include "settings/MediaSourceSettings.h"
 #include "guilib/TextureManager.h"
 #include "storage/MediaManager.h"

diff --git a/xbmc/guilib/FrameBufferObject.cpp b/xbmc/guilib/FrameBufferObject.cpp
index ab0459c..d9bb6e0 100644 (file)
--- a/xbmc/guilib/FrameBufferObject.cpp
+++ b/xbmc/guilib/FrameBufferObject.cpp
@@ -22,7 +22,6 @@
 
 #if defined(HAS_GL) || HAS_GLES == 2
 #include "FrameBufferObject.h"
-#include "settings/Settings.h"
 #include "windowing/WindowingFactory.h"
 #include "utils/GLUtils.h"
 #include "utils/log.h"

diff --git a/xbmc/guilib/GraphicContext.cpp b/xbmc/guilib/GraphicContext.cpp
index e633178..6d88955 100644 (file)
--- a/xbmc/guilib/GraphicContext.cpp
+++ b/xbmc/guilib/GraphicContext.cpp
@@ -25,7 +25,6 @@
 #include "ApplicationMessenger.h"
 #include "settings/DisplaySettings.h"
 #include "settings/GUISettings.h"
-#include "settings/Settings.h"
 #include "settings/AdvancedSettings.h"
 #include "cores/VideoRenderers/RenderManager.h"
 #include "windowing/WindowingFactory.h"

diff --git a/xbmc/guilib/Shader.cpp b/xbmc/guilib/Shader.cpp
index 6405f61..1aa3b80 100644 (file)
--- a/xbmc/guilib/Shader.cpp
+++ b/xbmc/guilib/Shader.cpp
@@ -23,7 +23,6 @@
 #if defined(HAS_GL) || HAS_GLES == 2
 
 #include "Shader.h"
-#include "settings/Settings.h"
 #include "filesystem/File.h"
 #include "utils/log.h"
 #include "utils/GLUtils.h"

diff --git a/xbmc/input/ButtonTranslator.cpp b/xbmc/input/ButtonTranslator.cpp
index 051cbd1..d925615 100644 (file)
--- a/xbmc/input/ButtonTranslator.cpp
+++ b/xbmc/input/ButtonTranslator.cpp
@@ -23,7 +23,6 @@
 #include "ButtonTranslator.h"
 #include "profiles/ProfilesManager.h"
 #include "utils/URIUtils.h"
-#include "settings/Settings.h"
 #include "guilib/Key.h"
 #include "guilib/WindowIDs.h"
 #include "input/XBMC_keysym.h"

diff --git a/xbmc/interfaces/legacy/Dialog.cpp b/xbmc/interfaces/legacy/Dialog.cpp
index d360223..b5869f2 100644 (file)
--- a/xbmc/interfaces/legacy/Dialog.cpp
+++ b/xbmc/interfaces/legacy/Dialog.cpp
@@ -9,7 +9,6 @@
 #include "dialogs/GUIDialogFileBrowser.h"
 #include "dialogs/GUIDialogNumeric.h"
 #include "settings/MediaSourceSettings.h"
-#include "settings/Settings.h"
 
 #define ACTIVE_WINDOW g_windowManager.GetActiveWindow()
 

diff --git a/xbmc/interfaces/legacy/PlayList.cpp b/xbmc/interfaces/legacy/PlayList.cpp
index 67f389b..b27372c 100644 (file)
--- a/xbmc/interfaces/legacy/PlayList.cpp
+++ b/xbmc/interfaces/legacy/PlayList.cpp
@@ -21,7 +21,6 @@
 
 #include "PlayList.h"
 #include "PlayListPlayer.h"
-#include "settings/Settings.h"
 #include "Application.h"
 #include "playlists/PlayListFactory.h"
 #include "utils/URIUtils.h"

diff --git a/xbmc/interfaces/legacy/Window.cpp b/xbmc/interfaces/legacy/Window.cpp
index 95e5514..ea0ed80 100644 (file)
--- a/xbmc/interfaces/legacy/Window.cpp
+++ b/xbmc/interfaces/legacy/Window.cpp
@@ -27,7 +27,6 @@
 #include "guilib/GUIRadioButtonControl.h"
 #include "guilib/GUIWindowManager.h"
 #include "settings/DisplaySettings.h"
-#include "settings/Settings.h"
 #include "Application.h"
 #include "ApplicationMessenger.h"
 #include "utils/Variant.h"

diff --git a/xbmc/interfaces/python/XBPython.cpp b/xbmc/interfaces/python/XBPython.cpp
index 67713d0..9fef88a 100644 (file)
--- a/xbmc/interfaces/python/XBPython.cpp
+++ b/xbmc/interfaces/python/XBPython.cpp
@@ -32,9 +32,9 @@
 #include "cores/DllLoader/DllLoaderContainer.h"
 #include "GUIPassword.h"
 #include "XBPython.h"
-#include "settings/Settings.h"
 #include "filesystem/File.h"
 #include "filesystem/SpecialProtocol.h"
+#include "guilib/GraphicContext.h"
 #include "profiles/ProfilesManager.h"
 #include "utils/log.h"
 #include "pythreadstate.h"

diff --git a/xbmc/music/dialogs/GUIDialogMusicInfo.cpp b/xbmc/music/dialogs/GUIDialogMusicInfo.cpp
index 07d871c..e4a6717 100644 (file)
--- a/xbmc/music/dialogs/GUIDialogMusicInfo.cpp
+++ b/xbmc/music/dialogs/GUIDialogMusicInfo.cpp
@@ -31,7 +31,6 @@
 #include "profiles/ProfilesManager.h"
 #include "storage/MediaManager.h"
 #include "utils/AsyncFileCopy.h"
-#include "settings/Settings.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/GUISettings.h"
 #include "settings/MediaSourceSettings.h"

diff --git a/xbmc/music/dialogs/GUIDialogSongInfo.cpp b/xbmc/music/dialogs/GUIDialogSongInfo.cpp
index c5f9f45..cf3139d 100644 (file)
--- a/xbmc/music/dialogs/GUIDialogSongInfo.cpp
+++ b/xbmc/music/dialogs/GUIDialogSongInfo.cpp
@@ -32,7 +32,6 @@
 #include "filesystem/File.h"
 #include "filesystem/CurlFile.h"
 #include "FileItem.h"
-#include "settings/Settings.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/GUISettings.h"
 #include "settings/MediaSourceSettings.h"

diff --git a/xbmc/music/karaoke/karaokelyricscdg.cpp b/xbmc/music/karaoke/karaokelyricscdg.cpp
index 153efdc..26483e3 100644 (file)
--- a/xbmc/music/karaoke/karaokelyricscdg.cpp
+++ b/xbmc/music/karaoke/karaokelyricscdg.cpp
@@ -21,7 +21,7 @@
 #include "system.h"
 #include "filesystem/File.h"
 #include "settings/DisplaySettings.h"
-#include "settings/Settings.h"
+#include "guilib/GraphicContext.h"
 #include "guilib/Texture.h"
 #include "guilib/GUITexture.h"
 #include "settings/AdvancedSettings.h"

diff --git a/xbmc/music/karaoke/karaokelyricstext.cpp b/xbmc/music/karaoke/karaokelyricstext.cpp
index 22cd199..64d2e45 100644 (file)
--- a/xbmc/music/karaoke/karaokelyricstext.cpp
+++ b/xbmc/music/karaoke/karaokelyricstext.cpp
@@ -24,7 +24,6 @@
 
 #include "utils/CharsetConverter.h"
 #include "settings/DisplaySettings.h"
-#include "settings/Settings.h"
 #include "settings/GUISettings.h"
 #include "guilib/GUITextLayout.h"
 #include "guilib/GUIFont.h"

diff --git a/xbmc/music/karaoke/karaokevideobackground.cpp b/xbmc/music/karaoke/karaokevideobackground.cpp
index af41a1b..e6a3c5c 100644 (file)
--- a/xbmc/music/karaoke/karaokevideobackground.cpp
+++ b/xbmc/music/karaoke/karaokevideobackground.cpp
@@ -21,9 +21,9 @@
 
 #include "karaokevideobackground.h"
 
+#include "guilib/GraphicContext.h"
 #include "guilib/Texture.h"
 #include "guilib/GUITexture.h"
-#include "settings/Settings.h"
 #include "Application.h"
 #include "DllAvFormat.h"
 #include "DllAvCodec.h"

diff --git a/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp b/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp
index f1997ba..b5730fb 100644 (file)
--- a/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp
+++ b/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp
@@ -23,7 +23,6 @@
 #include "network/cddb.h"
 #include "MusicInfoTag.h"
 #include "profiles/ProfilesManager.h"
-#include "settings/Settings.h"
 #include "storage/MediaManager.h"
 #include "utils/log.h"
 

diff --git a/xbmc/music/windows/GUIWindowMusicSongs.cpp b/xbmc/music/windows/GUIWindowMusicSongs.cpp
index a0e2a7b..4f9b214 100644 (file)
--- a/xbmc/music/windows/GUIWindowMusicSongs.cpp
+++ b/xbmc/music/windows/GUIWindowMusicSongs.cpp
@@ -31,7 +31,6 @@
 #include "FileItem.h"
 #include "profiles/ProfilesManager.h"
 #include "storage/MediaManager.h"
-#include "settings/Settings.h"
 #include "settings/GUISettings.h"
 #include "settings/MediaSourceSettings.h"
 #include "guilib/Key.h"

diff --git a/xbmc/network/Zeroconf.cpp b/xbmc/network/Zeroconf.cpp
index 1ec94ed..b1130f6 100644 (file)
--- a/xbmc/network/Zeroconf.cpp
+++ b/xbmc/network/Zeroconf.cpp
@@ -19,7 +19,6 @@
  */
 #include "system.h" //HAS_ZEROCONF define
 #include "Zeroconf.h"
-#include "settings/Settings.h"
 #include "settings/GUISettings.h"
 
 #ifdef _LINUX
@@ -170,4 +169,4 @@ bool CZeroconf::CPublish::DoWork()
     CZeroconf::GetInstance()->doPublishService(it->first, it->second.type, it->second.name, it->second.port, it->second.txt);
 
   return true;
-}
\ No newline at end of file
+}

diff --git a/xbmc/network/ZeroconfBrowser.cpp b/xbmc/network/ZeroconfBrowser.cpp
index 61b2717..de94b59 100644 (file)
--- a/xbmc/network/ZeroconfBrowser.cpp
+++ b/xbmc/network/ZeroconfBrowser.cpp
@@ -19,7 +19,6 @@
  */
 #include "system.h" //HAS_ZEROCONF define
 #include "ZeroconfBrowser.h"
-#include "settings/Settings.h"
 #include <stdexcept>
 #include "utils/log.h"
 

diff --git a/xbmc/network/httprequesthandler/HTTPVfsHandler.cpp b/xbmc/network/httprequesthandler/HTTPVfsHandler.cpp
index f19aa31..522809d 100644 (file)
--- a/xbmc/network/httprequesthandler/HTTPVfsHandler.cpp
+++ b/xbmc/network/httprequesthandler/HTTPVfsHandler.cpp
@@ -24,7 +24,6 @@
 #include "filesystem/File.h"
 #include "network/WebServer.h"
 #include "settings/MediaSourceSettings.h"
-#include "settings/Settings.h"
 #include "utils/URIUtils.h"
 
 using namespace std;

diff --git a/xbmc/network/upnp/UPnP.cpp b/xbmc/network/upnp/UPnP.cpp
index ecb5f5b..5c67919 100644 (file)
--- a/xbmc/network/upnp/UPnP.cpp
+++ b/xbmc/network/upnp/UPnP.cpp
@@ -36,7 +36,6 @@
 #include "profiles/ProfilesManager.h"
 #include "settings/GUISettings.h"
 #include "GUIUserMessages.h"
-#include "settings/Settings.h"
 #include "FileItem.h"
 #include "guilib/GUIWindowManager.h"
 #include "GUIInfoManager.h"

diff --git a/xbmc/peripherals/devices/PeripheralHID.cpp b/xbmc/peripherals/devices/PeripheralHID.cpp
index 11f6254..43fa12c 100644 (file)
--- a/xbmc/peripherals/devices/PeripheralHID.cpp
+++ b/xbmc/peripherals/devices/PeripheralHID.cpp
@@ -20,7 +20,6 @@
 
 #include "PeripheralHID.h"
 #include "utils/log.h"
-#include "settings/Settings.h"
 #include "guilib/LocalizeStrings.h"
 #include "input/ButtonTranslator.h"
 

diff --git a/xbmc/profiles/windows/GUIWindowSettingsProfile.cpp b/xbmc/profiles/windows/GUIWindowSettingsProfile.cpp
index 7799332..6fbb1c6 100644 (file)
--- a/xbmc/profiles/windows/GUIWindowSettingsProfile.cpp
+++ b/xbmc/profiles/windows/GUIWindowSettingsProfile.cpp
@@ -33,7 +33,6 @@
 #include "guilib/GUIWindowManager.h"
 #include "filesystem/Directory.h"
 #include "FileItem.h"
-#include "settings/Settings.h"
 #include "guilib/Key.h"
 #include "guilib/LocalizeStrings.h"
 

diff --git a/xbmc/programs/GUIViewStatePrograms.cpp b/xbmc/programs/GUIViewStatePrograms.cpp
index 6be388c..9c4c8c8 100644 (file)
--- a/xbmc/programs/GUIViewStatePrograms.cpp
+++ b/xbmc/programs/GUIViewStatePrograms.cpp
@@ -22,7 +22,6 @@
 #include "FileItem.h"
 #include "view/ViewState.h"
 #include "settings/GUISettings.h"
-#include "settings/Settings.h"
 #include "settings/MediaSourceSettings.h"
 #include "filesystem/Directory.h"
 #include "guilib/LocalizeStrings.h"

diff --git a/xbmc/programs/GUIWindowPrograms.cpp b/xbmc/programs/GUIWindowPrograms.cpp
index 57a34db..0b69352 100644 (file)
--- a/xbmc/programs/GUIWindowPrograms.cpp
+++ b/xbmc/programs/GUIWindowPrograms.cpp
@@ -26,7 +26,6 @@
 #include "guilib/GUIWindowManager.h"
 #include "FileItem.h"
 #include "settings/MediaSourceSettings.h"
-#include "settings/Settings.h"
 #include "guilib/Key.h"
 #include "guilib/LocalizeStrings.h"
 #include "utils/log.h"

diff --git a/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp b/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp
index 8e93551..80e397d 100644 (file)
--- a/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp
+++ b/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp
@@ -39,7 +39,6 @@
 #include "pvr/channels/PVRChannelGroupsContainer.h"
 #include "pvr/addons/PVRClients.h"
 #include "settings/GUISettings.h"
-#include "settings/Settings.h"
 #include "storage/MediaManager.h"
 
 #define BUTTON_OK                 4

diff --git a/xbmc/pvr/windows/GUIViewStatePVR.cpp b/xbmc/pvr/windows/GUIViewStatePVR.cpp
index 411749c..c065b5f 100644 (file)
--- a/xbmc/pvr/windows/GUIViewStatePVR.cpp
+++ b/xbmc/pvr/windows/GUIViewStatePVR.cpp
@@ -23,7 +23,6 @@
 #include "GUIWindowPVRCommon.h"
 #include "guilib/GUIWindowManager.h"
 #include "settings/GUISettings.h"
-#include "settings/Settings.h"
 
 using namespace PVR;
 

diff --git a/xbmc/pvr/windows/GUIWindowPVRChannels.cpp b/xbmc/pvr/windows/GUIWindowPVRChannels.cpp
index 0be2c8e..aad6a5c 100644 (file)
--- a/xbmc/pvr/windows/GUIWindowPVRChannels.cpp
+++ b/xbmc/pvr/windows/GUIWindowPVRChannels.cpp
@@ -38,7 +38,6 @@
 #include "pvr/timers/PVRTimers.h"
 #include "epg/EpgContainer.h"
 #include "settings/GUISettings.h"
-#include "settings/Settings.h"
 #include "storage/MediaManager.h"
 #include "utils/log.h"
 #include "threads/SingleLock.h"

diff --git a/xbmc/pvr/windows/GUIWindowPVRGuide.cpp b/xbmc/pvr/windows/GUIWindowPVRGuide.cpp
index 2d76970..4dfd5fb 100644 (file)
--- a/xbmc/pvr/windows/GUIWindowPVRGuide.cpp
+++ b/xbmc/pvr/windows/GUIWindowPVRGuide.cpp
@@ -30,7 +30,6 @@
 #include "pvr/windows/GUIWindowPVR.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/GUISettings.h"
-#include "settings/Settings.h"
 #include "threads/SingleLock.h"
 #include "utils/log.h"
 #include "pvr/addons/PVRClients.h"

diff --git a/xbmc/settings/MediaSourceSettings.cpp b/xbmc/settings/MediaSourceSettings.cpp
index df1dcd2..a3108c1 100644 (file)
--- a/xbmc/settings/MediaSourceSettings.cpp
+++ b/xbmc/settings/MediaSourceSettings.cpp
@@ -23,7 +23,6 @@
 #include "Util.h"
 #include "filesystem/File.h"
 #include "profiles/ProfilesManager.h"
-#include "settings/Settings.h"
 #include "utils/log.h"
 #include "utils/StringUtils.h"
 #include "utils/URIUtils.h"

diff --git a/xbmc/settings/VideoSettings.cpp b/xbmc/settings/VideoSettings.cpp
index 556288e..4818c0d 100644 (file)
--- a/xbmc/settings/VideoSettings.cpp
+++ b/xbmc/settings/VideoSettings.cpp
@@ -22,7 +22,6 @@
 //////////////////////////////////////////////////////////////////////
 
 #include "VideoSettings.h"
-#include "Settings.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction

diff --git a/xbmc/settings/windows/GUIWindowTestPattern.cpp b/xbmc/settings/windows/GUIWindowTestPattern.cpp
index a815aad..555e327 100644 (file)
--- a/xbmc/settings/windows/GUIWindowTestPattern.cpp
+++ b/xbmc/settings/windows/GUIWindowTestPattern.cpp
@@ -22,7 +22,6 @@
 
 #include "GUIWindowTestPattern.h"
 #include "settings/DisplaySettings.h"
-#include "settings/Settings.h"
 #include "guilib/GUIWindowManager.h"
 #include "guilib/Key.h"
 #include "guilib/WindowIDs.h"

diff --git a/xbmc/storage/MediaManager.cpp b/xbmc/storage/MediaManager.cpp
index f3758e8..3a2dcb4 100644 (file)
--- a/xbmc/storage/MediaManager.cpp
+++ b/xbmc/storage/MediaManager.cpp
@@ -37,7 +37,6 @@
 #endif
 #include "Autorun.h"
 #include "GUIUserMessages.h"
-#include "settings/Settings.h"
 #include "settings/MediaSourceSettings.h"
 #include "utils/XBMCTinyXML.h"
 #include "threads/SingleLock.h"

diff --git a/xbmc/utils/EdenVideoArtUpdater.cpp b/xbmc/utils/EdenVideoArtUpdater.cpp
index 85e21b8..d7ff690 100644 (file)
--- a/xbmc/utils/EdenVideoArtUpdater.cpp
+++ b/xbmc/utils/EdenVideoArtUpdater.cpp
@@ -32,7 +32,6 @@
 #include "pictures/Picture.h"
 #include "profiles/ProfilesManager.h"
 #include "settings/GUISettings.h"
-#include "settings/Settings.h"
 #include "settings/AdvancedSettings.h"
 #include "guilib/Texture.h"
 #include "guilib/GUIWindowManager.h"

diff --git a/xbmc/utils/RecentlyAddedJob.cpp b/xbmc/utils/RecentlyAddedJob.cpp
index 750ac91..8ceba27 100644 (file)
--- a/xbmc/utils/RecentlyAddedJob.cpp
+++ b/xbmc/utils/RecentlyAddedJob.cpp
@@ -28,7 +28,6 @@
 #include "guilib/WindowIDs.h"
 #include "music/MusicDatabase.h"
 #include "music/tags/MusicInfoTag.h"
-#include "settings/Settings.h"
 #include "utils/Variant.h"
 #include "utils/StringUtils.h"
 #include "settings/AdvancedSettings.h"

diff --git a/xbmc/utils/RssManager.cpp b/xbmc/utils/RssManager.cpp
index c9b2e93..686c3eb 100644 (file)
--- a/xbmc/utils/RssManager.cpp
+++ b/xbmc/utils/RssManager.cpp
@@ -21,7 +21,6 @@
 #include "RssManager.h"
 #include "filesystem/File.h"
 #include "profiles/ProfilesManager.h"
-#include "settings/Settings.h"
 #include "threads/SingleLock.h"
 #include "utils/log.h"
 #include "utils/RssReader.h"

diff --git a/xbmc/video/dialogs/GUIDialogTeletext.cpp b/xbmc/video/dialogs/GUIDialogTeletext.cpp
index f70730c..a5f238a 100644 (file)
--- a/xbmc/video/dialogs/GUIDialogTeletext.cpp
+++ b/xbmc/video/dialogs/GUIDialogTeletext.cpp
@@ -24,7 +24,6 @@
 #include "Application.h"
 #include "guilib/GUITexture.h"
 #include "guilib/Texture.h"
-#include "settings/Settings.h"
 #include "guilib/LocalizeStrings.h"
 #include "dialogs/GUIDialogKaiToast.h"
 #include "cores/IPlayer.h"

diff --git a/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp b/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
index 560ecd8..5fa58f6 100644 (file)
--- a/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
+++ b/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
@@ -30,7 +30,6 @@
 #include "dialogs/GUIDialogContextMenu.h"
 #include "view/ViewState.h"
 #include "profiles/ProfilesManager.h"
-#include "settings/Settings.h"
 #include "settings/AdvancedSettings.h"
 #include "FileItem.h"
 #include "guilib/Texture.h"

diff --git a/xbmc/video/dialogs/GUIDialogVideoInfo.cpp b/xbmc/video/dialogs/GUIDialogVideoInfo.cpp
index 88ecf50..538f54b 100644 (file)
--- a/xbmc/video/dialogs/GUIDialogVideoInfo.cpp
+++ b/xbmc/video/dialogs/GUIDialogVideoInfo.cpp
@@ -40,7 +40,6 @@
 #include "storage/MediaManager.h"
 #include "utils/AsyncFileCopy.h"
 #include "profiles/ProfilesManager.h"
-#include "settings/Settings.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/GUISettings.h"
 #include "settings/MediaSourceSettings.h"

diff --git a/xbmc/view/ViewDatabase.cpp b/xbmc/view/ViewDatabase.cpp
index 314bd96..ecc38c7 100644 (file)
--- a/xbmc/view/ViewDatabase.cpp
+++ b/xbmc/view/ViewDatabase.cpp
@@ -20,7 +20,6 @@
 
 #include "ViewDatabase.h"
 #include "utils/URIUtils.h"
-#include "settings/Settings.h"
 #include "view/ViewState.h"
 #include "utils/log.h"
 #ifdef _LINUX

diff --git a/xbmc/windows/GUIMediaWindow.cpp b/xbmc/windows/GUIMediaWindow.cpp
index 0c2ff5d..33cd79c 100644 (file)
--- a/xbmc/windows/GUIMediaWindow.cpp
+++ b/xbmc/windows/GUIMediaWindow.cpp
@@ -50,7 +50,6 @@
 #include "dialogs/GUIDialogOK.h"
 #include "playlists/PlayList.h"
 #include "storage/MediaManager.h"
-#include "settings/Settings.h"
 #include "utils/StringUtils.h"
 #include "utils/URIUtils.h"
 #include "guilib/Key.h"

diff --git a/xbmc/windows/GUIWindowLoginScreen.cpp b/xbmc/windows/GUIWindowLoginScreen.cpp
index d6c472b..699b595 100644 (file)
--- a/xbmc/windows/GUIWindowLoginScreen.cpp
+++ b/xbmc/windows/GUIWindowLoginScreen.cpp
@@ -42,7 +42,6 @@
 #include "GUIUserMessages.h"
 #include "guilib/GUIWindowManager.h"
 #include "dialogs/GUIDialogOK.h"
-#include "settings/Settings.h"
 #include "settings/GUISettings.h"
 #include "FileItem.h"
 #include "guilib/Key.h"

diff --git a/xbmc/windows/GUIWindowWeather.cpp b/xbmc/windows/GUIWindowWeather.cpp
index ca617b0..925031e 100644 (file)
--- a/xbmc/windows/GUIWindowWeather.cpp
+++ b/xbmc/windows/GUIWindowWeather.cpp
@@ -33,7 +33,6 @@
 #include "LangInfo.h"
 #include "utils/log.h"
 #include "utils/SystemInfo.h"
-#include "settings/Settings.h"
 #include "addons/AddonManager.h"
 
 using namespace ADDON;