Commit d93d198d authored by Peter Penz's avatar Peter Penz
Browse files

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

 

svn path=/trunk/KDE/kdebase/apps/; revision=1154129
parent 49eb864b
......@@ -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
......
......@@ -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>
......
......@@ -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");)
......
......@@ -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");)
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment