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

generic: remove obsolete resource types support

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-02-28 15:01:11 +02:00
parent 2f9251dcb8
commit 90ac09db86
7 changed files with 7 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
KDE4Config.cmake
View file

@ -16,7 +16,6 @@ set(KDE4_DATA_INSTALL_DIR "@KDE4_DATA_INSTALL_DIR@")
set(KDE4_ICON_INSTALL_DIR "@KDE4_ICON_INSTALL_DIR@") set(KDE4_ICON_INSTALL_DIR "@KDE4_ICON_INSTALL_DIR@")
set(KDE4_KCFG_INSTALL_DIR "@KDE4_KCFG_INSTALL_DIR@") set(KDE4_KCFG_INSTALL_DIR "@KDE4_KCFG_INSTALL_DIR@")
set(KDE4_LOCALE_INSTALL_DIR "@KDE4_LOCALE_INSTALL_DIR@") set(KDE4_LOCALE_INSTALL_DIR "@KDE4_LOCALE_INSTALL_DIR@")
set(KDE4_MIME_INSTALL_DIR "@KDE4_MIME_INSTALL_DIR@")
set(KDE4_SERVICES_INSTALL_DIR "@KDE4_SERVICES_INSTALL_DIR@") set(KDE4_SERVICES_INSTALL_DIR "@KDE4_SERVICES_INSTALL_DIR@")
set(KDE4_SERVICETYPES_INSTALL_DIR "@KDE4_SERVICETYPES_INSTALL_DIR@") set(KDE4_SERVICETYPES_INSTALL_DIR "@KDE4_SERVICETYPES_INSTALL_DIR@")
set(KDE4_SOUND_INSTALL_DIR "@KDE4_SOUND_INSTALL_DIR@") set(KDE4_SOUND_INSTALL_DIR "@KDE4_SOUND_INSTALL_DIR@")

5
cmake/modules/FindKDE4Internal.cmake
View file

