Hello community, here is the log from the commit of package knotifications for openSUSE:Factory checked in at 2015-11-24 22:24:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/knotifications (Old) and /work/SRC/openSUSE:Factory/.knotifications.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "knotifications" Changes: -------- --- /work/SRC/openSUSE:Factory/knotifications/knotifications.changes 2015-10-19 22:26:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.knotifications.new/knotifications.changes 2015-11-24 22:24:30.000000000 +0100 @@ -1,0 +2,12 @@ +Sun Nov 8 17:02:55 UTC 2015 - [email protected] + +- Update to 5.16.0 (boo#955067) + * Now that kparts no longer needs knotifications, only things that + really want notifications require on this framework + * Add description + purpose for speech + phonon + * Make phonon dependency optional, purely internal change, like + it is done for speech. + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.16.0.php + +------------------------------------------------------------------- Old: ---- knotifications-5.15.0.tar.xz New: ---- knotifications-5.16.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ knotifications.spec ++++++ --- /var/tmp/diff_new_pack.Ap8SV9/_old 2015-11-24 22:24:30.000000000 +0100 +++ /var/tmp/diff_new_pack.Ap8SV9/_new 2015-11-24 22:24:30.000000000 +0100 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5Notifications5 -%define _tar_path 5.15 +%define _tar_path 5.16 Name: knotifications -Version: 5.15.0 +Version: 5.16.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 ++++++ knotifications-5.15.0.tar.xz -> knotifications-5.16.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.15.0/CMakeLists.txt new/knotifications-5.16.0/CMakeLists.txt --- old/knotifications-5.15.0/CMakeLists.txt 2015-10-05 10:17:13.000000000 +0200 +++ new/knotifications-5.16.0/CMakeLists.txt 2015-11-08 13:30:47.000000000 +0100 @@ -4,7 +4,7 @@ # ECM setup include(FeatureSummary) -find_package(ECM 5.15.0 NO_MODULE) +find_package(ECM 5.16.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) @@ -17,8 +17,8 @@ include(ECMQtDeclareLoggingCategory) include(ECMPoQmTools) -set(KF5_VERSION "5.15.0") # handled by release scripts -set(KF5_DEP_VERSION "5.15.0") # handled by release scripts +set(KF5_VERSION "5.16.0") # handled by release scripts +set(KF5_DEP_VERSION "5.16.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KNOTIFICATIONS @@ -32,9 +32,11 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus) find_package(Qt5 ${REQUIRED_QT_VERSION} QUIET OPTIONAL_COMPONENTS TextToSpeech) -if (NOT Qt5TextToSpeech_FOUND) - message(STATUS "Qt5TextToSpeech not found, notifications by tts will not be built") -else() +set_package_properties(Qt5TextToSpeech PROPERTIES + DESCRIPTION "Qt text to speech module" + TYPE OPTIONAL + PURPOSE "Required to build text to speech notification support") +if (Qt5TextToSpeech_FOUND) add_definitions(-DHAVE_SPEECH) endif() @@ -60,7 +62,11 @@ find_package(Phonon4Qt5 4.6.60 REQUIRED NO_MODULE) set_package_properties(Phonon4Qt5 PROPERTIES DESCRIPTION "Qt-based audio library" - TYPE REQUIRED) + TYPE REQUIRED + PURPOSE "Required to build audio notification support") +if (Phonon4Qt5_FOUND) + add_definitions(-DHAVE_PHONON4QT5) +endif() remove_definitions(-DQT_NO_CAST_FROM_ASCII) remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.15.0/po/ca@valencia/knotifications5_qt.po new/knotifications-5.16.0/po/ca@valencia/knotifications5_qt.po --- old/knotifications-5.15.0/po/ca@valencia/knotifications5_qt.po 2015-10-05 10:17:13.000000000 +0200 +++ new/knotifications-5.16.0/po/ca@valencia/knotifications5_qt.po 2015-11-08 13:30:47.000000000 +0100 @@ -1,28 +1,27 @@ -# Translation of knotifications5.po to Catalan -# Copyright (C) 1998-2014 This_file_is_part_of_KDE +# Translation of knotifications5_qt.po to Catalan (Valencian) +# Copyright (C) 2014 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # -# Sebastià Pla i Sanz <[email protected]>, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006. -# Antoni Bella Pérez <[email protected]>, 2003, 2006, 2011, 2012, 2013. +# Sebastià Pla i Sanz <[email protected]>, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007. +# Antoni Bella Pérez <[email protected]>, 2003, 2006, 2011, 2012, 2013, 2014. # Albert Astals Cid <[email protected]>, 2004, 2005, 2007. -# Sebastia Pla Sanz <[email protected]>, 2006, 2007. # Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014. # Robert Millan <[email protected]>, 2009. # Orestes Mas <[email protected]>, 2010. msgid "" msgstr "" -"Project-Id-Version: knotifications5\n" +"Project-Id-Version: knotifications5_qt\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2014-03-30 14:09+0200\n" -"Last-Translator: Josep Ma. Ferrer <[email protected]>\n" +"PO-Revision-Date: 2014-08-08 15:00+0200\n" +"Last-Translator: Antoni Bella Pérez <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca@valencia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" "X-Qt-Contexts: true\n" @@ -51,7 +50,7 @@ #, qt-format msgctxt "KStatusNotifierItem|" msgid "<qt>Are you sure you want to quit <b>%1</b>?</qt>" -msgstr "<qt>Esteu segur que voleu eixir de <b>%1</b>?</qt>" +msgstr "<qt>De veres voleu eixir de <b>%1</b>?</qt>" #: kstatusnotifieritem.cpp:899 msgctxt "KStatusNotifierItem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.15.0/po/el/knotifications5_qt.po new/knotifications-5.16.0/po/el/knotifications5_qt.po --- old/knotifications-5.15.0/po/el/knotifications5_qt.po 2015-10-05 10:17:13.000000000 +0200 +++ new/knotifications-5.16.0/po/el/knotifications5_qt.po 2015-11-08 13:30:47.000000000 +0100 @@ -15,60 +15,50 @@ # Dimitrios Glentadakis <[email protected]>, 2010, 2011, 2012, 2013, 2014. # nikos, 2011. # Stelios <[email protected]>, 2012, 2013. +# Dimitris Kardarakos <[email protected]>, 2015. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2014-01-04 09:52+0100\n" -"Last-Translator: Dimitrios Glentadakis <[email protected]>\n" +"PO-Revision-Date: 2015-11-04 16:36+0200\n" +"Last-Translator: Dimitris Kardarakos <[email protected]>\n" "Language-Team: Greek <[email protected]>\n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 -#, fuzzy -#| msgid "Unknown Application" msgctxt "KNotificationRestrictions|" msgid "Unknown Application" msgstr "Άγνωστη εφαρμογή" #: kstatusnotifieritem.cpp:439 kstatusnotifieritem.cpp:884 -#, fuzzy -#| msgid "&Minimize" msgctxt "KStatusNotifierItem|" msgid "&Minimize" msgstr "&Ελαχιστοποίηση" #: kstatusnotifieritem.cpp:709 -#, fuzzy -#| msgid "Quit" msgctxt "KStatusNotifierItem|" msgid "Quit" msgstr "Έξοδος" #: kstatusnotifieritem.cpp:882 -#, fuzzy -#| msgid "&Restore" msgctxt "KStatusNotifierItem|" msgid "&Restore" -msgstr "&Επαναφορά" +msgstr "Επανα&φορά" #: kstatusnotifieritem.cpp:896 -#, fuzzy, qt-format -#| msgid "<qt>Are you sure you want to quit <b>%1</b>?</qt>" +#, qt-format msgctxt "KStatusNotifierItem|" msgid "<qt>Are you sure you want to quit <b>%1</b>?</qt>" msgstr "<qt>Είστε σίγουροι ότι επιθυμείτε τον τερματισμό του <b>%1</b>;</qt>" #: kstatusnotifieritem.cpp:899 -#, fuzzy -#| msgid "Confirm Quit From System Tray" msgctxt "KStatusNotifierItem|" msgid "Confirm Quit From System Tray" msgstr "Επιβεβαίωση εξόδου από το πλαίσιο συστήματος" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.15.0/po/gd/knotifications5_qt.po new/knotifications-5.16.0/po/gd/knotifications5_qt.po --- old/knotifications-5.15.0/po/gd/knotifications5_qt.po 2015-10-05 10:17:13.000000000 +0200 +++ new/knotifications-5.16.0/po/gd/knotifications5_qt.po 2015-11-08 13:30:47.000000000 +0100 @@ -1,8 +1,10 @@ # GunChleoc <[email protected]>, 2014. msgid "" msgstr "" -"PO-Revision-Date: 2014-12-09 12:26+0100\n" -"Last-Translator: GunChleoc <[email protected]>\n" +"Project-Id-Version: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: 2015-11-04 15:13+0000\n" +"Last-Translator: Michael Bauer <[email protected]>\n" "Language-Team: Fòram na Gàidhlig\n" "Language: gd\n" "MIME-Version: 1.0\n" @@ -10,7 +12,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : " "(n > 2 && n < 20) ? 2 : 3;\n" -"X-Generator: Virtaal 0.7.1\n" +"X-Generator: Poedit 1.8.4\n" "X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.15.0/src/CMakeLists.txt new/knotifications-5.16.0/src/CMakeLists.txt --- old/knotifications-5.15.0/src/CMakeLists.txt 2015-10-05 10:17:13.000000000 +0200 +++ new/knotifications-5.16.0/src/CMakeLists.txt 2015-11-08 13:30:47.000000000 +0100 @@ -1,4 +1,6 @@ -include_directories(${PHONON_INCLUDE_DIR}) +if (Phonon4Qt5_FOUND) + include_directories(${PHONON_INCLUDE_DIR}) +endif() ecm_create_qm_loader(knotifications_QM_LOADER knotifications5_qt) @@ -19,12 +21,16 @@ notifybyexecute.cpp # notifybylogfile.cpp notifybytaskbar.cpp - notifybyaudio.cpp ${knotifications_QM_LOADER} ) ecm_qt_declare_logging_category(knotifications_SRCS HEADER debug_p.h IDENTIFIER LOG_KNOTIFICATIONS CATEGORY_NAME org.kde.knotifications) +if (Phonon4Qt5_FOUND) + set(knotifications_SRCS ${knotifications_SRCS} + notifybyaudio.cpp) +endif() + if (Qt5TextToSpeech_FOUND) set(knotifications_SRCS ${knotifications_SRCS} notifybytts.cpp) @@ -63,7 +69,6 @@ Qt5::Widgets ) target_link_libraries(KF5Notifications PRIVATE - ${PHONON_LIBRARIES} KF5::CoreAddons KF5::ConfigCore KF5::WindowSystem @@ -71,6 +76,11 @@ Qt5::DBus ) +if (Phonon4Qt5_FOUND) + target_link_libraries(KF5Notifications PRIVATE + ${PHONON_LIBRARIES}) +endif() + if (Qt5TextToSpeech_FOUND) target_link_libraries(KF5Notifications PRIVATE Qt5::TextToSpeech) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.15.0/src/knotificationmanager.cpp new/knotifications-5.16.0/src/knotificationmanager.cpp --- old/knotifications-5.15.0/src/knotificationmanager.cpp 2015-10-05 10:17:13.000000000 +0200 +++ new/knotifications-5.16.0/src/knotificationmanager.cpp 2015-11-08 13:30:47.000000000 +0100 @@ -30,12 +30,16 @@ #include "knotifyconfig.h" #include "knotificationplugin.h" #include "notifybypopup.h" -#include "notifybyaudio.h" + #include "notifybylogfile.h" #include "notifybytaskbar.h" #include "notifybyexecute.h" #include "debug_p.h" +#ifdef HAVE_PHONON4QT5 +#include "notifybyaudio.h" +#endif + #ifdef HAVE_SPEECH #include "notifybytts.h" #endif @@ -74,7 +78,11 @@ addPlugin(new NotifyByExecute(this)); //FIXME: port and reenable // addPlugin(new NotifyByLogfile(this)); + +#ifdef HAVE_PHONON4QT5 addPlugin(new NotifyByAudio(this)); +#endif + //TODO reactivate on Mac/Win when KWindowSystem::demandAttention will implemented on this system. #ifndef Q_OS_MAC addPlugin(new NotifyByTaskbar(this)); @@ -175,7 +183,7 @@ d->dirtyConfigCache.removeOne(n->appName()); } - QString notifyActions = notifyConfig.readEntry("Action"); + QString notifyActions = notifyConfig.readEntry(QStringLiteral("Action")); if (notifyActions.isEmpty() || notifyActions == QLatin1String("None")) { // this will cause KNotification closing itself fast diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.15.0/src/knotificationrestrictions.cpp new/knotifications-5.16.0/src/knotificationrestrictions.cpp --- old/knotifications-5.15.0/src/knotificationrestrictions.cpp 2015-10-05 10:17:13.000000000 +0200 +++ new/knotifications-5.16.0/src/knotificationrestrictions.cpp 2015-11-08 13:30:47.000000000 +0100 @@ -108,7 +108,7 @@ qCDebug(LOG_KNOTIFICATIONS); QDBusMessage message = QDBusMessage::createMethodCall( - "org.freedesktop.ScreenSaver", "/ScreenSaver", "org.freedesktop.ScreenSaver", "Inhibit"); + QStringLiteral("org.freedesktop.ScreenSaver"), QStringLiteral("/ScreenSaver"), QStringLiteral("org.freedesktop.ScreenSaver"), QStringLiteral("Inhibit")); message << determineProgramName(); message << reason; QDBusReply<uint> reply = QDBusConnection::sessionBus().call(message); @@ -158,7 +158,7 @@ if (screenSaverDbusCookie != -1) { QDBusMessage message = QDBusMessage::createMethodCall( - "org.freedesktop.ScreenSaver", "/ScreenSaver", "org.freedesktop.ScreenSaver", "UnInhibit"); + QStringLiteral("org.freedesktop.ScreenSaver"), QStringLiteral("/ScreenSaver"), QStringLiteral("org.freedesktop.ScreenSaver"), QStringLiteral("UnInhibit")); message << static_cast<uint>(screenSaverDbusCookie); screenSaverDbusCookie = -1; if (QDBusConnection::sessionBus().send(message)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.15.0/src/kstatusnotifieritem.cpp new/knotifications-5.16.0/src/kstatusnotifieritem.cpp --- old/knotifications-5.15.0/src/kstatusnotifieritem.cpp 2015-10-05 10:17:13.000000000 +0200 +++ new/knotifications-5.16.0/src/kstatusnotifieritem.cpp 2015-11-08 13:30:47.000000000 +0100 @@ -395,10 +395,10 @@ // application. The string "/NO_DBUSMENU" must be the same as in // DBusSystemTrayWidget::findDBusMenuInterface() in the Plasma // systemtray applet. - d->menuObjectPath = "/NO_DBUSMENU"; + d->menuObjectPath = QStringLiteral("/NO_DBUSMENU"); menu->installEventFilter(this); } else { - d->menuObjectPath = "/MenuBar"; + d->menuObjectPath = QStringLiteral("/MenuBar"); #if HAVE_DBUSMENUQT new DBusMenuExporter(d->menuObjectPath, menu, d->statusNotifierItemDBus->dbusConnection()); #endif @@ -431,11 +431,11 @@ } if (d->associatedWidget && d->associatedWidget != d->menu) { - QAction *action = d->actionCollection.value("minimizeRestore"); + QAction *action = d->actionCollection.value(QStringLiteral("minimizeRestore")); if (!action) { action = new QAction(this); - d->actionCollection.insert("minimizeRestore", action); + d->actionCollection.insert(QStringLiteral("minimizeRestore"), action); action->setText(tr("&Minimize")); connect(action, SIGNAL(triggered(bool)), this, SLOT(minimizeRestore())); } @@ -444,7 +444,7 @@ d->onAllDesktops = info.onAllDesktops(); } else { if (d->menu && d->hasQuit) { - QAction *action = d->actionCollection.value("minimizeRestore"); + QAction *action = d->actionCollection.value(QStringLiteral("minimizeRestore")); if (action) { d->menu->removeAction(action); } @@ -488,12 +488,12 @@ d->standardActionsEnabled = enabled; if (d->menu && !enabled && d->hasQuit) { - QAction *action = d->actionCollection.value("minimizeRestore"); + QAction *action = d->actionCollection.value(QStringLiteral("minimizeRestore")); if (action) { d->menu->removeAction(action); } - action = d->actionCollection.value("quit"); + action = d->actionCollection.value(QStringLiteral("quit")); if (action) { d->menu->removeAction(action); } @@ -510,7 +510,7 @@ void KStatusNotifierItem::showMessage(const QString &title, const QString &message, const QString &icon, int timeout) { if (!d->notificationsClient) { - d->notificationsClient = new org::freedesktop::Notifications("org.freedesktop.Notifications", "/org/freedesktop/Notifications", + d->notificationsClient = new org::freedesktop::Notifications(QStringLiteral("org.freedesktop.Notifications"), QStringLiteral("/org/freedesktop/Notifications"), QDBusConnection::sessionBus()); } @@ -707,9 +707,9 @@ QAction *action = new QAction(q); action->setText(KStatusNotifierItem::tr("Quit")); - action->setIcon(QIcon::fromTheme("application-exit")); + action->setIcon(QIcon::fromTheme(QStringLiteral("application-exit"))); QObject::connect(action, SIGNAL(triggered()), q, SLOT(maybeQuit())); - actionCollection.insert("quit", action); + actionCollection.insert(QStringLiteral("quit"), action); id = title; if (!extraId.isEmpty()) { @@ -717,7 +717,7 @@ } // Init iconThemePath to the app folder for now - iconThemePath = QStandardPaths::locate(QStandardPaths::DataLocation, "icons", QStandardPaths::LocateDirectory); + iconThemePath = QStandardPaths::locate(QStandardPaths::DataLocation, QStringLiteral("icons"), QStandardPaths::LocateDirectory); registerToDaemon(); } @@ -726,7 +726,7 @@ { qCDebug(LOG_KNOTIFICATIONS) << "Registering a client interface to the KStatusNotifierWatcher"; if (!statusNotifierWatcher) { - statusNotifierWatcher = new org::kde::StatusNotifierWatcher(s_statusNotifierWatcherServiceName, "/StatusNotifierWatcher", + statusNotifierWatcher = new org::kde::StatusNotifierWatcher(s_statusNotifierWatcherServiceName, QStringLiteral("/StatusNotifierWatcher"), QDBusConnection::sessionBus()); QObject::connect(statusNotifierWatcher, SIGNAL(StatusNotifierHostRegistered()), q, SLOT(checkForRegisteredHosts())); @@ -779,7 +779,7 @@ void KStatusNotifierItemPrivate::legacyWheelEvent(int delta) { - statusNotifierItemDBus->Scroll(delta, "vertical"); + statusNotifierItemDBus->Scroll(delta, QStringLiteral("vertical")); } void KStatusNotifierItemPrivate::legacyActivated(QSystemTrayIcon::ActivationReason reason) @@ -860,14 +860,14 @@ // appear at the _END_ of the menu menu->addSeparator(); if (associatedWidget && associatedWidget != menu) { - QAction *action = actionCollection.value("minimizeRestore"); + QAction *action = actionCollection.value(QStringLiteral("minimizeRestore")); if (action) { menu->addAction(action); } } - QAction *action = actionCollection.value("quit"); + QAction *action = actionCollection.value(QStringLiteral("quit")); if (action) { menu->addAction(action); @@ -877,7 +877,7 @@ } if (associatedWidget && associatedWidget != menu) { - QAction *action = actionCollection.value("minimizeRestore"); + QAction *action = actionCollection.value(QStringLiteral("minimizeRestore")); if (checkVisibility(QPoint(0, 0), false)) { action->setText(KStatusNotifierItem::tr("&Restore")); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.15.0/src/kstatusnotifieritemdbus_p.cpp new/knotifications-5.16.0/src/kstatusnotifieritemdbus_p.cpp --- old/knotifications-5.15.0/src/kstatusnotifieritemdbus_p.cpp 2015-10-05 10:17:13.000000000 +0200 +++ new/knotifications-5.16.0/src/kstatusnotifieritemdbus_p.cpp 2015-11-08 13:30:47.000000000 +0100 @@ -149,7 +149,7 @@ KStatusNotifierItemDBus::KStatusNotifierItemDBus(KStatusNotifierItem *parent) : QObject(parent), m_statusNotifierItem(parent), - m_service(QString("org.kde.StatusNotifierItem-%1-%2") + m_service(QStringLiteral("org.kde.StatusNotifierItem-%1-%2") .arg(QCoreApplication::applicationPid()) .arg(++s_serviceCount)), m_dbus(QDBusConnection::connectToBus(QDBusConnection::SessionBus, m_service)) @@ -157,12 +157,12 @@ new StatusNotifierItemAdaptor(this); qCDebug(LOG_KNOTIFICATIONS) << "service is" << m_service; m_dbus.registerService(m_service); - m_dbus.registerObject("/StatusNotifierItem", this); + m_dbus.registerObject(QStringLiteral("/StatusNotifierItem"), this); } KStatusNotifierItemDBus::~KStatusNotifierItemDBus() { - m_dbus.unregisterObject("/StatusNotifierItem"); + m_dbus.unregisterObject(QStringLiteral("/StatusNotifierItem")); m_dbus.unregisterService(m_service); m_dbus.disconnectFromBus(m_service); } @@ -308,7 +308,7 @@ void KStatusNotifierItemDBus::Scroll(int delta, const QString &orientation) { - Qt::Orientation dir = (orientation.toLower() == "horizontal" ? Qt::Horizontal : Qt::Vertical); + Qt::Orientation dir = (orientation.toLower() == QLatin1String("horizontal") ? Qt::Horizontal : Qt::Vertical); emit m_statusNotifierItem->scrollRequested(delta, dir); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.15.0/src/notifybyaudio.cpp new/knotifications-5.16.0/src/notifybyaudio.cpp --- old/knotifications-5.15.0/src/notifybyaudio.cpp 2015-10-05 10:17:13.000000000 +0200 +++ new/knotifications-5.16.0/src/notifybyaudio.cpp 2015-11-08 13:30:47.000000000 +0100 @@ -52,7 +52,7 @@ if (!m_audioOutput) { m_audioOutput = new Phonon::AudioOutput(Phonon::NotificationCategory, this); } - QString soundFilename = config->readEntry("Sound"); + QString soundFilename = config->readEntry(QStringLiteral("Sound")); if (soundFilename.isEmpty()) { qCWarning(LOG_KNOTIFICATIONS) << "Audio notification requested, but no sound file provided in notifyrc file, aborting audio notification"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.15.0/src/notifybypopup.cpp new/knotifications-5.16.0/src/notifybypopup.cpp --- old/knotifications-5.15.0/src/notifybypopup.cpp 2015-10-05 10:17:13.000000000 +0200 +++ new/knotifications-5.16.0/src/notifybypopup.cpp 2015-11-08 13:30:47.000000000 +0100 @@ -167,7 +167,7 @@ d->dbusServiceExists = interface && interface->isServiceRegistered(dbusServiceName); if (d->dbusServiceExists) { - onServiceOwnerChanged(dbusServiceName, QString(), "_"); //connect signals + onServiceOwnerChanged(dbusServiceName, QString(), QStringLiteral("_")); //connect signals } // to catch register/unregister events from service in runtime @@ -184,10 +184,10 @@ startfdo = true; #else if (qgetenv("KDE_FULL_SESSION").isEmpty()) { - QDBusMessage message = QDBusMessage::createMethodCall("org.freedesktop.DBus", - "/org/freedesktop/DBus", - "org.freedesktop.DBus", - "ListActivatableNames"); + QDBusMessage message = QDBusMessage::createMethodCall(QStringLiteral("org.freedesktop.DBus"), + QStringLiteral("/org/freedesktop/DBus"), + QStringLiteral("org.freedesktop.DBus"), + QStringLiteral("ListActivatableNames")); // FIXME - this should be async QDBusReply<QStringList> reply = QDBusConnection::sessionBus().call(message); @@ -442,7 +442,7 @@ bool connected = QDBusConnection::sessionBus().connect(QString(), // from any service dbusPath, dbusInterfaceName, - "ActionInvoked", + QStringLiteral("ActionInvoked"), this, SLOT(onGalagoNotificationActionInvoked(uint,QString))); if (!connected) { @@ -452,7 +452,7 @@ connected = QDBusConnection::sessionBus().connect(QString(), // from any service dbusPath, dbusInterfaceName, - "NotificationClosed", + QStringLiteral("NotificationClosed"), this, SLOT(onGalagoNotificationClosed(uint,uint))); if (!connected) { @@ -531,10 +531,10 @@ void NotifyByPopupPrivate::getAppCaptionAndIconName(const KNotifyConfig ¬ifyConfig, QString *appCaption, QString *iconName) { - KConfigGroup globalgroup(&(*notifyConfig.eventsfile), QString("Global")); + KConfigGroup globalgroup(&(*notifyConfig.eventsfile), QStringLiteral("Global")); *appCaption = globalgroup.readEntry("Name", globalgroup.readEntry("Comment", notifyConfig.appname)); - KConfigGroup eventGroup(&(*notifyConfig.eventsfile), QString("Event/%1").arg(notifyConfig.eventid)); + KConfigGroup eventGroup(&(*notifyConfig.eventsfile), QStringLiteral("Event/%1").arg(notifyConfig.eventid)); if (eventGroup.hasKey("IconName")) { *iconName = eventGroup.readEntry("IconName", notifyConfig.appname); } else { @@ -593,14 +593,14 @@ if (!notification->actions().isEmpty()) { - QString linkCode = QString::fromLatin1("<p align=\"right\">"); + QString linkCode = QStringLiteral("<p align=\"right\">"); int i = 0; Q_FOREACH (const QString &it, notification->actions()) { i++; - linkCode += QString::fromLatin1(" <a href=\"%1/%2\">%3</a>").arg(QString::number(notification->id()), QString::number(i), it.toHtmlEscaped()); + linkCode += QStringLiteral(" <a href=\"%1/%2\">%3</a>").arg(QString::number(notification->id()), QString::number(i), it.toHtmlEscaped()); } - linkCode += QString::fromLatin1("</p>"); + linkCode += QLatin1String("</p>"); QLabel *link = new QLabel(linkCode , vb ); link->setTextInteractionFlags(Qt::LinksAccessibleByMouse); link->setOpenExternalLinks(false); @@ -624,7 +624,7 @@ } } - QDBusMessage dbusNotificationMessage = QDBusMessage::createMethodCall(dbusServiceName, dbusPath, dbusInterfaceName, "Notify"); + QDBusMessage dbusNotificationMessage = QDBusMessage::createMethodCall(dbusServiceName, dbusPath, dbusInterfaceName, QStringLiteral("Notify")); QList<QVariant> args; @@ -644,11 +644,11 @@ QString title = notification->title().isEmpty() ? appCaption : notification->title(); QString text = notification->text(); - if (!popupServerCapabilities.contains("body-markup")) { - if (title.startsWith("<html>")) { + if (!popupServerCapabilities.contains(QStringLiteral("body-markup"))) { + if (title.startsWith(QLatin1String("<html>"))) { title = stripHtml(title); } - if (text.startsWith("<html>")) { + if (text.startsWith(QLatin1String("<html>"))) { text = stripHtml(text); } } @@ -662,7 +662,7 @@ // assign id's to actions like it's done in fillPopup() method // (i.e. starting from 1) QStringList actionList; - if (popupServerCapabilities.contains("actions")) { + if (popupServerCapabilities.contains(QStringLiteral("actions"))) { int actId = 0; Q_FOREACH (const QString &actionName, notification->actions()) { actId++; @@ -678,7 +678,7 @@ // According to fdo spec, the app_name is supposed to be the applicaton's "pretty name" // but in some places it's handy to know the application name itself if (!notification->appName().isEmpty()) { - hintsMap["x-kde-appname"] = notification->appName(); + hintsMap[QStringLiteral("x-kde-appname")] = notification->appName(); } //FIXME - reenable/fix @@ -689,7 +689,7 @@ buffer.open(QIODevice::WriteOnly); notification->pixmap().save(&buffer, "PNG"); buffer.close(); - hintsMap["image_data"] = ImageConverter::variantForImage(QImage::fromData(pixmapData)); + hintsMap[QStringLiteral("image_data")] = ImageConverter::variantForImage(QImage::fromData(pixmapData)); } args.append(hintsMap); // hints @@ -724,7 +724,7 @@ } QDBusMessage m = QDBusMessage::createMethodCall(dbusServiceName, dbusPath, - dbusInterfaceName, "CloseNotification"); + dbusInterfaceName, QStringLiteral("CloseNotification")); QList<QVariant> args; args.append(galagoId); m.setArguments(args); @@ -745,8 +745,8 @@ popupServerCapabilities = NotifyByPopupGrowl::capabilities(); } else { // Return capabilities of the KPassivePopup implementation - popupServerCapabilities = QStringList() << "actions" << "body" << "body-hyperlinks" - << "body-markup" << "icon-static"; + popupServerCapabilities = QStringList() << QStringLiteral("actions") << QStringLiteral("body") << QStringLiteral("body-hyperlinks") + << QStringLiteral("body-markup") << QStringLiteral("icon-static"); } } @@ -754,7 +754,7 @@ QDBusMessage m = QDBusMessage::createMethodCall(dbusServiceName, dbusPath, dbusInterfaceName, - "GetCapabilities"); + QStringLiteral("GetCapabilities")); QDBusConnection::sessionBus().callWithCallback(m, q, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.15.0/src/notifybypopup.h new/knotifications-5.16.0/src/notifybypopup.h --- old/knotifications-5.15.0/src/notifybypopup.h 2015-10-05 10:17:13.000000000 +0200 +++ new/knotifications-5.16.0/src/notifybypopup.h 2015-11-08 13:30:47.000000000 +0100 @@ -40,7 +40,7 @@ NotifyByPopup(QObject *parent = 0l); virtual ~NotifyByPopup(); - QString optionName() Q_DECL_OVERRIDE { return "Popup"; } + QString optionName() Q_DECL_OVERRIDE { return QStringLiteral("Popup"); } void notify(KNotification *notification, KNotifyConfig *notifyConfig) Q_DECL_OVERRIDE; void close(KNotification *notification) Q_DECL_OVERRIDE; void update(KNotification *notification, KNotifyConfig *config) Q_DECL_OVERRIDE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.15.0/src/notifybytts.cpp new/knotifications-5.16.0/src/notifybytts.cpp --- old/knotifications-5.15.0/src/notifybytts.cpp 2015-10-05 10:17:13.000000000 +0200 +++ new/knotifications-5.16.0/src/notifybytts.cpp 2015-11-08 13:30:47.000000000 +0100 @@ -47,7 +47,7 @@ void NotifyByTTS::notify(KNotification *notification, KNotifyConfig *config ) { if (m_speech->state() != QTextToSpeech::BackendError) { - QString say = config->readEntry( "TTS" ); + QString say = config->readEntry( QStringLiteral("TTS") ); if (!say.isEmpty()) { // Create a hash of characters to strings to expand text into the notification text. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.15.0/src/notifybytts.h new/knotifications-5.16.0/src/notifybytts.h --- old/knotifications-5.15.0/src/notifybytts.h 2015-10-05 10:17:13.000000000 +0200 +++ new/knotifications-5.16.0/src/notifybytts.h 2015-11-08 13:30:47.000000000 +0100 @@ -36,7 +36,7 @@ NotifyByTTS(QObject *parent=0l); virtual ~NotifyByTTS(); - virtual QString optionName() { return "TTS"; } + virtual QString optionName() { return QStringLiteral("TTS"); } virtual void notify(KNotification *notification, KNotifyConfig *config); private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.15.0/tests/knotificationdbustest.cpp new/knotifications-5.16.0/tests/knotificationdbustest.cpp --- old/knotifications-5.15.0/tests/knotificationdbustest.cpp 2015-10-05 10:17:13.000000000 +0200 +++ new/knotifications-5.16.0/tests/knotificationdbustest.cpp 2015-11-08 13:30:47.000000000 +0100 @@ -32,7 +32,7 @@ void notificationDBusCall(const QString &iconName, const QString &title, const QString &body, const QStringList &actions, bool persistent = false) { - QDBusMessage dbusNotificationMessage = QDBusMessage::createMethodCall(dbusServiceName, dbusPath, dbusInterfaceName, "Notify"); + QDBusMessage dbusNotificationMessage = QDBusMessage::createMethodCall(dbusServiceName, dbusPath, dbusInterfaceName, QStringLiteral("Notify")); QList<QVariant> args; @@ -72,27 +72,27 @@ { QApplication app(argc, argv); - notificationDBusCall("amarok", - "Testing notification #1", - "Lorem ipsum dolor sit amet, consectetur adipiscing elit. In condimentum", - QStringList() << "action1" << "action2"); + notificationDBusCall(QStringLiteral("amarok"), + QStringLiteral("Testing notification #1"), + QStringLiteral("Lorem ipsum dolor sit amet, consectetur adipiscing elit. In condimentum"), + QStringList() << QStringLiteral("action1") << QStringLiteral("action2")); // wait a little before sending another notification QEventLoop a; QTimer::singleShot(500, &a, SLOT(quit())); a.exec(); - notificationDBusCall("kwalletmanager", - "Testing notification #2", - "Praesent odio ipsum, posuere a magna ac, egestas vehicula lectus", - QStringList() << "action1" << "action2"); + notificationDBusCall(QStringLiteral("kwalletmanager"), + QStringLiteral("Testing notification #2"), + QStringLiteral("Praesent odio ipsum, posuere a magna ac, egestas vehicula lectus"), + QStringList() << QStringLiteral("action1") << QStringLiteral("action2")); QTimer::singleShot(1000, &a, SLOT(quit())); a.exec(); - notificationDBusCall("preferences-desktop-accessibility", - "Testing notification #3", - "Fusce hendrerit egestas pellentesque", + notificationDBusCall(QStringLiteral("preferences-desktop-accessibility"), + QStringLiteral("Testing notification #3"), + QStringLiteral("Fusce hendrerit egestas pellentesque"), QStringList(), true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.15.0/tests/knotificationrestrictionstest.cpp new/knotifications-5.16.0/tests/knotificationrestrictionstest.cpp --- old/knotifications-5.15.0/tests/knotificationrestrictionstest.cpp 2015-10-05 10:17:13.000000000 +0200 +++ new/knotifications-5.16.0/tests/knotificationrestrictionstest.cpp 2015-11-08 13:30:47.000000000 +0100 @@ -27,7 +27,7 @@ QApplication app(argc, argv); QLabel *mainWidget = new QLabel(); - mainWidget->setText("You should see on console debug outpout for KNotificationRestrictions"); + mainWidget->setText(QStringLiteral("You should see on console debug outpout for KNotificationRestrictions")); KNotificationRestrictions knr(KNotificationRestrictions::ScreenSaver, 0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.15.0/tests/kpassivepopuptest.cpp new/knotifications-5.16.0/tests/kpassivepopuptest.cpp --- old/knotifications-5.15.0/tests/kpassivepopuptest.cpp 2015-10-05 10:17:13.000000000 +0200 +++ new/knotifications-5.16.0/tests/kpassivepopuptest.cpp 2015-11-08 13:30:47.000000000 +0100 @@ -18,91 +18,91 @@ void Test::showIt() { - KPassivePopup::message(QLatin1String("Hello World"), pb); + KPassivePopup::message(QStringLiteral("Hello World"), pb); } void Test::showIt2() { - KPassivePopup::message(QLatin1String("The caption is..."), QLatin1String("Hello World"), pb2); + KPassivePopup::message(QStringLiteral("The caption is..."), QStringLiteral("Hello World"), pb2); } void Test::showIt3() { KPassivePopup *pop = new KPassivePopup(); - pop->setView(QLatin1String("Caption"), QLatin1String("test")); + pop->setView(QStringLiteral("Caption"), QStringLiteral("test")); pop->show(); } void Test::showIt4() { - KPassivePopup::message(KPassivePopup::Boxed, QLatin1String("The caption is..."), QLatin1String("Hello World"), pb4); + KPassivePopup::message(KPassivePopup::Boxed, QStringLiteral("The caption is..."), QStringLiteral("Hello World"), pb4); } void Test::showIt5() { - KPassivePopup::message(KPassivePopup::Balloon, QLatin1String("The caption is..."), QLatin1String("Hello World"), pb5); + KPassivePopup::message(KPassivePopup::Balloon, QStringLiteral("The caption is..."), QStringLiteral("Hello World"), pb5); } void Test::showIt6() { - KPassivePopup::message(KPassivePopup::Boxed, QLatin1String("The caption is..."), QLatin1String("Hello World"), pb6); + KPassivePopup::message(KPassivePopup::Boxed, QStringLiteral("The caption is..."), QStringLiteral("Hello World"), pb6); } void Test::showIt7() { int iconDimension = QApplication::fontMetrics().height(); - KPassivePopup::message(QLatin1String("The caption is..."), QLatin1String("Hello World"), QIcon::fromTheme("dialog-ok").pixmap(iconDimension, iconDimension), pb2); + KPassivePopup::message(QStringLiteral("The caption is..."), QStringLiteral("Hello World"), QIcon::fromTheme(QStringLiteral("dialog-ok")).pixmap(iconDimension, iconDimension), pb2); } void Test::showItIcon(QSystemTrayIcon::ActivationReason reason) { if (reason == QSystemTrayIcon::Trigger) { - KPassivePopup::message(QLatin1String("QSystemTrayIcon test"), QLatin1String("Hello World"), icon); + KPassivePopup::message(QStringLiteral("QSystemTrayIcon test"), QStringLiteral("Hello World"), icon); } } int main(int argc, char **argv) { - QApplication::setApplicationName(QLatin1String("test")); + QApplication::setApplicationName(QStringLiteral("test")); QApplication app(argc, argv); QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); Test *t = new Test(); pb = new QPushButton(); - pb->setText(QLatin1String("By taskbar entry (no caption, default style)")); + pb->setText(QStringLiteral("By taskbar entry (no caption, default style)")); pb->connect(pb, SIGNAL(clicked()), t, SLOT(showIt())); pb->show(); pb2 = new QPushButton(); - pb2->setText(QLatin1String("By taskbar entry (with caption, default style)")); + pb2->setText(QStringLiteral("By taskbar entry (with caption, default style)")); pb2->connect(pb2, SIGNAL(clicked()), t, SLOT(showIt2())); pb2->show(); pb3 = new QPushButton(); - pb3->setText(QLatin1String("Without WinID")); + pb3->setText(QStringLiteral("Without WinID")); pb3->connect(pb3, SIGNAL(clicked()), t, SLOT(showIt3())); pb3->show(); pb4 = new QPushButton(); - pb4->setText(QLatin1String("By taskbar entry (with caption, boxed)")); + pb4->setText(QStringLiteral("By taskbar entry (with caption, boxed)")); pb4->connect(pb4, SIGNAL(clicked()), t, SLOT(showIt4())); pb4->show(); pb5 = new QPushButton(); - pb5->setText(QLatin1String("By taskbar entry (with caption, balloon)")); + pb5->setText(QStringLiteral("By taskbar entry (with caption, balloon)")); pb5->connect(pb5, SIGNAL(clicked()), t, SLOT(showIt5())); pb5->show(); // this test depends on X11 pb6 = new QPushButton(); - pb6->setText(QLatin1String("By window (with caption, balloon)")); + pb6->setText(QStringLiteral("By window (with caption, balloon)")); pb6->connect(pb6, SIGNAL(clicked()), t, SLOT(showIt6())); pb6->show(); KWindowSystem::setState(pb6->effectiveWinId(), NET::SkipTaskbar); pb7 = new QPushButton(); - pb7->setText(QLatin1String("By taskbar entry (with caption and icon, default style)")); + pb7->setText(QStringLiteral("By taskbar entry (with caption and icon, default style)")); pb7->connect(pb7, SIGNAL(clicked()), t, SLOT(showIt7())); pb7->show(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.15.0/tests/kstatusnotifieritemtest.cpp new/knotifications-5.16.0/tests/kstatusnotifieritemtest.cpp --- old/knotifications-5.15.0/tests/kstatusnotifieritemtest.cpp 2015-10-05 10:17:13.000000000 +0200 +++ new/knotifications-5.16.0/tests/kstatusnotifieritemtest.cpp 2015-11-08 13:30:47.000000000 +0100 @@ -37,9 +37,9 @@ QMenu *menu = tray->contextMenu(); m_tray = tray; - QAction *needsAttention = new QAction("Set needs attention", menu); - QAction *active = new QAction("Set active", menu); - QAction *passive = new QAction("Set passive", menu); + QAction *needsAttention = new QAction(QStringLiteral("Set needs attention"), menu); + QAction *active = new QAction(QStringLiteral("Set active"), menu); + QAction *passive = new QAction(QStringLiteral("Set passive"), menu); menu->addAction(needsAttention); menu->addAction(active); @@ -53,7 +53,7 @@ void KStatusNotifierItemTest::setNeedsAttention() { qDebug() << "Asking for attention"; - m_tray->showMessage("message test", "Test of the new systemtray notifications wrapper", "konqueror", 3000); + m_tray->showMessage(QStringLiteral("message test"), QStringLiteral("Test of the new systemtray notifications wrapper"), QStringLiteral("konqueror"), 3000); m_tray->setStatus(KStatusNotifierItem::NeedsAttention); } @@ -79,38 +79,38 @@ QCommandLineParser parser; parser.setApplicationDescription(QCoreApplication::translate("main", "KStatusNotifierItemtest")); parser.addHelpOption(); - parser.addOption(QCommandLineOption(QStringList() << "active-icon", QCoreApplication::translate("main", "Name of active icon"), "name", "konqueror")); - parser.addOption(QCommandLineOption(QStringList() << "ksni-count", QCoreApplication::translate("main", "How many instances of KStatusNotifierItem to create"), "count", "1")); + parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("active-icon"), QCoreApplication::translate("main", "Name of active icon"), QStringLiteral("name"), QStringLiteral("konqueror"))); + parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("ksni-count"), QCoreApplication::translate("main", "How many instances of KStatusNotifierItem to create"), QStringLiteral("count"), QStringLiteral("1"))); parser.process(app); if (parser.positionalArguments().count() != 0) { parser.showHelp(); return (1); } - ksniCount = parser.value("ksni-count").toInt(); - iconName = parser.value("active-icon"); + ksniCount = parser.value(QStringLiteral("ksni-count")).toInt(); + iconName = parser.value(QStringLiteral("active-icon")); } - QLabel *l = new QLabel("System Tray Main Window", 0L); + QLabel *l = new QLabel(QStringLiteral("System Tray Main Window"), 0L); for (int x = 0; x < ksniCount; ++x) { KStatusNotifierItem *tray = new KStatusNotifierItem(l); new KStatusNotifierItemTest(0, tray); - tray->setTitle("DBus System tray test"); + tray->setTitle(QStringLiteral("DBus System tray test")); tray->setIconByName(iconName); //tray->setIconByPixmap(QIcon::fromTheme("konqueror")); //tray->setAttentionIconByName("kmail"); - tray->setOverlayIconByName("emblem-important"); + tray->setOverlayIconByName(QStringLiteral("emblem-important")); tray->setStatus(KStatusNotifierItem::Active); - tray->setToolTipIconByName("konqueror"); - tray->setToolTipTitle("DBus System tray test"); - tray->setToolTipSubTitle("This is a test of the new systemtray specification"); + tray->setToolTipIconByName(QStringLiteral("konqueror")); + tray->setToolTipTitle(QStringLiteral("DBus System tray test")); + tray->setToolTipSubTitle(QStringLiteral("This is a test of the new systemtray specification")); - tray->setToolTip("konqueror", QString("DBus System tray test #%1").arg(x + 1), "This is a test of the new systemtray specification"); + tray->setToolTip(QStringLiteral("konqueror"), QStringLiteral("DBus System tray test #%1").arg(x + 1), QStringLiteral("This is a test of the new systemtray specification")); - tray->showMessage("message test", "Test of the new systemtray notifications wrapper", "konqueror", 3000); + tray->showMessage(QStringLiteral("message test"), QStringLiteral("Test of the new systemtray notifications wrapper"), QStringLiteral("konqueror"), 3000); //tray->setStandardActionsEnabled(false); }
