Sourcecode hierarchy cleanup: Use subfolders inside the "settings" folder

 

svn path=/trunk/KDE/kdebase/apps/; revision=1154129

38 files changed, 70 insertions, 66 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cdfd4d7d2..0cbe663ac 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -114,24 +114,24 @@ set(dolphin_SRCS
     panels/folders/folderspanel.cpp
     panels/folders/paneltreeview.cpp
     search/dolphinsearchbox.cpp
-    settings/behaviorsettingspage.cpp
-    settings/columnviewsettingspage.cpp
-    settings/contextmenusettingspage.cpp
-    settings/dolphinfontrequester.cpp
+    settings/general/behaviorsettingspage.cpp
+    settings/general/contextmenusettingspage.cpp
+    settings/general/generalsettingspage.cpp
+    settings/general/previewssettingspage.cpp
+    settings/general/statusbarsettingspage.cpp
     settings/dolphinsettingsdialog.cpp
-    settings/detailsviewsettingspage.cpp
-    settings/generalsettingspage.cpp
-    settings/iconsizegroupbox.cpp
-    settings/iconsviewsettingspage.cpp
-    settings/navigationsettingspage.cpp
-    settings/previewssettingspage.cpp
-    settings/servicessettingspage.cpp
+    settings/navigation/navigationsettingspage.cpp
+    settings/services/servicessettingspage.cpp
     settings/settingspagebase.cpp
-    settings/startupsettingspage.cpp
-    settings/statusbarsettingspage.cpp
-    settings/trashsettingspage.cpp
-    settings/viewsettingspage.cpp
-    settings/viewsettingspagebase.cpp
+    settings/startup/startupsettingspage.cpp
+    settings/trash/trashsettingspage.cpp
+    settings/viewmodes/columnviewsettingspage.cpp
+    settings/viewmodes/detailsviewsettingspage.cpp
+    settings/viewmodes/dolphinfontrequester.cpp
+    settings/viewmodes/iconsizegroupbox.cpp
+    settings/viewmodes/iconsviewsettingspage.cpp
+    settings/viewmodes/viewsettingspage.cpp
+    settings/viewmodes/viewsettingspagebase.cpp
     statusbar/dolphinstatusbar.cpp
     statusbar/statusbarspaceinfo.cpp
     statusbar/statusbarmessagelabel.cpp
@@ -199,29 +199,29 @@ install(TARGETS dolphin ${INSTALL_TARGETS_DEFAULT_ARGS})
 set(kcm_dolphinviewmodes_PART_SRCS
     kcm/kcmdolphinviewmodes.cpp
     pixmapviewer.cpp
-    settings/columnviewsettingspage.cpp
-    settings/detailsviewsettingspage.cpp
-    settings/dolphinfontrequester.cpp
-    settings/iconsizegroupbox.cpp
-    settings/iconsviewsettingspage.cpp
-    settings/viewsettingspagebase.cpp
+    settings/viewmodes/columnviewsettingspage.cpp
+    settings/viewmodes/detailsviewsettingspage.cpp
+    settings/viewmodes/dolphinfontrequester.cpp
+    settings/viewmodes/iconsizegroupbox.cpp
+    settings/viewmodes/iconsviewsettingspage.cpp
+    settings/viewmodes/viewsettingspagebase.cpp
     zoomlevelinfo.cpp)
 
 set(kcm_dolphinnavigation_PART_SRCS
     kcm/kcmdolphinnavigation.cpp
-    settings/navigationsettingspage.cpp
+    settings/navigation/navigationsettingspage.cpp
     settings/settingspagebase.cpp)
 
 set(kcm_dolphinservices_PART_SRCS
     kcm/kcmdolphinservices.cpp
-    settings/servicessettingspage.cpp
+    settings/services/servicessettingspage.cpp
     settings/settingspagebase.cpp)
 
 set(kcm_dolphingeneral_PART_SRCS
     kcm/kcmdolphingeneral.cpp
-    settings/behaviorsettingspage.cpp
-    settings/previewssettingspage.cpp
-    settings/contextmenusettingspage.cpp
+    settings/general/behaviorsettingspage.cpp
+    settings/general/previewssettingspage.cpp
+    settings/general/contextmenusettingspage.cpp
     settings/settingspagebase.cpp)
 
 kde4_add_kcfg_files(kcm_dolphinviewmodes_PART_SRCS
diff --git a/src/kcm/kcmdolphingeneral.cpp b/src/kcm/kcmdolphingeneral.cpp
index 6f539674d..fb4a643ea 100644
--- a/src/kcm/kcmdolphingeneral.cpp
+++ b/src/kcm/kcmdolphingeneral.cpp
@@ -19,16 +19,16 @@
 
 #include "kcmdolphingeneral.h"
 
-#include "settings/behaviorsettingspage.h"
-#include "settings/previewssettingspage.h"
-#include "settings/contextmenusettingspage.h"
-
 #include <ktabwidget.h>
 #include <kdialog.h>
 #include <klocale.h>
 #include <kpluginfactory.h>
 #include <kpluginloader.h>
 
+#include <settings/general/behaviorsettingspage.h>
+#include <settings/general/previewssettingspage.h>
+#include <settings/general/contextmenusettingspage.h>
+
 #include <QDir>
 #include <QVBoxLayout>
 
diff --git a/src/kcm/kcmdolphinnavigation.cpp b/src/kcm/kcmdolphinnavigation.cpp
index b0e5a9ffb..fdf9de550 100644
--- a/src/kcm/kcmdolphinnavigation.cpp
+++ b/src/kcm/kcmdolphinnavigation.cpp
@@ -19,14 +19,14 @@
 
 #include "kcmdolphinnavigation.h"
 
-#include "settings/navigationsettingspage.h"
-
 #include <ktabwidget.h>
 #include <kdialog.h>
 #include <klocale.h>
 #include <kpluginfactory.h>
 #include <kpluginloader.h>
 
+#include <settings/navigation/navigationsettingspage.h>
+
 #include <QVBoxLayout>
 
 K_PLUGIN_FACTORY(KCMDolphinNavigationConfigFactory, registerPlugin<DolphinNavigationConfigModule>("dolphinnavigation");)
diff --git a/src/kcm/kcmdolphinservices.cpp b/src/kcm/kcmdolphinservices.cpp
index f82804620..22e4e32cc 100644
--- a/src/kcm/kcmdolphinservices.cpp
+++ b/src/kcm/kcmdolphinservices.cpp
@@ -19,14 +19,14 @@
 
 #include "kcmdolphinservices.h"
 
-#include "settings/servicessettingspage.h"
-
 #include <ktabwidget.h>
 #include <kdialog.h>
 #include <klocale.h>
 #include <kpluginfactory.h>
 #include <kpluginloader.h>
 
+#include <settings/services/servicessettingspage.h>
+
 #include <QVBoxLayout>
 
 K_PLUGIN_FACTORY(KCMDolphinServicesConfigFactory, registerPlugin<DolphinServicesConfigModule>("dolphinservices");)
diff --git a/src/kcm/kcmdolphinviewmodes.cpp b/src/kcm/kcmdolphinviewmodes.cpp
index 9aa53cf8b..e24d549e0 100644
--- a/src/kcm/kcmdolphinviewmodes.cpp
+++ b/src/kcm/kcmdolphinviewmodes.cpp
@@ -19,16 +19,16 @@
 
 #include "kcmdolphinviewmodes.h"
 
-#include "settings/columnviewsettingspage.h"
-#include "settings/detailsviewsettingspage.h"
-#include "settings/iconsviewsettingspage.h"
-
 #include <ktabwidget.h>
 #include <kdialog.h>
 #include <klocale.h>
 #include <kpluginfactory.h>
 #include <kpluginloader.h>
 
+#include <settings/viewmodes/columnviewsettingspage.h>
+#include <settings/viewmodes/detailsviewsettingspage.h>
+#include <settings/viewmodes/iconsviewsettingspage.h>
+
 #include <QDBusConnection>
 #include <QDBusMessage>
 #include <QDir>
diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index 93f95ca44..4762ae457 100644
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -22,12 +22,12 @@
 
 #include <dolphinapplication.h>
 #include <dolphinmainwindow.h>
-#include "generalsettingspage.h"
-#include "navigationsettingspage.h"
-#include "servicessettingspage.h"
-#include "startupsettingspage.h"
-#include "viewsettingspage.h"
-#include "trashsettingspage.h"
+#include "general/generalsettingspage.h"
+#include "navigation/navigationsettingspage.h"
+#include "services/servicessettingspage.h"
+#include "startup/startupsettingspage.h"
+#include "viewmodes/viewsettingspage.h"
+#include "trash/trashsettingspage.h"
 
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/src/settings/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp
index dae2e4577..0d7a4a0ab 100644
--- a/src/settings/behaviorsettingspage.cpp
+++ b/src/settings/general/behaviorsettingspage.cpp
@@ -20,10 +20,9 @@
 
 #include "behaviorsettingspage.h"
 
-#include "dolphinsettings.h"
 #include "dolphin_generalsettings.h"
-#include "filemetadataconfigurationdialog.h"
-
+#include <settings/filemetadataconfigurationdialog.h>
+#include <settings/dolphinsettings.h>
 #include <viewproperties.h>
 
 #include <kdialog.h>
diff --git a/src/settings/behaviorsettingspage.h b/src/settings/general/behaviorsettingspage.h
index 331e45806..331e45806 100644
--- a/src/settings/behaviorsettingspage.h
+++ b/src/settings/general/behaviorsettingspage.h
diff --git a/src/settings/contextmenusettingspage.cpp b/src/settings/general/contextmenusettingspage.cpp
index 14b4286f9..233e899b4 100644
--- a/src/settings/contextmenusettingspage.cpp
+++ b/src/settings/general/contextmenusettingspage.cpp
@@ -18,8 +18,9 @@
  ***************************************************************************/
 
 #include "contextmenusettingspage.h"
-#include "dolphinsettings.h"
-#include "dolphin_generalsettings.h"
+
+#include <settings/dolphinsettings.h>
+#include <dolphin_generalsettings.h>
 
 #include <kdialog.h>
 #include <klocale.h>
diff --git a/src/settings/contextmenusettingspage.h b/src/settings/general/contextmenusettingspage.h
index 8a11c23c5..8a11c23c5 100644
--- a/src/settings/contextmenusettingspage.h
+++ b/src/settings/general/contextmenusettingspage.h
diff --git a/src/settings/generalsettingspage.cpp b/src/settings/general/generalsettingspage.cpp
index 6b7d5917c..e156dadfc 100644
--- a/src/settings/generalsettingspage.cpp
+++ b/src/settings/general/generalsettingspage.cpp
@@ -23,7 +23,7 @@
 #include "behaviorsettingspage.h"
 #include "contextmenusettingspage.h"
 #include "previewssettingspage.h"
-#include "settingspagebase.h"
+#include <settings/settingspagebase.h>
 #include "statusbarsettingspage.h"
 
 #include <kdialog.h>
diff --git a/src/settings/generalsettingspage.h b/src/settings/general/generalsettingspage.h
index 0d28664f5..0d28664f5 100644
--- a/src/settings/generalsettingspage.h
+++ b/src/settings/general/generalsettingspage.h
diff --git a/src/settings/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp
index 1d50f41f0..1059e8547 100644
--- a/src/settings/previewssettingspage.cpp
+++ b/src/settings/general/previewssettingspage.cpp
@@ -18,7 +18,6 @@
  ***************************************************************************/
 
 #include "previewssettingspage.h"
-#include "dolphinsettings.h"
 
 #include "dolphin_generalsettings.h"
 
@@ -30,6 +29,8 @@
 #include <kservicetypetrader.h>
 #include <kservice.h>
 
+#include <settings/dolphinsettings.h>
+
 #include <QCheckBox>
 #include <QGroupBox>
 #include <QLabel>
diff --git a/src/settings/previewssettingspage.h b/src/settings/general/previewssettingspage.h
index 4b59ec87b..4b59ec87b 100644
--- a/src/settings/previewssettingspage.h
+++ b/src/settings/general/previewssettingspage.h
diff --git a/src/settings/statusbarsettingspage.cpp b/src/settings/general/statusbarsettingspage.cpp
index 74a453eff..5c2d34af8 100644
--- a/src/settings/statusbarsettingspage.cpp
+++ b/src/settings/general/statusbarsettingspage.cpp
@@ -18,13 +18,15 @@
  ***************************************************************************/
 
 #include "statusbarsettingspage.h"
-#include "dolphinsettings.h"
-#include "dolphin_generalsettings.h"
+
+#include <dolphin_generalsettings.h>
 
 #include <kdialog.h>
 #include <klocale.h>
 #include <kvbox.h>
 
+#include <settings/dolphinsettings.h>
+
 #include <QCheckBox>
 #include <QVBoxLayout>
 
diff --git a/src/settings/statusbarsettingspage.h b/src/settings/general/statusbarsettingspage.h
index 6e9667be4..6e9667be4 100644
--- a/src/settings/statusbarsettingspage.h
+++ b/src/settings/general/statusbarsettingspage.h
diff --git a/src/settings/navigationsettingspage.cpp b/src/settings/navigation/navigationsettingspage.cpp
index 31f4d47c0..31f4d47c0 100644
--- a/src/settings/navigationsettingspage.cpp
+++ b/src/settings/navigation/navigationsettingspage.cpp
diff --git a/src/settings/navigationsettingspage.h b/src/settings/navigation/navigationsettingspage.h
index 8178d6095..8178d6095 100644
--- a/src/settings/navigationsettingspage.h
+++ b/src/settings/navigation/navigationsettingspage.h
diff --git a/src/settings/servicessettingspage.cpp b/src/settings/services/servicessettingspage.cpp
index 7da299399..7da299399 100644
--- a/src/settings/servicessettingspage.cpp
+++ b/src/settings/services/servicessettingspage.cpp
diff --git a/src/settings/servicessettingspage.h b/src/settings/services/servicessettingspage.h
index cb526460f..cb526460f 100644
--- a/src/settings/servicessettingspage.h
+++ b/src/settings/services/servicessettingspage.h
diff --git a/src/settings/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp
index 1e1c6ed87..1e1c6ed87 100644
--- a/src/settings/startupsettingspage.cpp
+++ b/src/settings/startup/startupsettingspage.cpp
diff --git a/src/settings/startupsettingspage.h b/src/settings/startup/startupsettingspage.h
index 98219a5a4..98219a5a4 100644
--- a/src/settings/startupsettingspage.h
+++ b/src/settings/startup/startupsettingspage.h
diff --git a/src/settings/trashsettingspage.cpp b/src/settings/trash/trashsettingspage.cpp
index 90670cb09..e23028b08 100644
--- a/src/settings/trashsettingspage.cpp
+++ b/src/settings/trash/trashsettingspage.cpp
@@ -17,16 +17,15 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-//Own
 #include "trashsettingspage.h"
-#include "dolphinsettings.h"
-//KDE
+
 #include <KCModuleProxy>
 #include <kdialog.h>
 #include <kvbox.h>
-//Qt
-#include <QVBoxLayout>
 
+#include <settings/dolphinsettings.h>
+
+#include <QVBoxLayout>
 
 TrashSettingsPage::TrashSettingsPage(QWidget* parent) :
         SettingsPageBase(parent)
diff --git a/src/settings/trashsettingspage.h b/src/settings/trash/trashsettingspage.h
index bf4a71ea4..bf4a71ea4 100644
--- a/src/settings/trashsettingspage.h
+++ b/src/settings/trash/trashsettingspage.h
diff --git a/src/settings/columnviewsettingspage.cpp b/src/settings/viewmodes/columnviewsettingspage.cpp
index b1c3e119c..aac28f0fd 100644
--- a/src/settings/columnviewsettingspage.cpp
+++ b/src/settings/viewmodes/columnviewsettingspage.cpp
@@ -20,8 +20,7 @@
 #include "columnviewsettingspage.h"
 
 #include "dolphinfontrequester.h"
-#include "dolphinsettings.h"
-#include "dolphin_columnmodesettings.h"
+#include <dolphin_columnmodesettings.h>
 #include "iconsizegroupbox.h"
 #include "zoomlevelinfo.h"
 
@@ -29,6 +28,8 @@
 #include <klocale.h>
 #include <kcombobox.h>
 
+#include <settings/dolphinsettings.h>
+
 #include <QButtonGroup>
 #include <QCheckBox>
 #include <QGroupBox>
diff --git a/src/settings/columnviewsettingspage.h b/src/settings/viewmodes/columnviewsettingspage.h
index c68221e90..1ef0a524e 100644
--- a/src/settings/columnviewsettingspage.h
+++ b/src/settings/viewmodes/columnviewsettingspage.h
@@ -20,7 +20,7 @@
 #ifndef COLUMNVIEWSETTINGSPAGE_H
 #define COLUMNVIEWSETTINGSPAGE_H
 
-#include <settings/viewsettingspagebase.h>
+#include "viewsettingspagebase.h"
 
 class DolphinFontRequester;
 class IconSizeGroupBox;
diff --git a/src/settings/detailsviewsettingspage.cpp b/src/settings/viewmodes/detailsviewsettingspage.cpp
index dd819be70..67cef32fe 100644
--- a/src/settings/detailsviewsettingspage.cpp
+++ b/src/settings/viewmodes/detailsviewsettingspage.cpp
@@ -21,13 +21,14 @@
 
 #include "iconsizegroupbox.h"
 #include "dolphinfontrequester.h"
-#include "dolphinsettings.h"
 #include "dolphin_detailsmodesettings.h"
 #include "zoomlevelinfo.h"
 
 #include <kdialog.h>
 #include <klocale.h>
 
+#include <settings/dolphinsettings.h>
+
 #include <QButtonGroup>
 #include <QCheckBox>
 #include <QComboBox>
diff --git a/src/settings/detailsviewsettingspage.h b/src/settings/viewmodes/detailsviewsettingspage.h
index 58e3fd905..a4cbdd019 100644
--- a/src/settings/detailsviewsettingspage.h
+++ b/src/settings/viewmodes/detailsviewsettingspage.h
@@ -20,7 +20,7 @@
 #ifndef DETAILSVIEWSETTINGSPAGE_H
 #define DETAILSVIEWSETTINGSPAGE_H
 
-#include <settings/viewsettingspagebase.h>
+#include "viewsettingspagebase.h"
 
 class DolphinFontRequester;
 class IconSizeGroupBox;
diff --git a/src/settings/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp
index 04c5ed586..04c5ed586 100644
--- a/src/settings/dolphinfontrequester.cpp
+++ b/src/settings/viewmodes/dolphinfontrequester.cpp
diff --git a/src/settings/dolphinfontrequester.h b/src/settings/viewmodes/dolphinfontrequester.h
index 03a062b2e..03a062b2e 100644
--- a/src/settings/dolphinfontrequester.h
+++ b/src/settings/viewmodes/dolphinfontrequester.h
diff --git a/src/settings/iconsizegroupbox.cpp b/src/settings/viewmodes/iconsizegroupbox.cpp
index d8e0e889a..d8e0e889a 100644
--- a/src/settings/iconsizegroupbox.cpp
+++ b/src/settings/viewmodes/iconsizegroupbox.cpp
diff --git a/src/settings/iconsizegroupbox.h b/src/settings/viewmodes/iconsizegroupbox.h
index 3ec51c3a5..3ec51c3a5 100644
--- a/src/settings/iconsizegroupbox.h
+++ b/src/settings/viewmodes/iconsizegroupbox.h
diff --git a/src/settings/iconsviewsettingspage.cpp b/src/settings/viewmodes/iconsviewsettingspage.cpp
index 059a4a846..059a4a846 100644
--- a/src/settings/iconsviewsettingspage.cpp
+++ b/src/settings/viewmodes/iconsviewsettingspage.cpp
diff --git a/src/settings/iconsviewsettingspage.h b/src/settings/viewmodes/iconsviewsettingspage.h
index 345c9f407..17fda4e26 100644
--- a/src/settings/iconsviewsettingspage.h
+++ b/src/settings/viewmodes/iconsviewsettingspage.h
@@ -21,7 +21,7 @@
 #define ICONSVIEWSETTINGSPAGE_H
 
 #include <dolphiniconsview.h>
-#include <settings/viewsettingspagebase.h>
+#include "viewsettingspagebase.h"
 
 class DolphinFontRequester;
 class IconSizeGroupBox;
@@ -29,7 +29,7 @@ class KComboBox;
 class KIntSpinBox;
 
 /**
- * @brief Tab page for the 'Icons Mode' and 'Previews Mode' settings
+ * @brief Tab page for the 'Icons Mode' settings
  * of the Dolphin settings dialog.
  *
  * Allows to set:
diff --git a/src/settings/viewsettingspage.cpp b/src/settings/viewmodes/viewsettingspage.cpp
index deb7a31bb..deb7a31bb 100644
--- a/src/settings/viewsettingspage.cpp
+++ b/src/settings/viewmodes/viewsettingspage.cpp
diff --git a/src/settings/viewsettingspage.h b/src/settings/viewmodes/viewsettingspage.h
index 56e9f910d..56e9f910d 100644
--- a/src/settings/viewsettingspage.h
+++ b/src/settings/viewmodes/viewsettingspage.h
diff --git a/src/settings/viewsettingspagebase.cpp b/src/settings/viewmodes/viewsettingspagebase.cpp
index b610bb0f5..b610bb0f5 100644
--- a/src/settings/viewsettingspagebase.cpp
+++ b/src/settings/viewmodes/viewsettingspagebase.cpp
diff --git a/src/settings/viewsettingspagebase.h b/src/settings/viewmodes/viewsettingspagebase.h
index 3e85e25cb..3e85e25cb 100644
--- a/src/settings/viewsettingspagebase.h
+++ b/src/settings/viewmodes/viewsettingspagebase.h