]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Sourcecode hierarchy cleanup: Use subfolders inside the "settings" folder
authorPeter Penz <peter.penz19@gmail.com>
Sat, 24 Jul 2010 20:39:19 +0000 (20:39 +0000)
committerPeter Penz <peter.penz19@gmail.com>
Sat, 24 Jul 2010 20:39:19 +0000 (20:39 +0000)
svn path=/trunk/KDE/kdebase/apps/; revision=1154129

38 files changed:
src/CMakeLists.txt
src/kcm/kcmdolphingeneral.cpp
src/kcm/kcmdolphinnavigation.cpp
src/kcm/kcmdolphinservices.cpp
src/kcm/kcmdolphinviewmodes.cpp
src/settings/dolphinsettingsdialog.cpp
src/settings/general/behaviorsettingspage.cpp [moved from src/settings/behaviorsettingspage.cpp with 99% similarity]
src/settings/general/behaviorsettingspage.h [moved from src/settings/behaviorsettingspage.h with 100% similarity]
src/settings/general/contextmenusettingspage.cpp [moved from src/settings/contextmenusettingspage.cpp with 98% similarity]
src/settings/general/contextmenusettingspage.h [moved from src/settings/contextmenusettingspage.h with 100% similarity]
src/settings/general/generalsettingspage.cpp [moved from src/settings/generalsettingspage.cpp with 98% similarity]
src/settings/general/generalsettingspage.h [moved from src/settings/generalsettingspage.h with 100% similarity]
src/settings/general/previewssettingspage.cpp [moved from src/settings/previewssettingspage.cpp with 99% similarity]
src/settings/general/previewssettingspage.h [moved from src/settings/previewssettingspage.h with 100% similarity]
src/settings/general/statusbarsettingspage.cpp [moved from src/settings/statusbarsettingspage.cpp with 97% similarity]
src/settings/general/statusbarsettingspage.h [moved from src/settings/statusbarsettingspage.h with 100% similarity]
src/settings/navigation/navigationsettingspage.cpp [moved from src/settings/navigationsettingspage.cpp with 100% similarity]
src/settings/navigation/navigationsettingspage.h [moved from src/settings/navigationsettingspage.h with 100% similarity]
src/settings/services/servicessettingspage.cpp [moved from src/settings/servicessettingspage.cpp with 100% similarity]
src/settings/services/servicessettingspage.h [moved from src/settings/servicessettingspage.h with 100% similarity]
src/settings/startup/startupsettingspage.cpp [moved from src/settings/startupsettingspage.cpp with 100% similarity]
src/settings/startup/startupsettingspage.h [moved from src/settings/startupsettingspage.h with 100% similarity]
src/settings/trash/trashsettingspage.cpp [moved from src/settings/trashsettingspage.cpp with 98% similarity]
src/settings/trash/trashsettingspage.h [moved from src/settings/trashsettingspage.h with 100% similarity]
src/settings/viewmodes/columnviewsettingspage.cpp [moved from src/settings/columnviewsettingspage.cpp with 98% similarity]
src/settings/viewmodes/columnviewsettingspage.h [moved from src/settings/columnviewsettingspage.h with 98% similarity]
src/settings/viewmodes/detailsviewsettingspage.cpp [moved from src/settings/detailsviewsettingspage.cpp with 99% similarity]
src/settings/viewmodes/detailsviewsettingspage.h [moved from src/settings/detailsviewsettingspage.h with 98% similarity]
src/settings/viewmodes/dolphinfontrequester.cpp [moved from src/settings/dolphinfontrequester.cpp with 100% similarity]
src/settings/viewmodes/dolphinfontrequester.h [moved from src/settings/dolphinfontrequester.h with 100% similarity]
src/settings/viewmodes/iconsizegroupbox.cpp [moved from src/settings/iconsizegroupbox.cpp with 100% similarity]
src/settings/viewmodes/iconsizegroupbox.h [moved from src/settings/iconsizegroupbox.h with 100% similarity]
src/settings/viewmodes/iconsviewsettingspage.cpp [moved from src/settings/iconsviewsettingspage.cpp with 100% similarity]
src/settings/viewmodes/iconsviewsettingspage.h [moved from src/settings/iconsviewsettingspage.h with 96% similarity]
src/settings/viewmodes/viewsettingspage.cpp [moved from src/settings/viewsettingspage.cpp with 100% similarity]
src/settings/viewmodes/viewsettingspage.h [moved from src/settings/viewsettingspage.h with 100% similarity]
src/settings/viewmodes/viewsettingspagebase.cpp [moved from src/settings/viewsettingspagebase.cpp with 100% similarity]
src/settings/viewmodes/viewsettingspagebase.h [moved from src/settings/viewsettingspagebase.h with 100% similarity]

