Sourcecode hierarchy cleanup: Move kcm to settings/kcm

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0cbe663acc8e0e663adb8b8e176abad1afca7e09..fe6b13ac3e0110ea90e4bedd1371dd92841344f8 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -197,8 +197,8 @@ install(TARGETS dolphin ${INSTALL_TARGETS_DEFAULT_ARGS})
 ##########################################
 
 set(kcm_dolphinviewmodes_PART_SRCS
 ##########################################
 
 set(kcm_dolphinviewmodes_PART_SRCS

-    kcm/kcmdolphinviewmodes.cpp

     pixmapviewer.cpp
     pixmapviewer.cpp

+    settings/kcm/kcmdolphinviewmodes.cpp

     settings/viewmodes/columnviewsettingspage.cpp
     settings/viewmodes/detailsviewsettingspage.cpp
     settings/viewmodes/dolphinfontrequester.cpp
     settings/viewmodes/columnviewsettingspage.cpp
     settings/viewmodes/detailsviewsettingspage.cpp
     settings/viewmodes/dolphinfontrequester.cpp


@@ -208,17 +208,17 @@ set(kcm_dolphinviewmodes_PART_SRCS
     zoomlevelinfo.cpp)
 
 set(kcm_dolphinnavigation_PART_SRCS
     zoomlevelinfo.cpp)
 
 set(kcm_dolphinnavigation_PART_SRCS

-    kcm/kcmdolphinnavigation.cpp
+    settings/kcm/kcmdolphinnavigation.cpp

     settings/navigation/navigationsettingspage.cpp
     settings/settingspagebase.cpp)
 
 set(kcm_dolphinservices_PART_SRCS
     settings/navigation/navigationsettingspage.cpp
     settings/settingspagebase.cpp)
 
 set(kcm_dolphinservices_PART_SRCS

-    kcm/kcmdolphinservices.cpp
+    settings/kcm/kcmdolphinservices.cpp

     settings/services/servicessettingspage.cpp
     settings/settingspagebase.cpp)
 
 set(kcm_dolphingeneral_PART_SRCS
     settings/services/servicessettingspage.cpp
     settings/settingspagebase.cpp)
 
 set(kcm_dolphingeneral_PART_SRCS

-    kcm/kcmdolphingeneral.cpp
+    settings/kcm/kcmdolphingeneral.cpp

     settings/general/behaviorsettingspage.cpp
     settings/general/previewssettingspage.cpp
     settings/general/contextmenusettingspage.cpp
     settings/general/behaviorsettingspage.cpp
     settings/general/previewssettingspage.cpp
     settings/general/contextmenusettingspage.cpp


@@ -284,11 +284,11 @@ install( FILES settings/dolphin_directoryviewpropertysettings.kcfg
          DESTINATION ${KCFG_INSTALL_DIR} )
 install( FILES dolphinui.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin )
 install( FILES search/filenamesearch.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
          DESTINATION ${KCFG_INSTALL_DIR} )
 install( FILES dolphinui.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin )
 install( FILES search/filenamesearch.protocol DESTINATION ${SERVICES_INSTALL_DIR} )

-install( FILES kcm/kcmdolphinviewmodes.desktop DESTINATION
+install( FILES settings/kcm/kcmdolphinviewmodes.desktop DESTINATION

 ${SERVICES_INSTALL_DIR} )
 ${SERVICES_INSTALL_DIR} )

-install( FILES kcm/kcmdolphinnavigation.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kcm/kcmdolphinservices.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kcm/kcmdolphingeneral.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES settings/kcm/kcmdolphinnavigation.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES settings/kcm/kcmdolphinservices.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES settings/kcm/kcmdolphingeneral.desktop DESTINATION ${SERVICES_INSTALL_DIR} )

 install( FILES khns/servicemenu.knsrc DESTINATION ${CONFIG_INSTALL_DIR} )
 install( PROGRAMS khns/servicemenuinstallation DESTINATION ${BIN_INSTALL_DIR} )
 install( PROGRAMS khns/servicemenudeinstallation DESTINATION ${BIN_INSTALL_DIR} )
 install( FILES khns/servicemenu.knsrc DESTINATION ${CONFIG_INSTALL_DIR} )
 install( PROGRAMS khns/servicemenuinstallation DESTINATION ${BIN_INSTALL_DIR} )
 install( PROGRAMS khns/servicemenudeinstallation DESTINATION ${BIN_INSTALL_DIR} )

diff --git a/src/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp
similarity index 100%
rename from src/kcm/kcmdolphingeneral.cpp
rename to src/settings/kcm/kcmdolphingeneral.cpp

diff --git a/src/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
similarity index 100%
rename from src/kcm/kcmdolphingeneral.desktop
rename to src/settings/kcm/kcmdolphingeneral.desktop

diff --git a/src/kcm/kcmdolphingeneral.h b/src/settings/kcm/kcmdolphingeneral.h
similarity index 100%
rename from src/kcm/kcmdolphingeneral.h
rename to src/settings/kcm/kcmdolphingeneral.h

diff --git a/src/kcm/kcmdolphinnavigation.cpp b/src/settings/kcm/kcmdolphinnavigation.cpp
similarity index 100%
rename from src/kcm/kcmdolphinnavigation.cpp
rename to src/settings/kcm/kcmdolphinnavigation.cpp

diff --git a/src/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
similarity index 100%
rename from src/kcm/kcmdolphinnavigation.desktop
rename to src/settings/kcm/kcmdolphinnavigation.desktop

diff --git a/src/kcm/kcmdolphinnavigation.h b/src/settings/kcm/kcmdolphinnavigation.h
similarity index 100%
rename from src/kcm/kcmdolphinnavigation.h
rename to src/settings/kcm/kcmdolphinnavigation.h

diff --git a/src/kcm/kcmdolphinservices.cpp b/src/settings/kcm/kcmdolphinservices.cpp
similarity index 100%
rename from src/kcm/kcmdolphinservices.cpp
rename to src/settings/kcm/kcmdolphinservices.cpp

diff --git a/src/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
similarity index 100%
rename from src/kcm/kcmdolphinservices.desktop
rename to src/settings/kcm/kcmdolphinservices.desktop

diff --git a/src/kcm/kcmdolphinservices.h b/src/settings/kcm/kcmdolphinservices.h
similarity index 100%
rename from src/kcm/kcmdolphinservices.h
rename to src/settings/kcm/kcmdolphinservices.h

diff --git a/src/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp
similarity index 100%
rename from src/kcm/kcmdolphinviewmodes.cpp
rename to src/settings/kcm/kcmdolphinviewmodes.cpp

diff --git a/src/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
similarity index 100%
rename from src/kcm/kcmdolphinviewmodes.desktop
rename to src/settings/kcm/kcmdolphinviewmodes.desktop

diff --git a/src/kcm/kcmdolphinviewmodes.h b/src/settings/kcm/kcmdolphinviewmodes.h
similarity index 100%
rename from src/kcm/kcmdolphinviewmodes.h
rename to src/settings/kcm/kcmdolphinviewmodes.h