From 20195315bb8c637f28d892323e6cdc43604d38ae Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 21 Feb 2007 09:31:52 +0000 Subject: [PATCH] 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 | 10 +++++----- src/detailsmodesettings.kcfgc | 4 ---- ...esettings.kcfg => dolphin_detailsmodesettings.kcfg} | 0 src/dolphin_detailsmodesettings.kcfgc | 4 ++++ ...kcfg => dolphin_directoryviewpropertysettings.kcfg} | 0 ...fgc => dolphin_directoryviewpropertysettings.kcfgc} | 2 +- ...neralsettings.kcfg => dolphin_generalsettings.kcfg} | 0 src/dolphin_generalsettings.kcfgc | 4 ++++ ...odesettings.kcfg => dolphin_iconsmodesettings.kcfg} | 0 src/dolphin_iconsmodesettings.kcfgc | 4 ++++ src/generalsettings.kcfgc | 4 ---- src/iconsmodesettings.kcfgc | 4 ---- 12 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 src/detailsmodesettings.kcfgc rename src/{detailsmodesettings.kcfg => dolphin_detailsmodesettings.kcfg} (100%) create mode 100644 src/dolphin_detailsmodesettings.kcfgc rename src/{directoryviewpropertysettings.kcfg => dolphin_directoryviewpropertysettings.kcfg} (100%) rename src/{directoryviewpropertysettings.kcfgc => dolphin_directoryviewpropertysettings.kcfgc} (71%) rename src/{generalsettings.kcfg => dolphin_generalsettings.kcfg} (100%) create mode 100644 src/dolphin_generalsettings.kcfgc rename src/{iconsmodesettings.kcfg => dolphin_iconsmodesettings.kcfg} (100%) create mode 100644 src/dolphin_iconsmodesettings.kcfgc delete mode 100644 src/generalsettings.kcfgc delete mode 100644 src/iconsmodesettings.kcfgc diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ba6ed88fad..d07886a1b3 100644 --- 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 - 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} ) diff --git a/src/detailsmodesettings.kcfgc b/src/detailsmodesettings.kcfgc deleted file mode 100644 index 4853c37d0c..0000000000 --- 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 index 0000000000..06da2e9e0c --- /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 09a91d8d18..753642f8cb 100644 --- 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 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 index 0000000000..91b1fee468 --- /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 index 0000000000..9987ce9389 --- /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 index 96d4c1fb5b..0000000000 --- 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 index 31f564a2ad..0000000000 --- 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