Hello community, here is the log from the commit of package kiconthemes for openSUSE:Factory checked in at 2017-03-03 15:44:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiconthemes (Old) and /work/SRC/openSUSE:Factory/.kiconthemes.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiconthemes" Fri Mar 3 15:44:12 2017 rev:41 rq:461429 version:5.31.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kiconthemes/kiconthemes.changes 2017-02-03 17:45:07.377671284 +0100 +++ /work/SRC/openSUSE:Factory/.kiconthemes.new/kiconthemes.changes 2017-03-03 15:44:14.210387169 +0100 @@ -1,0 +2,7 @@ +Thu Feb 9 09:29:26 UTC 2017 - [email protected] + +- Update to 5.31.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.31.0.php + +------------------------------------------------------------------- Old: ---- kiconthemes-5.30.0.tar.xz New: ---- kiconthemes-5.31.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiconthemes.spec ++++++ --- /var/tmp/diff_new_pack.OPQncv/_old 2017-03-03 15:44:14.890290912 +0100 +++ /var/tmp/diff_new_pack.OPQncv/_new 2017-03-03 15:44:14.894290346 +0100 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5IconThemes5 -%define _tar_path 5.30 +%define _tar_path 5.31 Name: kiconthemes -Version: 5.30.0 +Version: 5.31.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 @@ -33,11 +33,11 @@ BuildRequires: ki18n-devel >= %{_tar_path} BuildRequires: kitemviews-devel >= %{_tar_path} BuildRequires: kwidgetsaddons-devel >= %{_tar_path} -BuildRequires: cmake(Qt5Core) >= 5.5.0 -BuildRequires: cmake(Qt5DBus) >= 5.5.0 -BuildRequires: cmake(Qt5Svg) >= 5.5.0 -BuildRequires: cmake(Qt5Test) >= 5.5.0 -BuildRequires: cmake(Qt5Widgets) >= 5.5.0 +BuildRequires: cmake(Qt5Core) >= 5.6.0 +BuildRequires: cmake(Qt5DBus) >= 5.6.0 +BuildRequires: cmake(Qt5Svg) >= 5.6.0 +BuildRequires: cmake(Qt5Test) >= 5.6.0 +BuildRequires: cmake(Qt5Widgets) >= 5.6.0 Summary: Icon GUI utilities License: LGPL-2.1+ Group: System/GUI/KDE @@ -64,7 +64,7 @@ Group: Development/Libraries/KDE Requires: %lname = %{version} Requires: extra-cmake-modules -Requires: cmake(Qt5Widgets) >= 5.5.0 +Requires: cmake(Qt5Widgets) >= 5.6.0 %description devel This library contains classes to improve the handling of icons ++++++ kiconthemes-5.30.0.tar.xz -> kiconthemes-5.31.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.30.0/CMakeLists.txt new/kiconthemes-5.31.0/CMakeLists.txt --- old/kiconthemes-5.30.0/CMakeLists.txt 2017-01-08 21:53:38.000000000 +0100 +++ new/kiconthemes-5.31.0/CMakeLists.txt 2017-02-05 12:00:01.000000000 +0100 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.30.0") # handled by release scripts -set(KF5_DEP_VERSION "5.30.0") # handled by release scripts +set(KF5_VERSION "5.31.0") # handled by release scripts +set(KF5_DEP_VERSION "5.31.0") # handled by release scripts project(KIconThemes VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.30.0 NO_MODULE) +find_package(ECM 5.31.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) @@ -29,7 +29,7 @@ SOVERSION 5) # Dependencies -set(REQUIRED_QT_VERSION 5.5.0) +set(REQUIRED_QT_VERSION 5.6.0) find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) find_package(Qt5Svg ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) find_package(Qt5DBus ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.30.0/autotests/kiconengine_unittest.cpp new/kiconthemes-5.31.0/autotests/kiconengine_unittest.cpp --- old/kiconthemes-5.30.0/autotests/kiconengine_unittest.cpp 2017-01-08 21:53:38.000000000 +0100 +++ new/kiconthemes-5.31.0/autotests/kiconengine_unittest.cpp 2017-02-05 12:00:01.000000000 +0100 @@ -127,6 +127,21 @@ QCOMPARE(icon3.name(), nonExistingIconName); } + + void testCenterIcon() + { + QIcon icon(new KIconEngine(QStringLiteral("kde"), KIconLoader::global())); + QVERIFY(!icon.isNull()); + + // "kde" icon is actually "test-22x22.png", so this is original icon image + const QImage image = icon.pixmap(22, 22).toImage(); + + // center vertically + QVERIFY(icon.pixmap(22, 26).toImage().copy(0, 2, 22, 22) == image); + + // center horizontally + QVERIFY(icon.pixmap(26, 22).toImage().copy(2, 0, 22, 22) == image); + } private: QDir testIconsDir; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.30.0/autotests/kiconloader_unittest.cpp new/kiconthemes-5.31.0/autotests/kiconloader_unittest.cpp --- old/kiconthemes-5.30.0/autotests/kiconloader_unittest.cpp 2017-01-08 21:53:38.000000000 +0100 +++ new/kiconthemes-5.31.0/autotests/kiconloader_unittest.cpp 2017-02-05 12:00:01.000000000 +0100 @@ -212,7 +212,7 @@ QCOMPARE(pix.size(), QSize(16, 16)); // And now set canReturnNull to true pix = iconLoader.loadIcon(QStringLiteral("this-icon-does-not-exist"), KIconLoader::Desktop, 16, KIconLoader::DefaultState, - QStringList(), 0, true); + QStringList(), nullptr, true); QVERIFY(pix.isNull()); // Try getting the "unknown" icon again, to see if the above call didn't put a null icon into the cache... pix = iconLoader.loadIcon(QStringLiteral("this-icon-does-not-exist"), KIconLoader::Desktop, 16); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.30.0/po/gl/kiconthemes5.po new/kiconthemes-5.31.0/po/gl/kiconthemes5.po --- old/kiconthemes-5.30.0/po/gl/kiconthemes5.po 2017-01-08 21:53:38.000000000 +0100 +++ new/kiconthemes-5.31.0/po/gl/kiconthemes5.po 2017-02-05 12:00:01.000000000 +0100 @@ -9,20 +9,22 @@ # Marce Villarino <[email protected]>, 2009, 2010, 2011, 2012. # Xosé <[email protected]>, 2010. # Marce Villarino <[email protected]>, 2011, 2012, 2013, 2014. +# Adrián Chaves Fernández (Gallaecio) <[email protected]>, 2017. msgid "" msgstr "" "Project-Id-Version: kio4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:11+0100\n" -"PO-Revision-Date: 2014-01-04 23:20+0100\n" -"Last-Translator: Marce Villarino <[email protected]>\n" -"Language-Team: Galician <[email protected]>\n" +"PO-Revision-Date: 2017-02-02 21:35+0100\n" +"Last-Translator: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail." +"com>\n" +"Language-Team: Galician <[email protected]>\n" "Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" @@ -50,7 +52,7 @@ #: kicondialog.cpp:307 #, kde-format msgid "&Browse..." -msgstr "&Examinar..." +msgstr "&Examinar…" #: kicondialog.cpp:318 #, kde-format @@ -70,7 +72,7 @@ #: kicondialog.cpp:356 #, kde-format msgid "Applications" -msgstr "Aplicacións" +msgstr "Aplicativos" #: kicondialog.cpp:357 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.30.0/po/ia/kiconthemes5.po new/kiconthemes-5.31.0/po/ia/kiconthemes5.po --- old/kiconthemes-5.30.0/po/ia/kiconthemes5.po 2017-01-08 21:53:38.000000000 +0100 +++ new/kiconthemes-5.31.0/po/ia/kiconthemes5.po 2017-02-05 12:00:01.000000000 +0100 @@ -1,21 +1,21 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# g.sora <[email protected]>, 2010, 2011, 2012, 2013. +# g.sora <[email protected]>, 2010, 2011, 2012, 2013, 2017. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:11+0100\n" -"PO-Revision-Date: 2013-07-11 23:25+0200\n" -"Last-Translator: Giovanni Sora <[email protected]>\n" -"Language-Team: Interlingua <[email protected]>\n" +"PO-Revision-Date: 2017-01-15 19:48+0100\n" +"Last-Translator: giovanni <[email protected]>\n" +"Language-Team: Interlingua <[email protected]>\n" "Language: ia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" #: kicondialog.cpp:260 kicondialog.cpp:272 kicondialog.cpp:602 #, kde-format @@ -100,7 +100,7 @@ #: kicondialog.cpp:364 #, kde-format msgid "All" -msgstr "" +msgstr "Omne" #: kicondialog.cpp:602 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.30.0/src/kiconbutton.cpp new/kiconthemes-5.31.0/src/kiconbutton.cpp --- old/kiconthemes-5.30.0/src/kiconbutton.cpp 2017-01-08 21:53:38.000000000 +0100 +++ new/kiconthemes-5.31.0/src/kiconbutton.cpp 2017-02-05 12:00:01.000000000 +0100 @@ -70,7 +70,7 @@ mbUser = false; mpLoader = loader; - mpDialog = 0L; + mpDialog = nullptr; connect(q, SIGNAL(clicked()), q, SLOT(_k_slotChangeIcon())); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.30.0/src/kiconbutton.h new/kiconthemes-5.31.0/src/kiconbutton.h --- old/kiconthemes-5.30.0/src/kiconbutton.h 2017-01-08 21:53:38.000000000 +0100 +++ new/kiconthemes-5.31.0/src/kiconbutton.h 2017-02-05 12:00:01.000000000 +0100 @@ -41,7 +41,7 @@ * * @param parent The parent widget. */ - explicit KIconButton(QWidget *parent = 0L); + explicit KIconButton(QWidget *parent = nullptr); /** * Constructs a KIconButton using a specific icon loader. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.30.0/src/kicondialog.cpp new/kiconthemes-5.31.0/src/kicondialog.cpp --- old/kiconthemes-5.30.0/src/kicondialog.cpp 2017-01-08 21:53:38.000000000 +0100 +++ new/kiconthemes-5.31.0/src/kicondialog.cpp 2017-02-05 12:00:01.000000000 +0100 @@ -225,7 +225,7 @@ void KIconCanvas::currentListItemChanged(QListWidgetItem *item) { - emit nameChanged((item != 0L) ? item->text() : QString()); + emit nameChanged((item != nullptr) ? item->text() : QString()); } // TODO KF6 remove and override KIconDialog::showEvent() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.30.0/src/kicondialog.h new/kiconthemes-5.31.0/src/kicondialog.h --- old/kiconthemes-5.30.0/src/kicondialog.h 2017-01-08 21:53:38.000000000 +0100 +++ new/kiconthemes-5.31.0/src/kicondialog.h 2017-02-05 12:00:01.000000000 +0100 @@ -38,7 +38,7 @@ * * @param parent The parent widget. */ - explicit KIconDialog(QWidget *parent = 0L); + explicit KIconDialog(QWidget *parent = nullptr); /** * Constructs an icon selection dialog using a specific icon loader. @@ -46,7 +46,7 @@ * @param loader The icon loader to use. * @param parent The parent widget. */ - explicit KIconDialog(KIconLoader *loader, QWidget *parent = 0); + explicit KIconDialog(KIconLoader *loader, QWidget *parent = nullptr); /** * Destructs the dialog. @@ -132,7 +132,7 @@ static QString getIcon(KIconLoader::Group group = KIconLoader::Desktop, KIconLoader::Context context = KIconLoader::Application, bool strictIconSize = false, int iconSize = 0, - bool user = false, QWidget *parent = 0, + bool user = false, QWidget *parent = nullptr, const QString &caption = QString()); Q_SIGNALS: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.30.0/src/kicondialog_p.h new/kiconthemes-5.31.0/src/kicondialog_p.h --- old/kiconthemes-5.30.0/src/kicondialog_p.h 2017-01-08 21:53:38.000000000 +0100 +++ new/kiconthemes-5.31.0/src/kicondialog_p.h 2017-02-05 12:00:01.000000000 +0100 @@ -40,7 +40,7 @@ * * @param parent The parent widget. */ - explicit KIconCanvas(QWidget *parent = 0L); + explicit KIconCanvas(QWidget *parent = nullptr); /** * Destroys the icon canvas. @@ -110,7 +110,7 @@ m_bStrictIconSize = true; m_bLockUser = false; m_bLockCustomDir = false; - searchLine = 0; + searchLine = nullptr; mNumOfSteps = 1; } ~KIconDialogPrivate() {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.30.0/src/kiconengine.cpp new/kiconthemes-5.31.0/src/kiconengine.cpp --- old/kiconthemes-5.30.0/src/kiconengine.cpp 2017-01-08 21:53:38.000000000 +0100 +++ new/kiconthemes-5.31.0/src/kiconengine.cpp 2017-02-05 12:00:01.000000000 +0100 @@ -72,18 +72,12 @@ return; } - Q_UNUSED(state) - #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) const qreal dpr = painter->device()->devicePixelRatioF(); #else const qreal dpr = painter->device()->devicePixelRatio(); #endif - - const int kstate = qIconModeToKIconState(mode); - const int iconSize = qMin(rect.width(), rect.height()) * dpr; - const QPixmap pix = mIconLoader.data()->loadIcon(mIconName, KIconLoader::Desktop, iconSize, kstate, mOverlays); - painter->drawPixmap(rect, pix); + painter->drawPixmap(rect, pixmap(rect.size() * dpr, mode, state)); } QPixmap KIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) @@ -113,7 +107,7 @@ pix2.fill(QColor(0, 0, 0, 0)); QPainter painter(&pix2); - painter.drawPixmap(QPoint(), pix); + painter.drawPixmap(QPoint((pix2.width() - pix.width()) / 2, (pix2.height() - pix.height()) / 2), pix); return pix2; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.30.0/src/kiconloader.cpp new/kiconthemes-5.31.0/src/kiconloader.cpp --- old/kiconthemes-5.30.0/src/kiconloader.cpp 2017-01-08 21:53:38.000000000 +0100 +++ new/kiconthemes-5.31.0/src/kiconloader.cpp 2017-02-05 12:00:01.000000000 +0100 @@ -207,8 +207,8 @@ public: KIconLoaderPrivate(KIconLoader *q) : q(q) - , mpGroups(0) - , mIconCache(0) + , mpGroups(nullptr) + , mIconCache(nullptr) { } @@ -224,8 +224,8 @@ qDeleteAll(links); delete[] mpGroups; delete mIconCache; - mpGroups = 0; - mIconCache = 0; + mpGroups = nullptr; + mIconCache = nullptr; mPixmapCache.clear(); appname.clear(); searchPaths.clear(); @@ -503,7 +503,7 @@ //TODO: should we pass in the kstate? it results in a slower // path, and perhaps emblems should remain in the default state // anyways? - const QPixmap pixmap = iconLoader->loadIcon(overlay, group, overlaySize, state, QStringList(), 0, true); + const QPixmap pixmap = iconLoader->loadIcon(overlay, group, overlaySize, state, QStringList(), nullptr, true); if (pixmap.isNull()) { continue; @@ -579,7 +579,7 @@ { extraDesktopIconsLoaded = false; mIconThemeInited = false; - mpThemeRoot = 0; + mpThemeRoot = nullptr; searchPaths = extraSearchPaths; @@ -595,15 +595,15 @@ mPixmapCache.setMaxCost(10 * 1024 * 1024); // These have to match the order in kiconloader.h - static const char *const groups[] = { "Desktop", "Toolbar", "MainToolbar", "Small", "Panel", "Dialog", 0L }; + static const char *const groups[] = { "Desktop", "Toolbar", "MainToolbar", "Small", "Panel", "Dialog", nullptr }; KSharedConfig::Ptr config = KSharedConfig::openConfig(); // loading config and default sizes initIconThemes(); - KIconTheme *defaultSizesTheme = links.empty() ? 0 : links.first()->theme; + KIconTheme *defaultSizesTheme = links.empty() ? nullptr : links.first()->theme; mpGroups = new KIconGroup[(int) KIconLoader::LastGroup]; for (KIconLoader::Group i = KIconLoader::FirstGroup; i < KIconLoader::LastGroup; ++i) { - if (groups[i] == 0L) { + if (groups[i] == nullptr) { break; } @@ -620,7 +620,7 @@ { if (mIconThemeInited) { // If mpThemeRoot isn't 0 then initing has succeeded - return (mpThemeRoot != 0); + return (mpThemeRoot != nullptr); } //qCDebug(KICONTHEMES); mIconThemeInited = true; @@ -1386,17 +1386,17 @@ { QString file = moviePath(name, group, size); if (file.isEmpty()) { - return 0; + return nullptr; } int dirLen = file.lastIndexOf('/'); QString icon = iconPath(name, size ? -size : group, true); if (!icon.isEmpty() && file.left(dirLen) != icon.left(dirLen)) { - return 0; + return nullptr; } QMovie *movie = new QMovie(file, QByteArray(), parent); if (!movie->isValid()) { delete movie; - return 0; + return nullptr; } return movie; } @@ -1504,7 +1504,7 @@ if (d->mpThemeRoot) { return d->mpThemeRoot->theme; } - return 0L; + return nullptr; } int KIconLoader::currentSize(KIconLoader::Group group) const @@ -1651,12 +1651,12 @@ bool canReturnNull) { QIcon iconset; - QPixmap tmp = loadIcon(name, g, s, KIconLoader::ActiveState, QStringList(), NULL, canReturnNull); + QPixmap tmp = loadIcon(name, g, s, KIconLoader::ActiveState, QStringList(), nullptr, canReturnNull); iconset.addPixmap(tmp, QIcon::Active, QIcon::On); // we don't use QIconSet's resizing anyway - tmp = loadIcon(name, g, s, KIconLoader::DisabledState, QStringList(), NULL, canReturnNull); + tmp = loadIcon(name, g, s, KIconLoader::DisabledState, QStringList(), nullptr, canReturnNull); iconset.addPixmap(tmp, QIcon::Disabled, QIcon::On); - tmp = loadIcon(name, g, s, KIconLoader::DefaultState, QStringList(), NULL, canReturnNull); + tmp = loadIcon(name, g, s, KIconLoader::DefaultState, QStringList(), nullptr, canReturnNull); iconset.addPixmap(tmp, QIcon::Normal, QIcon::On); return iconset; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.30.0/src/kiconloader.h new/kiconthemes-5.31.0/src/kiconloader.h --- old/kiconthemes-5.30.0/src/kiconloader.h 2017-01-08 21:53:38.000000000 +0100 +++ new/kiconthemes-5.31.0/src/kiconloader.h 2017-02-05 12:00:01.000000000 +0100 @@ -76,12 +76,6 @@ class KICONTHEMES_EXPORT KIconLoader : public QObject { Q_OBJECT - Q_ENUMS(Context) - Q_ENUMS(Type) - Q_ENUMS(MatchType) - Q_ENUMS(Group) - Q_ENUMS(StdSizes) - Q_ENUMS(States) public: /** @@ -102,6 +96,7 @@ Place, ///< An icon that represents a location (e.g. 'home', 'trash'). StatusIcon ///< An icon that represents an event. }; + Q_ENUM(Context) /** * The type of the icon. @@ -111,6 +106,7 @@ Scalable, ///< Scalable-size icon. Threshold ///< A threshold icon. }; + Q_ENUM(Type) /** * The type of a match. @@ -119,6 +115,7 @@ MatchExact, ///< Only try to find an exact match. MatchBest ///< Take the best match if there is no exact match. }; + Q_ENUM(MatchType) /** * The group of the icon. @@ -145,6 +142,7 @@ /// User icons User }; + Q_ENUM(Group) /** * These are the standard sizes for icons. @@ -163,6 +161,7 @@ /// enormous sized icons for iconviews SizeEnormous = 128 }; + Q_ENUM(StdSizes) /** * Defines the possible states of an icon. @@ -174,6 +173,7 @@ SelectedState, ///< Icon is selected. @since 5.22 LastState ///< Last state (last constant) }; + Q_ENUM(States) /** * Constructs an iconloader. @@ -186,7 +186,7 @@ * KIconLoader::global(), so you hardly ever have to create an * iconloader object yourself. That one is the application's iconloader. */ - explicit KIconLoader(const QString &appname = QString(), const QStringList &extraSearchPaths = QStringList(), QObject *parent = 0); + explicit KIconLoader(const QString &appname = QString(), const QStringList &extraSearchPaths = QStringList(), QObject *parent = nullptr); /** * Cleanup @@ -239,7 +239,7 @@ */ QPixmap loadIcon(const QString &name, KIconLoader::Group group, int size = 0, int state = KIconLoader::DefaultState, const QStringList &overlays = QStringList(), - QString *path_store = 0L, + QString *path_store = nullptr, bool canReturnNull = false) const; /** @@ -262,7 +262,7 @@ */ QPixmap loadMimeTypeIcon(const QString &iconName, KIconLoader::Group group, int size = 0, int state = KIconLoader::DefaultState, const QStringList &overlays = QStringList(), - QString *path_store = 0) const; + QString *path_store = nullptr) const; /** * Loads a pixmapSequence given the xdg icon name @@ -322,7 +322,7 @@ * @return A QMovie object. Can be null if not found or not valid. * Ownership is passed to the caller. */ - QMovie *loadMovie(const QString &name, KIconLoader::Group group, int size = 0, QObject *parent = 0) const; + QMovie *loadMovie(const QString &name, KIconLoader::Group group, int size = 0, QObject *parent = nullptr) const; /** * Returns the path to an animated icon. @@ -593,14 +593,14 @@ * KDE style and effect standards. * @since 5.0 */ -KICONTHEMES_EXPORT QIcon icon(const QString &iconName, KIconLoader *iconLoader = 0); +KICONTHEMES_EXPORT QIcon icon(const QString &iconName, KIconLoader *iconLoader = nullptr); /** * \relates KIconLoader * Returns a QIcon for the given icon, with additional overlays. * @since 5.0 */ -KICONTHEMES_EXPORT QIcon icon(const QString &iconName, const QStringList &overlays, KIconLoader *iconLoader = 0); +KICONTHEMES_EXPORT QIcon icon(const QString &iconName, const QStringList &overlays, KIconLoader *iconLoader = nullptr); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.30.0/tests/kicondialogtest.cpp new/kiconthemes-5.31.0/tests/kicondialogtest.cpp --- old/kiconthemes-5.30.0/tests/kicondialogtest.cpp 2017-01-08 21:53:38.000000000 +0100 +++ new/kiconthemes-5.31.0/tests/kicondialogtest.cpp 2017-02-05 12:00:01.000000000 +0100 @@ -40,7 +40,7 @@ delete dialog; icon = KIconDialog::getIcon(KIconLoader::Desktop, KIconLoader::MimeType, - true, 48, true, 0, QStringLiteral("Test dialog")); + true, 48, true, nullptr, QStringLiteral("Test dialog")); QTextStream(stdout) << "Icon \"" << icon << "\" was chosen (getIcon)\n"; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.30.0/tests/kiconeffecttest.h new/kiconthemes-5.31.0/tests/kiconeffecttest.h --- old/kiconthemes-5.30.0/tests/kiconeffecttest.h 2017-01-08 21:53:38.000000000 +0100 +++ new/kiconthemes-5.31.0/tests/kiconeffecttest.h 2017-02-05 12:00:01.000000000 +0100 @@ -10,7 +10,7 @@ { Q_OBJECT public: - KIconEffectTestWidget(QWidget *parent = 0); + KIconEffectTestWidget(QWidget *parent = nullptr); private Q_SLOTS: void slotGray(int); void slotMonochrome(int);