@ -326,7 +326,7 @@ endif()
##################### some more settings ########################################## ##################### some more settings ##########################################
# if bootstrap set the variablse now, otherwise they will be set by KDE4Config # if bootstrap set the variables now, otherwise they will be set by KDE4Config
if(_kdeBootStrapping) if(_kdeBootStrapping)
include(GNUInstallDirs) include(GNUInstallDirs)
@ -345,7 +345,6 @@ if(_kdeBootStrapping)
set(KDE4_ICON_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/icons" CACHE PATH "KDE icon 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_KCFG_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/config.kcfg" CACHE PATH "KDE kcfg installation directory")
set(KDE4_LOCALE_INSTALL_DIR "${CMAKE_INSTALL_FULL_LOCALEDIR}" CACHE PATH "KDE locale installation directory") set(KDE4_LOCALE_INSTALL_DIR "${CMAKE_INSTALL_FULL_LOCALEDIR}" CACHE PATH "KDE locale installation directory")
set(KDE4_MIME_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/mimelnk" CACHE PATH "KDE mime installation directory")
set(KDE4_SERVICES_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/kde4/services" CACHE PATH "KDE services 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") set(KDE4_SERVICETYPES_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/kde4/servicetypes" CACHE PATH "KDE service types installation directory")
set(KDE4_SOUND_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/sounds" CACHE PATH "KDE sounds installation directory") set(KDE4_SOUND_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/sounds" CACHE PATH "KDE sounds installation directory")
@ -358,7 +357,7 @@ if(_kdeBootStrapping)
set(KDE4_XDG_MIME_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/mime/packages" CACHE PATH "KDE XDG MIME packages installation directory") set(KDE4_XDG_MIME_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/mime/packages" CACHE PATH "KDE XDG MIME packages installation directory")
set(KDE4_SYSCONF_INSTALL_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}" CACHE PATH "KDE system config installation directory") set(KDE4_SYSCONF_INSTALL_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}" CACHE PATH "KDE system config installation directory")
set(KDE4_DBUS_INTERFACES_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/dbus-1/interfaces" CACHE PATH "KDE dbus interfaces installation directory") set(KDE4_DBUS_INTERFACES_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/dbus-1/interfaces" CACHE PATH "KDE D-Bus interfaces installation directory")
set(KDE4_DBUS_SERVICES_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/dbus-1/services" CACHE PATH "KDE D-Bus services installation directory") set(KDE4_DBUS_SERVICES_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/dbus-1/services" CACHE PATH "KDE D-Bus services installation directory")
set(KDE4_DBUS_SYSTEM_SERVICES_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/dbus-1/system-services" CACHE PATH "KDE D-Bus system services installation directory") set(KDE4_DBUS_SYSTEM_SERVICES_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/dbus-1/system-services" CACHE PATH "KDE D-Bus system services installation directory")

1
config-prefix.h.cmake
View file

@ -11,7 +11,6 @@
#define ICON_INSTALL_DIR "${KDE4_ICON_INSTALL_DIR}" #define ICON_INSTALL_DIR "${KDE4_ICON_INSTALL_DIR}"
#define KCFG_INSTALL_DIR "${KDE4_KCFG_INSTALL_DIR}" #define KCFG_INSTALL_DIR "${KDE4_KCFG_INSTALL_DIR}"
#define PLUGIN_INSTALL_DIR "${KDE4_PLUGIN_INSTALL_DIR}" #define PLUGIN_INSTALL_DIR "${KDE4_PLUGIN_INSTALL_DIR}"
#define MIME_INSTALL_DIR "${KDE4_MIME_INSTALL_DIR}"
#define SERVICES_INSTALL_DIR "${KDE4_SERVICES_INSTALL_DIR}" #define SERVICES_INSTALL_DIR "${KDE4_SERVICES_INSTALL_DIR}"
#define SERVICETYPES_INSTALL_DIR "${KDE4_SERVICETYPES_INSTALL_DIR}" #define SERVICETYPES_INSTALL_DIR "${KDE4_SERVICETYPES_INSTALL_DIR}"
#define SOUND_INSTALL_DIR "${KDE4_SOUND_INSTALL_DIR}" #define SOUND_INSTALL_DIR "${KDE4_SOUND_INSTALL_DIR}"

2
kdecore/kde-config.cpp
View file

@ -125,7 +125,6 @@ int main(int argc, char **argv)
const char *helptexts[] = { const char *helptexts[] = {
"autostart", I18N_NOOP("Autostart directories"), "autostart", I18N_NOOP("Autostart directories"),
"cache", I18N_NOOP("Cached information (e.g. favicons, web-pages)"), "cache", I18N_NOOP("Cached information (e.g. favicons, web-pages)"),
"cgi", I18N_NOOP("CGIs to run from kdehelp"),
"config", I18N_NOOP("Configuration files"), "config", I18N_NOOP("Configuration files"),
"data", I18N_NOOP("Where applications store data"), "data", I18N_NOOP("Where applications store data"),
"emoticons", I18N_NOOP("Emoticons"), "emoticons", I18N_NOOP("Emoticons"),
@ -136,7 +135,6 @@ int main(int argc, char **argv)
"lib", I18N_NOOP("Libraries"), "lib", I18N_NOOP("Libraries"),
"include", I18N_NOOP("Includes/Headers"), "include", I18N_NOOP("Includes/Headers"),
"locale", I18N_NOOP("Translation files for KLocale"), "locale", I18N_NOOP("Translation files for KLocale"),
"mime", I18N_NOOP("Mime types"),
"module", I18N_NOOP("Loadable modules"), "module", I18N_NOOP("Loadable modules"),
"pixmap", I18N_NOOP("Legacy pixmaps"), "pixmap", I18N_NOOP("Legacy pixmaps"),
"qtplugins", I18N_NOOP("Qt plugins"), "qtplugins", I18N_NOOP("Qt plugins"),

18
kdecore/kernel/kstandarddirs.cpp
View file

@ -127,10 +127,6 @@ services
share/kde4/services share/kde4/services
servicetypes servicetypes
share/kde4/servicetypes share/kde4/servicetypes
mime
share/mimelnk
cgi
cgi-bin
wallpaper wallpaper
share/wallpapers share/wallpapers
templates templates
@ -180,10 +176,6 @@ static const char types_string[] =
"share/kde4/services\0" "share/kde4/services\0"
"servicetypes\0" "servicetypes\0"
"share/kde4/servicetypes\0" "share/kde4/servicetypes\0"
"mime\0"
"share/mimelnk\0"
"cgi\0"
"cgi-bin\0"
"wallpaper\0" "wallpaper\0"
"share/wallpapers\0" "share/wallpapers\0"
"templates\0" "templates\0"
@ -207,6 +199,7 @@ static const char types_string[] =
"xdgdata-dirs\0" "xdgdata-dirs\0"
"desktop-directories\0" "desktop-directories\0"
"xdgdata-mime\0" "xdgdata-mime\0"
"mime\0"
"xdgconf-menu\0" "xdgconf-menu\0"
"menus\0" "menus\0"
"xdgconf-autostart\0" "xdgconf-autostart\0"
@ -216,11 +209,10 @@ static const char types_string[] =
static const int types_indices[] = { static const int types_indices[] = {
0, 5, 16, 21, 36, 41, 53, 60, 0, 5, 16, 21, 36, 41, 53, 60,
73, 80, 94, 100, 113, 120, 133, 142, 73, 80, 94, 100, 113, 120, 133, 142,
162, 175, 199, 204, 218, 222, 230, 240, 162, 175, 199, 209, 226, 236, 252, 256,
257, 267, 283, 287, 291, 298, 308, 318, 260, 267, 277, 287, 305, 310, 328, 338,
336, 341, 359, 369, 385, 398, 411, 424, 354, 367, 380, 393, 399, 414, 422, 435,
430, 445, 453, 466, 486, 199, 499, 512, 455, 468, 473, 486, 492, 510, -1
518, 536, -1
}; };
static void tokenize(QStringList& token, const QString& str, static void tokenize(QStringList& token, const QString& str,

4
kdecore/kernel/kstandarddirs.h
View file

@ -63,7 +63,6 @@ class KConfig;
* *
* @li @c autostart - Autostart directories (both XDG and kde-specific) * @li @c autostart - Autostart directories (both XDG and kde-specific)
* @li @c cache - Cached information (e.g. favicons, web-pages) * @li @c cache - Cached information (e.g. favicons, web-pages)
* @li @c cgi - CGIs to run from kdehelp.
* @li @c config - Configuration files. * @li @c config - Configuration files.
* @li @c data - Where applications store data. * @li @c data - Where applications store data.
* @li @c emoticons - Emoticons themes * @li @c emoticons - Emoticons themes
@ -73,7 +72,6 @@ class KConfig;
* @li @c kcfg - KConfigXT config files. * @li @c kcfg - KConfigXT config files.
* @li @c lib - Libraries. * @li @c lib - Libraries.
* @li @c locale - Translation files for KLocale. * @li @c locale - Translation files for KLocale.
* @li @c mime - Mime types defined by KDE-specific .desktop files.
* @li @c module - Module (dynamically loaded library). * @li @c module - Module (dynamically loaded library).
* @li @c qtplugins - Qt plugins (dynamically loaded objects for Qt) * @li @c qtplugins - Qt plugins (dynamically loaded objects for Qt)
* @li @c services - Services. * @li @c services - Services.
@ -612,8 +610,6 @@ public:
* @li @c locale - @c share/locale * @li @c locale - @c share/locale
* @li @c services - @c share/kde4/services * @li @c services - @c share/kde4/services
* @li @c servicetypes - @c share/kde4/servicetypes * @li @c servicetypes - @c share/kde4/servicetypes
* @li @c mime - @c share/mimelnk
* @li @c cgi - @c cgi-bin
* @li @c wallpaper - @c share/wallpapers * @li @c wallpaper - @c share/wallpapers
* @li @c templates - @c share/templates * @li @c templates - @c share/templates
* @li @c exe - @c bin * @li @c exe - @c bin

2
kdecore/kernel/kstandarddirs_unix.cpp
View file

@ -67,8 +67,6 @@ QString KStandardDirs::installPath(const char *type)
case 'm': case 'm':
if (strcmp("module", type) == 0) if (strcmp("module", type) == 0)
return QFile::decodeName(PLUGIN_INSTALL_DIR "/"); return QFile::decodeName(PLUGIN_INSTALL_DIR "/");
if (strcmp("mime", type) == 0)
return QFile::decodeName(MIME_INSTALL_DIR "/");
break; break;
case 'q': case 'q':
if (strcmp("qtplugins", type) == 0) if (strcmp("qtplugins", type) == 0)