Hello community, here is the log from the commit of package kservice for openSUSE:Factory checked in at 2017-03-03 17:18:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kservice (Old) and /work/SRC/openSUSE:Factory/.kservice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kservice" Fri Mar 3 17:18:47 2017 rev:43 rq:461459 version:5.31.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kservice/kservice.changes 2017-02-03 17:46:19.551455524 +0100 +++ /work/SRC/openSUSE:Factory/.kservice.new/kservice.changes 2017-03-03 17:18:48.459344033 +0100 @@ -1,0 +2,7 @@ +Thu Feb 9 09:32:55 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: ---- kservice-5.30.0.tar.xz New: ---- kservice-5.31.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kservice.spec ++++++ --- /var/tmp/diff_new_pack.vPu7KN/_old 2017-03-03 17:18:49.107252390 +0100 +++ /var/tmp/diff_new_pack.vPu7KN/_new 2017-03-03 17:18:49.111251825 +0100 @@ -17,9 +17,9 @@ %bcond_without lang -%define _tar_path 5.30 +%define _tar_path 5.31 Name: kservice -Version: 5.30.0 +Version: 5.31.0 Release: 0 %define kf5_version %{version} BuildRequires: bison @@ -34,10 +34,10 @@ BuildRequires: kdoctools-devel >= %{_tar_path} BuildRequires: kf5-filesystem BuildRequires: ki18n-devel >= %{_tar_path} -BuildRequires: cmake(Qt5Concurrent) >= 5.5.0 -BuildRequires: cmake(Qt5DBus) >= 5.5.0 -BuildRequires: cmake(Qt5Test) >= 5.5.0 -BuildRequires: cmake(Qt5Xml) >= 5.5.0 +BuildRequires: cmake(Qt5Concurrent) >= 5.6.0 +BuildRequires: cmake(Qt5DBus) >= 5.6.0 +BuildRequires: cmake(Qt5Test) >= 5.6.0 +BuildRequires: cmake(Qt5Xml) >= 5.6.0 %if %{with lang} Recommends: %{name}-lang = %{version} %endif ++++++ kservice-5.30.0.tar.xz -> kservice-5.31.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/CMakeLists.txt new/kservice-5.31.0/CMakeLists.txt --- old/kservice-5.30.0/CMakeLists.txt 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/CMakeLists.txt 2017-02-05 12:11:59.000000000 +0100 @@ -1,13 +1,13 @@ 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(KService 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) @@ -34,7 +34,7 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII) # Dependencies -set(REQUIRED_QT_VERSION 5.5.0) +set(REQUIRED_QT_VERSION 5.6.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus Xml) find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/autotests/kservicetest.cpp new/kservice-5.31.0/autotests/kservicetest.cpp --- old/kservice-5.30.0/autotests/kservicetest.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/autotests/kservicetest.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -74,7 +74,7 @@ // - some character other than dot as decimal separator // If it cannot be set, locale-dependent tests are skipped. setlocale(LC_ALL, "fr_FR.utf8"); - m_hasNonCLocale = (setlocale(LC_ALL, NULL) == QByteArray("fr_FR.utf8")); + m_hasNonCLocale = (setlocale(LC_ALL, nullptr) == QByteArray("fr_FR.utf8")); if (!m_hasNonCLocale) { qDebug() << "Setting locale to fr_FR.utf8 failed"; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/autotests/ksycocatest.cpp new/kservice-5.31.0/autotests/ksycocatest.cpp --- old/kservice-5.30.0/autotests/ksycocatest.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/autotests/ksycocatest.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -153,7 +153,7 @@ #ifdef Q_OS_UNIX const QString path = serviceTypesDir(); struct timeval tp; - gettimeofday(&tp, 0); + gettimeofday(&tp, nullptr); struct utimbuf utbuf; utbuf.actime = tp.tv_sec; utbuf.modtime = tp.tv_sec + 60; // 60 second in the future @@ -198,7 +198,7 @@ // ### use QFile::setFileTime when it lands in Qt... #ifdef Q_OS_UNIX struct timeval tp; - gettimeofday(&tp, 0); + gettimeofday(&tp, nullptr); struct utimbuf utbuf; utbuf.actime = tp.tv_sec; utbuf.modtime = tp.tv_sec + 60; // 60 second in the future @@ -248,7 +248,7 @@ // ### use QFile::setFileTime when it lands in Qt... #ifdef Q_OS_UNIX struct timeval tp; - gettimeofday(&tp, 0); + gettimeofday(&tp, nullptr); struct utimbuf utbuf; utbuf.actime = tp.tv_sec; utbuf.modtime = tp.tv_sec + 60; // 60 second in the future diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/autotests/pluginlocatortest.cpp new/kservice-5.31.0/autotests/pluginlocatortest.cpp --- old/kservice-5.30.0/autotests/pluginlocatortest.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/autotests/pluginlocatortest.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -80,7 +80,7 @@ const QString constraint = QStringLiteral("[X-KDE-PluginInfo-Name] == '%1'").arg(pluginName); QObject *plugin = KPluginTrader::createInstanceFromQuery<QObject>(QString(), serviceType, constraint, this); - QVERIFY(plugin != 0); + QVERIFY(plugin != nullptr); QCOMPARE(plugin->objectName(), QStringLiteral("Test Plugin Spy")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/po/gl/kservice5.po new/kservice-5.31.0/po/gl/kservice5.po --- old/kservice-5.30.0/po/gl/kservice5.po 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/po/gl/kservice5.po 2017-02-05 12:11:59.000000000 +0100 @@ -9,13 +9,13 @@ # 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]>, 2015. +# Adrián Chaves Fernández (Gallaecio) <[email protected]>, 2015, 2017. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-12-13 02:42+0100\n" -"PO-Revision-Date: 2015-11-07 11:15+0100\n" +"PO-Revision-Date: 2017-02-02 21:34+0100\n" "Last-Translator: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail." "com>\n" "Language-Team: Galician <[email protected]>\n" @@ -82,7 +82,7 @@ "Do not signal applications to update (deprecated, no longer having any " "effect)" msgstr "" -"Non enviar sinais ás aplicacións para que se actualicen (obsoleto, non " +"Non enviar sinais aos aplicativos para que se actualicen (obsoleto, non " "funciona)." #: kbuildsycoca/kbuildsycoca_main.cpp:78 @@ -139,7 +139,7 @@ "start the application." msgstr "" "Produciuse un erro ao iniciar %1. Ou KLauncher deixou de funcionar, ou non " -"puido arrincar o programa." +"puido arrincar o aplicativo." #: kdeinit/ktoolinvocation.cpp:106 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/po/ia/kservice5.po new/kservice-5.31.0/po/ia/kservice5.po --- old/kservice-5.30.0/po/ia/kservice5.po 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/po/ia/kservice5.po 2017-02-05 12:11:59.000000000 +0100 @@ -1,22 +1,22 @@ # 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, 2014. +# g.sora <[email protected]>, 2010, 2011, 2012, 2013, 2014, 2017. # Giovanni Sora <[email protected]>, 2014, 2016. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-12-13 02:42+0100\n" -"PO-Revision-Date: 2016-11-29 13:45+0100\n" -"Last-Translator: Giovanni Sora <[email protected]>\n" -"Language-Team: Interlingua <[email protected]>\n" +"PO-Revision-Date: 2017-01-15 20:03+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" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -84,7 +84,7 @@ #, kde-format msgctxt "@info:shell command-line option" msgid "Check file timestamps (deprecated, no longer having any effect)" -msgstr "" +msgstr "Verifica le file timestamps (deprecate, il non ha plus alcun effecto)" #: kbuildsycoca/kbuildsycoca_main.cpp:84 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/po/nb/kservice5.po new/kservice-5.31.0/po/nb/kservice5.po --- old/kservice-5.30.0/po/nb/kservice5.po 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/po/nb/kservice5.po 2017-02-05 12:11:59.000000000 +0100 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2016-11-19 20:12+0100\n" +"POT-Creation-Date: 2016-12-13 02:42+0100\n" "PO-Revision-Date: 2014-11-05 13:40+0100\n" "Last-Translator: Bjørn Steensrud <[email protected]>\n" "Language-Team: Norwegian Bokmål <[email protected]>\n" @@ -203,12 +203,12 @@ msgid "No service implementing %1" msgstr "Ingen tjeneste som implementerer %1" -#: services/kservice.cpp:1012 +#: services/kservice.cpp:1018 #, kde-format msgid "The provided service is not valid" msgstr "Den oppgitte tjenesten er ikke gyldig" -#: services/kservice.cpp:1016 +#: services/kservice.cpp:1022 #, kde-format msgid "The service '%1' provides no library or the Library key is missing" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/po/se/kservice5.po new/kservice-5.31.0/po/se/kservice5.po --- old/kservice-5.30.0/po/se/kservice5.po 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/po/se/kservice5.po 2017-02-05 12:11:59.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2016-11-19 20:12+0100\n" +"POT-Creation-Date: 2016-12-13 02:42+0100\n" "PO-Revision-Date: 2012-05-30 23:19+0200\n" "Last-Translator: Børre Gaup <[email protected]>\n" "Language-Team: Northern Sami <[email protected]>\n" @@ -197,12 +197,12 @@ msgid "No service implementing %1" msgstr "Ii gávdno bálvalus %1 várás" -#: services/kservice.cpp:1012 +#: services/kservice.cpp:1018 #, kde-format msgid "The provided service is not valid" msgstr "Addon bálvalus ii gusto" -#: services/kservice.cpp:1016 +#: services/kservice.cpp:1022 #, kde-format msgid "The service '%1' provides no library or the Library key is missing" msgstr "«%1»-bálvalusas ii leat bibliotehka dahje «Library»-čoavdda ii gávdno " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/kdeinit/ktoolinvocation.cpp new/kservice-5.31.0/src/kdeinit/ktoolinvocation.cpp --- old/kservice-5.30.0/src/kdeinit/ktoolinvocation.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/kdeinit/ktoolinvocation.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -43,7 +43,7 @@ return &s_self()->instance; } -KToolInvocation::KToolInvocation() : QObject(0), d(0) +KToolInvocation::KToolInvocation() : QObject(nullptr), d(nullptr) { } @@ -229,7 +229,7 @@ } return self()->startServiceInternal("kdeinit_exec", - name, args, error, 0, pid, startup_id, false); + name, args, error, nullptr, pid, startup_id, false); } int @@ -241,7 +241,7 @@ } return self()->startServiceInternal("kdeinit_exec_wait", - name, args, error, 0, pid, startup_id, false); + name, args, error, nullptr, pid, startup_id, false); } void KToolInvocation::invokeMailer(const QString &address, const QString &subject, const QByteArray &startup_id) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/kdeinit/ktoolinvocation.h new/kservice-5.31.0/src/kdeinit/ktoolinvocation.h --- old/kservice-5.30.0/src/kdeinit/ktoolinvocation.h 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/kdeinit/ktoolinvocation.h 2017-02-05 12:11:59.000000000 +0100 @@ -185,7 +185,7 @@ */ #ifndef KSERVICE_NO_DEPRECATED KSERVICE_DEPRECATED static int startServiceByName(const QString &_name, const QString &URL, - QString *error = 0, QString *serviceName = 0, int *pid = 0, + QString *error = nullptr, QString *serviceName = nullptr, int *pid = nullptr, const QByteArray &startup_id = QByteArray(), bool noWait = false); #endif @@ -212,7 +212,7 @@ */ #ifndef KSERVICE_NO_DEPRECATED KSERVICE_DEPRECATED static int startServiceByName(const QString &_name, const QStringList &URLs = QStringList(), - QString *error = 0, QString *serviceName = 0, int *pid = 0, + QString *error = nullptr, QString *serviceName = nullptr, int *pid = nullptr, const QByteArray &startup_id = QByteArray(), bool noWait = false); #endif @@ -241,7 +241,7 @@ * it installs a dbus org.kde.serviceName.service file). Otherwise just use QProcess or KRun. */ static int startServiceByDesktopPath(const QString &_name, const QString &URL, - QString *error = 0, QString *serviceName = 0, int *pid = 0, + QString *error = nullptr, QString *serviceName = nullptr, int *pid = nullptr, const QByteArray &startup_id = QByteArray(), bool noWait = false); /** @@ -267,7 +267,7 @@ * it installs a dbus org.kde.serviceName.service file). Otherwise just use QProcess or KRun. */ static int startServiceByDesktopPath(const QString &_name, const QStringList &URLs = QStringList(), - QString *error = 0, QString *serviceName = 0, int *pid = 0, + QString *error = nullptr, QString *serviceName = nullptr, int *pid = nullptr, const QByteArray &startup_id = QByteArray(), bool noWait = false); /** @@ -294,7 +294,7 @@ * it installs a dbus org.kde.serviceName.service file). Otherwise just use QProcess or KRun. */ static int startServiceByDesktopName(const QString &_name, const QString &URL, - QString *error = 0, QString *serviceName = 0, int *pid = 0, + QString *error = nullptr, QString *serviceName = nullptr, int *pid = nullptr, const QByteArray &startup_id = QByteArray(), bool noWait = false); /** @@ -321,7 +321,7 @@ * it installs a dbus org.kde.serviceName.service file). Otherwise just use QProcess or KRun. */ static int startServiceByDesktopName(const QString &_name, const QStringList &URLs = QStringList(), - QString *error = 0, QString *serviceName = 0, int *pid = 0, + QString *error = nullptr, QString *serviceName = nullptr, int *pid = nullptr, const QByteArray &startup_id = QByteArray(), bool noWait = false); /** @@ -342,7 +342,7 @@ * @return an error code indicating success (== 0) or failure (> 0). */ static int kdeinitExec(const QString &name, const QStringList &args = QStringList(), - QString *error = 0, int *pid = 0, const QByteArray &startup_id = QByteArray()); + QString *error = nullptr, int *pid = nullptr, const QByteArray &startup_id = QByteArray()); /** * Starts a program via kdeinit and wait for it to finish. @@ -362,7 +362,7 @@ * @return an error code indicating success (== 0) or failure (> 0). */ static int kdeinitExecWait(const QString &name, const QStringList &args = QStringList(), - QString *error = 0, int *pid = 0, const QByteArray &startup_id = QByteArray()); + QString *error = nullptr, int *pid = nullptr, const QByteArray &startup_id = QByteArray()); /** * Ensures that kdeinit5 and klauncher are running. @@ -382,7 +382,7 @@ QString *error, QString *serviceName, int *pid, const QByteArray &startup_id, bool noWait, const QString &workdir = QString()); - static bool isMainThreadActive(QString *error = 0); + static bool isMainThreadActive(QString *error = nullptr); KToolInvocationPrivate *const d; friend class KToolInvocationSingleton; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/kdeinit/ktoolinvocation_x11.cpp new/kservice-5.31.0/src/kdeinit/ktoolinvocation_x11.cpp --- old/kservice-5.30.0/src/kdeinit/ktoolinvocation_x11.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/kdeinit/ktoolinvocation_x11.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -246,7 +246,7 @@ QString error; // TODO this should check if cmd has a .desktop file, and use data from it, together // with sending more ASN data - if (kdeinitExec(cmd, cmdTokens, &error, NULL, startup_id)) { + if (kdeinitExec(cmd, cmdTokens, &error, nullptr, startup_id)) { KMessage::message(KMessage::Error, i18n("Could not launch the mail client:\n\n%1", error), i18n("Could not launch Mail Client")); @@ -295,7 +295,7 @@ if (service) { //qDebug() << "Starting service" << service->entryPath(); if (startServiceByDesktopPath(service->entryPath(), args, - &error, 0, 0, startup_id)) { + &error, nullptr, nullptr, startup_id)) { KMessage::message(KMessage::Error, // TODO: i18n("Could not launch %1:\n\n%2", exe, error), i18n("Could not launch the browser:\n\n%1", error), @@ -319,7 +319,7 @@ } QString error; int pid = 0; - int err = startServiceByDesktopPath(entryPath, url, &error, 0, &pid, startup_id); + int err = startServiceByDesktopPath(entryPath, url, &error, nullptr, &pid, startup_id); if (err != 0) { KMessage::message(KMessage::Error, // TODO: i18n("Could not launch %1:\n\n%2", htmlApp->exec(), error), @@ -339,7 +339,7 @@ } //qDebug() << "Using" << exe << "to open" << url; - if (kdeinitExec(exe, args, &error, NULL, startup_id)) { + if (kdeinitExec(exe, args, &error, nullptr, startup_id)) { KMessage::message(KMessage::Error, // TODO: i18n("Could not launch %1:\n\n%2", exe, error), i18n("Could not launch the browser:\n\n%1", error), @@ -380,7 +380,7 @@ QString error; if (self()->startServiceInternal("kdeinit_exec_with_workdir", - cmd, cmdTokens, &error, 0, NULL, startup_id, false, workdir)) { + cmd, cmdTokens, &error, nullptr, nullptr, startup_id, false, workdir)) { KMessage::message(KMessage::Error, i18n("Could not launch the terminal client:\n\n%1", error), i18n("Could not launch Terminal Client")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/plugin/kdbusservicestarter.cpp new/kservice-5.31.0/src/plugin/kdbusservicestarter.cpp --- old/kservice-5.30.0/src/plugin/kdbusservicestarter.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/plugin/kdbusservicestarter.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -28,7 +28,7 @@ class KDBusServiceStarterPrivate { public: - KDBusServiceStarterPrivate() : q(0) {} + KDBusServiceStarterPrivate() : q(nullptr) {} ~KDBusServiceStarterPrivate() { delete q; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/plugin/kdbusservicestarter.h new/kservice-5.31.0/src/plugin/kdbusservicestarter.h --- old/kservice-5.30.0/src/plugin/kdbusservicestarter.h 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/plugin/kdbusservicestarter.h 2017-02-05 12:11:59.000000000 +0100 @@ -62,7 +62,7 @@ */ int findServiceFor(const QString &serviceType, const QString &constraint = QString(), - QString *error = 0, QString *dbusService = 0, + QString *error = nullptr, QString *dbusService = nullptr, int flags = 0); /** @@ -88,7 +88,7 @@ */ virtual int startServiceFor(const QString &serviceType, const QString &constraint = QString(), - QString *error = 0, QString *dbusService = 0, + QString *error = nullptr, QString *dbusService = nullptr, int flags = 0); protected: friend class KDBusServiceStarterPrivate; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/plugin/kplugintrader.cpp new/kservice-5.31.0/src/plugin/kplugintrader.cpp --- old/kservice-5.30.0/src/plugin/kplugintrader.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/plugin/kplugintrader.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -46,7 +46,7 @@ } KPluginTrader::KPluginTrader() - : d(0) + : d(nullptr) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/plugin/kplugintrader.h new/kservice-5.31.0/src/plugin/kplugintrader.h --- old/kservice-5.30.0/src/plugin/kplugintrader.h 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/plugin/kplugintrader.h 2017-02-05 12:11:59.000000000 +0100 @@ -189,11 +189,11 @@ static T *createInstanceFromQuery(const QString &subDirectory, const QString &serviceType = QString(), const QString &constraint = QString(), - QObject *parent = 0, + QObject *parent = nullptr, const QVariantList &args = QVariantList(), - QString *error = 0) + QString *error = nullptr) { - return createInstanceFromQuery<T>(subDirectory, serviceType, constraint, parent, 0, args, error); + return createInstanceFromQuery<T>(subDirectory, serviceType, constraint, parent, nullptr, args, error); } /** @@ -221,7 +221,7 @@ QObject *parent, QWidget *parentWidget, const QVariantList &args = QVariantList(), - QString *error = 0) + QString *error = nullptr) { Q_UNUSED(parentWidget) Q_UNUSED(args) @@ -244,7 +244,7 @@ if (error && error->isEmpty()) { *error = QCoreApplication::translate("", "No service matching the requirements was found"); } - return 0; + return nullptr; } static void applyConstraints(KPluginInfo::List &lst, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/services/application.desktop new/kservice-5.31.0/src/services/application.desktop --- old/kservice-5.30.0/src/services/application.desktop 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/services/application.desktop 2017-02-05 12:11:59.000000000 +0100 @@ -3,6 +3,7 @@ X-KDE-ServiceType=Application Name=Application Name[af]=Program +Name[ar]=تطبيق Name[as]=অনুপ্ৰয়োগ Name[ast]=Aplicación Name[be]=Праграма @@ -31,7 +32,7 @@ Name[fy]=Applikaasje Name[ga]=Feidhmchlár Name[gd]=Aplacaid -Name[gl]=Aplicación +Name[gl]=Aplicativo Name[gu]=કાર્યક્રમ Name[he]=תוכנית Name[hi]=अनुप्रयोग diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/services/kautostart.cpp new/kservice-5.31.0/src/services/kautostart.cpp --- old/kservice-5.30.0/src/services/kautostart.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/services/kautostart.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -30,7 +30,7 @@ { public: KAutostartPrivate() - : df(0), + : df(nullptr), copyIfNeededChecked(false) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/services/kautostart.h new/kservice-5.31.0/src/services/kautostart.h --- old/kservice-5.30.0/src/services/kautostart.h 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/services/kautostart.h 2017-02-05 12:11:59.000000000 +0100 @@ -71,7 +71,7 @@ * @param parent QObject */ explicit KAutostart(const QString &entryName = QString(), - QObject *parent = 0); + QObject *parent = nullptr); ~KAutostart(); /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/services/kmimetypefactory.cpp new/kservice-5.31.0/src/services/kmimetypefactory.cpp --- old/kservice-5.30.0/src/services/kmimetypefactory.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/services/kmimetypefactory.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -67,18 +67,18 @@ KSycocaType type; QDataStream *str = sycoca()->findEntry(offset, type); if (!str) { - return 0; + return nullptr; } if (type != KST_KMimeTypeEntry) { qWarning() << "KMimeTypeFactory: unexpected object entry in KSycoca database (type=" << int(type) << ")"; - return 0; + return nullptr; } MimeTypeEntry *newEntry = new MimeTypeEntry(*str, offset); if (newEntry && !newEntry->isValid()) { qWarning() << "KMimeTypeFactory: corrupt object in KSycoca database!\n"; delete newEntry; - newEntry = 0; + newEntry = nullptr; } return newEntry; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/services/kmimetypefactory_p.h new/kservice-5.31.0/src/services/kmimetypefactory_p.h --- old/kservice-5.30.0/src/services/kmimetypefactory_p.h 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/services/kmimetypefactory_p.h 2017-02-05 12:11:59.000000000 +0100 @@ -53,7 +53,7 @@ KSycocaEntry *createEntry(const QString &) const Q_DECL_OVERRIDE { assert(0); - return 0; + return nullptr; } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/services/kmimetypetrader.h new/kservice-5.31.0/src/services/kmimetypetrader.h --- old/kservice-5.30.0/src/services/kmimetypetrader.h 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/services/kmimetypetrader.h 2017-02-05 12:11:59.000000000 +0100 @@ -119,10 +119,10 @@ * factory was unable to create an object of the given type. */ template <class T> - static T *createPartInstanceFromQuery(const QString &mimeType, QWidget *parentWidget = 0, QObject *parent = 0, + static T *createPartInstanceFromQuery(const QString &mimeType, QWidget *parentWidget = nullptr, QObject *parent = nullptr, const QString &constraint = QString(), const QVariantList &args = QVariantList(), - QString *error = 0) + QString *error = nullptr) { const KService::List offers = self()->query(mimeType, QStringLiteral("KParts/ReadOnlyPart"), constraint); Q_FOREACH (const KService::Ptr &ptr, offers) { @@ -154,10 +154,10 @@ * factory was unable to create an object of the given type. */ template <class T> - static T *createInstanceFromQuery(const QString &mimeType, const QString &serviceType, QObject *parent = 0, + static T *createInstanceFromQuery(const QString &mimeType, const QString &serviceType, QObject *parent = nullptr, const QString &constraint = QString(), const QVariantList &args = QVariantList(), - QString *error = 0) + QString *error = nullptr) { const KService::List offers = self()->query(mimeType, serviceType, constraint); Q_FOREACH (const KService::Ptr &ptr, offers) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/services/kplugininfo.cpp new/kservice-5.31.0/src/services/kplugininfo.cpp --- old/kservice-5.30.0/src/services/kplugininfo.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/services/kplugininfo.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -303,7 +303,7 @@ : d(new KPluginInfoPrivate) { if (!service) { - d = 0; // isValid() == false + d = nullptr; // isValid() == false return; } d->service = service; @@ -356,13 +356,13 @@ #endif KPluginInfo::KPluginInfo() - : d(0) // isValid() == false + : d(nullptr) // isValid() == false { } bool KPluginInfo::isValid() const { - return d.data() != 0; + return d.data() != nullptr; } KPluginInfo::KPluginInfo(const KPluginInfo &rhs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/services/kplugininfo.desktop new/kservice-5.31.0/src/services/kplugininfo.desktop --- old/kservice-5.30.0/src/services/kplugininfo.desktop 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/services/kplugininfo.desktop 2017-02-05 12:11:59.000000000 +0100 @@ -3,6 +3,7 @@ X-KDE-ServiceType=KPluginInfo Name=KDE Plugin Information Name[af]=KDE inpropmodule Informasie +Name[ar]=معلومات ملحقة «كدي» Name[as]=KDE প্লাগ-ইনৰ তথ্য Name[be]=Звесткі пра ўтулкі KDE Name[be@latin]=Źviestki pra plugin dla KDE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/services/kservice.h new/kservice-5.31.0/src/services/kservice.h --- old/kservice-5.30.0/src/services/kservice.h 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/services/kservice.h 2017-02-05 12:11:59.000000000 +0100 @@ -485,8 +485,8 @@ * @return The path to use for the new KService. */ static QString newServicePath(bool showInMenu, const QString &suggestedName, - QString *menuId = 0, - const QStringList *reservedMenuIds = 0); + QString *menuId = nullptr, + const QStringList *reservedMenuIds = nullptr); /** * This template allows to load the library for the specified service and ask the @@ -501,8 +501,8 @@ * factory was unable to create an object of the given type. */ template <class T> - T *createInstance(QObject *parent = 0, - const QVariantList &args = QVariantList(), QString *error = 0) const + T *createInstance(QObject *parent = nullptr, + const QVariantList &args = QVariantList(), QString *error = nullptr) const { return createInstance<T>(0, parent, args, error); } @@ -522,7 +522,7 @@ */ template <class T> T *createInstance(QWidget *parentWidget, QObject *parent, - const QVariantList &args = QVariantList(), QString *error = 0) const + const QVariantList &args = QVariantList(), QString *error = nullptr) const { KPluginLoader pluginLoader(*this); KPluginFactory *factory = pluginLoader.factory(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/services/kservicefactory.cpp new/kservice-5.31.0/src/services/kservicefactory.cpp --- old/kservice-5.30.0/src/services/kservicefactory.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/services/kservicefactory.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -29,9 +29,9 @@ KServiceFactory::KServiceFactory(KSycoca *db) : KSycocaFactory(KST_KServiceFactory, db), - m_nameDict(0), - m_relNameDict(0), - m_menuIdDict(0) + m_nameDict(nullptr), + m_relNameDict(nullptr), + m_menuIdDict(nullptr) { m_offerListOffset = 0; m_nameDictOffset = 0; @@ -212,13 +212,13 @@ QDataStream *str = sycoca()->findEntry(offset, type); if (type != KST_KService) { qWarning() << "KServiceFactory: unexpected object entry in KSycoca database (type=" << int(type) << ")"; - return 0; + return nullptr; } KService *newEntry = new KService(*str, offset); if (!newEntry->isValid()) { qWarning() << "KServiceFactory: corrupt object in KSycoca database!"; delete newEntry; - newEntry = 0; + newEntry = nullptr; } return newEntry; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/services/kservicefactory_p.h new/kservice-5.31.0/src/services/kservicefactory_p.h --- old/kservice-5.30.0/src/services/kservicefactory_p.h 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/services/kservicefactory_p.h 2017-02-05 12:11:59.000000000 +0100 @@ -54,7 +54,7 @@ KSycocaEntry *createEntry(const QString &) const Q_DECL_OVERRIDE { assert(0); - return 0; + return nullptr; } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/services/kservicegroup.cpp new/kservice-5.31.0/src/services/kservicegroup.cpp --- old/kservice-5.30.0/src/services/kservicegroup.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/services/kservicegroup.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -368,7 +368,7 @@ grp = KSycocaPrivate::self()->serviceGroupFactory()->findGroupByDesktopPath(path, true); group = grp.data(); - if (0 == group) { // No guarantee that we still exist! + if (nullptr == group) { // No guarantee that we still exist! return KServiceGroup::List(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/services/kservicegroupfactory.cpp new/kservice-5.31.0/src/services/kservicegroupfactory.cpp --- old/kservice-5.30.0/src/services/kservicegroupfactory.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/services/kservicegroupfactory.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -26,7 +26,7 @@ KServiceGroupFactory::KServiceGroupFactory(KSycoca *db) : KSycocaFactory(KST_KServiceGroupFactory, db) - , m_baseGroupDict(0) + , m_baseGroupDict(nullptr) , m_baseGroupDictOffset(0) { if (!sycoca()->isBuilding()) { @@ -66,7 +66,7 @@ // Check whether the dictionary was right. if (newGroup && (newGroup->relPath() != _name)) { // No it wasn't... - newGroup = 0; // Not found + newGroup = nullptr; // Not found } return newGroup; } @@ -91,7 +91,7 @@ // Check whether the dictionary was right. if (newGroup && (newGroup->baseGroupName() != _baseGroupName)) { // No it wasn't... - newGroup = 0; // Not found + newGroup = nullptr; // Not found } return newGroup; } @@ -102,14 +102,14 @@ QDataStream *str = sycoca()->findEntry(offset, type); if (type != KST_KServiceGroup) { qWarning() << "KServiceGroupFactory: unexpected object entry in KSycoca database (type = " << int(type) << ")"; - return 0; + return nullptr; } KServiceGroup *newEntry = new KServiceGroup(*str, offset, deep); if (!newEntry->isValid()) { qWarning() << "KServiceGroupFactory: corrupt object in KSycoca database!"; delete newEntry; - newEntry = 0; + newEntry = nullptr; } return newEntry; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/services/kservicegroupfactory_p.h new/kservice-5.31.0/src/services/kservicegroupfactory_p.h --- old/kservice-5.30.0/src/services/kservicegroupfactory_p.h 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/services/kservicegroupfactory_p.h 2017-02-05 12:11:59.000000000 +0100 @@ -51,7 +51,7 @@ KSycocaEntry *createEntry(const QString &) const Q_DECL_OVERRIDE { assert(0); - return 0; + return nullptr; } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/services/kserviceoffer.cpp new/kservice-5.31.0/src/services/kserviceoffer.cpp --- old/kservice-5.30.0/src/services/kserviceoffer.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/services/kserviceoffer.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -26,7 +26,7 @@ : preference(-1), mimeTypeInheritanceLevel(0), bAllowAsDefault(false), - pService(0) + pService(nullptr) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/services/kservicetypefactory.cpp new/kservice-5.31.0/src/services/kservicetypefactory.cpp --- old/kservice-5.30.0/src/services/kservicetypefactory.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/services/kservicetypefactory.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -73,7 +73,7 @@ // Check whether the dictionary was right. if (newServiceType && (newServiceType->name() != _name)) { // No it wasn't... - newServiceType = 0; // Not found + newServiceType = nullptr; // Not found } return newServiceType; } @@ -114,19 +114,19 @@ KSycocaType type; QDataStream *str = sycoca()->findEntry(offset, type); if (!str) { - return 0; + return nullptr; } if (type != KST_KServiceType) { qWarning() << "KServiceTypeFactory: unexpected object entry in KSycoca database (type=" << int(type) << ")"; - return 0; + return nullptr; } KServiceType *newEntry = new KServiceType(*str, offset); if (newEntry && !newEntry->isValid()) { qWarning() << "KServiceTypeFactory: corrupt object in KSycoca database!"; delete newEntry; - newEntry = 0; + newEntry = nullptr; } return newEntry; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/services/kservicetypefactory_p.h new/kservice-5.31.0/src/services/kservicetypefactory_p.h --- old/kservice-5.30.0/src/services/kservicetypefactory_p.h 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/services/kservicetypefactory_p.h 2017-02-05 12:11:59.000000000 +0100 @@ -55,7 +55,7 @@ KSycocaEntry *createEntry(const QString &) const Q_DECL_OVERRIDE { assert(0); - return 0; + return nullptr; } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/services/kservicetypeprofile.cpp new/kservice-5.31.0/src/services/kservicetypeprofile.cpp --- old/kservice-5.30.0/src/services/kservicetypeprofile.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/services/kservicetypeprofile.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -82,7 +82,7 @@ const QString type = *aIt; KConfigGroup config(&configFile, type); const int count = config.readEntry("NumberOfEntries", 0); - KServiceTypeProfileEntry *p = this->value(type, 0); + KServiceTypeProfileEntry *p = this->value(type, nullptr); if (!p) { p = new KServiceTypeProfileEntry(); this->insert(type, p); @@ -123,7 +123,7 @@ { QMutexLocker lock(&s_serviceTypeProfiles()->m_mutex); s_serviceTypeProfiles()->ensureParsed(); - KServiceTypeProfileEntry *profile = s_serviceTypeProfiles()->value(serviceType, 0); + KServiceTypeProfileEntry *profile = s_serviceTypeProfiles()->value(serviceType, nullptr); KServiceOfferList offers; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/services/kservicetypetrader.cpp new/kservice-5.31.0/src/services/kservicetypetrader.cpp --- old/kservice-5.30.0/src/services/kservicetypetrader.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/services/kservicetypetrader.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -52,7 +52,7 @@ } KServiceTypeTrader::KServiceTypeTrader() - : d(0) + : d(nullptr) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/services/kservicetypetrader.h new/kservice-5.31.0/src/services/kservicetypetrader.h --- old/kservice-5.30.0/src/services/kservicetypetrader.h 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/services/kservicetypetrader.h 2017-02-05 12:11:59.000000000 +0100 @@ -153,8 +153,8 @@ */ template <class T> static T *createInstanceFromQuery(const QString &serviceType, - const QString &constraint = QString(), QObject *parent = 0, - const QVariantList &args = QVariantList(), QString *error = 0) + const QString &constraint = QString(), QObject *parent = nullptr, + const QVariantList &args = QVariantList(), QString *error = nullptr) { return createInstanceFromQuery<T>(serviceType, 0, parent, constraint, args, error); } @@ -179,7 +179,7 @@ template <class T> static T *createInstanceFromQuery(const QString &serviceType, QWidget *parentWidget, QObject *parent, const QString &constraint = QString(), - const QVariantList &args = QVariantList(), QString *error = 0) + const QVariantList &args = QVariantList(), QString *error = nullptr) { const KService::List offers = self()->query(serviceType, constraint); if (error) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/services/ktraderparse.cpp new/kservice-5.31.0/src/services/ktraderparse.cpp --- old/kservice-5.30.0/src/services/ktraderparse.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/services/ktraderparse.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -55,7 +55,7 @@ data->buffer = _constr.toUtf8(); KTraderParse_mainParse(data->buffer.constData()); ParseTreeBase::Ptr ret = data->ptr; - s_parsingData()->setLocalData(0); + s_parsingData()->setLocalData(nullptr); return ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/services/ktraderparsetree_p.h new/kservice-5.31.0/src/services/ktraderparsetree_p.h --- old/kservice-5.30.0/src/services/ktraderparsetree_p.h 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/services/ktraderparsetree_p.h 2017-02-05 12:11:59.000000000 +0100 @@ -77,7 +77,7 @@ : service(_service), info(KPluginInfo()), maxima(_m), offers(_offers), pluginOffers(KPluginInfo::List()) {} ParseContext(KPluginInfo _info, const KPluginInfo::List &_offers, QMap<QString, PreferencesMaxima> &_m) - : service(0), info(_info), maxima(_m), offers(KService::List()), pluginOffers(_offers) {} + : service(nullptr), info(_info), maxima(_m), offers(KService::List()), pluginOffers(_offers) {} bool initMaxima(const QString &_prop); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/sycoca/kbuildmimetypefactory.cpp new/kservice-5.31.0/src/sycoca/kbuildmimetypefactory.cpp --- old/kservice-5.30.0/src/sycoca/kbuildmimetypefactory.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/sycoca/kbuildmimetypefactory.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -53,16 +53,16 @@ const int pos = file.lastIndexOf('/'); if (pos == -1) { // huh? - return 0; + return nullptr; } const QStringRef dirName = file.leftRef(pos); if (dirName == QLatin1String("packages")) { // special subdir - return 0; + return nullptr; } const int dot = file.lastIndexOf('.'); if (dot == -1) { // huh? - return 0; + return nullptr; } const QString name = file.left(dot); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/sycoca/kbuildmimetypefactory_p.h new/kservice-5.31.0/src/sycoca/kbuildmimetypefactory_p.h --- old/kservice-5.30.0/src/sycoca/kbuildmimetypefactory_p.h 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/sycoca/kbuildmimetypefactory_p.h 2017-02-05 12:11:59.000000000 +0100 @@ -47,7 +47,7 @@ MimeTypeEntry *createEntry(int) const Q_DECL_OVERRIDE { assert(0); - return 0L; + return nullptr; } KMimeTypeFactory::MimeTypeEntry::Ptr createFakeMimeType(const QString &name); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/sycoca/kbuildservicefactory.cpp new/kservice-5.31.0/src/sycoca/kbuildservicefactory.cpp --- old/kservice-5.30.0/src/sycoca/kbuildservicefactory.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/sycoca/kbuildservicefactory.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -112,10 +112,10 @@ qCWarning(SYCOCA) << "Invalid Service : " << file; } delete serv; - return 0; + return nullptr; } } // TODO else if a Windows application, new KService(name, exec, icon) - return 0; + return nullptr; } void KBuildServiceFactory::saveHeader(QDataStream &str) @@ -234,7 +234,7 @@ if (dup->storageId().endsWith(service->storageId())) { // allow dup to be overridden m_nameDict->remove(name); - dup = 0; + dup = nullptr; } } if (!dup) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/sycoca/kbuildservicefactory_p.h new/kservice-5.31.0/src/sycoca/kbuildservicefactory_p.h --- old/kservice-5.30.0/src/sycoca/kbuildservicefactory_p.h 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/sycoca/kbuildservicefactory_p.h 2017-02-05 12:11:59.000000000 +0100 @@ -61,7 +61,7 @@ KService *createEntry(int) const Q_DECL_OVERRIDE { assert(0); - return 0; + return nullptr; } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/sycoca/kbuildservicegroupfactory.cpp new/kservice-5.31.0/src/sycoca/kbuildservicegroupfactory.cpp --- old/kservice-5.30.0/src/sycoca/kbuildservicegroupfactory.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/sycoca/kbuildservicegroupfactory.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -45,7 +45,7 @@ { // Unused qCWarning(SYCOCA) << "called!"; - return 0; + return nullptr; } void KBuildServiceGroupFactory::addNewEntryTo(const QString &menuName, const KService::Ptr &newEntry) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/sycoca/kbuildservicegroupfactory_p.h new/kservice-5.31.0/src/sycoca/kbuildservicegroupfactory_p.h --- old/kservice-5.30.0/src/sycoca/kbuildservicegroupfactory_p.h 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/sycoca/kbuildservicegroupfactory_p.h 2017-02-05 12:11:59.000000000 +0100 @@ -45,7 +45,7 @@ KServiceGroup *createEntry(int) const Q_DECL_OVERRIDE { assert(0); - return 0L; + return nullptr; } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/sycoca/kbuildservicetypefactory.cpp new/kservice-5.31.0/src/sycoca/kbuildservicetypefactory.cpp --- old/kservice-5.30.0/src/sycoca/kbuildservicetypefactory.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/sycoca/kbuildservicetypefactory.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -58,40 +58,40 @@ } if (name.isEmpty()) { - return 0; + return nullptr; } KDesktopFile desktopFile(QStandardPaths::GenericDataLocation, "kservicetypes5/" + file); const KConfigGroup desktopGroup = desktopFile.desktopGroup(); if (desktopGroup.readEntry("Hidden", false) == true) { - return 0; + return nullptr; } const QString type = desktopGroup.readEntry("Type"); if (type != QLatin1String("ServiceType")) { qCWarning(SYCOCA) << "The service type config file " << desktopFile.fileName() << " has Type=" << type << " instead of Type=ServiceType"; - return 0; + return nullptr; } const QString serviceType = desktopGroup.readEntry("X-KDE-ServiceType"); if (serviceType.isEmpty()) { qCWarning(SYCOCA) << "The service type config file " << desktopFile.fileName() << " does not contain a ServiceType=... entry"; - return 0; + return nullptr; } KServiceType *e = new KServiceType(&desktopFile); if (e->isDeleted()) { delete e; - return 0; + return nullptr; } if (!(e->isValid())) { qCWarning(SYCOCA) << "Invalid ServiceType : " << file; delete e; - return 0; + return nullptr; } return e; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/sycoca/kbuildservicetypefactory_p.h new/kservice-5.31.0/src/sycoca/kbuildservicetypefactory_p.h --- old/kservice-5.30.0/src/sycoca/kbuildservicetypefactory_p.h 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/sycoca/kbuildservicetypefactory_p.h 2017-02-05 12:11:59.000000000 +0100 @@ -51,7 +51,7 @@ KServiceType *createEntry(int) const Q_DECL_OVERRIDE { assert(0); - return 0L; + return nullptr; } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/sycoca/kbuildsycoca.cpp new/kservice-5.31.0/src/sycoca/kbuildsycoca.cpp --- old/kservice-5.30.0/src/sycoca/kbuildsycoca.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/sycoca/kbuildsycoca.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -51,19 +51,19 @@ #include <qstandardpaths.h> #include <QLockFile> -static const char *s_cSycocaPath = 0; +static const char *s_cSycocaPath = nullptr; KBuildSycocaInterface::~KBuildSycocaInterface() {} KBuildSycoca::KBuildSycoca(bool globalDatabase) : KSycoca(true), - m_allEntries(0), - m_currentFactory(0), - m_ctimeFactory(0), - m_ctimeDict(0), - m_currentEntryDict(0), - m_serviceGroupEntryDict(0), - m_vfolder(0), + m_allEntries(nullptr), + m_currentFactory(nullptr), + m_ctimeFactory(nullptr), + m_ctimeDict(nullptr), + m_currentEntryDict(nullptr), + m_serviceGroupEntryDict(nullptr), + m_vfolder(nullptr), m_newTimestamp(0), m_globalDatabase(globalDatabase), m_menuTest(false), @@ -142,7 +142,7 @@ { typedef QList<KBSEntryDict *> KBSEntryDictList; KBSEntryDictList entryDictList; - KBSEntryDict *serviceEntryDict = 0; + KBSEntryDict *serviceEntryDict = nullptr; // Convert for each factory the entryList to a Dict. entryDictList.reserve(factories()->size()); @@ -220,7 +220,7 @@ for (; it != end; ++it, ++ed_it) { m_currentFactory = (*it); // m_ctimeInfo gets created after the initial loop, so it has no entryDict. - m_currentEntryDict = ed_it == ed_end ? 0 : *ed_it; + m_currentEntryDict = ed_it == ed_end ? nullptr : *ed_it; // For each resource the factory deals with const KSycocaResourceList *list = m_currentFactory->resourceList(); if (!list) { @@ -335,7 +335,7 @@ if (group) { entry = KServiceGroup::Ptr(static_cast<KServiceGroup*>(group.data())); if (entry->directoryEntryPath() != directoryFile) { - entry = 0; // Can't reuse this one! + entry = nullptr; // Can't reuse this one! } } } @@ -392,8 +392,8 @@ QByteArray qSycocaPath = QFile::encodeName(path); s_cSycocaPath = qSycocaPath.data(); - m_allEntries = 0; - m_ctimeDict = 0; + m_allEntries = nullptr; + m_ctimeDict = nullptr; if (incremental && checkGlobalHeader()) { qDebug() << "Reusing existing ksycoca"; KSycoca *oldSycoca = KSycoca::self(); @@ -409,7 +409,7 @@ KCTimeFactory *ctimeInfo = new KCTimeFactory(oldSycoca); *m_ctimeDict = ctimeInfo->loadDict(); } - s_cSycocaPath = 0; + s_cSycocaPath = nullptr; QSaveFile database(path); bool openedOK = database.open(QIODevice::WriteOnly); @@ -444,7 +444,7 @@ database.cancelWriting(); // Error } delete str; - str = 0; + str = nullptr; //if we are currently via sudo, preserve the original owner //as $HOME may also be that of another user rather than /root @@ -479,7 +479,7 @@ } } else { delete str; - str = 0; + str = nullptr; database.cancelWriting(); if (m_menuTest) { return true; @@ -513,7 +513,7 @@ (*str) << qint32(KSycoca::version()); //KSycocaFactory * servicetypeFactory = 0; //KBuildMimeTypeFactory * mimeTypeFactory = 0; - KBuildServiceFactory *serviceFactory = 0; + KBuildServiceFactory *serviceFactory = nullptr; Q_FOREACH (KSycocaFactory* factory, *factories()) { qint32 aId; qint32 aOffset; @@ -577,8 +577,8 @@ QStringList KBuildSycoca::factoryResourceDirs() { - static QStringList *dirs = NULL; - if (dirs != NULL) { + static QStringList *dirs = nullptr; + if (dirs != nullptr) { return *dirs; } dirs = new QStringList; @@ -592,8 +592,8 @@ QStringList KBuildSycoca::existingResourceDirs() { - static QStringList *dirs = NULL; - if (dirs != NULL) { + static QStringList *dirs = nullptr; + if (dirs != nullptr) { return *dirs; } dirs = new QStringList(factoryResourceDirs()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/sycoca/kctimefactory_p.h new/kservice-5.31.0/src/sycoca/kctimefactory_p.h --- old/kservice-5.30.0/src/sycoca/kctimefactory_p.h 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/sycoca/kctimefactory_p.h 2017-02-05 12:11:59.000000000 +0100 @@ -72,11 +72,11 @@ KSycocaEntry *createEntry(const QString &) const Q_DECL_OVERRIDE { - return 0; + return nullptr; } KSycocaEntry *createEntry(int) const Q_DECL_OVERRIDE { - return 0; + return nullptr; } // Loads the dict and returns it; does not set m_ctimeDict; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/sycoca/kmemfile_p.h new/kservice-5.31.0/src/sycoca/kmemfile_p.h --- old/kservice-5.30.0/src/sycoca/kmemfile_p.h 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/sycoca/kmemfile_p.h 2017-02-05 12:11:59.000000000 +0100 @@ -45,7 +45,7 @@ * @param filename the file to load into memory * @param parent our parent */ - explicit KMemFile(const QString &filename, QObject *parent = 0); + explicit KMemFile(const QString &filename, QObject *parent = nullptr); /** * dtor */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/sycoca/ksycoca.cpp new/kservice-5.31.0/src/sycoca/ksycoca.cpp --- old/kservice-5.30.0/src/sycoca/ksycoca.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/sycoca/ksycoca.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -95,13 +95,13 @@ m_globalDatabase(false), q(q), sycoca_size(0), - sycoca_mmap(0), - m_mmapFile(0), - m_device(0), - m_mimeTypeFactory(0), - m_serviceTypeFactory(0), - m_serviceFactory(0), - m_serviceGroupFactory(0) + sycoca_mmap(nullptr), + m_mmapFile(nullptr), + m_device(nullptr), + m_mimeTypeFactory(nullptr), + m_serviceTypeFactory(nullptr), + m_serviceFactory(nullptr), + m_serviceGroupFactory(nullptr) { #ifdef Q_OS_WIN /* @@ -141,14 +141,14 @@ } fcntl(m_mmapFile->handle(), F_SETFD, FD_CLOEXEC); sycoca_size = m_mmapFile->size(); - void *mmapRet = mmap(0, sycoca_size, + void *mmapRet = mmap(nullptr, sycoca_size, PROT_READ, MAP_SHARED, m_mmapFile->handle(), 0); /* POSIX mandates only MAP_FAILED, but we are paranoid so check for null pointer too. */ - if (mmapRet == MAP_FAILED || mmapRet == 0) { + if (mmapRet == MAP_FAILED || mmapRet == nullptr) { qCDebug(SYCOCA).nospace() << "mmap failed. (length = " << sycoca_size << ")"; - sycoca_mmap = 0; + sycoca_mmap = nullptr; return false; } else { sycoca_mmap = static_cast<const char *>(mmapRet); @@ -240,7 +240,7 @@ { Q_ASSERT(databaseStatus == DatabaseNotOpen); - delete m_device; m_device = 0; + delete m_device; m_device = nullptr; if (m_databasePath.isEmpty()) { m_databasePath = findDatabase(); @@ -287,7 +287,7 @@ device = new KSycocaMmapDevice(sycoca_mmap, sycoca_size); if (!device->device()->open(QIODevice::ReadOnly)) { - delete device; device = 0; + delete device; device = nullptr; } } #endif @@ -295,7 +295,7 @@ if (!device && m_sycocaStrategy == StrategyMemFile) { device = new KSycocaMemFileDevice(m_databasePath); if (!device->device()->open(QIODevice::ReadOnly)) { - delete device; device = 0; + delete device; device = nullptr; } } #endif @@ -413,7 +413,7 @@ void KSycocaPrivate::closeDatabase() { delete m_device; - m_device = 0; + m_device = nullptr; // It is very important to delete all factories here // since they cache information about the database file @@ -422,19 +422,19 @@ qDeleteAll(m_factories); m_factories.clear(); - m_mimeTypeFactory = 0; - m_serviceFactory = 0; - m_serviceTypeFactory = 0; - m_serviceGroupFactory = 0; + m_mimeTypeFactory = nullptr; + m_serviceFactory = nullptr; + m_serviceTypeFactory = nullptr; + m_serviceGroupFactory = nullptr; #if HAVE_MMAP if (sycoca_mmap) { // Solaris has munmap(char*, size_t) and everything else should // be happy with a char* for munmap(void*, size_t) munmap(const_cast<char *>(sycoca_mmap), sycoca_size); - sycoca_mmap = 0; + sycoca_mmap = nullptr; } - delete m_mmapFile; m_mmapFile = 0; + delete m_mmapFile; m_mmapFile = nullptr; #endif databaseStatus = DatabaseNotOpen; @@ -533,7 +533,7 @@ { // Ensure we have a valid database (right version, and rewinded to beginning) if (!d->checkDatabase(KSycocaPrivate::IfNotFoundRecreate)) { - return 0; + return nullptr; } QDataStream *str = stream(); @@ -554,7 +554,7 @@ return str; } } - return 0; + return nullptr; } bool KSycoca::needsRebuild() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/sycoca/ksycocadevices_p.h new/kservice-5.31.0/src/sycoca/ksycocadevices_p.h --- old/kservice-5.30.0/src/sycoca/ksycocadevices_p.h 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/sycoca/ksycocadevices_p.h 2017-02-05 12:11:59.000000000 +0100 @@ -40,7 +40,7 @@ class KSycocaAbstractDevice { public: - KSycocaAbstractDevice() : m_stream(0) + KSycocaAbstractDevice() : m_stream(nullptr) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/sycoca/ksycocadict.cpp new/kservice-5.31.0/src/sycoca/ksycocadict.cpp --- old/kservice-5.30.0/src/sycoca/ksycocadict.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/sycoca/ksycocadict.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -53,7 +53,7 @@ { public: KSycocaDictPrivate() - : stream(0) + : stream(nullptr) , offset(0) , hashTableSize(0) { @@ -229,7 +229,7 @@ KSycocaDict::clear() { delete d; - d = 0; + d = nullptr; } uint KSycocaDictPrivate::hashKey(const QString &key) const @@ -454,8 +454,8 @@ //qDebug() << "Clearing hashtable..."; for (unsigned int i = 0; i < sz; i++) { - hashTable[i].entry = 0; - hashTable[i].duplicates = 0; + hashTable[i].entry = nullptr; + hashTable[i].duplicates = nullptr; } //qDebug() << "Filling hashtable..."; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/sycoca/ksycocaentry.cpp new/kservice-5.31.0/src/sycoca/ksycocaentry.cpp --- old/kservice-5.30.0/src/sycoca/ksycocaentry.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/sycoca/ksycocaentry.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -29,7 +29,7 @@ } KSycocaEntry::KSycocaEntry() - : d_ptr(0) + : d_ptr(nullptr) { } @@ -79,7 +79,7 @@ bool KSycocaEntry::isSeparator() const { - return d_ptr == 0 || isType(KST_KServiceSeparator); + return d_ptr == nullptr || isType(KST_KServiceSeparator); } int KSycocaEntry::offset() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/sycoca/ksycocafactory.cpp new/kservice-5.31.0/src/sycoca/ksycocafactory.cpp --- old/kservice-5.30.0/src/sycoca/ksycocafactory.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/sycoca/ksycocafactory.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -49,7 +49,7 @@ }; KSycocaFactory::KSycocaFactory(KSycocaFactoryId factory_id, KSycoca *sycoca) - : m_resourceList(0), m_entryDict(0), m_str(0), m_sycoca(sycoca), d(new KSycocaFactoryPrivate) + : m_resourceList(nullptr), m_entryDict(nullptr), m_str(nullptr), m_sycoca(sycoca), d(new KSycocaFactoryPrivate) { if (!m_sycoca->isBuilding() && (m_str = m_sycoca->findFactory(factory_id))) { // Read position of index tables.... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/sycoca/vfolder_menu.cpp new/kservice-5.31.0/src/sycoca/vfolder_menu.cpp --- old/kservice-5.30.0/src/sycoca/vfolder_menu.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/sycoca/vfolder_menu.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -158,7 +158,7 @@ } } } - return 0; // Not found + return nullptr; // Not found } void @@ -278,9 +278,9 @@ } VFolderMenu::VFolderMenu(KServiceFactory *serviceFactory, KBuildSycocaInterface *kbuildsycocaInterface) - : m_appsInfo(0) - , m_rootMenu(0) - , m_currentMenu(0) + : m_appsInfo(nullptr) + , m_rootMenu(nullptr) + , m_currentMenu(nullptr) , m_track(false) , m_serviceFactory(serviceFactory) , m_kbuildsycocaInterface(kbuildsycocaInterface) @@ -397,7 +397,7 @@ } m_appsInfoStack.removeAll(m_appsInfo); // Remove - m_appsInfo = 0; + m_appsInfo = nullptr; } QString @@ -1041,7 +1041,7 @@ // Setup current menu entry if (pass == 0) { - m_currentMenu = 0; + m_currentMenu = nullptr; // Look up menu if (parentMenu) { foreach (SubMenu *menu, parentMenu->subMenus) { @@ -1381,7 +1381,7 @@ VFolderMenu::SubMenu *VFolderMenu::parseMenu(const QString &file) { - m_appsInfo = 0; + m_appsInfo = nullptr; const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericConfigLocation, QStringLiteral("menus"), QStandardPaths::LocateDirectory); for (QStringList::ConstIterator it = dirs.begin(); @@ -1392,7 +1392,7 @@ loadMenu(file); delete m_rootMenu; - m_rootMenu = m_currentMenu = 0; + m_rootMenu = m_currentMenu = nullptr; QDomElement docElem = m_doc.documentElement(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/src/sycoca/vfolder_menu_p.h new/kservice-5.31.0/src/sycoca/vfolder_menu_p.h --- old/kservice-5.30.0/src/sycoca/vfolder_menu_p.h 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/src/sycoca/vfolder_menu_p.h 2017-02-05 12:11:59.000000000 +0100 @@ -40,7 +40,7 @@ class SubMenu { public: - SubMenu() : isDeleted(false), apps_info(0) + SubMenu() : isDeleted(false), apps_info(nullptr) { items.reserve(43); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.30.0/tests/pluginlocator/plugintest.cpp new/kservice-5.31.0/tests/pluginlocator/plugintest.cpp --- old/kservice-5.30.0/tests/pluginlocator/plugintest.cpp 2017-01-08 22:01:32.000000000 +0100 +++ new/kservice-5.31.0/tests/pluginlocator/plugintest.cpp 2017-02-05 12:11:59.000000000 +0100 @@ -45,7 +45,7 @@ }; PluginTest::PluginTest() : - QObject(0) + QObject(nullptr) { d = new PluginTestPrivate; }
