Hello community, here is the log from the commit of package kiconthemes for openSUSE:Factory checked in at 2019-11-12 11:47:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiconthemes (Old) and /work/SRC/openSUSE:Factory/.kiconthemes.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiconthemes" Tue Nov 12 11:47:37 2019 rev:77 rq:747115 version:5.64.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kiconthemes/kiconthemes.changes 2019-10-14 13:36:31.850174847 +0200 +++ /work/SRC/openSUSE:Factory/.kiconthemes.new.2990/kiconthemes.changes 2019-11-12 11:47:40.938865634 +0100 @@ -1,0 +2,12 @@ +Sun Nov 3 15:47:03 UTC 2019 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.64.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.64.0.php +- Changes since 5.63.0: + * Fix usage of the new deprecation macros for assignIconsToContextMenu + * Deprecate KIconTheme::assignIconsToContextMenu + * Use ECMGenerateExportHeader to manage deprecated API better + +------------------------------------------------------------------- Old: ---- kiconthemes-5.63.0.tar.xz kiconthemes-5.63.0.tar.xz.sig New: ---- kiconthemes-5.64.0.tar.xz kiconthemes-5.64.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiconthemes.spec ++++++ --- /var/tmp/diff_new_pack.tHSC7D/_old 2019-11-12 11:47:41.538866248 +0100 +++ /var/tmp/diff_new_pack.tHSC7D/_new 2019-11-12 11:47:41.542866252 +0100 @@ -17,14 +17,14 @@ %define lname libKF5IconThemes5 -%define _tar_path 5.63 +%define _tar_path 5.64 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kiconthemes -Version: 5.63.0 +Version: 5.64.0 Release: 0 Summary: Icon GUI utilities License: LGPL-2.1-or-later AND GPL-2.0-or-later ++++++ kiconthemes-5.63.0.tar.xz -> kiconthemes-5.64.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.63.0/CMakeLists.txt new/kiconthemes-5.64.0/CMakeLists.txt --- old/kiconthemes-5.63.0/CMakeLists.txt 2019-10-06 11:46:23.000000000 +0200 +++ new/kiconthemes-5.64.0/CMakeLists.txt 2019-11-02 13:56:44.000000000 +0100 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.63.0") # handled by release scripts -set(KF5_DEP_VERSION "5.63.0") # handled by release scripts +set(KF5_VERSION "5.64.0") # handled by release scripts +set(KF5_DEP_VERSION "5.64.0") # handled by release scripts project(KIconThemes VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.63.0 NO_MODULE) +find_package(ECM 5.64.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -16,13 +16,15 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) -include(GenerateExportHeader) +include(ECMGenerateExportHeader) include(ECMSetupVersion) include(ECMGenerateHeaders) include(ECMMarkNonGuiExecutable) include(ECMQtDeclareLoggingCategory) include(ECMAddQch) +set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprecated API excluded from the build [default=0].") + option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") @@ -53,6 +55,7 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII) remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) +add_definitions(-DQT_DEPRECATED_WARNINGS_SINCE=0x060000) add_definitions(-DQT_NO_FOREACH) add_definitions(-DTRANSLATION_DOMAIN=\"kiconthemes5\") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.63.0/docs/Doxyfile.local new/kiconthemes-5.64.0/docs/Doxyfile.local --- old/kiconthemes-5.63.0/docs/Doxyfile.local 1970-01-01 01:00:00.000000000 +0100 +++ new/kiconthemes-5.64.0/docs/Doxyfile.local 2019-11-02 13:56:44.000000000 +0100 @@ -0,0 +1,7 @@ +### KApiDox Project-specific Overrides File + +# define so that deprecated API is not skipped +PREDEFINED += \ + "KICONTHEMES_ENABLE_DEPRECATED_SINCE(x, y)=1" \ + "KICONTHEMES_BUILD_DEPRECATED_SINCE(x, y)=1" \ + "KICONTHEMES_DEPRECATED_VERSION(x, y, t)=" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.63.0/po/et/kiconthemes5.po new/kiconthemes-5.64.0/po/et/kiconthemes5.po --- old/kiconthemes-5.63.0/po/et/kiconthemes5.po 2019-10-06 11:46:23.000000000 +0200 +++ new/kiconthemes-5.64.0/po/et/kiconthemes5.po 2019-11-02 13:56:44.000000000 +0100 @@ -7,20 +7,20 @@ # Marek Laane <b...@smail.ee>, 2003-2009. # Peeter Russak <p...@tkwcy.ee>, 2005. # Hasso Tepper <ha...@kde.org>, 2005. -# Marek Laane <b...@smail.ee>, 2009, 2010, 2011, 2012. +# Marek Laane <b...@smail.ee>, 2009, 2010, 2011, 2012, 2019. msgid "" msgstr "" "Project-Id-Version: kio4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-08-15 02:37+0200\n" -"PO-Revision-Date: 2012-12-17 15:51+0200\n" -"Last-Translator: Marek Laane <b...@smail.ee>\n" -"Language-Team: Estonian <kde...@linux.ee>\n" +"PO-Revision-Date: 2019-10-31 12:39+0200\n" +"Last-Translator: Marek Laane <qiila...@gmail.com>\n" +"Language-Team: Estonian <kde...@lists.linux.ee>\n" "Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 19.08.1\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: kicondialog.cpp:260 kicondialog.cpp:272 kicondialog.cpp:604 @@ -106,11 +106,11 @@ #: kicondialog.cpp:364 #, kde-format msgid "All" -msgstr "" +msgstr "Kõik" #: kicondialog.cpp:604 -#, fuzzy, kde-format -#| msgid "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)" +#, kde-format msgid "" "*.ico *.png *.xpm *.svg *.svgz|Icon Files (*.ico *.png *.xpm *.svg *.svgz)" -msgstr "*.png *.xpm *.svg *.svgz|Ikoonide failid (*.png *.xpm *.svg *.svgz)" +msgstr "" +"*.ico *.png *.xpm *.svg *.svgz|Ikoonifailid (*.ico *.png *.xpm *.svg *.svgz)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.63.0/po/id/kiconthemes5.po new/kiconthemes-5.64.0/po/id/kiconthemes5.po --- old/kiconthemes-5.63.0/po/id/kiconthemes5.po 2019-10-06 11:46:23.000000000 +0200 +++ new/kiconthemes-5.64.0/po/id/kiconthemes5.po 2019-11-02 13:56:44.000000000 +0100 @@ -15,7 +15,6 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 2.0\n" #: kicondialog.cpp:260 kicondialog.cpp:272 kicondialog.cpp:604 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.63.0/po/zh_CN/kiconthemes5.po new/kiconthemes-5.64.0/po/zh_CN/kiconthemes5.po --- old/kiconthemes-5.63.0/po/zh_CN/kiconthemes5.po 2019-10-06 11:46:23.000000000 +0200 +++ new/kiconthemes-5.64.0/po/zh_CN/kiconthemes5.po 2019-11-02 13:56:44.000000000 +0100 @@ -17,7 +17,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-08-15 02:37+0200\n" -"PO-Revision-Date: 2019-09-05 09:24\n" +"PO-Revision-Date: 2019-10-09 09:45\n" "Last-Translator: Guo Yunhe (guoyunhe)\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.63.0/src/CMakeLists.txt new/kiconthemes-5.64.0/src/CMakeLists.txt --- old/kiconthemes-5.63.0/src/CMakeLists.txt 2019-10-06 11:46:23.000000000 +0200 +++ new/kiconthemes-5.64.0/src/CMakeLists.txt 2019-11-02 13:56:44.000000000 +0100 @@ -17,8 +17,15 @@ ecm_qt_declare_logging_category(kiconthemes_SRCS HEADER debug.h IDENTIFIER KICONTHEMES CATEGORY_NAME kf5.kiconthemes) add_library(KF5IconThemes ${kiconthemes_SRCS}) -generate_export_header(KF5IconThemes BASE_NAME KIconThemes) add_library(KF5::IconThemes ALIAS KF5IconThemes) +ecm_generate_export_header(KF5IconThemes + BASE_NAME KIconThemes + GROUP_BASE_NAME KF + VERSION ${KF5_VERSION} + DEPRECATED_BASE_VERSION 0 + DEPRECATION_VERSIONS 4.8 5.0 5.63 5.64 + EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} +) target_include_directories(KF5IconThemes INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KIconThemes>") @@ -86,6 +93,7 @@ KICONTHEMES_EXPORT KICONTHEMES_DEPRECATED KICONTHEMES_DEPRECATED_EXPORT + "KICONTHEMES_DEPRECATED_VERSION(x, y, t)" TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} COMPONENT Devel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.63.0/src/kiconloader.cpp new/kiconthemes-5.64.0/src/kiconloader.cpp --- old/kiconthemes-5.63.0/src/kiconloader.cpp 2019-10-06 11:46:23.000000000 +0200 +++ new/kiconthemes-5.64.0/src/kiconloader.cpp 2019-11-02 13:56:44.000000000 +0100 @@ -1680,8 +1680,7 @@ return true; } -// deprecated -#ifndef KICONTHEMES_NO_DEPRECATED +#if KICONTHEMES_BUILD_DEPRECATED_SINCE(5, 0) QIcon KIconLoader::loadIconSet(const QString &name, KIconLoader::Group g, int s, bool canReturnNull) { @@ -1699,53 +1698,63 @@ // Easy access functions -#ifndef KICONTHEMES_NO_DEPRECATED +#if KICONTHEMES_BUILD_DEPRECATED_SINCE(5, 63) QPixmap DesktopIcon(const QString &name, int force_size, int state, const QStringList &overlays) { KIconLoader *loader = KIconLoader::global(); return loader->loadIcon(name, KIconLoader::Desktop, force_size, state, overlays); } +#endif -// deprecated +#if KICONTHEMES_BUILD_DEPRECATED_SINCE(5, 0) QIcon DesktopIconSet(const QString &name, int force_size) { KIconLoader *loader = KIconLoader::global(); return loader->loadIconSet(name, KIconLoader::Desktop, force_size); } +#endif +#if KICONTHEMES_BUILD_DEPRECATED_SINCE(5, 63) QPixmap BarIcon(const QString &name, int force_size, int state, const QStringList &overlays) { KIconLoader *loader = KIconLoader::global(); return loader->loadIcon(name, KIconLoader::Toolbar, force_size, state, overlays); } +#endif -// deprecated +#if KICONTHEMES_BUILD_DEPRECATED_SINCE(5, 0) QIcon BarIconSet(const QString &name, int force_size) { KIconLoader *loader = KIconLoader::global(); return loader->loadIconSet(name, KIconLoader::Toolbar, force_size); } +#endif +#if KICONTHEMES_BUILD_DEPRECATED_SINCE(5, 63) QPixmap SmallIcon(const QString &name, int force_size, int state, const QStringList &overlays) { KIconLoader *loader = KIconLoader::global(); return loader->loadIcon(name, KIconLoader::Small, force_size, state, overlays); } +#endif -// deprecated +#if KICONTHEMES_BUILD_DEPRECATED_SINCE(5, 0) QIcon SmallIconSet(const QString &name, int force_size) { KIconLoader *loader = KIconLoader::global(); return loader->loadIconSet(name, KIconLoader::Small, force_size); } +#endif +#if KICONTHEMES_BUILD_DEPRECATED_SINCE(5, 63) QPixmap MainBarIcon(const QString &name, int force_size, int state, const QStringList &overlays) { KIconLoader *loader = KIconLoader::global(); return loader->loadIcon(name, KIconLoader::MainToolbar, force_size, state, overlays); } +#endif -// deprecated +#if KICONTHEMES_BUILD_DEPRECATED_SINCE(5, 0) QIcon MainBarIconSet(const QString &name, int force_size) { KIconLoader *loader = KIconLoader::global(); @@ -1759,8 +1768,7 @@ return loader->loadIcon(name, KIconLoader::User, 0, state, overlays); } -// deprecated -#ifndef KICONTHEMES_NO_DEPRECATED +#if KICONTHEMES_BUILD_DEPRECATED_SINCE(5, 0) QIcon UserIconSet(const QString &name) { KIconLoader *loader = KIconLoader::global(); @@ -1835,7 +1843,6 @@ return globalIconLoader(); } -#ifndef KICONTHEMES_NO_DEPRECATED void KIconLoader::newIconLoader() { if (global() == this) { @@ -1845,7 +1852,6 @@ reconfigure(objectName()); emit iconLoaderSettingsChanged(); } -#endif void KIconLoader::emitChange(KIconLoader::Group g) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.63.0/src/kiconloader.h new/kiconthemes-5.64.0/src/kiconloader.h --- old/kiconthemes-5.63.0/src/kiconloader.h 2019-10-06 11:46:23.000000000 +0200 +++ new/kiconthemes-5.64.0/src/kiconloader.h 2019-11-02 13:56:44.000000000 +0100 @@ -88,7 +88,11 @@ Action, ///< An action icon (e.g. 'save', 'print'). Application, ///< An icon that represents an application. Device, ///< An icon that represents a device. - FileSystem, ///< An icon that represents a file system. @deprecated Use Place instead. +#if KICONTHEMES_ENABLE_DEPRECATED_SINCE(4, 8) + FileSystem, ///< An icon that represents a file system. @deprecated Since 4.8. Use Place instead. +#elif KICONTHEMES_BUILD_DEPRECATED_SINCE(4, 8) + FileSystem_DEPRECATED_DO_NOT_USE, +#endif MimeType, ///< An icon that represents a mime type (or file type). Animation, ///< An icon that is animated. Category, ///< An icon that represents a category. @@ -313,6 +317,7 @@ */ KPixmapSequence loadPixmapSequence(const QString &iconName, int size = SizeSmall) const; +#if KICONTHEMES_ENABLE_DEPRECATED_SINCE(5, 0) /** * Creates an icon set, that will do on-demand loading of the icon. * Loading itself is done by calling loadIcon . @@ -328,10 +333,10 @@ * @return the icon set. Can be null when not found, depending on * @p canReturnNull. * - * @deprecated use QIcon::fromTheme instead, which uses the iconloader internally + * @deprecated Since 5.0, use QIcon::fromTheme instead, which uses the iconloader internally */ -#ifndef KICONTHEMES_NO_DEPRECATED - KICONTHEMES_DEPRECATED QIcon loadIconSet(const QString &name, KIconLoader::Group group, int size = 0, + KICONTHEMES_DEPRECATED_VERSION(5, 0, "Use QIcon::fromTheme(const QString&)") + QIcon loadIconSet(const QString &name, KIconLoader::Group group, int size = 0, bool canReturnNull = false); #endif @@ -546,14 +551,17 @@ void resetPalette(); public Q_SLOTS: + // TODO: while marked as deprecated, newIconLoader() is still used: + // internally by KIconLoadeer as well as by Plasma's Icons kcm module (state: 5.17) + // this needs some further cleanup work before removing it from the API with KICONTHEMES_ENABLE_DEPRECATED_SINCE /** * Re-initialize the global icon loader * - * @deprecated since 5.0, use emitChange(Group) + * @todo Check deprecation, still used internally. + * @deprecated Since 5.0, use emitChange(Group) */ -#ifndef KICONTHEMES_NO_DEPRECATED - KICONTHEMES_DEPRECATED void newIconLoader(); -#endif + KICONTHEMES_DEPRECATED_VERSION(5, 0, "Use KIconLoader::emitChange(Group)") + void newIconLoader(); /** * Emits an iconChanged() signal on all the KIconLoader instances in the system @@ -586,7 +594,7 @@ Q_PRIVATE_SLOT(d, void _k_refreshIcons(int group)) }; -#ifndef KICONTHEMES_NO_DEPRECATED +#if KICONTHEMES_ENABLE_DEPRECATED_SINCE(5, 63) /** * \relates KIconLoader * Load a desktop icon. @@ -594,16 +602,22 @@ * if you need a pixmap use QIcon::pixmap with KIconLoader::StdSizes, * if you need the overlay, use KIconLoader::loadIcon. */ -KICONTHEMES_DEPRECATED_EXPORT QPixmap DesktopIcon(const QString &name, int size = 0, +KICONTHEMES_DEPRECATED_VERSION(5, 63, "See API dox for replacement") +KICONTHEMES_EXPORT QPixmap DesktopIcon(const QString &name, int size = 0, int state = KIconLoader::DefaultState, const QStringList &overlays = QStringList()); +#endif +#if KICONTHEMES_ENABLE_DEPRECATED_SINCE(5, 0) /** * \relates KIconLoader * Load a desktop icon, and apply the necessary effects to get an IconSet. - * @deprecated use QIcon::fromTheme instead + * @deprecated Since 5.0, use QIcon::fromTheme instead */ -KICONTHEMES_DEPRECATED_EXPORT QIcon DesktopIconSet(const QString &name, int size = 0); +KICONTHEMES_DEPRECATED_VERSION(5, 0, "Use QIcon::fromTheme(const QString&)") +KICONTHEMES_EXPORT QIcon DesktopIconSet(const QString &name, int size = 0); +#endif +#if KICONTHEMES_ENABLE_DEPRECATED_SINCE(5, 63) /** * \relates KIconLoader * Load a toolbar icon. @@ -611,16 +625,22 @@ * if you need a pixmap use QIcon::pixmap with KIconLoader::StdSizes, * if you need the overlay, use KIconLoader::loadIcon. */ -KICONTHEMES_DEPRECATED_EXPORT QPixmap BarIcon(const QString &name, int size = 0, int state = KIconLoader::DefaultState, +KICONTHEMES_DEPRECATED_VERSION(5, 63, "See API dox for replacement") +KICONTHEMES_EXPORT QPixmap BarIcon(const QString &name, int size = 0, int state = KIconLoader::DefaultState, const QStringList &overlays = QStringList()); +#endif +#if KICONTHEMES_ENABLE_DEPRECATED_SINCE(5, 0) /** * \relates KIconLoader * Load a toolbar icon, and apply the necessary effects to get an IconSet. - * @deprecated use QIcon::fromTheme instead + * @deprecated Since 5.0, use QIcon::fromTheme instead */ -KICONTHEMES_DEPRECATED_EXPORT QIcon BarIconSet(const QString &name, int size = 0); +KICONTHEMES_DEPRECATED_VERSION(5, 0, "Use QIcon::fromTheme(const QString&)") +KICONTHEMES_EXPORT QIcon BarIconSet(const QString &name, int size = 0); +#endif +#if KICONTHEMES_ENABLE_DEPRECATED_SINCE(5, 63) /** * \relates KIconLoader * Load a small icon. @@ -628,16 +648,22 @@ * if you need a pixmap use QIcon::pixmap with KIconLoader::StdSizes, * if you need the overlay, use KIconLoader::loadIcon. */ -KICONTHEMES_DEPRECATED_EXPORT QPixmap SmallIcon(const QString &name, int size = 0, +KICONTHEMES_DEPRECATED_VERSION(5, 63, "See API dox for replacement") +KICONTHEMES_EXPORT QPixmap SmallIcon(const QString &name, int size = 0, int state = KIconLoader::DefaultState, const QStringList &overlays = QStringList()); +#endif +#if KICONTHEMES_ENABLE_DEPRECATED_SINCE(5, 0) /** * \relates KIconLoader * Load a small icon, and apply the necessary effects to get an IconSet. - * @deprecated use QIcon::fromTheme instead + * @deprecated Since 5.0, use QIcon::fromTheme instead */ -KICONTHEMES_DEPRECATED_EXPORT QIcon SmallIconSet(const QString &name, int size = 0); +KICONTHEMES_DEPRECATED_VERSION(5, 0, "Use QIcon::fromTheme(const QString&)") +KICONTHEMES_EXPORT QIcon SmallIconSet(const QString &name, int size = 0); +#endif +#if KICONTHEMES_ENABLE_DEPRECATED_SINCE(5, 63) /** * \relates KIconLoader * Load a main toolbar icon. @@ -645,15 +671,19 @@ * if you need a pixmap use QIcon::pixmap with KIconLoader::StdSizes, * if you need the overlay, use KIconLoader::loadIcon. */ -KICONTHEMES_DEPRECATED_EXPORT QPixmap MainBarIcon(const QString &name, int size = 0, +KICONTHEMES_DEPRECATED_VERSION(5, 63, "See API dox for replacement") +KICONTHEMES_EXPORT QPixmap MainBarIcon(const QString &name, int size = 0, int state = KIconLoader::DefaultState, const QStringList &overlays = QStringList()); +#endif +#if KICONTHEMES_ENABLE_DEPRECATED_SINCE(5, 0) /** * \relates KIconLoader * Load a main toolbar icon, and apply the effects to get an IconSet. - * @deprecated use QIcon::fromTheme instead + * @deprecated Since 5.0, use QIcon::fromTheme instead */ -KICONTHEMES_DEPRECATED_EXPORT QIcon MainBarIconSet(const QString &name, int size = 0); +KICONTHEMES_DEPRECATED_VERSION(5, 0, "Use QIcon::fromTheme(const QString&)") +KICONTHEMES_EXPORT QIcon MainBarIconSet(const QString &name, int size = 0); #endif /** @@ -662,13 +692,14 @@ */ KICONTHEMES_EXPORT QPixmap UserIcon(const QString &name, int state = KIconLoader::DefaultState, const QStringList &overlays = QStringList()); +#if KICONTHEMES_ENABLE_DEPRECATED_SINCE(5, 0) /** * \relates KIconLoader * Load a user icon, and apply the effects to get an IconSet. - * @deprecated use QIcon::fromTheme instead + * @deprecated Since 5.0, use QIcon::fromTheme instead */ -#ifndef KICONTHEMES_NO_DEPRECATED -KICONTHEMES_DEPRECATED_EXPORT QIcon UserIconSet(const QString &name); +KICONTHEMES_DEPRECATED_VERSION(5, 0, "Use QIcon::fromTheme(const QString&)") +KICONTHEMES_EXPORT QIcon UserIconSet(const QString &name); #endif /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.63.0/src/kicontheme.cpp new/kiconthemes-5.64.0/src/kicontheme.cpp --- old/kiconthemes-5.63.0/src/kicontheme.cpp 2019-10-06 11:46:23.000000000 +0200 +++ new/kiconthemes-5.64.0/src/kicontheme.cpp 2019-11-02 13:56:44.000000000 +0100 @@ -677,6 +677,7 @@ return QStringLiteral("hicolor"); } +#if KICONTHEMES_BUILD_DEPRECATED_SINCE(5, 64) void KIconTheme::assignIconsToContextMenu(ContextMenus type, QList<QAction *> actions) { @@ -710,6 +711,7 @@ break; } } +#endif /*** KIconThemeDir ***/ @@ -733,8 +735,10 @@ mContext = KIconLoader::Device; } else if (tmp == QLatin1String("MimeTypes")) { mContext = KIconLoader::MimeType; +#if KICONTHEMES_BUILD_DEPRECATED_SINCE(4, 8) } else if (tmp == QLatin1String("FileSystems")) { mContext = KIconLoader::FileSystem; +#endif } else if (tmp == QLatin1String("Applications")) { mContext = KIconLoader::Application; } else if (tmp == QLatin1String("Actions")) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.63.0/src/kicontheme.h new/kiconthemes-5.64.0/src/kicontheme.h --- old/kiconthemes-5.63.0/src/kicontheme.h 2019-10-06 11:46:23.000000000 +0200 +++ new/kiconthemes-5.64.0/src/kicontheme.h 2019-11-02 13:56:44.000000000 +0100 @@ -267,6 +267,7 @@ */ static QString defaultThemeName(); +#if KICONTHEMES_ENABLE_DEPRECATED_SINCE(5, 64) /** * Defines the context menus that assignIconsToContextMenus is * aware of. @@ -275,15 +276,21 @@ * * TextEditor is expected to have the full complement of * undo, redo, cut, copy, paste and clear. + * + * @deprecated since 5.64 no longer needed */ enum ContextMenus { TextEditor, ReadOnlyText - }; + }; // TODO KF6 remove /** * Assigns standard icons to the various standard text edit context menus. + * + * @deprecated since 5.64, no longer necessary, Qt assigns icon itself by now. */ - static void assignIconsToContextMenu(ContextMenus type, QList<QAction *> actions); + KICONTHEMES_DEPRECATED_VERSION(5, 64, "No longer necessary") + static void assignIconsToContextMenu(ContextMenus type, QList<QAction *> actions); // TODO KF6 remove +#endif private: class KIconThemePrivate;
