Hello community, here is the log from the commit of package kservice for openSUSE:Factory checked in at 2018-11-14 14:37:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kservice (Old) and /work/SRC/openSUSE:Factory/.kservice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kservice" Wed Nov 14 14:37:30 2018 rev:64 rq:648541 version:5.52.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kservice/kservice.changes 2018-10-22 11:15:27.223648450 +0200 +++ /work/SRC/openSUSE:Factory/.kservice.new/kservice.changes 2018-11-14 14:37:32.963082146 +0100 @@ -1,0 +2,17 @@ +Sun Nov 11 19:48:07 UTC 2018 - [email protected] + +- Update to 5.52.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.52.0.php +- Changes since 5.51.0: + * Use more explicit constructors with internal classes + * Use Q_OBJECT with all QObject subclasses (helps debugging introspection) + * Do not use const reference for enum type argument in internal API + * Use const ref for non-trivial copy types in internal API + * Use QLatin1String method overload instead of creating a temporary QString + * Use QStringLiteral, not QLatin1String, if a final QString is wanted + * Use QLatin1String, not QString::fromLatin1, in string calculations + * Use qEnvironmentVariableIntValue + +------------------------------------------------------------------- Old: ---- kservice-5.51.0.tar.xz New: ---- kservice-5.52.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kservice.spec ++++++ --- /var/tmp/diff_new_pack.qOetYm/_old 2018-11-14 14:37:33.599081520 +0100 +++ /var/tmp/diff_new_pack.qOetYm/_new 2018-11-14 14:37:33.599081520 +0100 @@ -16,14 +16,14 @@ # -%define _tar_path 5.51 +%define _tar_path 5.52 # 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: kservice -Version: 5.51.0 +Version: 5.52.0 Release: 0 Summary: Plugin framework for desktop services License: LGPL-2.1-or-later ++++++ dont-show-yast-modules-in-the-applications-menu.patch ++++++ --- /var/tmp/diff_new_pack.qOetYm/_old 2018-11-14 14:37:33.623081496 +0100 +++ /var/tmp/diff_new_pack.qOetYm/_new 2018-11-14 14:37:33.623081496 +0100 @@ -1,8 +1,8 @@ -Index: kservice-5.36.0/src/applications.menu -=================================================================== ---- kservice-5.36.0.orig/src/applications.menu -+++ kservice-5.36.0/src/applications.menu -@@ -350,7 +350,10 @@ +diff --git a/src/applications.menu b/src/applications.menu +index f2d5253..85970c7 100644 +--- a/src/applications.menu ++++ b/src/applications.menu +@@ -369,7 +369,10 @@ <Name>Settingsmenu</Name> <Directory>kf5-settingsmenu.directory</Directory> <Include> @@ -14,7 +14,7 @@ </Include> </Menu> <Menu> -@@ -360,6 +363,7 @@ +@@ -379,6 +383,7 @@ <And> <Category>System</Category> <Not><Category>X-KDE-More</Category></Not> ++++++ kservice-5.51.0.tar.xz -> kservice-5.52.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/CMakeLists.txt new/kservice-5.52.0/CMakeLists.txt --- old/kservice-5.51.0/CMakeLists.txt 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/CMakeLists.txt 2018-11-03 19:04:24.000000000 +0100 @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.51.0") # handled by release scripts -set(KF5_DEP_VERSION "5.51.0") # handled by release scripts +set(KF5_VERSION "5.52.0") # handled by release scripts +set(KF5_DEP_VERSION "5.52.0") # handled by release scripts project(KService VERSION ${KF5_VERSION}) # Disallow in-source build @@ -12,7 +12,7 @@ # ECM setup include(FeatureSummary) -find_package(ECM 5.51.0 NO_MODULE) +find_package(ECM 5.52.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) @@ -67,11 +67,6 @@ ) add_definitions(-DTRANSLATION_DOMAIN=\"kservice5\") -add_definitions(-DQT_NO_CAST_FROM_ASCII) -add_definitions(-DQT_NO_CAST_TO_ASCII) -add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) -add_definitions(-DQT_NO_URL_CAST_FROM_STRING) -add_definitions(-DQT_USE_QSTRINGBUILDER) if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") ki18n_install(po) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/po/ast/kservice5.po new/kservice-5.52.0/po/ast/kservice5.po --- old/kservice-5.51.0/po/ast/kservice5.po 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/po/ast/kservice5.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,206 +0,0 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. -# -# enolp <[email protected]>, 2016. -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-09-12 03:46+0200\n" -"PO-Revision-Date: 2016-12-22 03:23+0100\n" -"Last-Translator: enolp <[email protected]>\n" -"Language-Team: Asturian <[email protected]>\n" -"Language: ast\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 2.0\n" - -#, kde-format -msgctxt "NAME OF TRANSLATORS" -msgid "Your names" -msgstr "Softastur" - -#, kde-format -msgctxt "EMAIL OF TRANSLATORS" -msgid "Your emails" -msgstr "[email protected]" - -#: kbuildsycoca/kbuildsycoca_main.cpp:56 -#, kde-format -msgctxt "application name" -msgid "KBuildSycoca" -msgstr "KBuildSycoca" - -#: kbuildsycoca/kbuildsycoca_main.cpp:58 -#, kde-format -msgctxt "application description" -msgid "Rebuilds the system configuration cache." -msgstr "Reconstrúi'l sistema de caché de configuración del sistema." - -#: kbuildsycoca/kbuildsycoca_main.cpp:60 -#, kde-format -msgctxt "@info:credit" -msgid "Copyright 1999-2014 KDE Developers" -msgstr "Copyright 1999-2014 Los desendolcadores de KDE" - -#: kbuildsycoca/kbuildsycoca_main.cpp:61 -#, kde-format -msgctxt "@info:credit" -msgid "David Faure" -msgstr "David Faure" - -#: kbuildsycoca/kbuildsycoca_main.cpp:62 kbuildsycoca/kbuildsycoca_main.cpp:65 -#, kde-format -msgctxt "@info:credit" -msgid "Author" -msgstr "Autor" - -#: kbuildsycoca/kbuildsycoca_main.cpp:64 -#, kde-format -msgctxt "@info:credit" -msgid "Waldo Bastian" -msgstr "Waldo Bastian" - -#: kbuildsycoca/kbuildsycoca_main.cpp:75 -#, kde-format -msgctxt "@info:shell command-line option" -msgid "" -"Do not signal applications to update (deprecated, no longer having any " -"effect)" -msgstr "" - -#: kbuildsycoca/kbuildsycoca_main.cpp:78 -#, kde-format -msgctxt "@info:shell command-line option" -msgid "Disable incremental update, re-read everything" -msgstr "" - -#: kbuildsycoca/kbuildsycoca_main.cpp:81 -#, kde-format -msgctxt "@info:shell command-line option" -msgid "Check file timestamps (deprecated, no longer having any effect)" -msgstr "" - -#: kbuildsycoca/kbuildsycoca_main.cpp:84 -#, kde-format -msgctxt "@info:shell command-line option" -msgid "Disable checking files (deprecated, no longer having any effect)" -msgstr "" - -#: kbuildsycoca/kbuildsycoca_main.cpp:87 -#, kde-format -msgctxt "@info:shell command-line option" -msgid "Create global database" -msgstr "" - -#: kbuildsycoca/kbuildsycoca_main.cpp:90 -#, kde-format -msgctxt "@info:shell command-line option" -msgid "Perform menu generation test run only" -msgstr "" - -#: kbuildsycoca/kbuildsycoca_main.cpp:93 -#, kde-format -msgctxt "@info:shell command-line option" -msgid "Track menu id for debug purposes" -msgstr "" - -#: kbuildsycoca/kbuildsycoca_main.cpp:97 -#, kde-format -msgctxt "@info:shell command-line option" -msgid "Switch QStandardPaths to test mode, for unit tests only" -msgstr "" - -#: kdeinit/ktoolinvocation.cpp:66 -#, kde-format -msgid "Function must be called from the main thread." -msgstr "Ha llamase a la función dende'l filu principal." - -#: kdeinit/ktoolinvocation.cpp:103 -#, kde-format -msgid "" -"Error launching %1. Either KLauncher is not running anymore, or it failed to " -"start the application." -msgstr "" -"Fallu al llanzar %1. O KLauncher yá nun ta execución, o falló al aniciase " -"l'aplicación." - -#: kdeinit/ktoolinvocation.cpp:106 -#, kde-format -msgid "" -"KLauncher could not be reached via D-Bus. Error when calling %1:\n" -"%2\n" -msgstr "" -"Nun pudo algamase a KLauncher per D-Bus. Fallu al llamar a %1:\n" -"%2\n" - -#: kdeinit/ktoolinvocation_x11.cpp:250 -#, kde-format -msgid "" -"Could not launch the mail client:\n" -"\n" -"%1" -msgstr "" -"Nun pudo llanzase'l veceru de corréu:\n" -"\n" -"%1" - -#: kdeinit/ktoolinvocation_x11.cpp:251 -#, kde-format -msgid "Could not launch Mail Client" -msgstr "Nun pudo llanzase'l veceru de corréu" - -#. i18n("Could not launch %1:\n\n%2", exe, error), -#. i18n("Could not launch %1:\n\n%2", htmlApp->exec(), error), -#. i18n("Could not launch %1:\n\n%2", exe, error), -#: kdeinit/ktoolinvocation_x11.cpp:300 kdeinit/ktoolinvocation_x11.cpp:325 -#: kdeinit/ktoolinvocation_x11.cpp:344 -#, kde-format -msgid "" -"Could not launch the browser:\n" -"\n" -"%1" -msgstr "" -"Nun pudo llanzase'l restolador:\n" -"\n" -"%1" - -#: kdeinit/ktoolinvocation_x11.cpp:301 kdeinit/ktoolinvocation_x11.cpp:326 -#: kdeinit/ktoolinvocation_x11.cpp:345 -#, kde-format -msgid "Could not launch Browser" -msgstr "Nun pudo llanzase'l restolador" - -#: kdeinit/ktoolinvocation_x11.cpp:384 -#, kde-format -msgid "" -"Could not launch the terminal client:\n" -"\n" -"%1" -msgstr "" -"Nun pudo llanzase'l veceru de terminal:\n" -"\n" -"%1" - -#: kdeinit/ktoolinvocation_x11.cpp:385 -#, kde-format -msgid "Could not launch Terminal Client" -msgstr "Nun pudo llanzase'l veceru de terminal" - -#: plugin/kdbusservicestarter.cpp:77 -#, kde-format -msgid "No service implementing %1" -msgstr "Nun hai serviciu qu'implemente %1" - -#: services/kservice.cpp:1019 -#, kde-format -msgid "The provided service is not valid" -msgstr "El serviciu forníu nun ye válidu" - -#: services/kservice.cpp:1023 -#, kde-format -msgid "The service '%1' provides no library or the Library key is missing" -msgstr "" -"El serviciu «%1» nun forne biblioteques o falta la clave de la biblioteca" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/po/hu/kservice5.po new/kservice-5.52.0/po/hu/kservice5.po --- old/kservice-5.51.0/po/hu/kservice5.po 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/po/hu/kservice5.po 2018-11-03 19:04:24.000000000 +0100 @@ -1,20 +1,21 @@ # Kiszel Kristóf <[email protected]>, 2010. # Kristóf Kiszel <[email protected]>, 2010, 2011, 2012, 2014. # Balázs Úr <[email protected]>, 2012, 2013. +# Kristof Kiszel <[email protected]>, 2018. msgid "" msgstr "" "Project-Id-Version: KDE 4.4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-09-12 03:46+0200\n" -"PO-Revision-Date: 2014-08-30 11:04+0200\n" -"Last-Translator: Kristóf Kiszel <[email protected]>\n" +"PO-Revision-Date: 2018-10-13 21:05+0200\n" +"Last-Translator: Kristof Kiszel <[email protected]>\n" "Language-Team: Hungarian <[email protected]>\n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -63,14 +64,14 @@ msgstr "Waldo Bastian" #: kbuildsycoca/kbuildsycoca_main.cpp:75 -#, fuzzy, kde-format -#| msgctxt "@info:shell command-line option" -#| msgid "Disable checking files (dangerous)" +#, kde-format msgctxt "@info:shell command-line option" msgid "" "Do not signal applications to update (deprecated, no longer having any " "effect)" -msgstr "A fájlellenőrzés kikapcsolása (nem biztonságos)" +msgstr "" +"Ne jelezzen az alkalmazásoknak, hogy frissítsenek (elavult, nincs többé " +"hatása)" #: kbuildsycoca/kbuildsycoca_main.cpp:78 #, kde-format @@ -82,15 +83,13 @@ #, kde-format msgctxt "@info:shell command-line option" msgid "Check file timestamps (deprecated, no longer having any effect)" -msgstr "" +msgstr "Fájlok időbélyegzőinek ellenőrzése (elavult, nincs többé hatása)" #: kbuildsycoca/kbuildsycoca_main.cpp:84 -#, fuzzy, kde-format -#| msgctxt "@info:shell command-line option" -#| msgid "Disable checking files (dangerous)" +#, kde-format msgctxt "@info:shell command-line option" msgid "Disable checking files (deprecated, no longer having any effect)" -msgstr "A fájlellenőrzés kikapcsolása (nem biztonságos)" +msgstr "A fájlellenőrzés kikapcsolása (elavult, nincs többé hatása)" #: kbuildsycoca/kbuildsycoca_main.cpp:87 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/po/zh_CN/kservice5.po new/kservice-5.52.0/po/zh_CN/kservice5.po --- old/kservice-5.51.0/po/zh_CN/kservice5.po 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/po/zh_CN/kservice5.po 2018-11-03 19:04:24.000000000 +0100 @@ -16,8 +16,8 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-09-12 03:46+0200\n" -"PO-Revision-Date: 2018-09-28 19:47\n" -"Last-Translator: guoyunhe <[email protected]>\n" +"PO-Revision-Date: 2018-10-09 18:38\n" +"Last-Translator: guoyunhe <[email protected]>\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/kservice-5.51.0/src/kdeinit/ktoolinvocation_x11.cpp new/kservice-5.52.0/src/kdeinit/ktoolinvocation_x11.cpp --- old/kservice-5.51.0/src/kdeinit/ktoolinvocation_x11.cpp 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/kdeinit/ktoolinvocation_x11.cpp 2018-11-03 19:04:24.000000000 +0100 @@ -171,7 +171,7 @@ if (profileGrp.readEntry("TerminalClient", false)) { KConfigGroup confGroup(KSharedConfig::openConfig(), "General"); QString preferredTerminal = confGroup.readPathEntry("TerminalApplication", QStringLiteral("konsole")); - command = preferredTerminal + QString::fromLatin1(" -e ") + command; + command = preferredTerminal + QLatin1String(" -e ") + command; } QStringList cmdTokens = KShell::splitArgs(command); @@ -359,12 +359,12 @@ if (!command.isEmpty()) { if (exec == QLatin1String("konsole")) { - exec += QString::fromLatin1(" --noclose"); + exec += QLatin1String(" --noclose"); } else if (exec == QLatin1String("xterm")) { - exec += QString::fromLatin1(" -hold"); + exec += QLatin1String(" -hold"); } - exec += QString::fromLatin1(" -e ") + command; + exec += QLatin1String(" -e ") + command; } QStringList cmdTokens = KShell::splitArgs(exec); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/services/application.desktop new/kservice-5.52.0/src/services/application.desktop --- old/kservice-5.51.0/src/services/application.desktop 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/services/application.desktop 2018-11-03 19:04:24.000000000 +0100 @@ -5,7 +5,6 @@ Name[af]=Program Name[ar]=تطبيق Name[as]=অনুপ্ৰয়োগ -Name[ast]=Aplicación Name[be]=Праграма Name[be@latin]=Aplikacyja Name[bg]=Програма diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/services/kautostart.cpp new/kservice-5.52.0/src/services/kautostart.cpp --- old/kservice-5.51.0/src/services/kautostart.cpp 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/services/kautostart.cpp 2018-11-03 19:04:24.000000000 +0100 @@ -222,7 +222,7 @@ // do not specialize the readEntry template - // http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=100911 -static KAutostart::StartPhase readEntry(const KConfigGroup &group, const char *key, const KAutostart::StartPhase &aDefault) +static KAutostart::StartPhase readEntry(const KConfigGroup &group, const char *key, KAutostart::StartPhase aDefault) { const QByteArray data = group.readEntry(key, QByteArray()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/services/kmimetypefactory_p.h new/kservice-5.52.0/src/services/kmimetypefactory_p.h --- old/kservice-5.51.0/src/services/kmimetypefactory_p.h 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/services/kmimetypefactory_p.h 2018-11-03 19:04:24.000000000 +0100 @@ -43,7 +43,7 @@ /** * Create factory */ - KMimeTypeFactory(KSycoca *db); + explicit KMimeTypeFactory(KSycoca *db); ~KMimeTypeFactory() override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/services/kservice.cpp new/kservice-5.52.0/src/services/kservice.cpp --- old/kservice-5.51.0/src/services/kservice.cpp 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/services/kservice.cpp 2018-11-03 19:04:24.000000000 +0100 @@ -231,7 +231,7 @@ m_serviceTypes.push_back(KService::ServiceTypeAndPreference(initialPreference, st)); } - if (entryMap.contains(QLatin1String("Actions"))) { + if (entryMap.contains(QStringLiteral("Actions"))) { parseActions(config, q); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/services/kservice_p.h new/kservice-5.52.0/src/services/kservice_p.h --- old/kservice-5.51.0/src/services/kservice_p.h 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/services/kservice_p.h 2018-11-03 19:04:24.000000000 +0100 @@ -31,7 +31,7 @@ public: K_SYCOCATYPE(KST_KService, KSycocaEntryPrivate) - KServicePrivate(const QString &path) + explicit KServicePrivate(const QString &path) : KSycocaEntryPrivate(path), m_bValid(true) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/services/kservicefactory_p.h new/kservice-5.52.0/src/services/kservicefactory_p.h --- old/kservice-5.51.0/src/services/kservicefactory_p.h 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/services/kservicefactory_p.h 2018-11-03 19:04:24.000000000 +0100 @@ -45,7 +45,7 @@ /** * Create factory */ - KServiceFactory(KSycoca *sycoca); + explicit KServiceFactory(KSycoca *sycoca); ~KServiceFactory() override; /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/services/kservicegroup.cpp new/kservice-5.52.0/src/services/kservicegroup.cpp --- old/kservice-5.51.0/src/services/kservicegroup.cpp 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/services/kservicegroup.cpp 2018-11-03 19:04:24.000000000 +0100 @@ -678,7 +678,7 @@ KServiceGroup::childGroup(const QString &parent) { KSycoca::self()->ensureCacheValid(); - return KSycocaPrivate::self()->serviceGroupFactory()->findGroupByDesktopPath(QString::fromLatin1("#parent#") + parent, true); + return KSycocaPrivate::self()->serviceGroupFactory()->findGroupByDesktopPath(QLatin1String("#parent#") + parent, true); } QString KServiceGroup::baseGroupName() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/services/kservicegroup_p.h new/kservice-5.52.0/src/services/kservicegroup_p.h --- old/kservice-5.51.0/src/services/kservicegroup_p.h 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/services/kservicegroup_p.h 2018-11-03 19:04:24.000000000 +0100 @@ -29,7 +29,7 @@ public: K_SYCOCATYPE(KST_KServiceGroup, KSycocaEntryPrivate) - KServiceGroupPrivate(const QString &path) + explicit KServiceGroupPrivate(const QString &path) : KSycocaEntryPrivate(path), m_bNoDisplay(false), m_bShowEmptyMenu(false), m_bShowInlineHeader(false), m_bInlineAlias(false), m_bAllowInline(false), m_inlineValue(4), m_bDeep(false), m_childCount(-1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/services/kservicegroupfactory_p.h new/kservice-5.52.0/src/services/kservicegroupfactory_p.h --- old/kservice-5.51.0/src/services/kservicegroupfactory_p.h 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/services/kservicegroupfactory_p.h 2018-11-03 19:04:24.000000000 +0100 @@ -42,7 +42,7 @@ /** * Create factory */ - KServiceGroupFactory(KSycoca *db); + explicit KServiceGroupFactory(KSycoca *db); ~KServiceGroupFactory() override; /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/services/kservicetype.cpp new/kservice-5.52.0/src/services/kservicetype.cpp --- old/kservice-5.51.0/src/services/kservicetype.cpp 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/services/kservicetype.cpp 2018-11-03 19:04:24.000000000 +0100 @@ -99,7 +99,7 @@ QString dummy; _str >> m_strName >> dummy >> m_strComment >> m_mapProps >> m_mapPropDefs >> b >> m_serviceOffersOffset; - m_bDerived = m_mapProps.contains(QLatin1String("X-KDE-Derived")); + m_bDerived = m_mapProps.contains(QStringLiteral("X-KDE-Derived")); } void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/services/kservicetype_p.h new/kservice-5.52.0/src/services/kservicetype_p.h --- old/kservice-5.51.0/src/services/kservicetype_p.h 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/services/kservicetype_p.h 2018-11-03 19:04:24.000000000 +0100 @@ -29,7 +29,7 @@ public: K_SYCOCATYPE(KST_KServiceType, KSycocaEntryPrivate) - KServiceTypePrivate(const QString &path) + explicit KServiceTypePrivate(const QString &path) : KSycocaEntryPrivate(path), m_serviceOffersOffset(-1), m_bDerived(false), m_parentTypeLoaded(false) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/services/kservicetypefactory_p.h new/kservice-5.52.0/src/services/kservicetypefactory_p.h --- old/kservice-5.51.0/src/services/kservicetypefactory_p.h 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/services/kservicetypefactory_p.h 2018-11-03 19:04:24.000000000 +0100 @@ -45,7 +45,7 @@ /** * Create factory */ - KServiceTypeFactory(KSycoca *db); + explicit KServiceTypeFactory(KSycoca *db); ~KServiceTypeFactory() override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/services/kservicetypeprofile.cpp new/kservice-5.52.0/src/services/kservicetypeprofile.cpp --- old/kservice-5.51.0/src/services/kservicetypeprofile.cpp 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/services/kservicetypeprofile.cpp 2018-11-03 19:04:24.000000000 +0100 @@ -89,7 +89,7 @@ } for (int i = 0; i < count; ++i) { - const QString num = QString::fromLatin1("Entry") + QString::number(i); + const QString num = QLatin1String("Entry") + QString::number(i); const QString serviceId = config.readEntry(num + QLatin1String("_Service"), QString()); if (!serviceId.isEmpty()) { const int pref = config.readEntry(num + QLatin1String("_Preference"), 0); @@ -196,7 +196,7 @@ int i = 0; for (; servit != services.end(); ++servit, ++i) { if (*servit) { - const QString num = QString::fromLatin1("Entry") + QString::number(i); + const QString num = QLatin1String("Entry") + QString::number(i); config.writeEntry(num + QLatin1String("_Service"), (*servit)->storageId()); config.writeEntry(num + QLatin1String("_Preference"), count - i); } @@ -204,7 +204,7 @@ servit = disabledServices.begin(); for (; servit != disabledServices.end(); ++servit, ++i) { if (*servit) { - const QString num = QString::fromLatin1("Entry") + QString::number(i); + const QString num = QLatin1String("Entry") + QString::number(i); config.writeEntry(num + QLatin1String("_Service"), (*servit)->storageId()); config.writeEntry(num + QLatin1String("_Preference"), 0); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/services/ktraderparsetree.cpp new/kservice-5.52.0/src/services/ktraderparsetree.cpp --- old/kservice-5.51.0/src/services/ktraderparsetree.cpp 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/services/ktraderparsetree.cpp 2018-11-03 19:04:24.000000000 +0100 @@ -661,7 +661,7 @@ return (c.b ? 1 : 0); } -int matchConstraintPlugin(const ParseTreeBase *_tree, KPluginInfo _info, +int matchConstraintPlugin(const ParseTreeBase *_tree, const KPluginInfo &_info, const KPluginInfo::List &_list) { // Empty tree matches always diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/services/ktraderparsetree_p.h new/kservice-5.52.0/src/services/ktraderparsetree_p.h --- old/kservice-5.51.0/src/services/ktraderparsetree_p.h 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/services/ktraderparsetree_p.h 2018-11-03 19:04:24.000000000 +0100 @@ -40,7 +40,7 @@ */ int matchConstraint(const ParseTreeBase *_tree, const KService::Ptr &, const KService::List &); -int matchConstraintPlugin(const ParseTreeBase *_tree, KPluginInfo _info, +int matchConstraintPlugin(const ParseTreeBase *_tree, const KPluginInfo &_info, const KPluginInfo::List &_list); /** @@ -75,7 +75,7 @@ ParseContext(const KService::Ptr &_service, const KService::List &_offers, QMap<QString, PreferencesMaxima> &_m) : service(_service), info(KPluginInfo()), maxima(_m), offers(_offers), pluginOffers(KPluginInfo::List()) {} - ParseContext(KPluginInfo _info, const KPluginInfo::List &_offers, + ParseContext(const KPluginInfo &_info, const KPluginInfo::List &_offers, QMap<QString, PreferencesMaxima> &_m) : service(nullptr), info(_info), maxima(_m), offers(KService::List()), pluginOffers(_offers) {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/sycoca/kbuildmimetypefactory_p.h new/kservice-5.52.0/src/sycoca/kbuildmimetypefactory_p.h --- old/kservice-5.51.0/src/sycoca/kbuildmimetypefactory_p.h 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/sycoca/kbuildmimetypefactory_p.h 2018-11-03 19:04:24.000000000 +0100 @@ -33,7 +33,7 @@ /** * Create factory */ - KBuildMimeTypeFactory(KSycoca *db); + explicit KBuildMimeTypeFactory(KSycoca *db); ~KBuildMimeTypeFactory() override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/sycoca/kbuildservicegroupfactory_p.h new/kservice-5.52.0/src/sycoca/kbuildservicegroupfactory_p.h --- old/kservice-5.51.0/src/sycoca/kbuildservicegroupfactory_p.h 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/sycoca/kbuildservicegroupfactory_p.h 2018-11-03 19:04:24.000000000 +0100 @@ -33,7 +33,7 @@ /** * Create factory */ - KBuildServiceGroupFactory(KSycoca *db); + explicit KBuildServiceGroupFactory(KSycoca *db); ~KBuildServiceGroupFactory() override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/sycoca/kbuildservicetypefactory_p.h new/kservice-5.52.0/src/sycoca/kbuildservicetypefactory_p.h --- old/kservice-5.51.0/src/sycoca/kbuildservicetypefactory_p.h 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/sycoca/kbuildservicetypefactory_p.h 2018-11-03 19:04:24.000000000 +0100 @@ -33,7 +33,7 @@ /** * Create factory */ - KBuildServiceTypeFactory(KSycoca *db); + explicit KBuildServiceTypeFactory(KSycoca *db); ~KBuildServiceTypeFactory() override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/sycoca/kbuildsycoca.cpp new/kservice-5.52.0/src/sycoca/kbuildsycoca.cpp --- old/kservice-5.51.0/src/sycoca/kbuildsycoca.cpp 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/sycoca/kbuildsycoca.cpp 2018-11-03 19:04:24.000000000 +0100 @@ -449,8 +449,8 @@ //as $HOME may also be that of another user rather than /root #ifdef Q_OS_UNIX if (qEnvironmentVariableIsSet("SUDO_UID")) { - const int uid = qgetenv("SUDO_UID").toInt(); - const int gid = qgetenv("SUDO_GID").toInt(); + const int uid = qEnvironmentVariableIntValue("SUDO_UID"); + const int gid = qEnvironmentVariableIntValue("SUDO_GID"); if (uid && gid) { fchown(database.handle(), uid, gid); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/sycoca/kbuildsycoca_p.h new/kservice-5.52.0/src/sycoca/kbuildsycoca_p.h --- old/kservice-5.51.0/src/sycoca/kbuildsycoca_p.h 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/sycoca/kbuildsycoca_p.h 2018-11-03 19:04:24.000000000 +0100 @@ -38,7 +38,7 @@ { Q_OBJECT public: - KBuildSycoca(bool globalDatabase = false); + explicit KBuildSycoca(bool globalDatabase = false); ~KBuildSycoca() override; /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/sycoca/kctimefactory_p.h new/kservice-5.52.0/src/sycoca/kctimefactory_p.h --- old/kservice-5.51.0/src/sycoca/kctimefactory_p.h 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/sycoca/kctimefactory_p.h 2018-11-03 19:04:24.000000000 +0100 @@ -56,7 +56,7 @@ /** * Create factory */ - KCTimeFactory(KSycoca *db); + explicit KCTimeFactory(KSycoca *db); ~KCTimeFactory() override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/sycoca/kmemfile_p.h new/kservice-5.52.0/src/sycoca/kmemfile_p.h --- old/kservice-5.51.0/src/sycoca/kmemfile_p.h 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/sycoca/kmemfile_p.h 2018-11-03 19:04:24.000000000 +0100 @@ -38,6 +38,7 @@ class KMemFile : public QIODevice { + Q_OBJECT public: /** * ctor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/sycoca/kmimeassociations.cpp new/kservice-5.52.0/src/sycoca/kmimeassociations.cpp --- old/kservice-5.51.0/src/sycoca/kmimeassociations.cpp 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/sycoca/kmimeassociations.cpp 2018-11-03 19:04:24.000000000 +0100 @@ -166,7 +166,7 @@ } } -void KOfferHash::removeServiceOffer(const QString &serviceType, KService::Ptr service) +void KOfferHash::removeServiceOffer(const QString &serviceType, const KService::Ptr &service) { ServiceTypeOffersData &data = m_serviceTypeData[serviceType]; // find or create data.removedOffers.insert(service); @@ -179,7 +179,7 @@ } } -bool KOfferHash::hasRemovedOffer(const QString &serviceType, KService::Ptr service) const +bool KOfferHash::hasRemovedOffer(const QString &serviceType, const KService::Ptr &service) const { QHash<QString, ServiceTypeOffersData>::const_iterator it = m_serviceTypeData.find(serviceType); if (it != m_serviceTypeData.end()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/sycoca/kmimeassociations_p.h new/kservice-5.52.0/src/sycoca/kmimeassociations_p.h --- old/kservice-5.51.0/src/sycoca/kmimeassociations_p.h 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/sycoca/kmimeassociations_p.h 2018-11-03 19:04:24.000000000 +0100 @@ -47,8 +47,8 @@ return QList<KServiceOffer>(); } void addServiceOffer(const QString &serviceType, const KServiceOffer &offer); - void removeServiceOffer(const QString &serviceType, KService::Ptr service); - bool hasRemovedOffer(const QString &serviceType, KService::Ptr service) const; + void removeServiceOffer(const QString &serviceType, const KService::Ptr &service); + bool hasRemovedOffer(const QString &serviceType, const KService::Ptr &service) const; const QHash<QString, ServiceTypeOffersData> &serviceTypeData() const { return m_serviceTypeData; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/sycoca/ksycoca.cpp new/kservice-5.52.0/src/sycoca/ksycoca.cpp --- old/kservice-5.51.0/src/sycoca/ksycoca.cpp 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/sycoca/ksycoca.cpp 2018-11-03 19:04:24.000000000 +0100 @@ -510,7 +510,7 @@ if (openDatabase(ifNotFound & IfNotFoundOpenDummy)) { // Database exists, and version is ok, we can read it. - if (qAppName() != QString::fromLatin1(KBUILDSYCOCA_EXENAME) && ifNotFound != IfNotFoundDoNothing) { + if (qAppName() != QLatin1String(KBUILDSYCOCA_EXENAME) && ifNotFound != IfNotFoundDoNothing) { // Ensure it's uptodate, rebuild if needed checkDirectories(); @@ -771,7 +771,7 @@ return; } sycoca->d->readError = true; - if (qAppName() != QString::fromLatin1(KBUILDSYCOCA_EXENAME) && !sycoca->isBuilding()) { + if (qAppName() != QLatin1String(KBUILDSYCOCA_EXENAME) && !sycoca->isBuilding()) { // Rebuild the damned thing. KBuildSycoca builder; (void)builder.recreate(); @@ -816,7 +816,7 @@ void KSycoca::ensureCacheValid() { - if (qAppName() == QString::fromLatin1(KBUILDSYCOCA_EXENAME)) { + if (qAppName() == QLatin1String(KBUILDSYCOCA_EXENAME)) { return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/sycoca/ksycoca_p.h new/kservice-5.52.0/src/sycoca/ksycoca_p.h --- old/kservice-5.51.0/src/sycoca/ksycoca_p.h 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/sycoca/ksycoca_p.h 2018-11-03 19:04:24.000000000 +0100 @@ -53,7 +53,7 @@ class KSERVICE_EXPORT KSycocaPrivate { public: - KSycocaPrivate(KSycoca *q); + explicit KSycocaPrivate(KSycoca *q); // per-thread "singleton" static KSycocaPrivate *self() { return KSycoca::self()->d; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/sycoca/ksycocadevices_p.h new/kservice-5.52.0/src/sycoca/ksycocadevices_p.h --- old/kservice-5.51.0/src/sycoca/ksycocadevices_p.h 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/sycoca/ksycocadevices_p.h 2018-11-03 19:04:24.000000000 +0100 @@ -71,7 +71,7 @@ class KSycocaFileDevice : public KSycocaAbstractDevice { public: - KSycocaFileDevice(const QString &path); + explicit KSycocaFileDevice(const QString &path); ~KSycocaFileDevice() override; QIODevice *device() override; private: @@ -83,7 +83,7 @@ class KSycocaMemFileDevice : public KSycocaAbstractDevice { public: - KSycocaMemFileDevice(const QString &path); + explicit KSycocaMemFileDevice(const QString &path); ~KSycocaMemFileDevice() override; QIODevice *device() override; private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/sycoca/ksycocaentry_p.h new/kservice-5.52.0/src/sycoca/ksycocaentry_p.h --- old/kservice-5.51.0/src/sycoca/ksycocaentry_p.h 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/sycoca/ksycocaentry_p.h 2018-11-03 19:04:24.000000000 +0100 @@ -28,7 +28,7 @@ class KSycocaEntryPrivate { public: - KSycocaEntryPrivate(const QString &path_) + explicit KSycocaEntryPrivate(const QString &path_) : offset(0), deleted(false), path(path_) {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.51.0/src/sycoca/vfolder_menu.cpp new/kservice-5.52.0/src/sycoca/vfolder_menu.cpp --- old/kservice-5.51.0/src/sycoca/vfolder_menu.cpp 2018-10-08 10:21:25.000000000 +0200 +++ new/kservice-5.52.0/src/sycoca/vfolder_menu.cpp 2018-11-03 19:04:24.000000000 +0100 @@ -651,7 +651,7 @@ static QString makeRelative(const QString &dir) { const QString canonical = QDir(dir).canonicalPath(); - Q_FOREACH (const QString &base, QStandardPaths::locateAll(QStandardPaths::GenericConfigLocation, QLatin1String("menus"), QStandardPaths::LocateDirectory)) { + Q_FOREACH (const QString &base, QStandardPaths::locateAll(QStandardPaths::GenericConfigLocation, QStringLiteral("menus"), QStandardPaths::LocateDirectory)) { if (canonical.startsWith(base)) { return canonical.mid(base.length() + 1); } ++++++ kservice-desktop-translations.patch ++++++ --- /var/tmp/diff_new_pack.qOetYm/_old 2018-11-14 14:37:33.767081355 +0100 +++ /var/tmp/diff_new_pack.qOetYm/_new 2018-11-14 14:37:33.771081351 +0100 @@ -1,8 +1,8 @@ -Index: kservice-5.36.0/src/services/kservicegroup.cpp -=================================================================== ---- kservice-5.36.0.orig/src/services/kservicegroup.cpp -+++ kservice-5.36.0/src/services/kservicegroup.cpp -@@ -54,9 +54,9 @@ void KServiceGroupPrivate::load(const QS +diff --git a/src/services/kservicegroup.cpp b/src/services/kservicegroup.cpp +index b182b5a..16c2846 100644 +--- a/src/services/kservicegroup.cpp ++++ b/src/services/kservicegroup.cpp +@@ -52,9 +52,9 @@ void KServiceGroupPrivate::load(const QString &cfg) const KConfigGroup config = desktopFile.desktopGroup();