index cdfd4d7d2bce37be5917f39f436e876ecbce268f..0cbe663acc8e0e663adb8b8e176abad1afca7e09 100644 (file)
@@ -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
index 6f539674d3521159f9cf1ee2c763924ba774eb05..fb4a643ea1389df7384fddf8227955a1cadd358d 100644 (file)
 
 #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>
 
index b0e5a9ffb46e88314abb0f1ea0e7ae8cb2708ee1..fdf9de55043f30ccf08d56599c73e27730ded2f4 100644 (file)
 
 #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");)
index f828046201f31177048377279b337177d1f5edd8..22e4e32ccfbfa0a06db0b898602fdcb8ba35d563 100644 (file)
 
 #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");)
index 9aa53cf8b4e1d3de4c0267474723a83a1aaa9055..e24d549e02da2340700f5208fa2340f8706c0f34 100644 (file)
 
 #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>
index 93f95ca443ccf045a514b97f5db66c4e9ccd7156..4762ae4578dca2628278bfd8107516e209d6dcf9 100644 (file)
 
 #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>
similarity index 99%
rename from src/settings/behaviorsettingspage.cpp
rename to src/settings/general/behaviorsettingspage.cpp
index dae2e4577aab912a716b09bbbeaa429f9a421ce2..0d7a4a0ab3c8c326566e51f6a6109aff8f95f27b 100644 (file)
 
 #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>
similarity index 98%
rename from src/settings/contextmenusettingspage.cpp
rename to src/settings/general/contextmenusettingspage.cpp
index 14b4286f9c17d6791a583a60df3e96988016256b..233e899b4a657d25035b25c2d0f433b90a513029 100644 (file)
@@ -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>
similarity index 98%
rename from src/settings/generalsettingspage.cpp
rename to src/settings/general/generalsettingspage.cpp
index 6b7d5917cd8fa55c63b700d5e9b726f4ba4ecca3..e156dadfc4bcbf45c8d7bf7544dfa031621446a2 100644 (file)
@@ -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>
similarity index 99%
rename from src/settings/previewssettingspage.cpp
rename to src/settings/general/previewssettingspage.cpp
index 1d50f41f0c812a8fdf925f0257ac6905d83ae497..1059e854770bcd3413137e012464199ef0fa9e23 100644 (file)
@@ -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>
similarity index 97%
rename from src/settings/statusbarsettingspage.cpp
rename to src/settings/general/statusbarsettingspage.cpp
index 74a453eff55338e0ce8b0c8a48363d7c071173ff..5c2d34af80b7f3fb5523e0d7b6ba54f5286b2499 100644 (file)
  ***************************************************************************/
 
 #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>
 
similarity index 98%
rename from src/settings/trashsettingspage.cpp
rename to src/settings/trash/trashsettingspage.cpp
index 90670cb09d87ff5860f7516817dc1320f497a7d2..e23028b082accd39936ccf55268f7cc2c78acbf2 100644 (file)
  *   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)
similarity index 98%
rename from src/settings/columnviewsettingspage.cpp
rename to src/settings/viewmodes/columnviewsettingspage.cpp
index b1c3e119c31d42b324c4b3317f4b8c2a07f036ee..aac28f0fd1b43e44039b712a6cd99e2326d09712 100644 (file)
@@ -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>
similarity index 98%
rename from src/settings/columnviewsettingspage.h
rename to src/settings/viewmodes/columnviewsettingspage.h
index c68221e90fc2caa25171269746c00552c1fa407c..1ef0a524e28e86243e38c889ac07c239b4ac4ec2 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef COLUMNVIEWSETTINGSPAGE_H
 #define COLUMNVIEWSETTINGSPAGE_H
 
-#include <settings/viewsettingspagebase.h>
+#include "viewsettingspagebase.h"
 
 class DolphinFontRequester;
 class IconSizeGroupBox;
similarity index 99%
rename from src/settings/detailsviewsettingspage.cpp
rename to src/settings/viewmodes/detailsviewsettingspage.cpp
index dd819be7092ab4738433af7ab2544fb7dc1280c8..67cef32fee07a99cc8febaff66c685588082490e 100644 (file)
 
 #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>
similarity index 98%
rename from src/settings/detailsviewsettingspage.h
rename to src/settings/viewmodes/detailsviewsettingspage.h
index 58e3fd905fa41bb0d070519e35b9a067cde35107..a4cbdd0198a9ec85de6868a905ef1af1d81704b5 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef DETAILSVIEWSETTINGSPAGE_H
 #define DETAILSVIEWSETTINGSPAGE_H
 
-#include <settings/viewsettingspagebase.h>
+#include "viewsettingspagebase.h"
 
 class DolphinFontRequester;
 class IconSizeGroupBox;
similarity index 96%
rename from src/settings/iconsviewsettingspage.h
rename to src/settings/viewmodes/iconsviewsettingspage.h
index 345c9f407e4bd3daf28f1c6a7fac023054ae9f20..17fda4e266e890b9cd7577b377f6552c483552dd 100644 (file)
@@ -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: