move profile related files into new "profiles" directory

Makefile.in

@@ -67,6 +67,9 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
                    xbmc/pictures/pictures.a \
                    xbmc/playlists/playlists.a \
                    xbmc/powermanagement/powermanagement.a \
+                   xbmc/profiles/profiles.a \
+                   xbmc/profiles/dialogs/profiles_dialogs.a \
+                   xbmc/profiles/windows/profiles_windows.a \
                    xbmc/programs/programs.a \
                    xbmc/pvr/addons/pvraddons.a \
                    xbmc/pvr/channels/pvrchannels.a \

xbmc/Application.cpp

@@ -187,7 +187,7 @@
 #include "music/dialogs/GUIDialogMusicInfo.h"
 #include "video/dialogs/GUIDialogVideoInfo.h"
 #include "video/windows/GUIWindowVideoNav.h"
-#include "settings/windows/GUIWindowSettingsProfile.h"
+#include "profiles/windows/GUIWindowSettingsProfile.h"
 #ifdef HAS_GL
 #include "rendering/gl/GUIWindowTestPatternGL.h"
 #endif
@@ -223,8 +223,8 @@
 #include "video/dialogs/GUIDialogVideoSettings.h"
 #include "video/dialogs/GUIDialogAudioSubtitleSettings.h"
 #include "video/dialogs/GUIDialogVideoBookmarks.h"
-#include "settings/dialogs/GUIDialogProfileSettings.h"
-#include "settings/dialogs/GUIDialogLockSettings.h"
+#include "profiles/dialogs/GUIDialogProfileSettings.h"
+#include "profiles/dialogs/GUIDialogLockSettings.h"
 #include "settings/dialogs/GUIDialogContentSettings.h"
 #include "dialogs/GUIDialogBusy.h"
 #include "dialogs/GUIDialogKeyboardGeneric.h"

xbmc/GUIPassword.cpp

@@ -25,8 +25,8 @@
 #include "guilib/GUIKeyboardFactory.h"
 #include "dialogs/GUIDialogNumeric.h"
 #include "dialogs/GUIDialogOK.h"
-#include "settings/dialogs/GUIDialogLockSettings.h"
-#include "settings/dialogs/GUIDialogProfileSettings.h"
+#include "profiles/dialogs/GUIDialogLockSettings.h"
+#include "profiles/dialogs/GUIDialogProfileSettings.h"
 #include "Util.h"
 #include "settings/Settings.h"
 #include "settings/GUISettings.h"

xbmc/PasswordManager.cpp

@@ -19,7 +19,7 @@
  */
 
 #include "PasswordManager.h"
-#include "settings/dialogs/GUIDialogLockSettings.h"
+#include "profiles/dialogs/GUIDialogLockSettings.h"
 #include "URL.h"
 #include "settings/Settings.h"
 #include "utils/XMLUtils.h"

xbmc/dialogs/GUIDialogContextMenu.cpp

@@ -31,7 +31,7 @@
 #include "settings/GUISettings.h"
 #include "settings/MediaSourceSettings.h"
 #include "GUIDialogMediaSource.h"
-#include "settings/dialogs/GUIDialogLockSettings.h"
+#include "profiles/dialogs/GUIDialogLockSettings.h"
 #include "storage/MediaManager.h"
 #include "guilib/GUIWindowManager.h"
 #include "guilib/Key.h"

xbmc/profiles/Makefile

@@ -0,0 +1,6 @@
+SRCS=Profile.cpp \
+
+LIB=profiles.a
+
+include ../../Makefile.include
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

xbmc/settings/Profile.h → xbmc/profiles/Profile.h

@@ -19,8 +19,8 @@
  *
  */
 
-#include "utils/StdString.h"
 #include "GUIPassword.h"
+#include "utils/StdString.h"
 
 #include <vector>
 

xbmc/settings/dialogs/GUIDialogLockSettings.h → xbmc/profiles/dialogs/GUIDialogLockSettings.h

@@ -21,7 +21,7 @@
  */
 
 #include "GUIPassword.h"
-#include "settings/Profile.h"
+#include "profiles/Profile.h"
 #include "settings/dialogs/GUIDialogSettings.h"
 
 class CGUIDialogLockSettings : public CGUIDialogSettings

xbmc/settings/dialogs/GUIDialogProfileSettings.cpp → xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp

@@ -21,7 +21,7 @@
 #include "GUIDialogProfileSettings.h"
 #include "dialogs/GUIDialogFileBrowser.h"
 #include "guilib/GUIKeyboardFactory.h"
