Hello community, here is the log from the commit of package knotifications for openSUSE:Factory checked in at 2018-01-09 14:43:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/knotifications (Old) and /work/SRC/openSUSE:Factory/.knotifications.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "knotifications" Tue Jan 9 14:43:28 2018 rev:49 rq:559457 version:5.41.0 Changes: -------- --- /work/SRC/openSUSE:Factory/knotifications/knotifications.changes 2017-11-16 14:39:49.453260921 +0100 +++ /work/SRC/openSUSE:Factory/.knotifications.new/knotifications.changes 2018-01-09 14:43:29.411099307 +0100 @@ -1,0 +2,12 @@ +Sun Dec 17 09:43:49 CET 2017 - [email protected] + +- Update to 5.41.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.41.0.php +- Changes since 5.40.0: + * Make it compile with QT_NO_CAST_FROM_ASCII + * Add explicit + * We already depend against 5.7.0 + +------------------------------------------------------------------- Old: ---- knotifications-5.40.0.tar.xz New: ---- knotifications-5.41.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ knotifications.spec ++++++ --- /var/tmp/diff_new_pack.nRfDZB/_old 2018-01-09 14:43:31.143018089 +0100 +++ /var/tmp/diff_new_pack.nRfDZB/_new 2018-01-09 14:43:31.151017713 +0100 @@ -18,13 +18,13 @@ %bcond_without lang %define lname libKF5Notifications5 -%define _tar_path 5.40 +%define _tar_path 5.41 # 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: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: knotifications -Version: 5.40.0 +Version: 5.41.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 ++++++ knotifications-5.40.0.tar.xz -> knotifications-5.41.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.40.0/CMakeLists.txt new/knotifications-5.41.0/CMakeLists.txt --- old/knotifications-5.40.0/CMakeLists.txt 2017-11-05 09:35:50.000000000 +0100 +++ new/knotifications-5.41.0/CMakeLists.txt 2017-12-02 21:07:04.000000000 +0100 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.40.0") # handled by release scripts -set(KF5_DEP_VERSION "5.40.0") # handled by release scripts +set(KF5_VERSION "5.41.0") # handled by release scripts +set(KF5_DEP_VERSION "5.41.0") # handled by release scripts project(KNotifications VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.40.0 NO_MODULE) +find_package(ECM 5.41.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) @@ -74,7 +74,6 @@ add_definitions(-DHAVE_PHONON4QT5) endif() -remove_definitions(-DQT_NO_CAST_FROM_ASCII) remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.40.0/src/knotificationmanager.cpp new/knotifications-5.41.0/src/knotificationmanager.cpp --- old/knotifications-5.40.0/src/knotificationmanager.cpp 2017-11-05 09:35:50.000000000 +0100 +++ new/knotifications-5.41.0/src/knotificationmanager.cpp 2017-12-02 21:07:04.000000000 +0100 @@ -84,7 +84,7 @@ if (!qEnvironmentVariableIsEmpty("XDG_RUNTIME_DIR")) { const QByteArray runtimeDir = qgetenv("XDG_RUNTIME_DIR"); if (!runtimeDir.isEmpty()) { - inSandbox = QFileInfo::exists(QFile::encodeName(runtimeDir) + QLatin1String("/flatpak-info")); + inSandbox = QFileInfo::exists(QFile::decodeName(runtimeDir) + QLatin1String("/flatpak-info")); } } @@ -199,7 +199,7 @@ KNotifyConfig notifyConfig(n->appName(), n->contexts(), n->eventId()); QString notifyActions = notifyConfig.readEntry(QStringLiteral("Action")); - Q_FOREACH (const QString &action, notifyActions.split('|')) { + Q_FOREACH (const QString &action, notifyActions.split(QLatin1Char('|'))) { if (!d->notifyPlugins.contains(action)) { qCDebug(LOG_KNOTIFICATIONS) << "No plugin for action" << action; continue; @@ -230,7 +230,7 @@ d->notifications.insert(d->notifyIdCounter, n); - Q_FOREACH (const QString &action, notifyActions.split('|')) { + Q_FOREACH (const QString &action, notifyActions.split(QLatin1Char('|'))) { if (!d->notifyPlugins.contains(action)) { qCDebug(LOG_KNOTIFICATIONS) << "No plugin for action" << action; continue; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.40.0/src/knotifyconfig.cpp new/knotifications-5.41.0/src/knotifyconfig.cpp --- old/knotifications-5.40.0/src/knotifyconfig.cpp 2017-11-05 09:35:50.000000000 +0100 +++ new/knotifications-5.41.0/src/knotifyconfig.cpp 2017-12-02 21:07:04.000000000 +0100 @@ -94,7 +94,7 @@ QPair<QString, QString> context; Q_FOREACH (context, contexts) { - const QString group = "Event/" + eventid + '/' + context.first + '/' + context.second; + const QString group = QStringLiteral("Event/") + eventid + QLatin1Char('/') + context.first + QLatin1Char('/') + context.second; if (configfile->hasGroup(group)) { KConfigGroup cg(configfile, group); @@ -115,7 +115,7 @@ } } // kDebug() << entry << " not found in contexts "; - const QString group = "Event/" + eventid; + const QString group = QStringLiteral("Event/") + eventid; if (configfile->hasGroup(group)) { KConfigGroup cg(configfile, group); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.40.0/src/kstatusnotifieritem.cpp new/knotifications-5.41.0/src/kstatusnotifieritem.cpp --- old/knotifications-5.40.0/src/kstatusnotifieritem.cpp 2017-11-05 09:35:50.000000000 +0100 +++ new/knotifications-5.41.0/src/kstatusnotifieritem.cpp 2017-12-02 21:07:04.000000000 +0100 @@ -758,7 +758,7 @@ statusNotifierItemDBus = new KStatusNotifierItemDBus(q); q->setAssociatedWidget(qobject_cast<QWidget *>(q->parent())); - QDBusServiceWatcher *watcher = new QDBusServiceWatcher(s_statusNotifierWatcherServiceName, + QDBusServiceWatcher *watcher = new QDBusServiceWatcher(QString::fromLatin1(s_statusNotifierWatcherServiceName), QDBusConnection::sessionBus(), QDBusServiceWatcher::WatchForOwnerChange, q); @@ -800,7 +800,7 @@ id = title; if (!extraId.isEmpty()) { - id.append('_').append(extraId); + id.append(QLatin1Char('_')).append(extraId); } // Init iconThemePath to the app folder for now @@ -813,13 +813,13 @@ { qCDebug(LOG_KNOTIFICATIONS) << "Registering a client interface to the KStatusNotifierWatcher"; if (!statusNotifierWatcher) { - statusNotifierWatcher = new org::kde::StatusNotifierWatcher(s_statusNotifierWatcherServiceName, QStringLiteral("/StatusNotifierWatcher"), + statusNotifierWatcher = new org::kde::StatusNotifierWatcher(QString::fromLatin1(s_statusNotifierWatcherServiceName), QStringLiteral("/StatusNotifierWatcher"), QDBusConnection::sessionBus()); } if (statusNotifierWatcher->isValid()) { // get protocol version in async way - QDBusMessage msg = QDBusMessage::createMethodCall(s_statusNotifierWatcherServiceName, + QDBusMessage msg = QDBusMessage::createMethodCall(QString::fromLatin1(s_statusNotifierWatcherServiceName), QStringLiteral("/StatusNotifierWatcher"), QStringLiteral("org.freedesktop.DBus.Properties"), QStringLiteral("Get")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.40.0/src/kstatusnotifieritemprivate_p.h new/knotifications-5.41.0/src/kstatusnotifieritemprivate_p.h --- old/knotifications-5.40.0/src/kstatusnotifieritemprivate_p.h 2017-11-05 09:35:50.000000000 +0100 +++ new/knotifications-5.41.0/src/kstatusnotifieritemprivate_p.h 2017-12-02 21:07:04.000000000 +0100 @@ -84,9 +84,7 @@ void setIconWithMask(QIcon &icon, bool isMask) { -#if QT_VERSION >= QT_VERSION_CHECK(5,6,0) icon.setIsMask(isMask); -#endif QSystemTrayIcon::setIcon(icon); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.40.0/src/notifybyaudio.cpp new/knotifications-5.41.0/src/notifybyaudio.cpp --- old/knotifications-5.40.0/src/notifybyaudio.cpp 2017-11-05 09:35:50.000000000 +0100 +++ new/knotifications-5.41.0/src/notifybyaudio.cpp 2017-12-02 21:07:04.000000000 +0100 @@ -64,7 +64,7 @@ const auto dataLocations = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation); foreach (const QString &dataLocation, dataLocations) { soundURL = QUrl::fromUserInput(soundFilename, - dataLocation + "/sounds", + dataLocation + QStringLiteral("/sounds"), QUrl::AssumeLocalFile); if (soundURL.isLocalFile() && QFile::exists(soundURL.toLocalFile())) { break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.40.0/src/notifybyaudio.h new/knotifications-5.41.0/src/notifybyaudio.h --- old/knotifications-5.40.0/src/notifybyaudio.h 2017-11-05 09:35:50.000000000 +0100 +++ new/knotifications-5.41.0/src/notifybyaudio.h 2017-12-02 21:07:04.000000000 +0100 @@ -40,7 +40,7 @@ Q_OBJECT public: - NotifyByAudio(QObject *parent = nullptr); + explicit NotifyByAudio(QObject *parent = nullptr); virtual ~NotifyByAudio(); QString optionName() Q_DECL_OVERRIDE { return QStringLiteral("Sound"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.40.0/src/notifybyexecute.cpp new/knotifications-5.41.0/src/notifybyexecute.cpp --- old/knotifications-5.40.0/src/notifybyexecute.cpp 2017-11-05 09:35:50.000000000 +0100 +++ new/knotifications-5.41.0/src/notifybyexecute.cpp 2017-12-02 21:07:04.000000000 +0100 @@ -47,15 +47,15 @@ if (!command.isEmpty()) { QHash<QChar,QString> subst; - subst.insert('e', notification->eventId()); - subst.insert('a', notification->appName()); - subst.insert('s', notification->text()); + subst.insert(QLatin1Char('e'), notification->eventId()); + subst.insert(QLatin1Char('a'), notification->appName()); + subst.insert(QLatin1Char('s'), notification->text()); if (notification->widget()) { - subst.insert('w', QString::number(notification->widget()->topLevelWidget()->winId())); + subst.insert(QLatin1Char('w'), QString::number(notification->widget()->topLevelWidget()->winId())); } else { - subst.insert('w', QStringLiteral("0")); + subst.insert(QLatin1Char('w'), QStringLiteral("0")); } - subst.insert('i', QString::number(notification->id())); + subst.insert(QLatin1Char('i'), QString::number(notification->id())); QString execLine = KMacroExpander::expandMacrosShellQuote(command, subst); if (execLine.isEmpty()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.40.0/src/notifybyexecute.h new/knotifications-5.41.0/src/notifybyexecute.h --- old/knotifications-5.40.0/src/notifybyexecute.h 2017-11-05 09:35:50.000000000 +0100 +++ new/knotifications-5.41.0/src/notifybyexecute.h 2017-12-02 21:07:04.000000000 +0100 @@ -30,7 +30,7 @@ { Q_OBJECT public: - NotifyByExecute(QObject *parent = nullptr); + explicit NotifyByExecute(QObject *parent = nullptr); virtual ~NotifyByExecute(); QString optionName() Q_DECL_OVERRIDE { return QStringLiteral("Execute"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.40.0/src/notifybyflatpak.cpp new/knotifications-5.41.0/src/notifybyflatpak.cpp --- old/knotifications-5.40.0/src/notifybyflatpak.cpp 2017-11-05 09:35:50.000000000 +0100 +++ new/knotifications-5.41.0/src/notifybyflatpak.cpp 2017-12-02 21:07:04.000000000 +0100 @@ -36,7 +36,6 @@ #include <QMap> #include <kconfiggroup.h> - static const char portalDbusServiceName[] = "org.freedesktop.portal.Desktop"; static const char portalDbusInterfaceName[] = "org.freedesktop.portal.Notification"; static const char portalDbusPath[] = "/org/freedesktop/portal/desktop"; @@ -96,17 +95,17 @@ { // check if service already exists on plugin instantiation QDBusConnectionInterface *interface = QDBusConnection::sessionBus().interface(); - d->dbusServiceExists = interface && interface->isServiceRegistered(portalDbusServiceName); + d->dbusServiceExists = interface && interface->isServiceRegistered(QString::fromLatin1(portalDbusServiceName)); if (d->dbusServiceExists) { - onServiceOwnerChanged(portalDbusServiceName, QString(), QStringLiteral("_")); //connect signals + onServiceOwnerChanged(QString::fromLatin1(portalDbusServiceName), QString(), QStringLiteral("_")); //connect signals } // to catch register/unregister events from service in runtime QDBusServiceWatcher *watcher = new QDBusServiceWatcher(this); watcher->setConnection(QDBusConnection::sessionBus()); watcher->setWatchMode(QDBusServiceWatcher::WatchForOwnerChange); - watcher->addWatchedService(portalDbusServiceName); + watcher->addWatchedService(QString::fromLatin1(portalDbusServiceName)); connect(watcher,&QDBusServiceWatcher::serviceOwnerChanged, this, &NotifyByFlatpak::onServiceOwnerChanged); } @@ -171,8 +170,8 @@ // connect to action invocation signals bool connected = QDBusConnection::sessionBus().connect(QString(), // from any service - portalDbusPath, - portalDbusInterfaceName, + QString::fromLatin1(portalDbusPath), + QString::fromLatin1(portalDbusInterfaceName), QStringLiteral("ActionInvoked"), this, SLOT(onPortalNotificationActionInvoked(QString,QString,QVariantList))); @@ -215,9 +214,9 @@ bool NotifyByFlatpakPrivate::sendNotificationToPortal(KNotification *notification, const KNotifyConfig ¬ifyConfig_nocheck) { QDBusMessage dbusNotificationMessage; - dbusNotificationMessage = QDBusMessage::createMethodCall(portalDbusServiceName, - portalDbusPath, - portalDbusInterfaceName, + dbusNotificationMessage = QDBusMessage::createMethodCall(QString::fromLatin1(portalDbusServiceName), + QString::fromLatin1(portalDbusPath), + QString::fromLatin1(portalDbusInterfaceName), QStringLiteral("AddNotification")); QVariantList args; @@ -284,9 +283,9 @@ return; } - QDBusMessage m = QDBusMessage::createMethodCall(portalDbusServiceName, - portalDbusPath, - portalDbusInterfaceName, + QDBusMessage m = QDBusMessage::createMethodCall(QString::fromLatin1(portalDbusServiceName), + QString::fromLatin1(portalDbusPath), + QString::fromLatin1(portalDbusInterfaceName), QStringLiteral("RemoveNotification")); m.setArguments({QString::number(id)}); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.40.0/src/notifybyflatpak.h new/knotifications-5.41.0/src/notifybyflatpak.h --- old/knotifications-5.40.0/src/notifybyflatpak.h 2017-11-05 09:35:50.000000000 +0100 +++ new/knotifications-5.41.0/src/notifybyflatpak.h 2017-12-02 21:07:04.000000000 +0100 @@ -36,7 +36,7 @@ { Q_OBJECT public: - NotifyByFlatpak(QObject *parent = nullptr); + explicit NotifyByFlatpak(QObject *parent = nullptr); virtual ~NotifyByFlatpak(); QString optionName() Q_DECL_OVERRIDE { return QStringLiteral("Popup"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.40.0/src/notifybylogfile.cpp new/knotifications-5.41.0/src/notifybylogfile.cpp --- old/knotifications-5.40.0/src/notifybylogfile.cpp 2017-11-05 09:35:50.000000000 +0100 +++ new/knotifications-5.41.0/src/notifybylogfile.cpp 2017-12-02 21:07:04.000000000 +0100 @@ -42,7 +42,7 @@ void NotifyByLogfile::notify(KNotification *notification, KNotifyConfig *config) { - QString file = config->readEntry("Logfile"); + QString file = config->readEntry(QStringLiteral("Logfile")); if (file.isEmpty()) { finish(notification); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.40.0/src/notifybylogfile.h new/knotifications-5.41.0/src/notifybylogfile.h --- old/knotifications-5.40.0/src/notifybylogfile.h 2017-11-05 09:35:50.000000000 +0100 +++ new/knotifications-5.41.0/src/notifybylogfile.h 2017-12-02 21:07:04.000000000 +0100 @@ -33,7 +33,7 @@ Q_OBJECT public: - NotifyByLogfile(QObject *parent = nullptr); + explicit NotifyByLogfile(QObject *parent = nullptr); virtual ~NotifyByLogfile(); QString optionName() Q_DECL_OVERRIDE { return QStringLiteral("Logfile"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.40.0/src/notifybypopup.cpp new/knotifications-5.41.0/src/notifybypopup.cpp --- old/knotifications-5.40.0/src/notifybypopup.cpp 2017-11-05 09:35:50.000000000 +0100 +++ new/knotifications-5.41.0/src/notifybypopup.cpp 2017-12-02 21:07:04.000000000 +0100 @@ -170,17 +170,17 @@ // check if service already exists on plugin instantiation QDBusConnectionInterface *interface = QDBusConnection::sessionBus().interface(); - d->dbusServiceExists = interface && interface->isServiceRegistered(dbusServiceName); + d->dbusServiceExists = interface && interface->isServiceRegistered(QString::fromLatin1(dbusServiceName)); if (d->dbusServiceExists) { - onServiceOwnerChanged(dbusServiceName, QString(), QStringLiteral("_")); //connect signals + onServiceOwnerChanged(QString::fromLatin1(dbusServiceName), QString(), QStringLiteral("_")); //connect signals } // to catch register/unregister events from service in runtime QDBusServiceWatcher *watcher = new QDBusServiceWatcher(this); watcher->setConnection(QDBusConnection::sessionBus()); watcher->setWatchMode(QDBusServiceWatcher::WatchForOwnerChange); - watcher->addWatchedService(dbusServiceName); + watcher->addWatchedService(QString::fromLatin1(dbusServiceName)); connect(watcher, SIGNAL(serviceOwnerChanged(QString,QString,QString)), SLOT(onServiceOwnerChanged(QString,QString,QString))); @@ -191,7 +191,7 @@ QStringLiteral("org.freedesktop.DBus"), QStringLiteral("ListActivatableNames")); QDBusReply<QStringList> reply = QDBusConnection::sessionBus().call(message); - if (reply.isValid() && reply.value().contains(dbusServiceName)) { + if (reply.isValid() && reply.value().contains(QString::fromLatin1(dbusServiceName))) { d->dbusServiceActivatable = true; //if the service is activatable, we can assume it exists even if it is not currently running d->dbusServiceExists = true; @@ -354,8 +354,8 @@ void NotifyByPopup::onPassivePopupLinkClicked(const QString &link) { - unsigned int id = link.section('/' , 0 , 0).toUInt(); - unsigned int action = link.section('/' , 1 , 1).toUInt(); + unsigned int id = link.section(QLatin1Char('/') , 0 , 0).toUInt(); + unsigned int action = link.section(QLatin1Char('/') , 1 , 1).toUInt(); if (id == 0 || action == 0) { return; @@ -439,8 +439,8 @@ // connect to action invocation signals bool connected = QDBusConnection::sessionBus().connect(QString(), // from any service - dbusPath, - dbusInterfaceName, + QString::fromLatin1(dbusPath), + QString::fromLatin1(dbusInterfaceName), QStringLiteral("ActionInvoked"), this, SLOT(onGalagoNotificationActionInvoked(uint,QString))); @@ -449,8 +449,8 @@ } connected = QDBusConnection::sessionBus().connect(QString(), // from any service - dbusPath, - dbusInterfaceName, + QString::fromLatin1(dbusPath), + QString::fromLatin1(dbusInterfaceName), QStringLiteral("NotificationClosed"), this, SLOT(onGalagoNotificationClosed(uint,uint))); @@ -624,7 +624,7 @@ } } - QDBusMessage dbusNotificationMessage = QDBusMessage::createMethodCall(dbusServiceName, dbusPath, dbusInterfaceName, QStringLiteral("Notify")); + QDBusMessage dbusNotificationMessage = QDBusMessage::createMethodCall(QString::fromLatin1(dbusServiceName), QString::fromLatin1(dbusPath), QString::fromLatin1(dbusInterfaceName), QStringLiteral("Notify")); QList<QVariant> args; @@ -702,11 +702,9 @@ hintsMap[QStringLiteral("transient")] = true; } -#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) if (!qApp->desktopFileName().isEmpty()) { hintsMap[QStringLiteral("desktop-entry")] = qApp->desktopFileName(); } -#endif //FIXME - reenable/fix // let's see if we've got an image, and store the image in the hints map @@ -750,8 +748,8 @@ return; } - QDBusMessage m = QDBusMessage::createMethodCall(dbusServiceName, dbusPath, - dbusInterfaceName, QStringLiteral("CloseNotification")); + QDBusMessage m = QDBusMessage::createMethodCall(QString::fromLatin1(dbusServiceName), QString::fromLatin1(dbusPath), + QString::fromLatin1(dbusInterfaceName), QStringLiteral("CloseNotification")); QList<QVariant> args; args.append(galagoId); m.setArguments(args); @@ -777,9 +775,9 @@ } if (dbusServiceCapCacheDirty) { - QDBusMessage m = QDBusMessage::createMethodCall(dbusServiceName, - dbusPath, - dbusInterfaceName, + QDBusMessage m = QDBusMessage::createMethodCall(QString::fromLatin1(dbusServiceName), + QString::fromLatin1(dbusPath), + QString::fromLatin1(dbusInterfaceName), QStringLiteral("GetCapabilities")); QDBusConnection::sessionBus().callWithCallback(m, @@ -792,7 +790,7 @@ QString NotifyByPopupPrivate::stripHtml(const QString &text) { - QXmlStreamReader r("<elem>" + text + "</elem>"); + QXmlStreamReader r(QStringLiteral("<elem>") + text + QStringLiteral("</elem>")); HtmlEntityResolver resolver; r.setEntityResolver(&resolver); QString result; @@ -800,8 +798,8 @@ r.readNext(); if (r.tokenType() == QXmlStreamReader::Characters) { result.append(r.text()); - } else if (r.tokenType() == QXmlStreamReader::StartElement && r.name() == "br") { - result.append("\n"); + } else if (r.tokenType() == QXmlStreamReader::StartElement && r.name() == QLatin1String("br")) { + result.append(QLatin1Char('\n')); } } @@ -825,13 +823,13 @@ return result; } - QChar ent = KCharsets::fromEntity('&' + name); + QChar ent = KCharsets::fromEntity(QLatin1Char('&') + name); if (ent.isNull()) { qCWarning(LOG_KNOTIFICATIONS) << "Notification to send to backend which does " "not support HTML, contains invalid entity: " << name; - ent = ' '; + ent = QLatin1Char(' '); } return QString(ent); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.40.0/src/notifybypopup.h new/knotifications-5.41.0/src/notifybypopup.h --- old/knotifications-5.40.0/src/notifybypopup.h 2017-11-05 09:35:50.000000000 +0100 +++ new/knotifications-5.41.0/src/notifybypopup.h 2017-12-02 21:07:04.000000000 +0100 @@ -37,7 +37,7 @@ { Q_OBJECT public: - NotifyByPopup(QObject *parent = nullptr); + explicit NotifyByPopup(QObject *parent = nullptr); virtual ~NotifyByPopup(); QString optionName() Q_DECL_OVERRIDE { return QStringLiteral("Popup"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.40.0/src/notifybytaskbar.h new/knotifications-5.41.0/src/notifybytaskbar.h --- old/knotifications-5.40.0/src/notifybytaskbar.h 2017-11-05 09:35:50.000000000 +0100 +++ new/knotifications-5.41.0/src/notifybytaskbar.h 2017-12-02 21:07:04.000000000 +0100 @@ -30,7 +30,7 @@ { Q_OBJECT public: - NotifyByTaskbar(QObject *parent = nullptr); + explicit NotifyByTaskbar(QObject *parent = nullptr); virtual ~NotifyByTaskbar(); QString optionName() Q_DECL_OVERRIDE { return QStringLiteral("Taskbar"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.40.0/src/notifybytts.cpp new/knotifications-5.41.0/src/notifybytts.cpp --- old/knotifications-5.40.0/src/notifybytts.cpp 2017-11-05 09:35:50.000000000 +0100 +++ new/knotifications-5.41.0/src/notifybytts.cpp 2017-12-02 21:07:04.000000000 +0100 @@ -52,12 +52,12 @@ if (!say.isEmpty()) { // Create a hash of characters to strings to expand text into the notification text. QHash<QChar,QString> subst; - subst.insert('e', notification->eventId()); - subst.insert('a', notification->appName()); - subst.insert('s', notification->text()); + subst.insert(QLatin1Char('e'), notification->eventId()); + subst.insert(QLatin1Char('a'), notification->appName()); + subst.insert(QLatin1Char('s'), notification->text()); //subst.insert('w', QString::number((quintptr)config->winId)); //subst.insert('i', QString::number(id)); - subst.insert('m', notification->text()); + subst.insert(QLatin1Char('m'), notification->text()); say = KMacroExpander::expandMacrosShellQuote( say, subst ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.40.0/src/notifybytts.h new/knotifications-5.41.0/src/notifybytts.h --- old/knotifications-5.40.0/src/notifybytts.h 2017-11-05 09:35:50.000000000 +0100 +++ new/knotifications-5.41.0/src/notifybytts.h 2017-12-02 21:07:04.000000000 +0100 @@ -33,7 +33,7 @@ { Q_OBJECT public: - NotifyByTTS(QObject *parent=0l); + explicit NotifyByTTS(QObject *parent = nullptr); virtual ~NotifyByTTS(); QString optionName() Q_DECL_OVERRIDE { return QStringLiteral("TTS"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.40.0/tests/knotificationdbustest.cpp new/knotifications-5.41.0/tests/knotificationdbustest.cpp --- old/knotifications-5.40.0/tests/knotificationdbustest.cpp 2017-11-05 09:35:50.000000000 +0100 +++ new/knotifications-5.41.0/tests/knotificationdbustest.cpp 2017-12-02 21:07:04.000000000 +0100 @@ -26,13 +26,9 @@ #include <QtDBus/QDBusConnection> #include <QtDBus/QDBusMessage> -static const char dbusServiceName[] = "org.freedesktop.Notifications"; -static const char dbusInterfaceName[] = "org.freedesktop.Notifications"; -static const char dbusPath[] = "/org/freedesktop/Notifications"; - void notificationDBusCall(const QString &iconName, const QString &title, const QString &body, const QStringList &actions, bool persistent = false) { - QDBusMessage dbusNotificationMessage = QDBusMessage::createMethodCall(dbusServiceName, dbusPath, dbusInterfaceName, QStringLiteral("Notify")); + QDBusMessage dbusNotificationMessage = QDBusMessage::createMethodCall(QStringLiteral("org.freedesktop.Notifications"), QStringLiteral("/org/freedesktop/Notifications"), QStringLiteral("org.freedesktop.Notifications"), QStringLiteral("Notify")); QList<QVariant> args;
