diff options
102 files changed, 103 insertions, 98 deletions
diff --git a/Makefile.in b/Makefile.in index d9c16cad3f..851da550b5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -91,6 +91,7 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \ xbmc/rendering/rendering.a \ xbmc/settings/settings.a \ xbmc/settings/dialogs/settings_dialogs.a \ + xbmc/settings/lib/settings_lib.a \ xbmc/settings/windows/settings_windows.a \ xbmc/storage/storage.a \ xbmc/utils/utils.a \ diff --git a/xbmc/Application.h b/xbmc/Application.h index 89ca19b0f6..a0e20b4253 100644 --- a/xbmc/Application.h +++ b/xbmc/Application.h @@ -49,9 +49,9 @@ class CPlayerController; #include "cores/IPlayerCallback.h" #include "cores/playercorefactory/PlayerCoreFactory.h" #include "PlayListPlayer.h" -#include "settings/ISettingsHandler.h" -#include "settings/ISettingCallback.h" -#include "settings/ISubSettings.h" +#include "settings/lib/ISettingsHandler.h" +#include "settings/lib/ISettingCallback.h" +#include "settings/lib/ISubSettings.h" #if !defined(TARGET_WINDOWS) && defined(HAS_DVD_DRIVE) #include "storage/DetectDVDType.h" #endif diff --git a/xbmc/GUIPassword.cpp b/xbmc/GUIPassword.cpp index 58d15b0fd3..568a352152 100644 --- a/xbmc/GUIPassword.cpp +++ b/xbmc/GUIPassword.cpp @@ -30,7 +30,6 @@ #include "profiles/dialogs/GUIDialogProfileSettings.h" #include "Util.h" #include "settings/MediaSourceSettings.h" -#include "settings/Setting.h" #include "settings/Settings.h" #include "guilib/GUIWindowManager.h" #include "FileItem.h" diff --git a/xbmc/GUIPassword.h b/xbmc/GUIPassword.h index d676761d4e..a090a82da2 100644 --- a/xbmc/GUIPassword.h +++ b/xbmc/GUIPassword.h @@ -23,9 +23,9 @@ #include <map> #include <vector> -#include "settings/ISettingCallback.h" +#include "settings/lib/ISettingCallback.h" #include "utils/StdString.h" -#include "settings/Setting.h" +#include "settings/lib/Setting.h" class CFileItem; class CMediaSource; diff --git a/xbmc/LangInfo.cpp b/xbmc/LangInfo.cpp index f283c28a15..5e2f2aaa3b 100644 --- a/xbmc/LangInfo.cpp +++ b/xbmc/LangInfo.cpp @@ -27,7 +27,7 @@ #include "guilib/LocalizeStrings.h" #include "pvr/PVRManager.h" #include "settings/AdvancedSettings.h" -#include "settings/Setting.h" +#include "settings/lib/Setting.h" #include "settings/Settings.h" #include "utils/CharsetConverter.h" #include "utils/log.h" diff --git a/xbmc/LangInfo.h b/xbmc/LangInfo.h index 63ce8ca8d0..b432da7786 100644 --- a/xbmc/LangInfo.h +++ b/xbmc/LangInfo.h @@ -19,7 +19,7 @@ * */ -#include "settings/ISettingCallback.h" +#include "settings/lib/ISettingCallback.h" #include "utils/StdString.h" #include <map> diff --git a/xbmc/addons/Skin.cpp b/xbmc/addons/Skin.cpp index 6e85a95429..e177edac68 100644 --- a/xbmc/addons/Skin.cpp +++ b/xbmc/addons/Skin.cpp @@ -25,8 +25,8 @@ #include "filesystem/File.h" #include "filesystem/SpecialProtocol.h" #include "guilib/WindowIDs.h" -#include "settings/Setting.h" #include "settings/Settings.h" +#include "settings/lib/Setting.h" #include "utils/URIUtils.h" #include "utils/log.h" #include "utils/StringUtils.h" diff --git a/xbmc/cores/AudioEngine/AEFactory.cpp b/xbmc/cores/AudioEngine/AEFactory.cpp index 18288bc69d..61813994c1 100644 --- a/xbmc/cores/AudioEngine/AEFactory.cpp +++ b/xbmc/cores/AudioEngine/AEFactory.cpp @@ -24,7 +24,7 @@ #if defined(TARGET_DARWIN) #include "Engines/CoreAudio/CoreAudioAE.h" - #include "settings/SettingsManager.h" + #include "settings/lib/SettingsManager.h" #else #include "Engines/ActiveAE/ActiveAE.h" #endif @@ -38,7 +38,7 @@ #endif #include "guilib/LocalizeStrings.h" -#include "settings/Setting.h" +#include "settings/lib/Setting.h" #include "settings/Settings.h" #include "utils/StringUtils.h" diff --git a/xbmc/cores/playercorefactory/PlayerCoreFactory.h b/xbmc/cores/playercorefactory/PlayerCoreFactory.h index 2649c7f44f..3c17dd361b 100644 --- a/xbmc/cores/playercorefactory/PlayerCoreFactory.h +++ b/xbmc/cores/playercorefactory/PlayerCoreFactory.h @@ -24,7 +24,7 @@ #include "system.h" #include "cores/IPlayerCallback.h" -#include "settings/ISettingsHandler.h" +#include "settings/lib/ISettingsHandler.h" #include "threads/CriticalSection.h" #include "utils/StdString.h" diff --git a/xbmc/epg/EpgContainer.cpp b/xbmc/epg/EpgContainer.cpp index cc0f2216cd..68d23c9e0d 100644 --- a/xbmc/epg/EpgContainer.cpp +++ b/xbmc/epg/EpgContainer.cpp @@ -21,7 +21,7 @@ #include "Application.h" #include "threads/SingleLock.h" #include "settings/AdvancedSettings.h" -#include "settings/Setting.h" +#include "settings/lib/Setting.h" #include "settings/Settings.h" #include "dialogs/GUIDialogExtendedProgressBar.h" #include "dialogs/GUIDialogProgress.h" diff --git a/xbmc/epg/EpgContainer.h b/xbmc/epg/EpgContainer.h index 5a05f66568..769f1a7891 100644 --- a/xbmc/epg/EpgContainer.h +++ b/xbmc/epg/EpgContainer.h @@ -21,7 +21,7 @@ */ #include "XBDateTime.h" -#include "settings/ISettingCallback.h" +#include "settings/lib/ISettingCallback.h" #include "threads/CriticalSection.h" #include "threads/Thread.h" #include "utils/Observer.h" diff --git a/xbmc/guilib/GUIAudioManager.cpp b/xbmc/guilib/GUIAudioManager.cpp index 61cb57bfec..7d2b6403b7 100644 --- a/xbmc/guilib/GUIAudioManager.cpp +++ b/xbmc/guilib/GUIAudioManager.cpp @@ -22,7 +22,7 @@ #include "GUIAudioManager.h" #include "Key.h" #include "input/ButtonTranslator.h" -#include "settings/Setting.h" +#include "settings/lib/Setting.h" #include "threads/SingleLock.h" #include "utils/URIUtils.h" #include "utils/XBMCTinyXML.h" diff --git a/xbmc/guilib/GUIAudioManager.h b/xbmc/guilib/GUIAudioManager.h index 2fb1cb0a9e..ab0d9658e1 100644 --- a/xbmc/guilib/GUIAudioManager.h +++ b/xbmc/guilib/GUIAudioManager.h @@ -23,7 +23,7 @@ #include <map> #include "cores/AudioEngine/Interfaces/AESound.h" -#include "settings/ISettingCallback.h" +#include "settings/lib/ISettingCallback.h" #include "threads/CriticalSection.h" #include "utils/log.h" #include "utils/StdString.h" diff --git a/xbmc/guilib/GUIFontManager.cpp b/xbmc/guilib/GUIFontManager.cpp index 5c4c96fa9b..a0f62d38b3 100644 --- a/xbmc/guilib/GUIFontManager.cpp +++ b/xbmc/guilib/GUIFontManager.cpp @@ -29,7 +29,7 @@ #include "filesystem/Directory.h" #include "filesystem/File.h" #include "filesystem/SpecialProtocol.h" -#include "settings/Setting.h" +#include "settings/lib/Setting.h" #include "utils/log.h" #include "utils/URIUtils.h" #include "utils/StringUtils.h" diff --git a/xbmc/guilib/GraphicContext.cpp b/xbmc/guilib/GraphicContext.cpp index 3c8f993e79..688c7855da 100644 --- a/xbmc/guilib/GraphicContext.cpp +++ b/xbmc/guilib/GraphicContext.cpp @@ -25,7 +25,7 @@ #include "ApplicationMessenger.h" #include "settings/AdvancedSettings.h" #include "settings/DisplaySettings.h" -#include "settings/Setting.h" +#include "settings/lib/Setting.h" #include "settings/Settings.h" #include "cores/VideoRenderers/RenderManager.h" #include "windowing/WindowingFactory.h" diff --git a/xbmc/guilib/GraphicContext.h b/xbmc/guilib/GraphicContext.h index c15a7e02b4..16832071a8 100644 --- a/xbmc/guilib/GraphicContext.h +++ b/xbmc/guilib/GraphicContext.h @@ -47,7 +47,7 @@ #include "Resolution.h" #include "utils/GlobalsHandling.h" #include "DirtyRegion.h" -#include "settings/ISettingCallback.h" +#include "settings/lib/ISettingCallback.h" #include "rendering/RenderSystem.h" enum VIEW_TYPE { VIEW_TYPE_NONE = 0, diff --git a/xbmc/guilib/StereoscopicsManager.cpp b/xbmc/guilib/StereoscopicsManager.cpp index f5cd2eeecc..ff308e9a0c 100644 --- a/xbmc/guilib/StereoscopicsManager.cpp +++ b/xbmc/guilib/StereoscopicsManager.cpp @@ -37,8 +37,8 @@ #include "guilib/Key.h" #include "guilib/GUIWindowManager.h" #include "settings/AdvancedSettings.h" -#include "settings/ISettingCallback.h" -#include "settings/Setting.h" +#include "settings/lib/ISettingCallback.h" +#include "settings/lib/Setting.h" #include "settings/Settings.h" #include "rendering/RenderSystem.h" #include "utils/log.h" diff --git a/xbmc/guilib/StereoscopicsManager.h b/xbmc/guilib/StereoscopicsManager.h index 95edefd34e..ef28bf7ff1 100644 --- a/xbmc/guilib/StereoscopicsManager.h +++ b/xbmc/guilib/StereoscopicsManager.h @@ -26,7 +26,7 @@ #pragma once #include <stdlib.h> -#include "settings/ISettingCallback.h" +#include "settings/lib/ISettingCallback.h" #include "guilib/IMsgTargetCallback.h" #include "rendering/RenderSystem.h" diff --git a/xbmc/input/MouseStat.cpp b/xbmc/input/MouseStat.cpp index 4108055a41..fb27d92687 100644 --- a/xbmc/input/MouseStat.cpp +++ b/xbmc/input/MouseStat.cpp @@ -20,7 +20,7 @@ #include "MouseStat.h" #include "guilib/Key.h" -#include "settings/Setting.h" +#include "settings/lib/Setting.h" #include "utils/TimeUtils.h" #include "windowing/WindowingFactory.h" diff --git a/xbmc/input/MouseStat.h b/xbmc/input/MouseStat.h index 7330ba09b4..c1b45d0d64 100644 --- a/xbmc/input/MouseStat.h +++ b/xbmc/input/MouseStat.h @@ -21,7 +21,7 @@ * */ -#include "settings/ISettingCallback.h" +#include "settings/lib/ISettingCallback.h" #include "windowing/XBMC_events.h" #define XBMC_BUTTON(X) (1 << ((X)-1)) diff --git a/xbmc/input/SDLJoystick.cpp b/xbmc/input/SDLJoystick.cpp index cdb128ddfb..6c671b7399 100644 --- a/xbmc/input/SDLJoystick.cpp +++ b/xbmc/input/SDLJoystick.cpp @@ -23,7 +23,7 @@ #include "ButtonTranslator.h" #include "peripherals/devices/PeripheralImon.h" #include "settings/AdvancedSettings.h" -#include "settings/Setting.h" +#include "settings/lib/Setting.h" #include "utils/log.h" #include "utils/StringUtils.h" diff --git a/xbmc/input/SDLJoystick.h b/xbmc/input/SDLJoystick.h index cbc163dd25..b5fa48a520 100644 --- a/xbmc/input/SDLJoystick.h +++ b/xbmc/input/SDLJoystick.h @@ -22,7 +22,7 @@ #define SDL_JOYSTICK_H #include "system.h" // for HAS_SDL_JOYSTICK -#include "settings/ISettingCallback.h" +#include "settings/lib/ISettingCallback.h" #include <vector> #include <string> diff --git a/xbmc/input/windows/WINJoystick.cpp b/xbmc/input/windows/WINJoystick.cpp index d9d9aae584..1677dd7d22 100644 --- a/xbmc/input/windows/WINJoystick.cpp +++ b/xbmc/input/windows/WINJoystick.cpp @@ -22,7 +22,7 @@ #include "input/ButtonTranslator.h" #include "peripherals/devices/PeripheralImon.h" #include "settings/AdvancedSettings.h" -#include "settings/Setting.h" +#include "settings/lib/Setting.h" #include "utils/log.h" #include <math.h> diff --git a/xbmc/input/windows/WINJoystick.h b/xbmc/input/windows/WINJoystick.h index 45b27dcd3c..b0232505fb 100644 --- a/xbmc/input/windows/WINJoystick.h +++ b/xbmc/input/windows/WINJoystick.h @@ -22,7 +22,7 @@ #include <vector> #include <string> #include <stdint.h> -#include "settings/ISettingCallback.h" +#include "settings/lib/ISettingCallback.h" #include "threads/CriticalSection.h" #define JACTIVE_BUTTON 0x00000001 diff --git a/xbmc/interfaces/json-rpc/SettingsOperations.cpp b/xbmc/interfaces/json-rpc/SettingsOperations.cpp index 09dbe04ec6..86a21e69df 100644 --- a/xbmc/interfaces/json-rpc/SettingsOperations.cpp +++ b/xbmc/interfaces/json-rpc/SettingsOperations.cpp @@ -21,11 +21,11 @@ #include "SettingsOperations.h" #include "addons/Addon.h" #include "settings/SettingAddon.h" -#include "settings/Setting.h" #include "settings/SettingControl.h" #include "settings/SettingPath.h" #include "settings/Settings.h" -#include "settings/SettingSection.h" +#include "settings/lib/Setting.h" +#include "settings/lib/SettingSection.h" #include "guilib/LocalizeStrings.h" #include "utils/StringUtils.h" diff --git a/xbmc/linux/LinuxTimezone.cpp b/xbmc/linux/LinuxTimezone.cpp index 3f9a4e1de2..1fe69cf275 100644 --- a/xbmc/linux/LinuxTimezone.cpp +++ b/xbmc/linux/LinuxTimezone.cpp @@ -36,7 +36,7 @@ #include "Util.h" #include "utils/StringUtils.h" #include "XBDateTime.h" -#include "settings/Setting.h" +#include "settings/lib/Setting.h" #include "settings/Settings.h" using namespace std; diff --git a/xbmc/linux/LinuxTimezone.h b/xbmc/linux/LinuxTimezone.h index efb6164936..3adc5b5441 100644 --- a/xbmc/linux/LinuxTimezone.h +++ b/xbmc/linux/LinuxTimezone.h @@ -21,7 +21,7 @@ * */ -#include "settings/ISettingCallback.h" +#include "settings/lib/ISettingCallback.h" #include "utils/StdString.h" #include <vector> #include <map> diff --git a/xbmc/network/Network.h b/xbmc/network/Network.h index c268f6ebd9..84b1e54900 100644 --- a/xbmc/network/Network.h +++ b/xbmc/network/Network.h @@ -23,7 +23,7 @@ #include "system.h" -#include "settings/ISettingCallback.h" +#include "settings/lib/ISettingCallback.h" #include "utils/StdString.h" enum EncMode { ENC_NONE = 0, ENC_WEP = 1, ENC_WPA = 2, ENC_WPA2 = 3 }; diff --git a/xbmc/network/NetworkServices.cpp b/xbmc/network/NetworkServices.cpp index bc78c3eea5..f1b82d7c62 100644 --- a/xbmc/network/NetworkServices.cpp +++ b/xbmc/network/NetworkServices.cpp @@ -74,7 +74,7 @@ #endif #include "settings/AdvancedSettings.h" -#include "settings/Setting.h" +#include "settings/lib/Setting.h" #include "settings/Settings.h" #include "utils/log.h" #include "utils/RssManager.h" diff --git a/xbmc/network/NetworkServices.h b/xbmc/network/NetworkServices.h index 457e1816f4..0c3555b181 100644 --- a/xbmc/network/NetworkServices.h +++ b/xbmc/network/NetworkServices.h @@ -20,7 +20,7 @@ */ #include "system.h" -#include "settings/ISettingCallback.h" +#include "settings/lib/ISettingCallback.h" #ifdef HAS_WEB_SERVER class CWebServer; diff --git a/xbmc/network/WakeOnAccess.h b/xbmc/network/WakeOnAccess.h index f801b927aa..c4fe5642e1 100644 --- a/xbmc/network/WakeOnAccess.h +++ b/xbmc/network/WakeOnAccess.h @@ -21,7 +21,7 @@ #include "URL.h" #include "XBDateTime.h" #include "utils/Job.h" -#include "settings/ISettingsHandler.h" +#include "settings/lib/ISettingsHandler.h" class CWakeOnAccess : private IJobCallback, public ISettingsHandler { diff --git a/xbmc/network/upnp/UPnPSettings.h b/xbmc/network/upnp/UPnPSettings.h index 68aaee1670..bb1d253d37 100644 --- a/xbmc/network/upnp/UPnPSettings.h +++ b/xbmc/network/upnp/UPnPSettings.h @@ -20,7 +20,7 @@ #pragma once #include <string> -#include "settings/ISettingsHandler.h" +#include "settings/lib/ISettingsHandler.h" #include "threads/CriticalSection.h" class CUPnPSettings : public ISettingsHandler diff --git a/xbmc/osx/XBMCHelper.cpp b/xbmc/osx/XBMCHelper.cpp index 2b6fd352c9..a4b749417d 100644 --- a/xbmc/osx/XBMCHelper.cpp +++ b/xbmc/osx/XBMCHelper.cpp @@ -32,7 +32,7 @@ #include "dialogs/GUIDialogYesNo.h" #include "utils/log.h" #include "system.h" -#include "settings/Setting.h" +#include "settings/lib/Setting.h" #include "settings/Settings.h" #include "utils/SystemInfo.h" diff --git a/xbmc/osx/XBMCHelper.h b/xbmc/osx/XBMCHelper.h index 9e99f95ca3..d0068c97fc 100644 --- a/xbmc/osx/XBMCHelper.h +++ b/xbmc/osx/XBMCHelper.h @@ -23,7 +23,7 @@ #if !defined(__arm__) -#include "settings/ISettingCallback.h" +#include "settings/lib/ISettingCallback.h" enum AppleRemoteOptions { diff --git a/xbmc/peripherals/Peripherals.cpp b/xbmc/peripherals/Peripherals.cpp index 8b13ebc310..f445b842da 100644 --- a/xbmc/peripherals/Peripherals.cpp +++ b/xbmc/peripherals/Peripherals.cpp @@ -47,7 +47,7 @@ #include "utils/StringUtils.h" #include "Util.h" #include "guilib/Key.h" -#include "settings/Setting.h" +#include "settings/lib/Setting.h" using namespace PERIPHERALS; using namespace XFILE; diff --git a/xbmc/peripherals/Peripherals.h b/xbmc/peripherals/Peripherals.h index 7ffc19d7af..3926566a0d 100644 --- a/xbmc/peripherals/Peripherals.h +++ b/xbmc/peripherals/Peripherals.h @@ -22,7 +22,7 @@ #include "system.h" #include "bus/PeripheralBus.h" #include "devices/Peripheral.h" -#include "settings/ISettingCallback.h" +#include "settings/lib/ISettingCallback.h" #include "threads/CriticalSection.h" #include "threads/Thread.h" #include "utils/Observer.h" diff --git a/xbmc/peripherals/devices/Peripheral.cpp b/xbmc/peripherals/devices/Peripheral.cpp index 056600dc31..dd2db26589 100644 --- a/xbmc/peripherals/devices/Peripheral.cpp +++ b/xbmc/peripherals/devices/Peripheral.cpp @@ -22,7 +22,7 @@ #include "peripherals/Peripherals.h" #include "utils/log.h" #include "utils/StringUtils.h" -#include "settings/Setting.h" +#include "settings/lib/Setting.h" #include "utils/XBMCTinyXML.h" #include "utils/URIUtils.h" #include "guilib/LocalizeStrings.h" diff --git a/xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.cpp b/xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.cpp index af5c29f657..95df796df0 100644 --- a/xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.cpp +++ b/xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.cpp @@ -21,7 +21,7 @@ #include "GUIDialogPeripheralSettings.h" #include "addons/Skin.h" #include "peripherals/Peripherals.h" -#include "settings/Setting.h" +#include "settings/lib/Setting.h" #include "utils/log.h" #include "video/dialogs/GUIDialogVideoSettings.h" diff --git a/xbmc/powermanagement/PowerManager.cpp b/xbmc/powermanagement/PowerManager.cpp index 2033574e78..590a88723d 100644 --- a/xbmc/powermanagement/PowerManager.cpp +++ b/xbmc/powermanagement/PowerManager.cpp @@ -23,7 +23,7 @@ #include "Application.h" #include "cores/AudioEngine/AEFactory.h" #include "input/KeyboardStat.h" -#include "settings/Setting.h" +#include "settings/lib/Setting.h" #include "settings/Settings.h" #include "windowing/WindowingFactory.h" #include "utils/log.h" diff --git a/xbmc/profiles/ProfilesManager.h b/xbmc/profiles/ProfilesManager.h index 8d7b4fa760..5c12c4f582 100644 --- a/xbmc/profiles/ProfilesManager.h +++ b/xbmc/profiles/ProfilesManager.h @@ -22,7 +22,7 @@ #include <vector> #include "profiles/Profile.h" -#include "settings/ISettingsHandler.h" +#include "settings/lib/ISettingsHandler.h" #include "threads/CriticalSection.h" class TiXmlNode; diff --git a/xbmc/pvr/PVRManager.cpp b/xbmc/pvr/PVRManager.cpp index a4545bc325..675abe35b7 100644 --- a/xbmc/pvr/PVRManager.cpp +++ b/xbmc/pvr/PVRManager.cpp @@ -32,7 +32,7 @@ #include "music/tags/MusicInfoTag.h" #include "settings/AdvancedSettings.h" #include "settings/MediaSettings.h" -#include "settings/Setting.h" +#include "settings/lib/Setting.h" #include "settings/Settings.h" #include "threads/SingleLock.h" #include "windows/GUIWindowPVR.h" diff --git a/xbmc/pvr/PVRManager.h b/xbmc/pvr/PVRManager.h index e1dd398d2b..5eb3195d92 100644 --- a/xbmc/pvr/PVRManager.h +++ b/xbmc/pvr/PVRManager.h @@ -22,7 +22,7 @@ #include <map> #include "addons/include/xbmc_pvr_types.h" -#include "settings/ISettingCallback.h" +#include "settings/lib/ISettingCallback.h" #include "threads/Event.h" #include "threads/Thread.h" #include "utils/JobManager.h" diff --git a/xbmc/pvr/channels/PVRChannelGroup.cpp b/xbmc/pvr/channels/PVRChannelGroup.cpp index cea725bc55..f06c6326ba 100644 --- a/xbmc/pvr/channels/PVRChannelGroup.cpp +++ b/xbmc/pvr/channels/PVRChannelGroup.cpp @@ -24,7 +24,7 @@ */ #include "settings/AdvancedSettings.h" -#include "settings/Setting.h" +#include "settings/lib/Setting.h" #include "settings/Settings.h" #include "guilib/GUIWindowManager.h" #include "dialogs/GUIDialogYesNo.h" diff --git a/xbmc/pvr/channels/PVRChannelGroup.h b/xbmc/pvr/channels/PVRChannelGroup.h index 76ef0b4719..3aba14fe30 100644 --- a/xbmc/pvr/channels/PVRChannelGroup.h +++ b/xbmc/pvr/channels/PVRChannelGroup.h @@ -22,7 +22,7 @@ #include "FileItem.h" #include "PVRChannel.h" -#include "settings/ISettingCallback.h" +#include "settings/lib/ISettingCallback.h" #include "utils/JobManager.h" #include <boost/shared_ptr.hpp> diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp index c1a38e5dea..4333df8649 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -28,7 +28,7 @@ #include "utils/LangCodeExpander.h" #include "LangInfo.h" #include "profiles/ProfilesManager.h" -#include "settings/Setting.h" +#include "settings/lib/Setting.h" #include "settings/Settings.h" #include "utils/StringUtils.h" #include "utils/SystemInfo.h" diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h index 12b477f4a4..7d16957930 100644 --- a/xbmc/settings/AdvancedSettings.h +++ b/xbmc/settings/AdvancedSettings.h @@ -21,8 +21,8 @@ #include <vector> -#include "settings/ISettingCallback.h" -#include "settings/ISettingsHandler.h" +#include "settings/lib/ISettingCallback.h" +#include "settings/lib/ISettingsHandler.h" #include "utils/StdString.h" #include "utils/GlobalsHandling.h" diff --git a/xbmc/settings/DisplaySettings.cpp b/xbmc/settings/DisplaySettings.cpp index bf307f6a3f..c8c2bbd5de 100644 --- a/xbmc/settings/DisplaySettings.cpp +++ b/xbmc/settings/DisplaySettings.cpp @@ -28,7 +28,7 @@ #include "guilib/LocalizeStrings.h" #include "guilib/StereoscopicsManager.h" #include "settings/AdvancedSettings.h" -#include "settings/Setting.h" +#include "settings/lib/Setting.h" #include "settings/Settings.h" #include "threads/SingleLock.h" #include "utils/log.h" diff --git a/xbmc/settings/DisplaySettings.h b/xbmc/settings/DisplaySettings.h index cc4002b593..8ee1be2ae1 100644 --- a/xbmc/settings/DisplaySettings.h +++ b/xbmc/settings/DisplaySettings.h @@ -24,8 +24,8 @@ #include <vector> #include "guilib/Resolution.h" -#include "settings/ISettingCallback.h" -#include "settings/ISubSettings.h" +#include "settings/lib/ISettingCallback.h" +#include "settings/lib/ISubSettings.h" #include "threads/CriticalSection.h" #include "utils/Observer.h" diff --git a/xbmc/settings/Makefile b/xbmc/settings/Makefile index c73493c9f1..38611880ef 100644 --- a/xbmc/settings/Makefile +++ b/xbmc/settings/Makefile @@ -1,21 +1,11 @@ SRCS=AdvancedSettings.cpp \ DisplaySettings.cpp \ - ISetting.cpp \ - ISettingControl.cpp \ MediaSettings.cpp \ MediaSourceSettings.cpp \ - Setting.cpp \ SettingAddon.cpp \ - SettingCategoryAccess.cpp \ - SettingConditions.cpp \ SettingControl.cpp \ - SettingDependency.cpp \ SettingPath.cpp \ - SettingSection.cpp \ Settings.cpp \ - SettingsManager.cpp \ - SettingRequirement.cpp \ - SettingUpdate.cpp \ SkinSettings.cpp \ VideoSettings.cpp \ diff --git a/xbmc/settings/MediaSettings.cpp b/xbmc/settings/MediaSettings.cpp index 7c89f3a55a..4e6e83d8a7 100644 --- a/xbmc/settings/MediaSettings.cpp +++ b/xbmc/settings/MediaSettings.cpp @@ -30,7 +30,7 @@ #include "interfaces/Builtins.h" #include "music/MusicDatabase.h" #include "profiles/ProfilesManager.h" -#include "settings/Setting.h" +#include "settings/lib/Setting.h" #include "storage/MediaManager.h" #include "threads/SingleLock.h" #include "utils/log.h" diff --git a/xbmc/settings/MediaSettings.h b/xbmc/settings/MediaSettings.h index a33f621aae..ad2fb7a247 100644 --- a/xbmc/settings/MediaSettings.h +++ b/xbmc/settings/MediaSettings.h @@ -22,8 +22,8 @@ #include <map> #include <string> -#include "settings/ISettingCallback.h" -#include "settings/ISubSettings.h" +#include "settings/lib/ISettingCallback.h" +#include "settings/lib/ISubSettings.h" #include "settings/VideoSettings.h" #include "threads/CriticalSection.h" diff --git a/xbmc/settings/MediaSourceSettings.h b/xbmc/settings/MediaSourceSettings.h index abcbe99696..fe6a8982ad 100644 --- a/xbmc/settings/MediaSourceSettings.h +++ b/xbmc/settings/MediaSourceSettings.h @@ -22,7 +22,7 @@ #include <string> #include "MediaSource.h" -#include "settings/ISettingsHandler.h" +#include "settings/lib/ISettingsHandler.h" class TiXmlNode; diff --git a/xbmc/settings/SettingAddon.cpp b/xbmc/settings/SettingAddon.cpp index 24bda86c0f..f6d38eaa1b 100644 --- a/xbmc/settings/SettingAddon.cpp +++ b/xbmc/settings/SettingAddon.cpp @@ -20,7 +20,7 @@ #include "SettingAddon.h" #include "addons/Addon.h" -#include "settings/SettingsManager.h" +#include "settings/lib/SettingsManager.h" #include "utils/log.h" #include "utils/XBMCTinyXML.h" #include "utils/XMLUtils.h" diff --git a/xbmc/settings/SettingAddon.h b/xbmc/settings/SettingAddon.h index 2aecde6702..fb58f15f2b 100644 --- a/xbmc/settings/SettingAddon.h +++ b/xbmc/settings/SettingAddon.h @@ -19,7 +19,7 @@ * */ -#include "Setting.h" +#include "settings/lib/Setting.h" #include "addons/IAddon.h" class CSettingAddon : public CSettingString diff --git a/xbmc/settings/SettingControl.cpp b/xbmc/settings/SettingControl.cpp index 554f1a4261..92e64faae2 100644 --- a/xbmc/settings/SettingControl.cpp +++ b/xbmc/settings/SettingControl.cpp @@ -21,7 +21,7 @@ #include <vector> #include "SettingControl.h" -#include "settings/SettingDefinitions.h" +#include "settings/lib/SettingDefinitions.h" #include "utils/log.h" #include "utils/StringUtils.h" #include "utils/XBMCTinyXML.h" diff --git a/xbmc/settings/SettingControl.h b/xbmc/settings/SettingControl.h index a30e8d6599..4d9901dc22 100644 --- a/xbmc/settings/SettingControl.h +++ b/xbmc/settings/SettingControl.h @@ -19,7 +19,7 @@ * */ -#include "ISettingControl.h" +#include "settings/lib/ISettingControl.h" #define SETTING_XML_ELM_CONTROL_FORMATLABEL "formatlabel" #define SETTING_XML_ELM_CONTROL_HIDDEN "hidden" diff --git a/xbmc/settings/SettingPath.cpp b/xbmc/settings/SettingPath.cpp index 9a23ace79c..b331c08c57 100644 --- a/xbmc/settings/SettingPath.cpp +++ b/xbmc/settings/SettingPath.cpp @@ -19,7 +19,7 @@ */ #include "SettingPath.h" -#include "settings/SettingsManager.h" +#include "settings/lib/SettingsManager.h" #include "utils/log.h" #include "utils/StringUtils.h" #include "utils/XBMCTinyXML.h" diff --git a/xbmc/settings/SettingPath.h b/xbmc/settings/SettingPath.h index bfc95ea702..d4bc580055 100644 --- a/xbmc/settings/SettingPath.h +++ b/xbmc/settings/SettingPath.h @@ -21,7 +21,7 @@ #include <vector> -#include "Setting.h" +#include "settings/lib/Setting.h" class CSettingPath : public CSettingString { diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp index dc057f4715..13fd23600a 100644 --- a/xbmc/settings/Settings.cpp +++ b/xbmc/settings/Settings.cpp @@ -70,9 +70,9 @@ #include "settings/MediaSourceSettings.h" #include "settings/SettingAddon.h" #include "settings/SettingControl.h" -#include "settings/SettingsManager.h" #include "settings/SettingPath.h" #include "settings/SkinSettings.h" +#include "settings/lib/SettingsManager.h" #include "threads/SingleLock.h" #include "utils/CharsetConverter.h" #include "utils/log.h" diff --git a/xbmc/settings/Settings.h b/xbmc/settings/Settings.h index ae7bae52b8..529e23c955 100644 --- a/xbmc/settings/Settings.h +++ b/xbmc/settings/Settings.h @@ -25,9 +25,9 @@ #include <boost/shared_ptr.hpp> -#include "settings/ISettingCallback.h" -#include "settings/ISettingControlCreator.h" -#include "settings/ISettingCreator.h" +#include "settings/lib/ISettingCallback.h" +#include "settings/lib/ISettingControlCreator.h" +#include "settings/lib/ISettingCreator.h" #include "threads/CriticalSection.h" #include "utils/Variant.h" diff --git a/xbmc/settings/SkinSettings.h b/xbmc/settings/SkinSettings.h index d80939bd57..c2d0da8916 100644 --- a/xbmc/settings/SkinSettings.h +++ b/xbmc/settings/SkinSettings.h @@ -22,7 +22,7 @@ #include <map> #include <string> -#include "settings/ISubSettings.h" +#include "settings/lib/ISubSettings.h" #include "threads/CriticalSection.h" class TiXmlNode; diff --git a/xbmc/settings/ISetting.cpp b/xbmc/settings/lib/ISetting.cpp index 755b1bf82f..755b1bf82f 100644 --- a/xbmc/settings/ISetting.cpp +++ b/xbmc/settings/lib/ISetting.cpp diff --git a/xbmc/settings/ISetting.h b/xbmc/settings/lib/ISetting.h index 4bfe65c4b9..4bfe65c4b9 100644 --- a/xbmc/settings/ISetting.h +++ b/xbmc/settings/lib/ISetting.h diff --git a/xbmc/settings/ISettingCallback.h b/xbmc/settings/lib/ISettingCallback.h index 1c1b79cb0f..1c1b79cb0f 100644 --- a/xbmc/settings/ISettingCallback.h +++ b/xbmc/settings/lib/ISettingCallback.h diff --git a/xbmc/settings/ISettingControl.cpp b/xbmc/settings/lib/ISettingControl.cpp index 5e3c695caa..5e3c695caa 100644 --- a/xbmc/settings/ISettingControl.cpp +++ b/xbmc/settings/lib/ISettingControl.cpp diff --git a/xbmc/settings/ISettingControl.h b/xbmc/settings/lib/ISettingControl.h index 8ef118f232..8ef118f232 100644 --- a/xbmc/settings/ISettingControl.h +++ b/xbmc/settings/lib/ISettingControl.h diff --git a/xbmc/settings/ISettingControlCreator.h b/xbmc/settings/lib/ISettingControlCreator.h index a3c8537fb9..a3c8537fb9 100644 --- a/xbmc/settings/ISettingControlCreator.h +++ b/xbmc/settings/lib/ISettingControlCreator.h diff --git a/xbmc/settings/ISettingCreator.h b/xbmc/settings/lib/ISettingCreator.h index 945915efbc..945915efbc 100644 --- a/xbmc/settings/ISettingCreator.h +++ b/xbmc/settings/lib/ISettingCreator.h diff --git a/xbmc/settings/ISettingsHandler.h b/xbmc/settings/lib/ISettingsHandler.h index b31d88be4f..b31d88be4f 100644 --- a/xbmc/settings/ISettingsHandler.h +++ b/xbmc/settings/lib/ISettingsHandler.h diff --git a/xbmc/settings/ISubSettings.h b/xbmc/settings/lib/ISubSettings.h index 707a32d789..707a32d789 100644 --- a/xbmc/settings/ISubSettings.h +++ b/xbmc/settings/lib/ISubSettings.h diff --git a/xbmc/settings/lib/Makefile b/xbmc/settings/lib/Makefile new file mode 100644 index 0000000000..c038f12e18 --- /dev/null +++ b/xbmc/settings/lib/Makefile @@ -0,0 +1,15 @@ +SRCS=ISetting.cpp \ + ISettingControl.cpp \ + Setting.cpp \ + SettingCategoryAccess.cpp \ + SettingConditions.cpp \ + SettingDependency.cpp \ + SettingSection.cpp \ + SettingsManager.cpp \ + SettingRequirement.cpp \ + SettingUpdate.cpp \ + +LIB=settings_lib.a + +include ../../../Makefile.include +-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS))) diff --git a/xbmc/settings/Setting.cpp b/xbmc/settings/lib/Setting.cpp index 5106a4571d..5106a4571d 100644 --- a/xbmc/settings/Setting.cpp +++ b/xbmc/settings/lib/Setting.cpp diff --git a/xbmc/settings/Setting.h b/xbmc/settings/lib/Setting.h index a3adcc1d3e..a3adcc1d3e 100644 --- a/xbmc/settings/Setting.h +++ b/xbmc/settings/lib/Setting.h diff --git a/xbmc/settings/SettingCategoryAccess.cpp b/xbmc/settings/lib/SettingCategoryAccess.cpp index 2604239011..2604239011 100644 --- a/xbmc/settings/SettingCategoryAccess.cpp +++ b/xbmc/settings/lib/SettingCategoryAccess.cpp diff --git a/xbmc/settings/SettingCategoryAccess.h b/xbmc/settings/lib/SettingCategoryAccess.h index e6b4960143..e6b4960143 100644 --- a/xbmc/settings/SettingCategoryAccess.h +++ b/xbmc/settings/lib/SettingCategoryAccess.h diff --git a/xbmc/settings/SettingConditions.cpp b/xbmc/settings/lib/SettingConditions.cpp index 3cd1e0ba93..3cd1e0ba93 100644 --- a/xbmc/settings/SettingConditions.cpp +++ b/xbmc/settings/lib/SettingConditions.cpp diff --git a/xbmc/settings/SettingConditions.h b/xbmc/settings/lib/SettingConditions.h index d83a633fd9..d83a633fd9 100644 --- a/xbmc/settings/SettingConditions.h +++ b/xbmc/settings/lib/SettingConditions.h diff --git a/xbmc/settings/SettingDefinitions.h b/xbmc/settings/lib/SettingDefinitions.h index 381d0fa970..381d0fa970 100644 --- a/xbmc/settings/SettingDefinitions.h +++ b/xbmc/settings/lib/SettingDefinitions.h diff --git a/xbmc/settings/SettingDependency.cpp b/xbmc/settings/lib/SettingDependency.cpp index 363acc26cf..363acc26cf 100644 --- a/xbmc/settings/SettingDependency.cpp +++ b/xbmc/settings/lib/SettingDependency.cpp diff --git a/xbmc/settings/SettingDependency.h b/xbmc/settings/lib/SettingDependency.h index 7cf3db184a..7cf3db184a 100644 --- a/xbmc/settings/SettingDependency.h +++ b/xbmc/settings/lib/SettingDependency.h diff --git a/xbmc/settings/SettingRequirement.cpp b/xbmc/settings/lib/SettingRequirement.cpp index 3b57eb7a46..3b57eb7a46 100644 --- a/xbmc/settings/SettingRequirement.cpp +++ b/xbmc/settings/lib/SettingRequirement.cpp diff --git a/xbmc/settings/SettingRequirement.h b/xbmc/settings/lib/SettingRequirement.h index 3534761f0a..3534761f0a 100644 --- a/xbmc/settings/SettingRequirement.h +++ b/xbmc/settings/lib/SettingRequirement.h diff --git a/xbmc/settings/SettingSection.cpp b/xbmc/settings/lib/SettingSection.cpp index 87d85bd745..87d85bd745 100644 --- a/xbmc/settings/SettingSection.cpp +++ b/xbmc/settings/lib/SettingSection.cpp diff --git a/xbmc/settings/SettingSection.h b/xbmc/settings/lib/SettingSection.h index 359e5b8066..359e5b8066 100644 --- a/xbmc/settings/SettingSection.h +++ b/xbmc/settings/lib/SettingSection.h diff --git a/xbmc/settings/SettingUpdate.cpp b/xbmc/settings/lib/SettingUpdate.cpp index e1c95137b8..e1c95137b8 100644 --- a/xbmc/settings/SettingUpdate.cpp +++ b/xbmc/settings/lib/SettingUpdate.cpp diff --git a/xbmc/settings/SettingUpdate.h b/xbmc/settings/lib/SettingUpdate.h index c8ecba27d8..c8ecba27d8 100644 --- a/xbmc/settings/SettingUpdate.h +++ b/xbmc/settings/lib/SettingUpdate.h diff --git a/xbmc/settings/SettingsManager.cpp b/xbmc/settings/lib/SettingsManager.cpp index b2255cb0f0..b2255cb0f0 100644 --- a/xbmc/settings/SettingsManager.cpp +++ b/xbmc/settings/lib/SettingsManager.cpp diff --git a/xbmc/settings/SettingsManager.h b/xbmc/settings/lib/SettingsManager.h index ee6c77486f..ee6c77486f 100644 --- a/xbmc/settings/SettingsManager.h +++ b/xbmc/settings/lib/SettingsManager.h diff --git a/xbmc/settings/windows/GUIControlSettings.cpp b/xbmc/settings/windows/GUIControlSettings.cpp index 7297ec78e6..6165966b03 100644 --- a/xbmc/settings/windows/GUIControlSettings.cpp +++ b/xbmc/settings/windows/GUIControlSettings.cpp @@ -39,7 +39,7 @@ #include "settings/SettingPath.h" #include "settings/Settings.h" #include "settings/MediaSourceSettings.h" -#include "settings/Setting.h" +#include "settings/lib/Setting.h" #include "storage/MediaManager.h" #include "utils/StringUtils.h" diff --git a/xbmc/settings/windows/GUIWindowSettingsCategory.h b/xbmc/settings/windows/GUIWindowSettingsCategory.h index b1a6d9e9a6..ea72725532 100644 --- a/xbmc/settings/windows/GUIWindowSettingsCategory.h +++ b/xbmc/settings/windows/GUIWindowSettingsCategory.h @@ -24,10 +24,10 @@ #include "GUIControlSettings.h" #include "guilib/GUIWindow.h" -#include "settings/SettingDependency.h" -#include "settings/SettingSection.h" +#include "settings/lib/SettingDependency.h" +#include "settings/lib/SettingSection.h" #include "settings/Settings.h" -#include "settings/SettingsManager.h" +#include "settings/lib/SettingsManager.h" #include "threads/Timer.h" typedef boost::shared_ptr<CGUIControlBaseSetting> BaseSettingControlPtr; diff --git a/xbmc/utils/CharsetConverter.cpp b/xbmc/utils/CharsetConverter.cpp index cab6471c24..ab26fb4c99 100644 --- a/xbmc/utils/CharsetConverter.cpp +++ b/xbmc/utils/CharsetConverter.cpp @@ -24,7 +24,7 @@ #include <fribidi/fribidi.h> #include "LangInfo.h" #include "guilib/LocalizeStrings.h" -#include "settings/Setting.h" +#include "settings/lib/Setting.h" #include "settings/Settings.h" #include "threads/SingleLock.h" #include "log.h" diff --git a/xbmc/utils/CharsetConverter.h b/xbmc/utils/CharsetConverter.h index ab88f9c770..96c782cf04 100644 --- a/xbmc/utils/CharsetConverter.h +++ b/xbmc/utils/CharsetConverter.h @@ -21,7 +21,7 @@ * */ -#include "settings/ISettingCallback.h" +#include "settings/lib/ISettingCallback.h" #include "threads/CriticalSection.h" #include "utils/GlobalsHandling.h" #include "utils/uXstrings.h" diff --git a/xbmc/utils/RssManager.cpp b/xbmc/utils/RssManager.cpp index dcdd4bef7b..b4fd24e353 100644 --- a/xbmc/utils/RssManager.cpp +++ b/xbmc/utils/RssManager.cpp @@ -25,7 +25,7 @@ #include "filesystem/File.h" #include "interfaces/Builtins.h" #include "profiles/ProfilesManager.h" -#include "settings/Setting.h" +#include "settings/lib/Setting.h" #include "threads/SingleLock.h" #include "utils/log.h" #include "utils/RssReader.h" diff --git a/xbmc/utils/RssManager.h b/xbmc/utils/RssManager.h index fe4e4bb941..c55f8a8a65 100644 --- a/xbmc/utils/RssManager.h +++ b/xbmc/utils/RssManager.h @@ -25,8 +25,8 @@ #include "threads/CriticalSection.h" -#include "settings/ISettingCallback.h" -#include "settings/ISettingsHandler.h" +#include "settings/lib/ISettingCallback.h" +#include "settings/lib/ISettingsHandler.h" class CRssReader; class IRssObserver; diff --git a/xbmc/utils/SystemInfo.h b/xbmc/utils/SystemInfo.h index 89354311c6..a6b3f905a2 100644 --- a/xbmc/utils/SystemInfo.h +++ b/xbmc/utils/SystemInfo.h @@ -22,7 +22,7 @@ #include "md5.h" #include "InfoLoader.h" -#include "settings/ISubSettings.h" +#include "settings/lib/ISubSettings.h" #define KB (1024) // 1 KiloByte (1KB) 1024 Byte (2^10 Byte) #define MB (1024*KB) // 1 MegaByte (1MB) 1024 KB (2^10 KB) diff --git a/xbmc/utils/Weather.cpp b/xbmc/utils/Weather.cpp index 10e5c58bc3..521a8cee16 100644 --- a/xbmc/utils/Weather.cpp +++ b/xbmc/utils/Weather.cpp @@ -28,7 +28,7 @@ #include "Temperature.h" #include "network/Network.h" #include "Application.h" -#include "settings/Setting.h" +#include "settings/lib/Setting.h" #include "settings/Settings.h" #include "guilib/GUIWindowManager.h" #include "GUIUserMessages.h" diff --git a/xbmc/utils/Weather.h b/xbmc/utils/Weather.h index bc59362412..2ab8a3ba77 100644 --- a/xbmc/utils/Weather.h +++ b/xbmc/utils/Weather.h @@ -22,7 +22,7 @@ #include "InfoLoader.h" #include "StdString.h" -#include "settings/ISettingCallback.h" +#include "settings/lib/ISettingCallback.h" #include "utils/GlobalsHandling.h" #include <map> diff --git a/xbmc/video/dialogs/GUIDialogSubtitles.cpp b/xbmc/video/dialogs/GUIDialogSubtitles.cpp index 329a3f1d57..ed228cb66c 100644 --- a/xbmc/video/dialogs/GUIDialogSubtitles.cpp +++ b/xbmc/video/dialogs/GUIDialogSubtitles.cpp @@ -32,8 +32,8 @@ #include "guilib/GUIImage.h" #include "settings/MediaSettings.h" #include "settings/Settings.h" -#include "settings/SettingsManager.h" #include "settings/VideoSettings.h" +#include "settings/lib/Setting.h" #include "utils/JobManager.h" #include "utils/LangCodeExpander.h" #include "utils/log.h" diff --git a/xbmc/view/ViewStateSettings.h b/xbmc/view/ViewStateSettings.h index cc0ca8d4a2..41ae290680 100644 --- a/xbmc/view/ViewStateSettings.h +++ b/xbmc/view/ViewStateSettings.h @@ -24,8 +24,8 @@ #include "ViewState.h" #include "guilib/GraphicContext.h" -#include "settings/ISubSettings.h" -#include "settings/Setting.h" +#include "settings/lib/ISubSettings.h" +#include "settings/lib/Setting.h" #include "threads/CriticalSection.h" class TiXmlNode; diff --git a/xbmc/windowing/WinSystem.cpp b/xbmc/windowing/WinSystem.cpp index b78913477b..57d6f2200e 100644 --- a/xbmc/windowing/WinSystem.cpp +++ b/xbmc/windowing/WinSystem.cpp @@ -21,7 +21,7 @@ #include "WinSystem.h" #include "guilib/GraphicContext.h" #include "settings/DisplaySettings.h" -#include "settings/Setting.h" +#include "settings/lib/Setting.h" #include "settings/Settings.h" using namespace std; diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp index 7caae9dfb3..6ca2d306d8 100644 --- a/xbmc/windowing/X11/WinSystemX11.cpp +++ b/xbmc/windowing/X11/WinSystemX11.cpp @@ -26,7 +26,7 @@ #include "WinSystemX11.h" #include "settings/DisplaySettings.h" #include "settings/Settings.h" -#include "settings/Setting.h" +#include "settings/lib/Setting.h" #include "guilib/GraphicContext.h" #include "guilib/Texture.h" #include "guilib/DispResource.h" diff --git a/xbmc/windowing/X11/WinSystemX11.h b/xbmc/windowing/X11/WinSystemX11.h index 2454fb1db1..b1464d082a 100644 --- a/xbmc/windowing/X11/WinSystemX11.h +++ b/xbmc/windowing/X11/WinSystemX11.h @@ -30,7 +30,7 @@ #include "windowing/WinSystem.h" #include "utils/Stopwatch.h" #include "threads/CriticalSection.h" -#include "settings/ISettingCallback.h" +#include "settings/lib/ISettingCallback.h" class IDispResource; |