installing a file called generalsettings.kcfgc just asks

for trouble - always prefix installed files 

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

src/CMakeLists.txt

@@ -51,10 +51,10 @@ set(dolphin_SRCS
 kde4_automoc(${dolphin_SRCS})
 
 kde4_add_kcfg_files(dolphin_SRCS
-   directoryviewpropertysettings.kcfgc
-   generalsettings.kcfgc
-   iconsmodesettings.kcfgc
-   detailsmodesettings.kcfgc )
+   dolphin_directoryviewpropertysettings.kcfgc
+   dolphin_generalsettings.kcfgc
+   dolphin_iconsmodesettings.kcfgc
+   dolphin_detailsmodesettings.kcfgc )
 
 qt4_add_dbus_adaptor(dolphin_SRCS
    org.kde.dolphin.Application.xml
@@ -72,7 +72,7 @@ install(TARGETS dolphin DESTINATION ${BIN_INSTALL_DIR})
 ########### install files ###############
 
 install( FILES  dolphin.desktop DESTINATION ${XDG_APPS_DIR} )
-install( FILES  directoryviewpropertysettings.kcfg generalsettings.kcfg iconsmodesettings.kcfg detailsmodesettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
+install( FILES  dolphin_directoryviewpropertysettings.kcfg dolphin_generalsettings.kcfg dolphin_iconsmodesettings.kcfg dolphin_detailsmodesettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 install( FILES  dolphinui.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin )
 
 kde4_install_icons( ${ICON_INSTALL_DIR} )

src/detailsmodesettings.kcfgc

@@ -1,4 +0,0 @@
-File=detailsmodesettings.kcfg
-ClassName=DetailsModeSettings
-Singleton=false 
-Mutators=true

src/dolphin_detailsmodesettings.kcfgc

@@ -0,0 +1,4 @@
+File=dolphin_detailsmodesettings.kcfg
+ClassName=DetailsModeSettings
+Singleton=false 
+Mutators=true

src/dolphin_directoryviewpropertysettings.kcfgc

@@ -1,4 +1,4 @@
-File=directoryviewpropertysettings.kcfg
+File=dolphin_directoryviewpropertysettings.kcfg
 Singleton=false
 ClassName=ViewPropertySettings
 Mutators=true

src/dolphin_generalsettings.kcfgc

@@ -0,0 +1,4 @@
+File=dolphin_generalsettings.kcfg
+ClassName=GeneralSettings 
+Singleton=false 
+Mutators=true

src/dolphin_iconsmodesettings.kcfgc

@@ -0,0 +1,4 @@
+File=dolphin_iconsmodesettings.kcfg
+ClassName=IconsModeSettings
+Singleton=false 
+Mutators=true

src/generalsettings.kcfgc

@@ -1,4 +0,0 @@
-File=generalsettings.kcfg
-ClassName=GeneralSettings 
-Singleton=false 
-Mutators=true

src/iconsmodesettings.kcfgc

@@ -1,4 +0,0 @@
-File=iconsmodesettings.kcfg
-ClassName=IconsModeSettings
-Singleton=false 
-Mutators=true