Hello community, here is the log from the commit of package knotifications for openSUSE:Factory checked in at 2020-10-12 13:55:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/knotifications (Old) and /work/SRC/openSUSE:Factory/.knotifications.new.3486 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "knotifications" Mon Oct 12 13:55:39 2020 rev:85 rq:840837 version:5.75.0 Changes: -------- --- /work/SRC/openSUSE:Factory/knotifications/knotifications.changes 2020-09-18 14:42:05.504039362 +0200 +++ /work/SRC/openSUSE:Factory/.knotifications.new.3486/knotifications.changes 2020-10-12 13:57:26.774169356 +0200 @@ -1,0 +2,13 @@ +Mon Oct 5 08:33:26 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.75.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.75.0 +- Changes since 5.74.0: + * Lower Android plugin until new Gradle is available + * Use Android SDK versions from ECM + * const'ify pointer + initialize variable + * Deprecate KNotification constructor taking widget parameter + +------------------------------------------------------------------- Old: ---- knotifications-5.74.0.tar.xz knotifications-5.74.0.tar.xz.sig New: ---- knotifications-5.75.0.tar.xz knotifications-5.75.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ knotifications.spec ++++++ --- /var/tmp/diff_new_pack.GWeNfE/_old 2020-10-12 13:57:27.254169555 +0200 +++ /var/tmp/diff_new_pack.GWeNfE/_new 2020-10-12 13:57:27.258169557 +0200 @@ -17,14 +17,14 @@ %define lname libKF5Notifications5 -%define _tar_path 5.74 +%define _tar_path 5.75 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: knotifications -Version: 5.74.0 +Version: 5.75.0 Release: 0 Summary: KDE Desktop notifications License: LGPL-2.1-or-later ++++++ knotifications-5.74.0.tar.xz -> knotifications-5.75.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.74.0/CMakeLists.txt new/knotifications-5.75.0/CMakeLists.txt --- old/knotifications-5.74.0/CMakeLists.txt 2020-09-06 12:32:07.000000000 +0200 +++ new/knotifications-5.75.0/CMakeLists.txt 2020-10-04 20:50:43.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.74.0") # handled by release scripts -set(KF5_DEP_VERSION "5.74.0") # handled by release scripts +set(KF5_VERSION "5.75.0") # handled by release scripts +set(KF5_DEP_VERSION "5.75.0") # handled by release scripts project(KNotifications VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.74.0 NO_MODULE) +find_package(ECM 5.75.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.74.0/cmake/modules/FindGradle.cmake new/knotifications-5.75.0/cmake/modules/FindGradle.cmake --- old/knotifications-5.74.0/cmake/modules/FindGradle.cmake 2020-09-06 12:32:07.000000000 +0200 +++ new/knotifications-5.75.0/cmake/modules/FindGradle.cmake 2020-10-04 20:50:43.000000000 +0200 @@ -64,9 +64,6 @@ set(_aar_suffix "-release") set(_aar_gradleCmd "assembleRelease") endif() - if (NOT Qt5Core_VERSION VERSION_LESS 5.14.0) # behavior change in Gradle shipped with Qt 5.14 - set(_aar_suffix "") - endif() file(GLOB_RECURSE _src_files CONFIGURE_DEPENDS "*") add_custom_command( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.74.0/po/ca/knotifications5_qt.po new/knotifications-5.75.0/po/ca/knotifications5_qt.po --- old/knotifications-5.74.0/po/ca/knotifications5_qt.po 2020-09-06 12:32:07.000000000 +0200 +++ new/knotifications-5.75.0/po/ca/knotifications5_qt.po 2020-10-04 20:50:43.000000000 +0200 @@ -11,7 +11,7 @@ # Orestes Mas <ores...@tsc.upc.edu>, 2010. msgid "" msgstr "" -"Project-Id-Version: knotifications5_qt\n" +"Project-Id-Version: knotifications\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" "PO-Revision-Date: 2020-07-22 13:05+0200\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.74.0/po/ca@valencia/knotifications5_qt.po new/knotifications-5.75.0/po/ca@valencia/knotifications5_qt.po --- old/knotifications-5.74.0/po/ca@valencia/knotifications5_qt.po 2020-09-06 12:32:07.000000000 +0200 +++ new/knotifications-5.75.0/po/ca@valencia/knotifications5_qt.po 2020-10-04 20:50:43.000000000 +0200 @@ -12,7 +12,7 @@ # Empar <montoro_...@gva.es>, 2019. msgid "" msgstr "" -"Project-Id-Version: knotifications5_qt\n" +"Project-Id-Version: knotifications\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" "PO-Revision-Date: 2019-06-17 13:30+0200\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.74.0/po/de/knotifications5_qt.po new/knotifications-5.75.0/po/de/knotifications5_qt.po --- old/knotifications-5.74.0/po/de/knotifications5_qt.po 2020-09-06 12:32:07.000000000 +0200 +++ new/knotifications-5.75.0/po/de/knotifications5_qt.po 2020-10-04 20:50:43.000000000 +0200 @@ -4,7 +4,7 @@ # Stephan Johach <hun...@gmx.de>, 2004, 2005, 2006, 2007. # Georg Schuster <gschus...@utanet.at>, 2005. # Thomas Reitelbach <t...@erdfunkstelle.de>, 2005, 2006, 2007, 2008, 2009. -# Burkhard Lück <lu...@hube-lueck.de>, 2006, 2007, 2009, 2010, 2011, 2012, 2013, 2014. +# Burkhard Lück <lu...@hube-lueck.de>, 2006, 2007, 2009, 2010, 2011, 2012, 2013, 2014, 2020. # Frederik Schwarzer <schwar...@kde.org>, 2007, 2008, 2009, 2010, 2011, 2012, 2013. # Johannes Obermayr <johannesoberm...@gmx.de>, 2010. # Panagiotis Papadopoulos <pano...@gmx.net>, 2010. @@ -14,24 +14,23 @@ "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-03-28 17:52+0100\n" +"PO-Revision-Date: 2020-09-14 07:59+0200\n" "Last-Translator: Burkhard Lück <lu...@hube-lueck.de>\n" "Language-Team: German <kde-i18n...@kde.org>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 19.04.3\n" "X-Qt-Contexts: true\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #. Job name, e.g. Copying has failed #: knotificationjobuidelegate.cpp:28 -#, fuzzy, qt-format -#| msgid "%1 (Link)" +#, qt-format msgctxt "KNotificationJobUiDelegate|" msgid "%1 (Failed)" -msgstr "%1 (Verknüpfung)" +msgstr "%1 (Fehlgeschlagen)" #: knotificationrestrictions.cpp:180 msgctxt "KNotificationRestrictions|" @@ -39,25 +38,16 @@ msgstr "Unbekannte Anwendung" #: kstatusnotifieritem.cpp:531 kstatusnotifieritem.cpp:1108 -#, fuzzy -#| msgctxt "KStatusNotifierItem|" -#| msgid "&Minimize" msgctxt "KStatusNotifierItem|@action:inmenu" msgid "&Minimize" msgstr "&Minimieren" #: kstatusnotifieritem.cpp:849 -#, fuzzy -#| msgctxt "KStatusNotifierItem|" -#| msgid "Quit" msgctxt "KStatusNotifierItem|@action:inmenu" msgid "Quit" msgstr "Beenden" #: kstatusnotifieritem.cpp:1106 -#, fuzzy -#| msgctxt "KStatusNotifierItem|" -#| msgid "&Restore" msgctxt "KStatusNotifierItem|@action:inmenu" msgid "&Restore" msgstr "&Wiederherstellen" @@ -69,9 +59,6 @@ msgstr "<qt>Möchten Sie <b>%1</b> wirklich beenden?</qt>" #: kstatusnotifieritem.cpp:1123 -#, fuzzy -#| msgctxt "KStatusNotifierItem|" -#| msgid "Confirm Quit From System Tray" msgctxt "KStatusNotifierItem|@title:window" msgid "Confirm Quit From System Tray" -msgstr "Beenden bestätigen" +msgstr "Beenden aus dem Systemabschnitt der Kontrollleiste bestätigen" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.74.0/po/ro/knotifications5_qt.po new/knotifications-5.75.0/po/ro/knotifications5_qt.po --- old/knotifications-5.74.0/po/ro/knotifications5_qt.po 2020-09-06 12:32:07.000000000 +0200 +++ new/knotifications-5.75.0/po/ro/knotifications5_qt.po 2020-10-04 20:50:43.000000000 +0200 @@ -1,32 +1,30 @@ # Traducerea kdelibs4.po în Română # Laurenţiu Buzdugan <l...@rolix.org>, 2008, 2009. -# Sergiu Bivol <ser...@ase.md>, 2008, 2009, 2010. -# Sergiu Bivol <ser...@ase.md>, 2010, 2012, 2013, 2014. +# Sergiu Bivol <ser...@cip.md>, 2008, 2009, 2010, 2012, 2013, 2014, 2020. # Cristian Oneț <onet.crist...@gmail.com>, 2010, 2011, 2012, 2013. 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-08-16 14:50+0300\n" -"Last-Translator: Sergiu Bivol <ser...@ase.md>\n" -"Language-Team: Romanian <kde-i18n...@kde.org>\n" +"PO-Revision-Date: 2020-10-03 22:32+0100\n" +"Last-Translator: Sergiu Bivol <ser...@cip.md>\n" +"Language-Team: Romanian\n" "Language: ro\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" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2;\n" +"X-Generator: Lokalize 19.12.3\n" "X-Qt-Contexts: true\n" #. Job name, e.g. Copying has failed #: knotificationjobuidelegate.cpp:28 -#, fuzzy, qt-format -#| msgid "%1 (Link)" +#, qt-format msgctxt "KNotificationJobUiDelegate|" msgid "%1 (Failed)" -msgstr "%1 (Legătură)" +msgstr "%1 (eșuată)" #: knotificationrestrictions.cpp:180 msgctxt "KNotificationRestrictions|" @@ -34,28 +32,19 @@ msgstr "Aplicație necunoscută" #: kstatusnotifieritem.cpp:531 kstatusnotifieritem.cpp:1108 -#, fuzzy -#| msgctxt "KStatusNotifierItem|" -#| msgid "&Minimize" msgctxt "KStatusNotifierItem|@action:inmenu" msgid "&Minimize" msgstr "&Minimizează" #: kstatusnotifieritem.cpp:849 -#, fuzzy -#| msgctxt "KStatusNotifierItem|" -#| msgid "Quit" msgctxt "KStatusNotifierItem|@action:inmenu" msgid "Quit" msgstr "Termină" #: kstatusnotifieritem.cpp:1106 -#, fuzzy -#| msgctxt "KStatusNotifierItem|" -#| msgid "&Restore" msgctxt "KStatusNotifierItem|@action:inmenu" msgid "&Restore" -msgstr "&Restaurează" +msgstr "&Restabilește" #: kstatusnotifieritem.cpp:1120 #, qt-format @@ -64,9 +53,6 @@ msgstr "<qt>Sigur doriți să închideți <b>%1</b>?</qt>" #: kstatusnotifieritem.cpp:1123 -#, fuzzy -#| msgctxt "KStatusNotifierItem|" -#| msgid "Confirm Quit From System Tray" msgctxt "KStatusNotifierItem|@title:window" msgid "Confirm Quit From System Tray" msgstr "Confirmă închiderea din tava de sistem" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.74.0/po/se/knotifications5_qt.po new/knotifications-5.75.0/po/se/knotifications5_qt.po --- old/knotifications-5.74.0/po/se/knotifications5_qt.po 2020-09-06 12:32:07.000000000 +0200 +++ new/knotifications-5.75.0/po/se/knotifications5_qt.po 2020-10-04 20:50:43.000000000 +0200 @@ -21,40 +21,40 @@ "X-Qt-Contexts: true\n" #. Job name, e.g. Copying has failed -#: knotificationjobuidelegate.cpp:39 +#: knotificationjobuidelegate.cpp:28 #, qt-format msgctxt "KNotificationJobUiDelegate|" msgid "%1 (Failed)" msgstr "" -#: knotificationrestrictions.cpp:192 +#: knotificationrestrictions.cpp:180 #, fuzzy msgctxt "KNotificationRestrictions|" msgid "Unknown Application" msgstr "Amas prográmma" -#: kstatusnotifieritem.cpp:544 kstatusnotifieritem.cpp:1121 +#: kstatusnotifieritem.cpp:531 kstatusnotifieritem.cpp:1108 msgctxt "KStatusNotifierItem|@action:inmenu" msgid "&Minimize" msgstr "" -#: kstatusnotifieritem.cpp:862 +#: kstatusnotifieritem.cpp:849 msgctxt "KStatusNotifierItem|@action:inmenu" msgid "Quit" msgstr "" -#: kstatusnotifieritem.cpp:1119 +#: kstatusnotifieritem.cpp:1106 msgctxt "KStatusNotifierItem|@action:inmenu" msgid "&Restore" msgstr "" -#: kstatusnotifieritem.cpp:1133 +#: kstatusnotifieritem.cpp:1120 #, fuzzy, qt-format msgctxt "KStatusNotifierItem|" msgid "<qt>Are you sure you want to quit <b>%1</b>?</qt>" msgstr "<qt>Háliidatgo duođaid heaittihit <b>%1</b>?</qt>" -#: kstatusnotifieritem.cpp:1136 +#: kstatusnotifieritem.cpp:1123 msgctxt "KStatusNotifierItem|@title:window" msgid "Confirm Quit From System Tray" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.74.0/po/zh_CN/knotifications5_qt.po new/knotifications-5.75.0/po/zh_CN/knotifications5_qt.po --- old/knotifications-5.74.0/po/zh_CN/knotifications5_qt.po 2020-09-06 12:32:07.000000000 +0200 +++ new/knotifications-5.75.0/po/zh_CN/knotifications5_qt.po 2020-10-04 20:50:43.000000000 +0200 @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2020-09-05 05:17\n" +"PO-Revision-Date: 2020-09-23 12:18\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.74.0/src/CMakeLists.txt new/knotifications-5.75.0/src/CMakeLists.txt --- old/knotifications-5.74.0/src/CMakeLists.txt 2020-09-06 12:32:07.000000000 +0200 +++ new/knotifications-5.75.0/src/CMakeLists.txt 2020-10-04 20:50:43.000000000 +0200 @@ -103,7 +103,7 @@ GROUP_BASE_NAME KF VERSION ${KF5_VERSION} DEPRECATED_BASE_VERSION 0 - DEPRECATION_VERSIONS 5.67 + DEPRECATION_VERSIONS 5.67 5.75 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.74.0/src/android/build.gradle new/knotifications-5.75.0/src/android/build.gradle --- old/knotifications-5.74.0/src/android/build.gradle 2020-09-06 12:32:07.000000000 +0200 +++ new/knotifications-5.75.0/src/android/build.gradle 2020-10-04 20:50:43.000000000 +0200 @@ -5,7 +5,7 @@ } dependencies { - classpath 'com.android.tools.build:gradle:3.2.0' + classpath 'com.android.tools.build:gradle:3.6.4' } } @@ -17,8 +17,8 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 28 - buildToolsVersion '28.0.2' + compileSdkVersion @ANDROID_SDK_COMPILE_API@ + buildToolsVersion '@ANDROID_SDK_BUILD_TOOLS_REVISION@' sourceSets { main { @@ -30,4 +30,9 @@ lintOptions { abortOnError false } + + defaultConfig { + minSdkVersion @ANDROID_API_LEVEL@ + targetSdkVersion @ANDROID_SDK_COMPILE_API@ + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.74.0/src/android_defaults.notifyrc new/knotifications-5.75.0/src/android_defaults.notifyrc --- old/knotifications-5.74.0/src/android_defaults.notifyrc 2020-09-06 12:32:07.000000000 +0200 +++ new/knotifications-5.75.0/src/android_defaults.notifyrc 2020-10-04 20:50:43.000000000 +0200 @@ -33,6 +33,7 @@ Name[pl]=Poważny błąd Name[pt]=Erro Fatal Name[pt_BR]=Erro fatal +Name[ro]=Eroare fatală Name[ru]=Критическая ошибка Name[sk]=Fatálna chyba Name[sl]=Usodna napaka @@ -81,6 +82,7 @@ Comment[pl]=Wystąpił poważny błąd i program zakończył działanie Comment[pt]=Ocorreu um erro sério que fez com que o programa saísse Comment[pt_BR]=Ocorreu um erro grave que causou o fechamento do programa +Comment[ro]=A intervenit o eroare gravă ce a provocat terminarea programului Comment[ru]=Произошла серьёзная ошибка, приведшая к завершению работы программы Comment[sk]=Vyskytla sa vážna chyba, ktorá spôsobila ukončenie programu Comment[sl]=Prišlo je do resne napake, zaradi katere se je program končal @@ -133,6 +135,7 @@ Name[pl]=Powiadomienie Name[pt]=Notificação Name[pt_BR]=Notificação +Name[ro]=Notificare Name[ru]=Уведомление Name[sk]=Pripomienka Name[sl]=Obvestila @@ -181,6 +184,7 @@ Comment[pl]=Coś niezwykłego stało się z programem Comment[pt]=Ocorreu algo de especial no programa Comment[pt_BR]=Algo especial aconteceu no programa +Comment[ro]=S-a întâmplat ceva deosebit în program Comment[ru]=С программой произошло что-то странное Comment[sk]=V programe sa stalo niečo zvláštne Comment[sl]=V programu se je zgodilo nekaj posebnega @@ -233,6 +237,7 @@ Name[pl]=Ostrzeżenie Name[pt]=Aviso Name[pt_BR]=Aviso +Name[ro]=Avertisment Name[ru]=Предупреждение Name[sk]=Upozornenie Name[sl]=Opozorilo @@ -281,6 +286,7 @@ Comment[pl]=W programie wystąpił błąd, może powodować problemy Comment[pt]=Ocorreu um erro no programa que poderá provocar problemas Comment[pt_BR]=Ocorreu um erro no programa, que pode causar problemas +Comment[ro]=A avut loc o eroare în program ce ar putea provoca probleme Comment[ru]=В программе произошла ошибка, которая может вызвать проблемы Comment[sk]=V programe sa vyskytla chyba, ktorá môže spôsobiť problémy Comment[sl]=V programu je prišlo do napake, ki lahko povzroči težave @@ -332,6 +338,7 @@ Name[pl]=Katastrofa Name[pt]=Catástrofe Name[pt_BR]=Catástrofe +Name[ro]=Catastrofă Name[ru]=Катастрофа Name[sk]=Katastrofa Name[sl]=Katastrofa @@ -379,6 +386,7 @@ Comment[pl]=Wystąpił bardzo poważny błąd, co najmniej nastąpiło zakończenie pracy programu Comment[pt]=Ocorreu um erro muito sério, que fez pelo menos com que o programa saísse Comment[pt_BR]=Um erro muito sério aconteceu, que causou (no mínimo) o fechamento do programa +Comment[ro]=A intervenit o eroare foarte gravă, provocând cel puțin terminarea programului Comment[ru]=Произошла очень серьёзная ошибка, как минимум, вызвавшая завершение работы программы Comment[sk]=Nastala veľmi vážna chyba, ktorá zapríčinila minimálne ukončenie programu Comment[sl]=Prišlo je do zelo resne napake, zaradi katere se je program končal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.74.0/src/knotification.cpp new/knotifications-5.75.0/src/knotification.cpp --- old/knotifications-5.74.0/src/knotification.cpp 2020-09-06 12:32:07.000000000 +0200 +++ new/knotifications-5.75.0/src/knotification.cpp 2020-10-04 20:50:43.000000000 +0200 @@ -28,10 +28,10 @@ struct Q_DECL_HIDDEN KNotification::Private { QString eventId; - int id; - int ref; + int id = -1; + int ref = 0; - QWidget *widget; + QWidget *widget = nullptr; QString title; QString text; QString iconName; @@ -41,13 +41,12 @@ ContextList contexts; NotificationFlags flags; QString componentName; - KNotification::Urgency urgency; + KNotification::Urgency urgency = KNotification::DefaultUrgency; QVariantMap hints; QTimer updateTimer; - bool needUpdate; + bool needUpdate = false; - Private() : id(-1), ref(0), widget(nullptr), urgency(KNotification::DefaultUrgency), needUpdate(false) {} #if KNOTIFICATIONS_BUILD_DEPRECATED_SINCE(5, 67) /** * recursive function that raise the widget. @p w @@ -58,6 +57,7 @@ #endif }; +#if KNOTIFICATIONS_BUILD_DEPRECATED_SINCE(5, 75) KNotification::KNotification(const QString &eventId, QWidget *parent, const NotificationFlags &flags) : QObject(parent), d(new Private) { @@ -68,6 +68,7 @@ d->updateTimer.setSingleShot(true); d->updateTimer.setInterval(100); } +#endif KNotification::KNotification( const QString &eventId, @@ -364,7 +365,8 @@ KNotification *KNotification::event(const QString &eventid, const QString &title, const QString &text, const QPixmap &pixmap, QWidget *widget, const NotificationFlags &flags, const QString &componentName) { - KNotification *notify = new KNotification(eventid, widget, flags); + KNotification *notify = new KNotification(eventid, flags); + notify->setWidget(widget); notify->setTitle(title); notify->setText(text); notify->setPixmap(pixmap); @@ -398,7 +400,8 @@ const QString &iconName, QWidget *widget, const NotificationFlags &flags, const QString &componentName) { - KNotification *notify = new KNotification(eventid, widget, flags); + KNotification *notify = new KNotification(eventid, flags); + notify->setWidget(widget); notify->setTitle(title); notify->setText(text); notify->setIconName(iconName); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.74.0/src/knotification.h new/knotifications-5.75.0/src/knotification.h --- old/knotifications-5.74.0/src/knotification.h 2020-09-06 12:32:07.000000000 +0200 +++ new/knotifications-5.75.0/src/knotification.h 2020-10-04 20:50:43.000000000 +0200 @@ -163,7 +163,8 @@ * This portion of code will fire the event for the "contactOnline" event * * @code - KNotification *notification= new KNotification ( "contactOnline", widget ); + KNotification *notification= new KNotification ( "contactOnline" ); + notification->setWidget( widget ); notification->setText( i18n("The contact <i>%1</i> has gone online", contact->name() ); notification->setPixmap( contact->pixmap() ); notification->setActions( QStringList( i18n( "Open chat" ) ) ); @@ -286,6 +287,7 @@ CriticalUrgency = 90 }; +#if KNOTIFICATIONS_ENABLE_DEPRECATED_SINCE(5, 75) /** * Create a new notification. * @@ -300,8 +302,32 @@ * @param eventId is the name of the event * @param widget is a widget where the notification reports to * @param flags is a bitmask of NotificationFlag + * @deprecated Since 5.75, use other constructor and call setWidget() explicitly */ - explicit KNotification(const QString &eventId, QWidget *widget = nullptr, const NotificationFlags &flags = CloseOnTimeout); + KNOTIFICATIONS_DEPRECATED_VERSION(5, 75, "Use other constructor and call setWidget() explicitly") + explicit KNotification(const QString &eventId, QWidget *widget, const NotificationFlags &flags = CloseOnTimeout); +#endif + + /** + * Create a new notification. + * + * You have to use sendEvent to show the notification. + * + * The pointer is automatically deleted when the event is closed. + * + * The NotificationFlags is set to CloseOnTimeout. + * + * @param eventId is the name of the event + * @since 5.75 + */ + inline explicit KNotification(const QString &eventId) + : KNotification(eventId, CloseOnTimeout, nullptr) + { + } + // TODO KF6: remove thic constructor, in favour of other non-deprecated constructor + // It is a helper constructor for software binary compatibility of code which called the + // deprecated constructor so far due to it's second parameter "widget" having had + // a default nullptr value. /** * Create a new notification. @@ -320,13 +346,8 @@ * @param flags is a bitmask of NotificationFlag * @param parent parent object */ - // KDE5: Clean up this mess - // Only this constructor should stay with saner argument order and - // defaults. Because of binary and source compatibility issues it has to - // stay this way for now. The second argument CANNOT have a default - // argument. if someone needs a widget associated with the notification he - // should use setWidget after creating the object (or some xyz_cast magic) explicit KNotification(const QString &eventId, const NotificationFlags &flags, QObject *parent = nullptr); + // TODO KF6: pass flags by value instead of reference, set CloseOnTimeout as default value ~KNotification(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.74.0/src/kpassivepopup.cpp new/knotifications-5.75.0/src/kpassivepopup.cpp --- old/knotifications-5.74.0/src/kpassivepopup.cpp 2020-09-06 12:32:07.000000000 +0200 +++ new/knotifications-5.75.0/src/kpassivepopup.cpp 2020-10-04 20:50:43.000000000 +0200 @@ -68,7 +68,7 @@ connect(q, QOverload<>::of(&KPassivePopup::clicked), q, &QWidget::hide); } - KPassivePopup *q; + KPassivePopup *const q; int popupStyle; QPolygon surround; @@ -85,7 +85,7 @@ QLabel *ttl = nullptr; QLabel *msg = nullptr; - bool autoDelete; + bool autoDelete = false; /** * Updates the transparency mask. Unused if PopupStyle == Boxed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.74.0/src/notifybytts.cpp new/knotifications-5.75.0/src/notifybytts.cpp --- old/knotifications-5.74.0/src/notifybytts.cpp 2020-09-06 12:32:07.000000000 +0200 +++ new/knotifications-5.75.0/src/notifybytts.cpp 2020-10-04 20:50:43.000000000 +0200 @@ -16,15 +16,14 @@ NotifyByTTS::NotifyByTTS(QObject *parent) : KNotificationPlugin(parent) + , m_speech(new QTextToSpeech(this)) { - m_speech = new QTextToSpeech(this); } NotifyByTTS::~NotifyByTTS() { delete m_speech; - m_speech = nullptr; } void NotifyByTTS::notify(KNotification *notification, KNotifyConfig *config ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.74.0/src/notifybytts.h new/knotifications-5.75.0/src/notifybytts.h --- old/knotifications-5.74.0/src/notifybytts.h 2020-09-06 12:32:07.000000000 +0200 +++ new/knotifications-5.75.0/src/notifybytts.h 2020-10-04 20:50:43.000000000 +0200 @@ -23,7 +23,7 @@ void notify(KNotification *notification, KNotifyConfig *config) override; private: - QTextToSpeech *m_speech = nullptr; + QTextToSpeech *const m_speech; }; #endif
