Hello community, here is the log from the commit of package kservice for openSUSE:Factory checked in at 2018-04-19 15:18:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kservice (Old) and /work/SRC/openSUSE:Factory/.kservice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kservice" Thu Apr 19 15:18:30 2018 rev:57 rq:596899 version:5.45.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kservice/kservice.changes 2018-03-20 21:47:30.953431792 +0100 +++ /work/SRC/openSUSE:Factory/.kservice.new/kservice.changes 2018-04-19 15:18:32.421642161 +0200 @@ -1,0 +2,13 @@ +Sat Apr 14 13:19:06 CEST 2018 - [email protected] + +- Update to 5.45.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.45.0.php +- Changes since 5.44.0: + * We depend against 5.8.0 + * API dox: consistently use X-KDE-ServiceTypes instead of ServiceTypes + * Remove not necessary QtCore and co + * [API dox] Remove deprecated Encoding=UTF-8 from example for desktop file + +------------------------------------------------------------------- Old: ---- kservice-5.44.0.tar.xz New: ---- kservice-5.45.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kservice.spec ++++++ --- /var/tmp/diff_new_pack.qKoQdg/_old 2018-04-19 15:18:33.077615938 +0200 +++ /var/tmp/diff_new_pack.qKoQdg/_new 2018-04-19 15:18:33.081615778 +0200 @@ -17,13 +17,13 @@ %bcond_without lang -%define _tar_path 5.44 +%define _tar_path 5.45 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kservice -Version: 5.44.0 +Version: 5.45.0 Release: 0 %define kf5_version %{version} BuildRequires: bison ++++++ kservice-5.44.0.tar.xz -> kservice-5.45.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/CMakeLists.txt new/kservice-5.45.0/CMakeLists.txt --- old/kservice-5.44.0/CMakeLists.txt 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/CMakeLists.txt 2018-04-07 21:38:38.000000000 +0200 @@ -1,13 +1,13 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.44.0") # handled by release scripts -set(KF5_DEP_VERSION "5.44.0") # handled by release scripts +set(KF5_VERSION "5.45.0") # handled by release scripts +set(KF5_DEP_VERSION "5.45.0") # handled by release scripts project(KService VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.44.0 NO_MODULE) +find_package(ECM 5.45.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) @@ -35,7 +35,7 @@ CACHE STRING "Name to install the applications.menu file as.") # Dependencies -set(REQUIRED_QT_VERSION 5.7.0) +set(REQUIRED_QT_VERSION 5.8.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus Xml) find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/autotests/CMakeLists.txt new/kservice-5.45.0/autotests/CMakeLists.txt --- old/kservice-5.44.0/autotests/CMakeLists.txt 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/autotests/CMakeLists.txt 2018-04-07 21:38:38.000000000 +0200 @@ -9,7 +9,7 @@ macro(KSERVICE_UNIT_TESTS) foreach(_testname ${ARGN}) ecm_add_test(${_testname}.cpp TEST_NAME ${_testname} - LINK_LIBRARIES KF5::Service Qt5::Test Qt5::Concurrent) + LINK_LIBRARIES KF5::Service Qt5::Test Qt5::Concurrent Qt5::Xml) target_compile_definitions(${_testname} PRIVATE -DKBUILDSYCOCAEXE=\"$<TARGET_FILE:kbuildsycoca5>\") endforeach() endmacro(KSERVICE_UNIT_TESTS) @@ -54,5 +54,5 @@ ecm_qt_declare_logging_category(kmimeassociationstest_SRCS HEADER sycocadebug.h IDENTIFIER SYCOCA CATEGORY_NAME kf5.kservice.sycoca) ecm_add_test(${kmimeassociationstest_SRCS} TEST_NAME kmimeassociationstest - LINK_LIBRARIES KF5::Service Qt5::Test) + LINK_LIBRARIES KF5::Service Qt5::Test Qt5::Xml) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/autotests/kautostarttest.cpp new/kservice-5.45.0/autotests/kautostarttest.cpp --- old/kservice-5.44.0/autotests/kautostarttest.cpp 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/autotests/kautostarttest.cpp 2018-04-07 21:38:38.000000000 +0200 @@ -21,7 +21,7 @@ #include <qstandardpaths.h> #include <QTest> -#include <QtCore/QFile> +#include <QFile> QTEST_MAIN(KAutostartTest) // Qt5 TODO: QTEST_GUILESS_MAIN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/autotests/kautostarttest.h new/kservice-5.45.0/autotests/kautostarttest.h --- old/kservice-5.44.0/autotests/kautostarttest.h 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/autotests/kautostarttest.h 2018-04-07 21:38:38.000000000 +0200 @@ -19,7 +19,7 @@ #ifndef KAUTOSTARTTEST_H #define KAUTOSTARTTEST_H -#include <QtCore/QObject> +#include <QObject> class KAutostartTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/autotests/kplugininfotest.cpp new/kservice-5.45.0/autotests/kplugininfotest.cpp --- old/kservice-5.44.0/autotests/kplugininfotest.cpp 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/autotests/kplugininfotest.cpp 2018-04-07 21:38:38.000000000 +0200 @@ -16,7 +16,7 @@ * Boston, MA 02110-1301, USA. */ -#include <QtTest/QTest> +#include <QTest> #include <QLocale> #include <QJsonDocument> #include <QFileInfo> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/autotests/kservicetest.h new/kservice-5.45.0/autotests/kservicetest.h --- old/kservice-5.44.0/autotests/kservicetest.h 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/autotests/kservicetest.h 2018-04-07 21:38:38.000000000 +0200 @@ -19,7 +19,7 @@ #define KSERVICETEST_H #include <QAtomicInt> -#include <QtCore/QObject> +#include <QObject> class KServiceTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/autotests/ksycocatest.cpp new/kservice-5.45.0/autotests/ksycocatest.cpp --- old/kservice-5.44.0/autotests/ksycocatest.cpp 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/autotests/ksycocatest.cpp 2018-04-07 21:38:38.000000000 +0200 @@ -44,13 +44,9 @@ #define Q_XDG_PLATFORM #endif -#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0) // On Unix, lastModified() finally returns milliseconds as well, since Qt 5.8.0 // Not sure about the situation on Windows though. static const int s_waitDelay = 10; -#else -static const int s_waitDelay = 1000; -#endif extern KSERVICE_EXPORT int ksycoca_ms_between_checks; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/autotests/ksycocathreadtest.cpp new/kservice-5.45.0/autotests/ksycocathreadtest.cpp --- old/kservice-5.44.0/autotests/ksycocathreadtest.cpp 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/autotests/ksycocathreadtest.cpp 2018-04-07 21:38:38.000000000 +0200 @@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA. */ -#include <QtTest/QTest> -#include <QtTest/QSignalSpy> +#include <QTest> +#include <QSignalSpy> #include <QMimeDatabase> #include <QThread> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/po/id/kservice5.po new/kservice-5.45.0/po/id/kservice5.po --- old/kservice-5.44.0/po/id/kservice5.po 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/po/id/kservice5.po 2018-04-07 21:38:38.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-02-07 08:40+0100\n" -"PO-Revision-Date: 2018-03-03 08:13+0700\n" +"PO-Revision-Date: 2018-04-03 06:32+0700\n" "Last-Translator: Wantoyo <[email protected]>\n" "Language-Team: Indonesian <[email protected]>\n" "Language: id\n" @@ -86,14 +86,14 @@ msgctxt "@info:shell command-line option" msgid "Check file timestamps (deprecated, no longer having any effect)" msgstr "" -"Periksa fail timestamp (tercela, tidak terlalu memiliki pengaruh apa pun)" +"Periksa file timestamp (tercela, tidak terlalu memiliki pengaruh apa pun)" #: kbuildsycoca/kbuildsycoca_main.cpp:84 #, kde-format msgctxt "@info:shell command-line option" msgid "Disable checking files (deprecated, no longer having any effect)" msgstr "" -"Nonaktifkan pemeriksaan fail (tercela, tidak terlalu memiliki pengaruh apa " +"Nonaktifkan pemeriksaan file (tercela, tidak terlalu memiliki pengaruh apa " "pun)" #: kbuildsycoca/kbuildsycoca_main.cpp:87 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/po/zh_CN/kservice5.po new/kservice-5.45.0/po/zh_CN/kservice5.po --- old/kservice-5.44.0/po/zh_CN/kservice5.po 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/po/zh_CN/kservice5.po 2018-04-07 21:38:38.000000000 +0200 @@ -16,7 +16,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-02-07 08:40+0100\n" -"PO-Revision-Date: 2018-02-28 02:23-0500\n" +"PO-Revision-Date: 2018-04-05 09:22-0400\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/kbuildsycoca/CMakeLists.txt new/kservice-5.45.0/src/kbuildsycoca/CMakeLists.txt --- old/kservice-5.44.0/src/kbuildsycoca/CMakeLists.txt 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/kbuildsycoca/CMakeLists.txt 2018-04-07 21:38:38.000000000 +0200 @@ -15,6 +15,7 @@ KF5::Crash # set a crash handler for the kbuildsycoca binary KF5::CoreAddons # KAboutData KF5::I18n + Qt5::Xml ) install(TARGETS kbuildsycoca5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/kdeinit/ktoolinvocation.h new/kservice-5.45.0/src/kdeinit/ktoolinvocation.h --- old/kservice-5.44.0/src/kdeinit/ktoolinvocation.h 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/kdeinit/ktoolinvocation.h 2018-04-07 21:38:38.000000000 +0200 @@ -27,9 +27,9 @@ #include <kservice_export.h> -#include <QtCore/QObject> -#include <QtCore/QByteArray> -#include <QtCore/QStringList> +#include <QObject> +#include <QByteArray> +#include <QStringList> class QUrl; class KToolInvocationPrivate; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/kdeinit/ktoolinvocation_win.cpp new/kservice-5.45.0/src/kdeinit/ktoolinvocation_win.cpp --- old/kservice-5.44.0/src/kdeinit/ktoolinvocation_win.cpp 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/kdeinit/ktoolinvocation_win.cpp 2018-04-07 21:38:38.000000000 +0200 @@ -26,8 +26,8 @@ #include <QUrl> #include <QUrlQuery> #include <QProcess> -#include <QtCore/QCoreApplication> -#include <QtCore/QHash> +#include <QCoreApplication> +#include <QHash> #include <QDBusConnection> #include "windows.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/kdeinit/ktoolinvocation_x11.cpp new/kservice-5.45.0/src/kdeinit/ktoolinvocation_x11.cpp --- old/kservice-5.44.0/src/kdeinit/ktoolinvocation_x11.cpp 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/kdeinit/ktoolinvocation_x11.cpp 2018-04-07 21:38:38.000000000 +0200 @@ -37,11 +37,11 @@ #include <QDebug> #include <qstandardpaths.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QProcess> -#include <QtCore/QHash> -#include <QtCore/QDebug> -#include <QtCore/QFile> +#include <QCoreApplication> +#include <QProcess> +#include <QHash> +#include <QDebug> +#include <QFile> #include <QUrl> #include <QUrlQuery> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/plugin/kdbusservicestarter.h new/kservice-5.45.0/src/plugin/kdbusservicestarter.h --- old/kservice-5.44.0/src/plugin/kdbusservicestarter.h 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/plugin/kdbusservicestarter.h 2018-04-07 21:38:38.000000000 +0200 @@ -21,7 +21,7 @@ #include <kservice_export.h> -#include <QtCore/QString> +#include <QString> class KDBusServiceStarterPrivate; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/plugin/kplugintrader.cpp new/kservice-5.45.0/src/plugin/kplugintrader.cpp --- old/kservice-5.44.0/src/plugin/kplugintrader.cpp 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/plugin/kplugintrader.cpp 2018-04-07 21:38:38.000000000 +0200 @@ -21,9 +21,9 @@ #include "kplugintrader.h" #include "ktraderparsetree_p.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QDirIterator> -#include <QtCore/QJsonObject> +#include <QCoreApplication> +#include <QDirIterator> +#include <QJsonObject> #include <QDebug> #include <QJsonArray> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/services/kautostart.cpp new/kservice-5.45.0/src/services/kautostart.cpp --- old/kservice-5.44.0/src/services/kautostart.cpp 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/services/kautostart.cpp 2018-04-07 21:38:38.000000000 +0200 @@ -23,7 +23,7 @@ #include "kconfiggroup.h" #include <QCoreApplication> -#include <QtCore/QFile> +#include <QFile> #include <QStringList> class KAutostartPrivate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/services/kautostart.h new/kservice-5.45.0/src/services/kautostart.h --- old/kservice-5.44.0/src/services/kautostart.h 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/services/kautostart.h 2018-04-07 21:38:38.000000000 +0200 @@ -22,7 +22,7 @@ #include <kservice_export.h> -#include <QtCore/QObject> +#include <QObject> class KAutostartPrivate; class QStringList; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/services/kmimetypefactory_p.h new/kservice-5.45.0/src/services/kmimetypefactory_p.h --- old/kservice-5.44.0/src/services/kmimetypefactory_p.h 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/services/kmimetypefactory_p.h 2018-04-07 21:38:38.000000000 +0200 @@ -22,7 +22,7 @@ #include <assert.h> -#include <QtCore/QStringList> +#include <QStringList> #include "ksycocafactory_p.h" #include "ksycocaentry_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/services/kplugininfo.h new/kservice-5.45.0/src/services/kplugininfo.h --- old/kservice-5.44.0/src/services/kplugininfo.h 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/services/kplugininfo.h 2018-04-07 21:38:38.000000000 +0200 @@ -20,14 +20,14 @@ #ifndef KPLUGININFO_H #define KPLUGININFO_H -#include <QtCore/QExplicitlySharedDataPointer> -#include <QtCore/QString> -#include <QtCore/QMap> -#include <QtCore/QStringList> +#include <QExplicitlySharedDataPointer> +#include <QString> +#include <QMap> +#include <QStringList> #include <kconfiggroup.h> #include <kservice.h> -#include <QtCore/QList> +#include <QList> class KPluginMetaData; class KPluginInfoPrivate; @@ -53,10 +53,9 @@ * The file should be of the following form: * \verbatim [Desktop Entry] - Encoding=UTF-8 Icon=mypluginicon Type=Service - ServiceTypes=KPluginInfo + X-KDE-ServiceTypes=KPluginInfo Name=User Visible Name Comment=Description of what the plugin does @@ -91,10 +90,9 @@ * The .desktop file should look like this: * \verbatim [Desktop Entry] - Encoding=UTF-8 Icon=mypluginicon Type=Service - ServiceTypes=KPluginInfo + X-KDE-ServiceTypes=KPluginInfo X-KDE-PluginInfo-Author=Author's Name [email protected] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/services/kservice.cpp new/kservice-5.45.0/src/services/kservice.cpp --- old/kservice-5.44.0/src/services/kservice.cpp 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/services/kservice.cpp 2018-04-07 21:38:38.000000000 +0200 @@ -25,10 +25,10 @@ #include <qplatformdefs.h> -#include <QtCore/QCharRef> -#include <QtCore/QFile> -#include <QtCore/QDir> -#include <QtCore/QMap> +#include <QCharRef> +#include <QFile> +#include <QDir> +#include <QMap> #include <QCoreApplication> #include <qmimedatabase.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/services/kservice.h new/kservice-5.45.0/src/services/kservice.h --- old/kservice-5.44.0/src/services/kservice.h 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/services/kservice.h 2018-04-07 21:38:38.000000000 +0200 @@ -22,12 +22,12 @@ #define KSERVICE_H #include "kserviceaction.h" -#include <QtCore/QStringList> -#include <QtCore/QVariant> +#include <QStringList> +#include <QVariant> #include <kpluginfactory.h> #include <kpluginloader.h> #include <ksycocaentry.h> -#include <QtCore/QCoreApplication> +#include <QCoreApplication> #include <QJsonObject> class KServiceType; @@ -46,7 +46,7 @@ * * The starting point you need is often the static methods, like createInstance(). * The types of service a plugin provides is taken from the accompanying desktop file - * where the 'ServiceTypes=' field is used. + * where the 'X-KDE-ServiceTypes=' field is used. * * For a tutorial on how to build a plugin-loading mechanism and how to write plugins * in general, see http://techbase.kde.org/Development/Tutorials#Services:_Applications_and_Plugins diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/services/kserviceaction.h new/kservice-5.45.0/src/services/kserviceaction.h --- old/kservice-5.44.0/src/services/kserviceaction.h 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/services/kserviceaction.h 2018-04-07 21:38:38.000000000 +0200 @@ -21,7 +21,7 @@ #define KSERVICEACTION_H #include <kservice_export.h> -#include <QtCore/QSharedDataPointer> +#include <QSharedDataPointer> class QVariant; class KServiceActionPrivate; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/services/kservicefactory_p.h new/kservice-5.45.0/src/services/kservicefactory_p.h --- old/kservice-5.44.0/src/services/kservicefactory_p.h 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/services/kservicefactory_p.h 2018-04-07 21:38:38.000000000 +0200 @@ -21,7 +21,7 @@ #ifndef KSERVICEFACTORY_P_H #define KSERVICEFACTORY_P_H -#include <QtCore/QStringList> +#include <QStringList> #include "kserviceoffer.h" #include "ksycocafactory_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/services/kservicegroup_p.h new/kservice-5.45.0/src/services/kservicegroup_p.h --- old/kservice-5.44.0/src/services/kservicegroup_p.h 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/services/kservicegroup_p.h 2018-04-07 21:38:38.000000000 +0200 @@ -22,7 +22,7 @@ #include "kservicegroup.h" #include <ksycocaentry_p.h> -#include <QtCore/QStringList> +#include <QStringList> class KServiceGroupPrivate : public KSycocaEntryPrivate { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/services/kservicegroupfactory_p.h new/kservice-5.45.0/src/services/kservicegroupfactory_p.h --- old/kservice-5.44.0/src/services/kservicegroupfactory_p.h 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/services/kservicegroupfactory_p.h 2018-04-07 21:38:38.000000000 +0200 @@ -19,7 +19,7 @@ #ifndef KSERVICEGROUPFACTORY_P_H #define KSERVICEGROUPFACTORY_P_H -#include <QtCore/QStringList> +#include <QStringList> #include "kservicegroup.h" #include "ksycocafactory_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/services/kserviceoffer.h new/kservice-5.45.0/src/services/kserviceoffer.h --- old/kservice-5.44.0/src/services/kserviceoffer.h 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/services/kserviceoffer.h 2018-04-07 21:38:38.000000000 +0200 @@ -20,7 +20,7 @@ #ifndef KSERVICEOFFER_H #define KSERVICEOFFER_H -#include <QtCore/QString> +#include <QString> #include <kservice.h> class KServiceOfferPrivate; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/services/kservicetype.h new/kservice-5.45.0/src/services/kservicetype.h --- old/kservice-5.44.0/src/services/kservicetype.h 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/services/kservicetype.h 2018-04-07 21:38:38.000000000 +0200 @@ -23,10 +23,10 @@ #include <ksycocaentry.h> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QMap> -#include <QtCore/QVariant> +#include <QString> +#include <QStringList> +#include <QMap> +#include <QVariant> #include <kconfig.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/services/kservicetypefactory_p.h new/kservice-5.45.0/src/services/kservicetypefactory_p.h --- old/kservice-5.44.0/src/services/kservicetypefactory_p.h 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/services/kservicetypefactory_p.h 2018-04-07 21:38:38.000000000 +0200 @@ -22,7 +22,7 @@ #include <assert.h> -#include <QtCore/QStringList> +#include <QStringList> #include "ksycocafactory_p.h" #include "kservicetype.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/services/kservicetypeprofile.cpp new/kservice-5.45.0/src/services/kservicetypeprofile.cpp --- old/kservice-5.44.0/src/services/kservicetypeprofile.cpp 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/services/kservicetypeprofile.cpp 2018-04-07 21:38:38.000000000 +0200 @@ -28,7 +28,7 @@ #include <kconfiggroup.h> #include <QMutex> -#include <QtCore/QHash> +#include <QHash> #include <QtAlgorithms> // servicetype -> profile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/services/kservicetypeprofile.h new/kservice-5.45.0/src/services/kservicetypeprofile.h --- old/kservice-5.44.0/src/services/kservicetypeprofile.h 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/services/kservicetypeprofile.h 2018-04-07 21:38:38.000000000 +0200 @@ -21,8 +21,8 @@ #ifndef __kservicetypeprofile_h__ #define __kservicetypeprofile_h__ -#include <QtCore/QString> -#include <QtCore/QList> +#include <QString> +#include <QList> #include <kservicetypetrader.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/services/ktraderparsetree_p.h new/kservice-5.45.0/src/services/ktraderparsetree_p.h --- old/kservice-5.44.0/src/services/ktraderparsetree_p.h 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/services/ktraderparsetree_p.h 2018-04-07 21:38:38.000000000 +0200 @@ -20,9 +20,9 @@ #ifndef __ktrader_parse_tree_h__ #define __ktrader_parse_tree_h__ -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QMap> +#include <QString> +#include <QStringList> +#include <QMap> #include <kservice.h> #include <kplugininfo.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/sycoca/kctimefactory_p.h new/kservice-5.45.0/src/sycoca/kctimefactory_p.h --- old/kservice-5.44.0/src/sycoca/kctimefactory_p.h 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/sycoca/kctimefactory_p.h 2018-04-07 21:38:38.000000000 +0200 @@ -20,7 +20,7 @@ #define KCTIME_FACTORY_H #include <ksycocafactory_p.h> -#include <QtCore/QHash> +#include <QHash> /** * Simple dict for assocating a timestamp with each file in ksycoca diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/sycoca/kmemfile.cpp new/kservice-5.45.0/src/sycoca/kmemfile.cpp --- old/kservice-5.44.0/src/sycoca/kmemfile.cpp 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/sycoca/kmemfile.cpp 2018-04-07 21:38:38.000000000 +0200 @@ -22,10 +22,10 @@ #ifndef QT_NO_SHAREDMEMORY -#include <QtCore/QSharedMemory> -#include <QtCore/QCryptographicHash> -#include <QtCore/QFile> -#include <QtCore/QDir> +#include <QSharedMemory> +#include <QCryptographicHash> +#include <QFile> +#include <QDir> #include <QCoreApplication> class KMemFile::Private diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/sycoca/kmemfile_p.h new/kservice-5.45.0/src/sycoca/kmemfile_p.h --- old/kservice-5.44.0/src/sycoca/kmemfile_p.h 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/sycoca/kmemfile_p.h 2018-04-07 21:38:38.000000000 +0200 @@ -23,7 +23,7 @@ #ifndef QT_NO_SHAREDMEMORY -#include <QtCore/QIODevice> +#include <QIODevice> #include <kservice_export.h> /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/sycoca/ksycoca.cpp new/kservice-5.45.0/src/sycoca/ksycoca.cpp --- old/kservice-5.44.0/src/sycoca/ksycoca.cpp 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/sycoca/ksycoca.cpp 2018-04-07 21:38:38.000000000 +0200 @@ -28,10 +28,10 @@ #include "sycocadebug.h" #include <qstandardpaths.h> -#include <QtCore/QDataStream> -#include <QtCore/QCoreApplication> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> +#include <QDataStream> +#include <QCoreApplication> +#include <QFile> +#include <QFileInfo> #include <QThread> #include <QThreadStorage> #include <QMetaMethod> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/sycoca/ksycoca.h new/kservice-5.45.0/src/sycoca/ksycoca.h --- old/kservice-5.44.0/src/sycoca/ksycoca.h 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/sycoca/ksycoca.h 2018-04-07 21:38:38.000000000 +0200 @@ -23,8 +23,8 @@ #include <kservice_export.h> #include <ksycocatype.h> -#include <QtCore/QObject> -#include <QtCore/QStringList> +#include <QObject> +#include <QStringList> class QDataStream; class KSycocaFactory; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/sycoca/ksycocaentry.h new/kservice-5.45.0/src/sycoca/ksycocaentry.h --- old/kservice-5.44.0/src/sycoca/ksycocaentry.h 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/sycoca/ksycocaentry.h 2018-04-07 21:38:38.000000000 +0200 @@ -22,9 +22,9 @@ #include <ksycocatype.h> #include <kservice_export.h> -#include <QtCore/QDataStream> -#include <QtCore/QStringList> -#include <QtCore/QVariant> +#include <QDataStream> +#include <QStringList> +#include <QVariant> #include <QExplicitlySharedDataPointer> class KSycocaEntryPrivate; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/sycoca/ksycocafactory.cpp new/kservice-5.45.0/src/sycoca/ksycocafactory.cpp --- old/kservice-5.44.0/src/sycoca/ksycocafactory.cpp 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/sycoca/ksycocafactory.cpp 2018-04-07 21:38:38.000000000 +0200 @@ -27,7 +27,7 @@ #include <QDebug> #include <QThread> -#include <QtCore/QHash> +#include <QHash> class KSycocaFactoryPrivate { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/sycoca/ksycocaresourcelist_p.h new/kservice-5.45.0/src/sycoca/ksycocaresourcelist_p.h --- old/kservice-5.44.0/src/sycoca/ksycocaresourcelist_p.h 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/sycoca/ksycocaresourcelist_p.h 2018-04-07 21:38:38.000000000 +0200 @@ -18,8 +18,8 @@ #ifndef KSYCOCARESOURCELIST_H #define KSYCOCARESOURCELIST_H -#include <QtCore/QLinkedList> -#include <QtCore/QString> +#include <QLinkedList> +#include <QString> struct KSycocaResource { QByteArray resource; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/sycoca/vfolder_menu.cpp new/kservice-5.45.0/src/sycoca/vfolder_menu.cpp --- old/kservice-5.44.0/src/sycoca/vfolder_menu.cpp 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/sycoca/vfolder_menu.cpp 2018-04-07 21:38:38.000000000 +0200 @@ -24,11 +24,11 @@ #include <kservice.h> #include <QDebug> -#include <QtCore/QMap> -#include <QtCore/QFile> -#include <QtCore/QDir> -#include <QtCore/QRegExp> -#include <QtCore/QDirIterator> +#include <QMap> +#include <QFile> +#include <QDir> +#include <QRegExp> +#include <QDirIterator> #include <QStandardPaths> static void foldNode(QDomElement &docElem, QDomElement &e, QMap<QString, QDomElement> &dupeList, QString s = QString()) //krazy:exclude=passbyvalue diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.44.0/src/sycoca/vfolder_menu_p.h new/kservice-5.45.0/src/sycoca/vfolder_menu_p.h --- old/kservice-5.44.0/src/sycoca/vfolder_menu_p.h 2018-03-03 11:06:21.000000000 +0100 +++ new/kservice-5.45.0/src/sycoca/vfolder_menu_p.h 2018-04-07 21:38:38.000000000 +0200 @@ -20,12 +20,12 @@ #ifndef VFOLDER_MENU_H #define VFOLDER_MENU_H -#include <QtCore/QObject> -#include <QtXml/QDomDocument> -#include <QtCore/QStringList> -#include <QtCore/QHash> -#include <QtCore/QSet> -#include <QtCore/QStack> +#include <QObject> +#include <QDomDocument> +#include <QStringList> +#include <QHash> +#include <QSet> +#include <QStack> #include <kservice.h>
