From d93d198db6eef9186177aa5a918b300a6b749627 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Sat, 24 Jul 2010 20:39:19 +0000 Subject: [PATCH] Sourcecode hierarchy cleanup: Use subfolders inside the "settings" folder svn path=/trunk/KDE/kdebase/apps/; revision=1154129 --- src/CMakeLists.txt | 54 +++++++++---------- src/kcm/kcmdolphingeneral.cpp | 8 +-- src/kcm/kcmdolphinnavigation.cpp | 4 +- src/kcm/kcmdolphinservices.cpp | 4 +- src/kcm/kcmdolphinviewmodes.cpp | 8 +-- src/settings/dolphinsettingsdialog.cpp | 12 ++--- .../{ => general}/behaviorsettingspage.cpp | 5 +- .../{ => general}/behaviorsettingspage.h | 0 .../{ => general}/contextmenusettingspage.cpp | 5 +- .../{ => general}/contextmenusettingspage.h | 0 .../{ => general}/generalsettingspage.cpp | 2 +- .../{ => general}/generalsettingspage.h | 0 .../{ => general}/previewssettingspage.cpp | 3 +- .../{ => general}/previewssettingspage.h | 0 .../{ => general}/statusbarsettingspage.cpp | 6 ++- .../{ => general}/statusbarsettingspage.h | 0 .../navigationsettingspage.cpp | 0 .../{ => navigation}/navigationsettingspage.h | 0 .../{ => services}/servicessettingspage.cpp | 0 .../{ => services}/servicessettingspage.h | 0 .../{ => startup}/startupsettingspage.cpp | 0 .../{ => startup}/startupsettingspage.h | 0 .../{ => trash}/trashsettingspage.cpp | 9 ++-- src/settings/{ => trash}/trashsettingspage.h | 0 .../columnviewsettingspage.cpp | 5 +- .../{ => viewmodes}/columnviewsettingspage.h | 2 +- .../detailsviewsettingspage.cpp | 3 +- .../{ => viewmodes}/detailsviewsettingspage.h | 2 +- .../{ => viewmodes}/dolphinfontrequester.cpp | 0 .../{ => viewmodes}/dolphinfontrequester.h | 0 .../{ => viewmodes}/iconsizegroupbox.cpp | 0 .../{ => viewmodes}/iconsizegroupbox.h | 0 .../{ => viewmodes}/iconsviewsettingspage.cpp | 0 .../{ => viewmodes}/iconsviewsettingspage.h | 4 +- .../{ => viewmodes}/viewsettingspage.cpp | 0 .../{ => viewmodes}/viewsettingspage.h | 0 .../{ => viewmodes}/viewsettingspagebase.cpp | 0 .../{ => viewmodes}/viewsettingspagebase.h | 0 38 files changed, 70 insertions(+), 66 deletions(-) rename src/settings/{ => general}/behaviorsettingspage.cpp (99%) rename src/settings/{ => general}/behaviorsettingspage.h (100%) rename src/settings/{ => general}/contextmenusettingspage.cpp (98%) rename src/settings/{ => general}/contextmenusettingspage.h (100%) rename src/settings/{ => general}/generalsettingspage.cpp (98%) rename src/settings/{ => general}/generalsettingspage.h (100%) rename src/settings/{ => general}/previewssettingspage.cpp (99%) rename src/settings/{ => general}/previewssettingspage.h (100%) rename src/settings/{ => general}/statusbarsettingspage.cpp (97%) rename src/settings/{ => general}/statusbarsettingspage.h (100%) rename src/settings/{ => navigation}/navigationsettingspage.cpp (100%) rename src/settings/{ => navigation}/navigationsettingspage.h (100%) rename src/settings/{ => services}/servicessettingspage.cpp (100%) rename src/settings/{ => services}/servicessettingspage.h (100%) rename src/settings/{ => startup}/startupsettingspage.cpp (100%) rename src/settings/{ => startup}/startupsettingspage.h (100%) rename src/settings/{ => trash}/trashsettingspage.cpp (98%) rename src/settings/{ => trash}/trashsettingspage.h (100%) rename src/settings/{ => viewmodes}/columnviewsettingspage.cpp (98%) rename src/settings/{ => viewmodes}/columnviewsettingspage.h (98%) rename src/settings/{ => viewmodes}/detailsviewsettingspage.cpp (99%) rename src/settings/{ => viewmodes}/detailsviewsettingspage.h (98%) rename src/settings/{ => viewmodes}/dolphinfontrequester.cpp (100%) rename src/settings/{ => viewmodes}/dolphinfontrequester.h (100%) rename src/settings/{ => viewmodes}/iconsizegroupbox.cpp (100%) rename src/settings/{ => viewmodes}/iconsizegroupbox.h (100%) rename src/settings/{ => viewmodes}/iconsviewsettingspage.cpp (100%) rename src/settings/{ => viewmodes}/iconsviewsettingspage.h (96%) rename src/settings/{ => viewmodes}/viewsettingspage.cpp (100%) rename src/settings/{ => viewmodes}/viewsettingspage.h (100%) rename src/settings/{ => viewmodes}/viewsettingspagebase.cpp (100%) rename src/settings/{ => viewmodes}/viewsettingspagebase.h (100%) 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 #include #include #include #include +#include +#include +#include + #include #include 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 #include #include #include #include +#include + #include K_PLUGIN_FACTORY(KCMDolphinNavigationConfigFactory, registerPlugin("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 #include #include #include #include +#include + #include K_PLUGIN_FACTORY(KCMDolphinServicesConfigFactory, registerPlugin("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 #include #include #include #include +#include +#include +#include + #include #include #include 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 #include -#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 #include diff --git a/src/settings/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp similarity index 99% rename from src/settings/behaviorsettingspage.cpp rename to 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 +#include #include #include diff --git a/src/settings/behaviorsettingspage.h b/src/settings/general/behaviorsettingspage.h similarity index 100% rename from src/settings/behaviorsettingspage.h rename to src/settings/general/behaviorsettingspage.h diff --git a/src/settings/contextmenusettingspage.cpp b/src/settings/general/contextmenusettingspage.cpp similarity index 98% rename from src/settings/contextmenusettingspage.cpp rename to 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 +#include #include #include diff --git a/src/settings/contextmenusettingspage.h b/src/settings/general/contextmenusettingspage.h similarity index 100% rename from src/settings/contextmenusettingspage.h rename to src/settings/general/contextmenusettingspage.h diff --git a/src/settings/generalsettingspage.cpp b/src/settings/general/generalsettingspage.cpp similarity index 98% rename from src/settings/generalsettingspage.cpp rename to 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 #include "statusbarsettingspage.h" #include diff --git a/src/settings/generalsettingspage.h b/src/settings/general/generalsettingspage.h similarity index 100% rename from src/settings/generalsettingspage.h rename to src/settings/general/generalsettingspage.h diff --git a/src/settings/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp similarity index 99% rename from src/settings/previewssettingspage.cpp rename to 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 #include +#include + #include #include #include diff --git a/src/settings/previewssettingspage.h b/src/settings/general/previewssettingspage.h similarity index 100% rename from src/settings/previewssettingspage.h rename to src/settings/general/previewssettingspage.h diff --git a/src/settings/statusbarsettingspage.cpp b/src/settings/general/statusbarsettingspage.cpp similarity index 97% rename from src/settings/statusbarsettingspage.cpp rename to 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 #include #include #include +#include + #include #include diff --git a/src/settings/statusbarsettingspage.h b/src/settings/general/statusbarsettingspage.h similarity index 100% rename from src/settings/statusbarsettingspage.h rename to src/settings/general/statusbarsettingspage.h diff --git a/src/settings/navigationsettingspage.cpp b/src/settings/navigation/navigationsettingspage.cpp similarity index 100% rename from src/settings/navigationsettingspage.cpp rename to src/settings/navigation/navigationsettingspage.cpp diff --git a/src/settings/navigationsettingspage.h b/src/settings/navigation/navigationsettingspage.h similarity index 100% rename from src/settings/navigationsettingspage.h rename to src/settings/navigation/navigationsettingspage.h diff --git a/src/settings/servicessettingspage.cpp b/src/settings/services/servicessettingspage.cpp similarity index 100% rename from src/settings/servicessettingspage.cpp rename to src/settings/services/servicessettingspage.cpp diff --git a/src/settings/servicessettingspage.h b/src/settings/services/servicessettingspage.h similarity index 100% rename from src/settings/servicessettingspage.h rename to src/settings/services/servicessettingspage.h diff --git a/src/settings/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp similarity index 100% rename from src/settings/startupsettingspage.cpp rename to src/settings/startup/startupsettingspage.cpp diff --git a/src/settings/startupsettingspage.h b/src/settings/startup/startupsettingspage.h similarity index 100% rename from src/settings/startupsettingspage.h rename to src/settings/startup/startupsettingspage.h diff --git a/src/settings/trashsettingspage.cpp b/src/settings/trash/trashsettingspage.cpp similarity index 98% rename from src/settings/trashsettingspage.cpp rename to 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 #include #include -//Qt -#include +#include + +#include TrashSettingsPage::TrashSettingsPage(QWidget* parent) : SettingsPageBase(parent) diff --git a/src/settings/trashsettingspage.h b/src/settings/trash/trashsettingspage.h similarity index 100% rename from src/settings/trashsettingspage.h rename to src/settings/trash/trashsettingspage.h diff --git a/src/settings/columnviewsettingspage.cpp b/src/settings/viewmodes/columnviewsettingspage.cpp similarity index 98% rename from src/settings/columnviewsettingspage.cpp rename to 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 #include "iconsizegroupbox.h" #include "zoomlevelinfo.h" @@ -29,6 +28,8 @@ #include #include +#include + #include #include #include diff --git a/src/settings/columnviewsettingspage.h b/src/settings/viewmodes/columnviewsettingspage.h similarity index 98% rename from src/settings/columnviewsettingspage.h rename to 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 +#include "viewsettingspagebase.h" class DolphinFontRequester; class IconSizeGroupBox; diff --git a/src/settings/detailsviewsettingspage.cpp b/src/settings/viewmodes/detailsviewsettingspage.cpp similarity index 99% rename from src/settings/detailsviewsettingspage.cpp rename to 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 #include +#include + #include #include #include diff --git a/src/settings/detailsviewsettingspage.h b/src/settings/viewmodes/detailsviewsettingspage.h similarity index 98% rename from src/settings/detailsviewsettingspage.h rename to 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 +#include "viewsettingspagebase.h" class DolphinFontRequester; class IconSizeGroupBox; diff --git a/src/settings/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp similarity index 100% rename from src/settings/dolphinfontrequester.cpp rename to src/settings/viewmodes/dolphinfontrequester.cpp diff --git a/src/settings/dolphinfontrequester.h b/src/settings/viewmodes/dolphinfontrequester.h similarity index 100% rename from src/settings/dolphinfontrequester.h rename to src/settings/viewmodes/dolphinfontrequester.h diff --git a/src/settings/iconsizegroupbox.cpp b/src/settings/viewmodes/iconsizegroupbox.cpp similarity index 100% rename from src/settings/iconsizegroupbox.cpp rename to src/settings/viewmodes/iconsizegroupbox.cpp diff --git a/src/settings/iconsizegroupbox.h b/src/settings/viewmodes/iconsizegroupbox.h similarity index 100% rename from src/settings/iconsizegroupbox.h rename to src/settings/viewmodes/iconsizegroupbox.h diff --git a/src/settings/iconsviewsettingspage.cpp b/src/settings/viewmodes/iconsviewsettingspage.cpp similarity index 100% rename from src/settings/iconsviewsettingspage.cpp rename to src/settings/viewmodes/iconsviewsettingspage.cpp diff --git a/src/settings/iconsviewsettingspage.h b/src/settings/viewmodes/iconsviewsettingspage.h similarity index 96% rename from src/settings/iconsviewsettingspage.h rename to 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 -#include +#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 similarity index 100% rename from src/settings/viewsettingspage.cpp rename to src/settings/viewmodes/viewsettingspage.cpp diff --git a/src/settings/viewsettingspage.h b/src/settings/viewmodes/viewsettingspage.h similarity index 100% rename from src/settings/viewsettingspage.h rename to src/settings/viewmodes/viewsettingspage.h diff --git a/src/settings/viewsettingspagebase.cpp b/src/settings/viewmodes/viewsettingspagebase.cpp similarity index 100% rename from src/settings/viewsettingspagebase.cpp rename to src/settings/viewmodes/viewsettingspagebase.cpp diff --git a/src/settings/viewsettingspagebase.h b/src/settings/viewmodes/viewsettingspagebase.h similarity index 100% rename from src/settings/viewsettingspagebase.h rename to src/settings/viewmodes/viewsettingspagebase.h -- 2.47.3