installing a file called generalsettings.kcfgc just asks

for trouble - always prefix installed files

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ba6ed88fadddef865fc3f933832342acb7131ecd..d07886a1b3841f2bbe391450304ce2dbcd8a3681 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -51,10 +51,10 @@ set(dolphin_SRCS
 kde4_automoc(${dolphin_SRCS})
 
 kde4_add_kcfg_files(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
 
 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 ###############
 
 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} )
 install( FILES  dolphinui.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin )
 
 kde4_install_icons( ${ICON_INSTALL_DIR} )

diff --git a/src/detailsmodesettings.kcfgc b/src/detailsmodesettings.kcfgc
deleted file mode 100644 (file)
index 4853c37..0000000
--- a/src/detailsmodesettings.kcfgc
+++ /dev/null
@@ -1,4 +0,0 @@
-File=detailsmodesettings.kcfg
-ClassName=DetailsModeSettings
-Singleton=false 
-Mutators=true
\ No newline at end of file

diff --git a/src/detailsmodesettings.kcfg b/src/dolphin_detailsmodesettings.kcfg
similarity index 100%
rename from src/detailsmodesettings.kcfg
rename to src/dolphin_detailsmodesettings.kcfg

diff --git a/src/dolphin_detailsmodesettings.kcfgc b/src/dolphin_detailsmodesettings.kcfgc
new file mode 100644 (file)
index 0000000..06da2e9
--- /dev/null
+++ b/src/dolphin_detailsmodesettings.kcfgc
@@ -0,0 +1,4 @@
+File=dolphin_detailsmodesettings.kcfg
+ClassName=DetailsModeSettings
+Singleton=false 
+Mutators=true

diff --git a/src/directoryviewpropertysettings.kcfg b/src/dolphin_directoryviewpropertysettings.kcfg
similarity index 100%
rename from src/directoryviewpropertysettings.kcfg
rename to src/dolphin_directoryviewpropertysettings.kcfg

diff --git a/src/directoryviewpropertysettings.kcfgc b/src/dolphin_directoryviewpropertysettings.kcfgc
similarity index 71%
rename from src/directoryviewpropertysettings.kcfgc
rename to src/dolphin_directoryviewpropertysettings.kcfgc
index 09a91d8d1836f7fba4b68f4b8c7597d9d04cdd28..753642f8cb57795f8bd651a4f4d433c0f76e834b 100644 (file)
--- a/src/directoryviewpropertysettings.kcfgc
+++ b/src/dolphin_directoryviewpropertysettings.kcfgc
@@ -1,4 +1,4 @@
-File=directoryviewpropertysettings.kcfg
+File=dolphin_directoryviewpropertysettings.kcfg

 Singleton=false
 ClassName=ViewPropertySettings
 Mutators=true
 Singleton=false
 ClassName=ViewPropertySettings
 Mutators=true

diff --git a/src/generalsettings.kcfg b/src/dolphin_generalsettings.kcfg
similarity index 100%
rename from src/generalsettings.kcfg
rename to src/dolphin_generalsettings.kcfg

diff --git a/src/dolphin_generalsettings.kcfgc b/src/dolphin_generalsettings.kcfgc
new file mode 100644 (file)
index 0000000..91b1fee
--- /dev/null
+++ b/src/dolphin_generalsettings.kcfgc
@@ -0,0 +1,4 @@
+File=dolphin_generalsettings.kcfg
+ClassName=GeneralSettings 
+Singleton=false 
+Mutators=true

diff --git a/src/iconsmodesettings.kcfg b/src/dolphin_iconsmodesettings.kcfg
similarity index 100%
rename from src/iconsmodesettings.kcfg
rename to src/dolphin_iconsmodesettings.kcfg

diff --git a/src/dolphin_iconsmodesettings.kcfgc b/src/dolphin_iconsmodesettings.kcfgc
new file mode 100644 (file)
index 0000000..9987ce9
--- /dev/null
+++ b/src/dolphin_iconsmodesettings.kcfgc
@@ -0,0 +1,4 @@
+File=dolphin_iconsmodesettings.kcfg
+ClassName=IconsModeSettings
+Singleton=false 
+Mutators=true

diff --git a/src/generalsettings.kcfgc b/src/generalsettings.kcfgc
deleted file mode 100644 (file)
index 96d4c1f..0000000
--- a/src/generalsettings.kcfgc
+++ /dev/null
@@ -1,4 +0,0 @@
-File=generalsettings.kcfg
-ClassName=GeneralSettings 
-Singleton=false 
-Mutators=true
\ No newline at end of file

diff --git a/src/iconsmodesettings.kcfgc b/src/iconsmodesettings.kcfgc
deleted file mode 100644 (file)
index 31f564a..0000000
--- a/src/iconsmodesettings.kcfgc
+++ /dev/null
@@ -1,4 +0,0 @@
-File=iconsmodesettings.kcfg
-ClassName=IconsModeSettings
-Singleton=false 
-Mutators=true
\ No newline at end of file