Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 10:22:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdecore: drop support for KStandardDirs kcfg resource

Browse source 
kcfg files are resources much like .ui files - not ment to be installed,
used only to generate .cpp and .h files from them. they are not used at
runtime altough Plasma::ConfigLoader does use its format to load files
for configuration purposes (files named main.xml shipped by plasmoids)

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-07-09 05:48:31 +03:00
parent 268b2cc053
commit ee1aa40904
6 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -48,7 +48,6 @@ set(KDE4_IMPORTS_INSTALL_DIR "${KDE4_PLUGIN_INSTALL_DIR}/imports" CACHE PATH "KD
set(KDE4_CONFIG_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/config" CACHE PATH "KDE config installation directory")
set(KDE4_DATA_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}" CACHE PATH "KDE data installation directory")
set(KDE4_ICON_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/icons" CACHE PATH "KDE icon installation directory")
set(KDE4_KCFG_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/config.kcfg" CACHE PATH "KDE kcfg installation directory")
set(KDE4_LOCALE_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/translations/kde4" CACHE PATH "KDE locale installation directory")
set(KDE4_SERVICES_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/kde4/services" CACHE PATH "KDE services installation directory")
set(KDE4_SERVICETYPES_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/kde4/servicetypes" CACHE PATH "KDE service types installation directory")

2
KDELibs4Config.cmake
View file

@ -16,7 +16,6 @@
# KDE4_CONFIG_INSTALL_DIR - the directory where config files from kdelibs are installed
# KDE4_ICON_INSTALL_DIR - the directory where icons from kdelibs are
# KDE4_IMPORTS_INSTALL_DIR - the directory where imports from kdelibs are
# KDE4_KCFG_INSTALL_DIR - the directory where kconfig files from kdelibs are installed
# KDE4_LOCALE_INSTALL_DIR - the directory where translations from kdelibs are installed
# KDE4_MIME_INSTALL_DIR - the directory where mimetype desktop files from kdelibs are installed
# KDE4_SOUND_INSTALL_DIR - the directory where sound files from kdelibs are installed
@ -72,7 +71,6 @@ if(NOT KDELIBS4_FOUND)
set(KDE4_CONFIG_INSTALL_DIR "@KDE4_CONFIG_INSTALL_DIR@")
set(KDE4_DATA_INSTALL_DIR "@KDE4_DATA_INSTALL_DIR@")
set(KDE4_ICON_INSTALL_DIR "@KDE4_ICON_INSTALL_DIR@")
set(KDE4_KCFG_INSTALL_DIR "@KDE4_KCFG_INSTALL_DIR@")
set(KDE4_LOCALE_INSTALL_DIR "@KDE4_LOCALE_INSTALL_DIR@")
set(KDE4_SERVICES_INSTALL_DIR "@KDE4_SERVICES_INSTALL_DIR@")
set(KDE4_SERVICETYPES_INSTALL_DIR "@KDE4_SERVICETYPES_INSTALL_DIR@")

1
config-prefix.h.cmake
View file

@ -9,7 +9,6 @@
#define BIN_INSTALL_DIR "${KDE4_BIN_INSTALL_DIR}"
#define CONFIG_INSTALL_DIR "${KDE4_CONFIG_INSTALL_DIR}"
#define ICON_INSTALL_DIR "${KDE4_ICON_INSTALL_DIR}"
#define KCFG_INSTALL_DIR "${KDE4_KCFG_INSTALL_DIR}"
#define PLUGIN_INSTALL_DIR "${KDE4_PLUGIN_INSTALL_DIR}"
#define SERVICES_INSTALL_DIR "${KDE4_SERVICES_INSTALL_DIR}"
#define SERVICETYPES_INSTALL_DIR "${KDE4_SERVICETYPES_INSTALL_DIR}"

1
kdecore/kernel/kstandarddirs.cpp
View file

@ -323,7 +323,6 @@ static const struct ResourcesTblData {
{ "exe\0", "bin\0" },
{ "module\0", "%lib/kde4\0" },
{ "qtplugins\0", "%lib/kde4/plugins\0" },
{ "kcfg\0", "share/config.kcfg\0" },
{ "xdgdata-apps\0", "applications\0" },
{ "xdgdata-icon\0", "icons\0" },
{ "xdgdata-pixmap\0", "pixmaps\0" },

1
kdecore/kernel/kstandarddirs.h
View file

@ -583,7 +583,6 @@ public:
* @li @c lib - @c lib[suffix]
* @li @c module - @c lib[suffix]/kde4
* @li @c qtplugins - @c lib[suffix]/kde4/plugins
* @li @c kcfg - @c share/config.kcfg
* @li @c xdgdata-apps - @c applications
* @li @c xdgdata-icon - @c icons
* @li @c xdgdata-pixmap - @c pixmaps

2
kdecore/kernel/kstandarddirs_unix.cpp
View file

@ -37,8 +37,6 @@ QString KStandardDirs::installPath(const char *type)
return QFile::decodeName(CONFIG_INSTALL_DIR "/");
break;
case 'k':
if (strcmp("kcfg", type) == 0)
return QFile::decodeName(KCFG_INSTALL_DIR "/");
if (strcmp("kdedir", type) == 0)
return QFile::decodeName(KDEDIR "/");
break;