-#include "settings/dialogs/GUIDialogLockSettings.h"
+#include "profiles/dialogs/GUIDialogLockSettings.h"
 #include "guilib/GUIImage.h"
 #include "guilib/GUIWindowManager.h"
 #include "storage/MediaManager.h"

xbmc/settings/dialogs/GUIDialogProfileSettings.h → xbmc/profiles/dialogs/GUIDialogProfileSettings.h

@@ -21,7 +21,7 @@
  */
 
 #include "MediaSource.h"
-#include "settings/Profile.h"
+#include "profiles/Profile.h"
 #include "settings/dialogs/GUIDialogSettings.h"
 
 class CGUIDialogProfileSettings : public CGUIDialogSettings

xbmc/profiles/dialogs/Makefile

@@ -0,0 +1,7 @@
+SRCS=GUIDialogLockSettings.cpp \
+     GUIDialogProfileSettings.cpp \
+
+LIB=profiles_dialogs.a
+
+include ../../../Makefile.include
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

xbmc/settings/windows/GUIWindowSettingsProfile.cpp → xbmc/profiles/windows/GUIWindowSettingsProfile.cpp

@@ -20,10 +20,10 @@
 
 #include "GUIWindowSettingsProfile.h"
 #include "windows/GUIWindowFileManager.h"
-#include "settings/Profile.h"
+#include "profiles/Profile.h"
 #include "Application.h"
 #include "dialogs/GUIDialogContextMenu.h"
-#include "settings/dialogs/GUIDialogProfileSettings.h"
+#include "profiles/dialogs/GUIDialogProfileSettings.h"
 #include "network/Network.h"
 #include "utils/URIUtils.h"
 #include "utils/Weather.h"

xbmc/profiles/windows/Makefile

@@ -0,0 +1,6 @@
+SRCS=GUIWindowSettingsProfile.cpp \
+
+LIB=profiles_windows.a
+
+include ../../../Makefile.include
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

xbmc/settings/Makefile

@@ -3,7 +3,6 @@ SRCS=AdvancedSettings.cpp \
      GUISettings.cpp \
      MediaSettings.cpp \
      MediaSourceSettings.cpp \
-     Profile.cpp \
      Settings.cpp \
      SkinSettings.cpp \
      VideoSettings.cpp \

xbmc/settings/Settings.h

@@ -46,7 +46,7 @@
 #include "settings/ISettingsHandler.h"
 #include "settings/ISubSettings.h"
 #include "settings/VideoSettings.h"
-#include "Profile.h"
+#include "profiles/Profile.h"
 #include "guilib/Resolution.h"
 #include "guilib/GraphicContext.h"
 #include "threads/CriticalSection.h"

xbmc/settings/dialogs/Makefile

@@ -1,6 +1,4 @@
 SRCS=GUIDialogContentSettings.cpp \
-     GUIDialogLockSettings.cpp \
-     GUIDialogProfileSettings.cpp \
      GUIDialogSettings.cpp \
 
 LIB=settings_dialogs.a

xbmc/settings/windows/Makefile

@@ -1,7 +1,6 @@
 SRCS=GUISettingControls.cpp \
      GUIWindowSettings.cpp \
      GUIWindowSettingsCategory.cpp \
-     GUIWindowSettingsProfile.cpp \
      GUIWindowSettingsScreenCalibration.cpp \
      GUIWindowTestPattern.cpp \
 

xbmc/windows/GUIWindowLoginScreen.cpp

@@ -22,9 +22,10 @@
 #include "Application.h"
 #include "ApplicationMessenger.h"
 #include "GUIWindowLoginScreen.h"
-#include "settings/windows/GUIWindowSettingsProfile.h"
+#include "profiles/Profile.h"
+#include "profiles/dialogs/GUIDialogProfileSettings.h"
+#include "profiles/windows/GUIWindowSettingsProfile.h"
 #include "dialogs/GUIDialogContextMenu.h"
-#include "settings/dialogs/GUIDialogProfileSettings.h"
 #include "GUIPassword.h"
 #ifdef HAS_PYTHON
 #include "interfaces/python/XBPython.h"
@@ -36,7 +37,6 @@
 #include "utils/Weather.h"
 #include "network/Network.h"
 #include "addons/Skin.h"
-#include "settings/Profile.h"
 #include "guilib/GUIMessage.h"
 #include "GUIUserMessages.h"
 #include "guilib/GUIWindowManager.h"