Hello community, here is the log from the commit of package kcoreaddons for openSUSE:Factory checked in at 2018-04-19 15:17:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcoreaddons (Old) and /work/SRC/openSUSE:Factory/.kcoreaddons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcoreaddons" Thu Apr 19 15:17:59 2018 rev:55 rq:596893 version:5.45.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kcoreaddons/kcoreaddons.changes 2018-03-20 21:45:07.094609878 +0100 +++ /work/SRC/openSUSE:Factory/.kcoreaddons.new/kcoreaddons.changes 2018-04-19 15:18:02.806825304 +0200 @@ -1,0 +2,14 @@ +Sat Apr 14 13:19:03 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: + * Add missing override + * Return when url is empty + * Use ecm_setup_qtplugin_macro_names + * Remove not necessary QtCore and co + * Cleanup m_inotify_wd_to_entry before invalidating Entry pointers (kde#390214) + +------------------------------------------------------------------- Old: ---- kcoreaddons-5.44.0.tar.xz New: ---- kcoreaddons-5.45.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcoreaddons.spec ++++++ --- /var/tmp/diff_new_pack.NPe7wv/_old 2018-04-19 15:18:03.386802147 +0200 +++ /var/tmp/diff_new_pack.NPe7wv/_new 2018-04-19 15:18:03.390801987 +0200 @@ -18,13 +18,13 @@ %bcond_without lang %define lname libKF5CoreAddons5 -%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: kcoreaddons -Version: 5.44.0 +Version: 5.45.0 Release: 0 BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_tar_path} ++++++ kcoreaddons-5.44.0.tar.xz -> kcoreaddons-5.45.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/CMakeLists.txt new/kcoreaddons-5.45.0/CMakeLists.txt --- old/kcoreaddons-5.44.0/CMakeLists.txt 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/CMakeLists.txt 2018-04-07 21:33:50.000000000 +0200 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.44.0") # handled by release scripts +set(KF5_VERSION "5.45.0") # handled by release scripts project(KCoreAddons VERSION ${KF5_VERSION}) 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) @@ -18,6 +18,7 @@ include(ECMGenerateHeaders) include(ECMQtDeclareLoggingCategory) include(ECMAddQch) +include(ECMSetupQtPluginMacroNames) include(KDEInstallDirs) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) @@ -26,30 +27,18 @@ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") -set(REQUIRED_QT_VERSION 5.7.0) +set(REQUIRED_QT_VERSION 5.8.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core) -# TODO: create ECM macro for automoc & json things -set(KCoreAddons_AUTOMOC_MACRO_NAMES "K_PLUGIN_FACTORY_WITH_JSON" "K_PLUGIN_FACTORY" "K_PLUGIN_CLASS_WITH_JSON") -if(NOT CMAKE_VERSION VERSION_LESS "3.10.0") - # CMake 3.9+ warns about automoc on files without Q_OBJECT, and doesn't know about other macros. - # 3.10+ lets us provide more macro names that require automoc. - list(APPEND CMAKE_AUTOMOC_MACRO_NAMES ${KCoreAddons_AUTOMOC_MACRO_NAMES}) -endif() -set(KCoreAddons_AUTOMOC_MACRO_NAMES_WITH_JSON_ARG2 "K_PLUGIN_FACTORY_WITH_JSON" "K_PLUGIN_CLASS_WITH_JSON") -if(NOT CMAKE_VERSION VERSION_LESS "3.9.0") - # CMake's automoc needs help to find names of plugin metadata files in case Q_PLUGIN_METADATA - # is indirectly used via other C++ preprocessor macros - # 3.9+ lets us provide some filter rule pairs (keyword, regexp) to match the names of such files - # in the plain text of the sources. See AUTOMOC_DEPEND_FILTERS docs for details. - foreach(macro_name ${KCoreAddons_AUTOMOC_MACRO_NAMES_WITH_JSON_ARG2}) - list(APPEND CMAKE_AUTOMOC_DEPEND_FILTERS - "${macro_name}" - "[\n^][ \t]*${macro_name}[ \t\n]*\\([^,]*,[ \t\n]*\"([^\"]+)\"" - ) - endforeach() -endif() - +ecm_setup_qtplugin_macro_names( + JSON_NONE + "K_PLUGIN_FACTORY" + JSON_ARG2 + "K_PLUGIN_FACTORY_WITH_JSON" + "K_PLUGIN_CLASS_WITH_JSON" + CONFIG_CODE_VARIABLE + PACKAGE_SETUP_AUTOMOC_VARIABLES +) find_package(Threads) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/KF5CoreAddonsConfig.cmake.in new/kcoreaddons-5.45.0/KF5CoreAddonsConfig.cmake.in --- old/kcoreaddons-5.44.0/KF5CoreAddonsConfig.cmake.in 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/KF5CoreAddonsConfig.cmake.in 2018-04-07 21:33:50.000000000 +0200 @@ -3,21 +3,7 @@ include(CMakeFindDependencyMacro) find_dependency(Qt5Core @REQUIRED_QT_VERSION@) - -if(NOT CMAKE_VERSION VERSION_LESS "3.10.0") - # CMake 3.9+ warns about automoc on files without Q_OBJECT, and doesn't know about other macros. - # 3.10+ lets us provide more macro names that require automoc. - list(APPEND CMAKE_AUTOMOC_MACRO_NAMES @KCoreAddons_AUTOMOC_MACRO_NAMES@) -endif() -if(NOT CMAKE_VERSION VERSION_LESS "3.9.0") - foreach(macro_name @KCoreAddons_AUTOMOC_MACRO_NAMES_WITH_JSON_ARG2@) - # tell automoc how to find names of plugin metadata files - list(APPEND CMAKE_AUTOMOC_DEPEND_FILTERS - "${macro_name}" - "[\n^][ \t]*${macro_name}[ \t\n]*\\([^,]*,[ \t\n]*\"([^\"]+)\"" - ) - endforeach() -endif() +@PACKAGE_SETUP_AUTOMOC_VARIABLES@ if(CMAKE_CROSSCOMPILING AND KF5_HOST_TOOLING) find_file(TARGETSFILE KF5CoreAddons/KF5CoreAddonsToolingTargets.cmake diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/autotests/kautosavefiletest.cpp new/kcoreaddons-5.45.0/autotests/kautosavefiletest.cpp --- old/kcoreaddons-5.44.0/autotests/kautosavefiletest.cpp 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/autotests/kautosavefiletest.cpp 2018-04-07 21:33:50.000000000 +0200 @@ -19,13 +19,13 @@ #include "kautosavefiletest.h" -#include <QtCore/QFile> -#include <QtCore/QTextStream> +#include <QFile> +#include <QTextStream> #include <qtemporaryfile.h> #include <kautosavefile.h> -#include <QtTest/QtTest> +#include <QtTest> QTEST_MAIN(KAutoSaveFileTest) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/autotests/kautosavefiletest.h new/kcoreaddons-5.45.0/autotests/kautosavefiletest.h --- old/kcoreaddons-5.44.0/autotests/kautosavefiletest.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/autotests/kautosavefiletest.h 2018-04-07 21:33:50.000000000 +0200 @@ -20,8 +20,8 @@ #ifndef kautosavefiletest_h #define kautosavefiletest_h -#include <QtCore/QObject> -#include <QtCore/QStringList> +#include <QObject> +#include <QStringList> class KAutoSaveFileTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/autotests/kcompositejobtest.cpp new/kcoreaddons-5.45.0/autotests/kcompositejobtest.cpp --- old/kcoreaddons-5.44.0/autotests/kcompositejobtest.cpp 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/autotests/kcompositejobtest.cpp 2018-04-07 21:33:50.000000000 +0200 @@ -19,7 +19,7 @@ #include "kcompositejobtest.h" -#include <QtTest/QtTest> +#include <QtTest> #include <QTimer> TestJob::TestJob(QObject *parent) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/autotests/kformattest.cpp new/kcoreaddons-5.45.0/autotests/kformattest.cpp --- old/kcoreaddons-5.44.0/autotests/kformattest.cpp 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/autotests/kformattest.cpp 2018-04-07 21:33:50.000000000 +0200 @@ -23,7 +23,7 @@ #include "kformattest.h" -#include <QtTest/QtTest> +#include <QtTest> #include "kformat.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/autotests/kformattest.h new/kcoreaddons-5.45.0/autotests/kformattest.h --- old/kcoreaddons-5.44.0/autotests/kformattest.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/autotests/kformattest.h 2018-04-07 21:33:50.000000000 +0200 @@ -24,7 +24,7 @@ #ifndef KFORMATTEST_H #define KFORMATTEST_H -#include <QtCore/QObject> +#include <QObject> class KFormatTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/autotests/kjobtest.cpp new/kcoreaddons-5.45.0/autotests/kjobtest.cpp --- old/kcoreaddons-5.44.0/autotests/kjobtest.cpp 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/autotests/kjobtest.cpp 2018-04-07 21:33:50.000000000 +0200 @@ -19,9 +19,9 @@ #include "kjobtest.h" -#include <QtCore/QTimer> -#include <QtTest/QSignalSpy> -#include <QtTest/QTest> +#include <QTimer> +#include <QSignalSpy> +#include <QTest> QTEST_MAIN(KJobTest) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/autotests/kjobtest.h new/kcoreaddons-5.45.0/autotests/kjobtest.h --- old/kcoreaddons-5.44.0/autotests/kjobtest.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/autotests/kjobtest.h 2018-04-07 21:33:50.000000000 +0200 @@ -20,8 +20,8 @@ #ifndef KJOBTEST_H #define KJOBTEST_H -#include <QtCore/QObject> -#include <QtCore/QEventLoop> +#include <QObject> +#include <QEventLoop> #include "kjob.h" #include "kjobuidelegate.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/autotests/kmacroexpandertest.cpp new/kcoreaddons-5.45.0/autotests/kmacroexpandertest.cpp --- old/kcoreaddons-5.44.0/autotests/kmacroexpandertest.cpp 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/autotests/kmacroexpandertest.cpp 2018-04-07 21:33:50.000000000 +0200 @@ -20,8 +20,8 @@ #include <QTest> #include <kmacroexpander.h> -#include <QtCore/QHash> -#include <QtCore/QObject> +#include <QHash> +#include <QObject> class KMacroExpanderTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/autotests/kprocesstest.cpp new/kcoreaddons-5.45.0/autotests/kprocesstest.cpp --- old/kcoreaddons-5.44.0/autotests/kprocesstest.cpp 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/autotests/kprocesstest.cpp 2018-04-07 21:33:50.000000000 +0200 @@ -20,7 +20,7 @@ */ #include <kprocess.h> -#include <QtTest/QtTest> +#include <QtTest> #include <qstandardpaths.h> #include <stdio.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/autotests/kshareddatacachetest.cpp new/kcoreaddons-5.45.0/autotests/kshareddatacachetest.cpp --- old/kcoreaddons-5.44.0/autotests/kshareddatacachetest.cpp 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/autotests/kshareddatacachetest.cpp 2018-04-07 21:33:50.000000000 +0200 @@ -20,12 +20,12 @@ #include <kshareddatacache.h> -#include <QtTest/QtTest> +#include <QtTest> -#include <QtCore/QObject> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QDir> +#include <QObject> +#include <QString> +#include <QStringList> +#include <QDir> #include <qstandardpaths.h> #include <string.h> // strcpy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/autotests/kshelltest.cpp new/kcoreaddons-5.45.0/autotests/kshelltest.cpp --- old/kcoreaddons-5.44.0/autotests/kshelltest.cpp 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/autotests/kshelltest.cpp 2018-04-07 21:33:50.000000000 +0200 @@ -20,12 +20,12 @@ #include <kshell.h> #include <kuser.h> -#include <QtTest/QtTest> +#include <QtTest> -#include <QtCore/QObject> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QDir> +#include <QObject> +#include <QString> +#include <QStringList> +#include <QDir> class KShellTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/autotests/kstringhandlertest.h new/kcoreaddons-5.45.0/autotests/kstringhandlertest.h --- old/kcoreaddons-5.44.0/autotests/kstringhandlertest.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/autotests/kstringhandlertest.h 2018-04-07 21:33:50.000000000 +0200 @@ -1,7 +1,7 @@ #ifndef KSTRINGHANDLERTEST_H #define KSTRINGHANDLERTEST_H -#include <QtCore/QObject> +#include <QObject> class KStringHandlerTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/autotests/ktexttohtmltest.h new/kcoreaddons-5.45.0/autotests/ktexttohtmltest.h --- old/kcoreaddons-5.44.0/autotests/ktexttohtmltest.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/autotests/ktexttohtmltest.h 2018-04-07 21:33:50.000000000 +0200 @@ -20,7 +20,7 @@ #ifndef KTEXTTOHTMLTEST_H #define KTEXTTOHTMLTEST_H -#include <QtCore/QObject> +#include <QObject> class KTextToHTMLTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/autotests/kurlmimedatatest.h new/kcoreaddons-5.45.0/autotests/kurlmimedatatest.h --- old/kcoreaddons-5.44.0/autotests/kurlmimedatatest.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/autotests/kurlmimedatatest.h 2018-04-07 21:33:50.000000000 +0200 @@ -20,7 +20,7 @@ #ifndef KURLMIMEDATATEST_H #define KURLMIMEDATATEST_H -#include <QtCore/QObject> +#include <QObject> class KUrlMimeDataTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/po/ca@valencia/kcoreaddons5_qt.po new/kcoreaddons-5.45.0/po/ca@valencia/kcoreaddons5_qt.po --- old/kcoreaddons-5.44.0/po/ca@valencia/kcoreaddons5_qt.po 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/po/ca@valencia/kcoreaddons5_qt.po 2018-04-07 21:33:50.000000000 +0200 @@ -33,7 +33,7 @@ "Please check the documentation or the source for any\n" "licensing terms.\n" msgstr "" -"No s'ha especificat cap terme de llicència per a este programa.\n" +"No s'ha especificat cap terme de llicència per a aquest programa.\n" "Per favor, busqueu els termes de llicència a la documentació\n" "o al codi font.\n" @@ -41,7 +41,7 @@ #, qt-format msgctxt "KAboutLicense|" msgid "This program is distributed under the terms of the %1." -msgstr "Este programa es distribueix sota els termes de la %1." +msgstr "Aquest programa es distribueix sota els termes de la %1." #: lib/kaboutdata.cpp:347 msgctxt "KAboutLicense|@item license (short name)" @@ -162,7 +162,7 @@ msgctxt "KAboutData CLI|" msgid "The base file name of the desktop entry for this application." msgstr "" -"El nom del fitxer base de l'entrada de l'escriptori per esta aplicació." +"El nom del fitxer base de l'entrada de l'escriptori per aquesta aplicació." #: lib/kaboutdata.cpp:1163 msgctxt "KAboutData CLI|" @@ -172,7 +172,7 @@ #: lib/kaboutdata.cpp:1172 msgctxt "KAboutData CLI|" msgid "This application was written by somebody who wants to remain anonymous." -msgstr "Esta aplicació la va escriure algú que vol restar anònim." +msgstr "Aquesta aplicació la va escriure algú que vol restar anònim." #: lib/kaboutdata.cpp:1174 #, qt-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/po/id/kcoreaddons5_qt.po new/kcoreaddons-5.45.0/po/id/kcoreaddons5_qt.po --- old/kcoreaddons-5.44.0/po/id/kcoreaddons5_qt.po 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/po/id/kcoreaddons5_qt.po 2018-04-07 21:33:50.000000000 +0200 @@ -9,7 +9,7 @@ "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: 2018-03-02 22:16+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" @@ -153,12 +153,12 @@ #: lib/kaboutdata.cpp:1162 msgctxt "KAboutData CLI|" msgid "The base file name of the desktop entry for this application." -msgstr "Nama fail dasar dari seluruh desktop untuk aplikasi ini." +msgstr "Nama file dasar dari seluruh desktop untuk aplikasi ini." #: lib/kaboutdata.cpp:1163 msgctxt "KAboutData CLI|" msgid "file name" -msgstr "nama fail " +msgstr "nama file " #: lib/kaboutdata.cpp:1172 msgctxt "KAboutData CLI|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/po/zh_CN/kcoreaddons5_qt.po new/kcoreaddons-5.45.0/po/zh_CN/kcoreaddons5_qt.po --- old/kcoreaddons-5.44.0/po/zh_CN/kcoreaddons5_qt.po 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/po/zh_CN/kcoreaddons5_qt.po 2018-04-07 21:33:50.000000000 +0200 @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\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/kcoreaddons-5.44.0/src/lib/caching/kshareddatacache.cpp new/kcoreaddons-5.45.0/src/lib/caching/kshareddatacache.cpp --- old/kcoreaddons-5.44.0/src/lib/caching/kshareddatacache.cpp 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/caching/kshareddatacache.cpp 2018-04-07 21:33:50.000000000 +0200 @@ -30,15 +30,15 @@ #include <krandom.h> -#include <QtCore/QDateTime> -#include <QtCore/QDebug> -#include <QtCore/QSharedPointer> -#include <QtCore/QByteArray> -#include <QtCore/QFile> -#include <QtCore/QAtomicInt> -#include <QtCore/QList> -#include <QtCore/QMutex> -#include <QtCore/QMutexLocker> +#include <QDateTime> +#include <QDebug> +#include <QSharedPointer> +#include <QByteArray> +#include <QFile> +#include <QAtomicInt> +#include <QList> +#include <QMutex> +#include <QMutexLocker> #include <QDir> #include <sys/types.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/caching/kshareddatacache_p.h new/kcoreaddons-5.45.0/src/lib/caching/kshareddatacache_p.h --- old/kcoreaddons-5.44.0/src/lib/caching/kshareddatacache_p.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/caching/kshareddatacache_p.h 2018-04-07 21:33:50.000000000 +0200 @@ -22,8 +22,8 @@ #include <config-caching.h> // HAVE_SYS_MMAN_H -#include <QtCore/QDebug> -#include <QtCore/QSharedPointer> +#include <QDebug> +#include <QSharedPointer> #include <qbasicatomic.h> #include "kcoreaddons_debug.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/caching/kshareddatacache_win.cpp new/kcoreaddons-5.45.0/src/lib/caching/kshareddatacache_win.cpp --- old/kcoreaddons-5.44.0/src/lib/caching/kshareddatacache_win.cpp 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/caching/kshareddatacache_win.cpp 2018-04-07 21:33:50.000000000 +0200 @@ -24,9 +24,9 @@ */ #include "kshareddatacache.h" -#include <QtCore/QString> -#include <QtCore/QByteArray> -#include <QtCore/QCache> +#include <QString> +#include <QByteArray> +#include <QCache> class Q_DECL_HIDDEN KSharedDataCache::Private { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/io/kautosavefile.cpp new/kcoreaddons-5.45.0/src/lib/io/kautosavefile.cpp --- old/kcoreaddons-5.44.0/src/lib/io/kautosavefile.cpp 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/io/kautosavefile.cpp 2018-04-07 21:33:50.000000000 +0200 @@ -22,13 +22,13 @@ #include <stdio.h> // for FILENAME_MAX -#include <QtCore/QLatin1Char> -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtCore/QDebug> -#include <QtCore/QFile> -#include <QtCore/QLockFile> -#include <QtCore/QStandardPaths> +#include <QLatin1Char> +#include <QCoreApplication> +#include <QDir> +#include <QDebug> +#include <QFile> +#include <QLockFile> +#include <QStandardPaths> #include "krandom.h" #include "kcoreaddons_debug.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/io/kautosavefile.h new/kcoreaddons-5.45.0/src/lib/io/kautosavefile.h --- old/kcoreaddons-5.44.0/src/lib/io/kautosavefile.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/io/kautosavefile.h 2018-04-07 21:33:50.000000000 +0200 @@ -22,9 +22,9 @@ #include <kcoreaddons_export.h> -#include <QtCore/QFile> -#include <QtCore/QList> -#include <QtCore/QUrl> +#include <QFile> +#include <QList> +#include <QUrl> class KAutoSaveFilePrivate; /** @@ -154,7 +154,7 @@ * Destroys the KAutoSaveFile object, removes the autosave * file and drops the lock being held (if any). */ - ~KAutoSaveFile(); + ~KAutoSaveFile() override; /** * Retrieves the URL of the file managed by KAutoSaveFile. This diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/io/kbackup.cpp new/kcoreaddons-5.45.0/src/lib/io/kbackup.cpp --- old/kcoreaddons-5.44.0/src/lib/io/kbackup.cpp 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/io/kbackup.cpp 2018-04-07 21:33:50.000000000 +0200 @@ -21,9 +21,9 @@ Boston, MA 02110-1301, USA. */ -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtCore/QProcess> +#include <QFileInfo> +#include <QDir> +#include <QProcess> #include <qstandardpaths.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/io/kbackup.h new/kcoreaddons-5.45.0/src/lib/io/kbackup.h --- old/kcoreaddons-5.44.0/src/lib/io/kbackup.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/io/kbackup.h 2018-04-07 21:33:50.000000000 +0200 @@ -23,7 +23,7 @@ #define KBACKUP_H #include <kcoreaddons_export.h> -#include <QtCore/QString> +#include <QString> /** * @namespace KBackup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/io/kdirwatch.cpp new/kcoreaddons-5.45.0/src/lib/io/kdirwatch.cpp --- old/kcoreaddons-5.44.0/src/lib/io/kdirwatch.cpp 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/io/kdirwatch.cpp 2018-04-07 21:33:50.000000000 +0200 @@ -51,13 +51,13 @@ #include <assert.h> #include <errno.h> #include <QLoggingCategory> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QSocketNotifier> -#include <QtCore/QTimer> -#include <QtCore/QThread> -#include <QtCore/QThreadStorage> -#include <QtCore/QCoreApplication> +#include <QDir> +#include <QFile> +#include <QSocketNotifier> +#include <QTimer> +#include <QThread> +#include <QThreadStorage> +#include <QCoreApplication> #include <qplatformdefs.h> // QT_LSTAT, QT_STAT, QT_STATBUF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/io/kdirwatch.h new/kcoreaddons-5.45.0/src/lib/io/kdirwatch.h --- old/kcoreaddons-5.44.0/src/lib/io/kdirwatch.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/io/kdirwatch.h 2018-04-07 21:33:50.000000000 +0200 @@ -18,9 +18,9 @@ #ifndef _KDIRWATCH_H #define _KDIRWATCH_H -#include <QtCore/QDateTime> -#include <QtCore/QObject> -#include <QtCore/QString> +#include <QDateTime> +#include <QObject> +#include <QString> #include <kcoreaddons_export.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/io/kdirwatch_p.h new/kcoreaddons-5.45.0/src/lib/io/kdirwatch_p.h --- old/kcoreaddons-5.44.0/src/lib/io/kdirwatch_p.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/io/kdirwatch_p.h 2018-04-07 21:33:50.000000000 +0200 @@ -36,12 +36,12 @@ #define HAVE_QFILESYSTEMWATCHER 0 #endif -#include <QtCore/QList> -#include <QtCore/QSet> -#include <QtCore/QMap> -#include <QtCore/QObject> -#include <QtCore/QString> -#include <QtCore/QTimer> +#include <QList> +#include <QSet> +#include <QMap> +#include <QObject> +#include <QString> +#include <QTimer> class QSocketNotifier; #if HAVE_FAM @@ -55,7 +55,7 @@ #define invalid_ctime (static_cast<time_t>(-1)) #if HAVE_QFILESYSTEMWATCHER -#include <QtCore/QFileSystemWatcher> +#include <QFileSystemWatcher> #endif // HAVE_QFILESYSTEMWATCHER /* KDirWatchPrivate is a singleton and does the watching diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/io/kfilesystemtype.h new/kcoreaddons-5.45.0/src/lib/io/kfilesystemtype.h --- old/kcoreaddons-5.44.0/src/lib/io/kfilesystemtype.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/io/kfilesystemtype.h 2018-04-07 21:33:50.000000000 +0200 @@ -20,7 +20,7 @@ #ifndef KFILESYSTEMTYPE_P_H #define KFILESYSTEMTYPE_P_H -#include <QtCore/QString> +#include <QString> #include <kcoreaddons_export.h> /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/io/kmessage.cpp new/kcoreaddons-5.45.0/src/lib/io/kmessage.cpp --- old/kcoreaddons-5.44.0/src/lib/io/kmessage.cpp 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/io/kmessage.cpp 2018-04-07 21:33:50.000000000 +0200 @@ -18,7 +18,7 @@ */ #include "kmessage.h" -#include <QtCore/QLatin1String> +#include <QLatin1String> #include <iostream> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/io/kmessage.h new/kcoreaddons-5.45.0/src/lib/io/kmessage.h --- old/kcoreaddons-5.44.0/src/lib/io/kmessage.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/io/kmessage.h 2018-04-07 21:33:50.000000000 +0200 @@ -21,7 +21,7 @@ #include <kcoreaddons_export.h> -#include <QtCore/QString> +#include <QString> class KMessageHandler; /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/io/kprocess.h new/kcoreaddons-5.45.0/src/lib/io/kprocess.h --- old/kcoreaddons-5.44.0/src/lib/io/kprocess.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/io/kprocess.h 2018-04-07 21:33:50.000000000 +0200 @@ -24,7 +24,7 @@ #include <kcoreaddons_export.h> -#include <QtCore/QProcess> +#include <QProcess> class KProcessPrivate; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/jobs/kcompositejob.h new/kcoreaddons-5.45.0/src/lib/jobs/kcompositejob.h --- old/kcoreaddons-5.44.0/src/lib/jobs/kcompositejob.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/jobs/kcompositejob.h 2018-04-07 21:33:50.000000000 +0200 @@ -23,7 +23,7 @@ #include <kcoreaddons_export.h> #include <kjob.h> -#include <QtCore/QList> +#include <QList> class KCompositeJobPrivate; /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/jobs/kjob.h new/kcoreaddons-5.45.0/src/lib/jobs/kjob.h --- old/kcoreaddons-5.44.0/src/lib/jobs/kjob.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/jobs/kjob.h 2018-04-07 21:33:50.000000000 +0200 @@ -23,8 +23,8 @@ #define KJOB_H #include <kcoreaddons_export.h> -#include <QtCore/QObject> -#include <QtCore/QPair> +#include <QObject> +#include <QPair> class KJobUiDelegate; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/jobs/kjobtrackerinterface.h new/kcoreaddons-5.45.0/src/lib/jobs/kjobtrackerinterface.h --- old/kcoreaddons-5.44.0/src/lib/jobs/kjobtrackerinterface.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/jobs/kjobtrackerinterface.h 2018-04-07 21:33:50.000000000 +0200 @@ -23,8 +23,8 @@ #include <kcoreaddons_export.h> #include <kjob.h> -#include <QtCore/QObject> -#include <QtCore/QPair> +#include <QObject> +#include <QPair> /** * @class KJobTrackerInterface kjobtrackerinterface.h KJobTrackerInterface diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/jobs/kjobuidelegate.h new/kcoreaddons-5.45.0/src/lib/jobs/kjobuidelegate.h --- old/kcoreaddons-5.44.0/src/lib/jobs/kjobuidelegate.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/jobs/kjobuidelegate.h 2018-04-07 21:33:50.000000000 +0200 @@ -23,7 +23,7 @@ #define KJOBUIDELEGATE_H #include <kcoreaddons_export.h> -#include <QtCore/QObject> +#include <QObject> class KJob; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/kaboutdata.cpp new/kcoreaddons-5.45.0/src/lib/kaboutdata.cpp --- old/kcoreaddons-5.44.0/src/lib/kaboutdata.cpp 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/kaboutdata.cpp 2018-04-07 21:33:50.000000000 +0200 @@ -28,11 +28,11 @@ #include <QCoreApplication> #include <QStandardPaths> -#include <QtCore/QFile> -#include <QtCore/QTextStream> -#include <QtCore/QSharedData> -#include <QtCore/QVariant> -#include <QtCore/QList> +#include <QFile> +#include <QTextStream> +#include <QSharedData> +#include <QVariant> +#include <QList> #include <QUrl> #include <QHash> #include <QCommandLineParser> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/kaboutdata.h new/kcoreaddons-5.45.0/src/lib/kaboutdata.h --- old/kcoreaddons-5.44.0/src/lib/kaboutdata.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/kaboutdata.h 2018-04-07 21:33:50.000000000 +0200 @@ -27,8 +27,8 @@ #define KABOUTDATA_H #include <kcoreaddons_export.h> -#include <QtCore/QString> -#include <QtCore/QSharedDataPointer> +#include <QString> +#include <QSharedDataPointer> template <class T> class QList; class QCommandLineParser; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/plugin/kexportplugin.h new/kcoreaddons-5.45.0/src/lib/plugin/kexportplugin.h --- old/kcoreaddons-5.44.0/src/lib/plugin/kexportplugin.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/plugin/kexportplugin.h 2018-04-07 21:33:50.000000000 +0200 @@ -18,8 +18,8 @@ #ifndef KEXPORTPLUGIN_H #define KEXPORTPLUGIN_H -#include <QtCore/QPluginLoader> -#include <QtCore/QtPlugin> +#include <QPluginLoader> +#include <QtPlugin> #include <kcoreaddons_export.h> /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/plugin/kpluginfactory.h new/kcoreaddons-5.45.0/src/lib/plugin/kpluginfactory.h --- old/kcoreaddons-5.44.0/src/lib/plugin/kpluginfactory.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/plugin/kpluginfactory.h 2018-04-07 21:33:50.000000000 +0200 @@ -24,9 +24,9 @@ #include "kcoreaddons_export.h" -#include <QtCore/QObject> -#include <QtCore/QVariant> -#include <QtCore/QStringList> +#include <QObject> +#include <QVariant> +#include <QStringList> #include <kexportplugin.h> // for source compat class QWidget; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/plugin/kpluginfactory_p.h new/kcoreaddons-5.45.0/src/lib/plugin/kpluginfactory_p.h --- old/kcoreaddons-5.44.0/src/lib/plugin/kpluginfactory_p.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/plugin/kpluginfactory_p.h 2018-04-07 21:33:50.000000000 +0200 @@ -24,7 +24,7 @@ #include "kpluginfactory.h" -#include <QtCore/QHash> +#include <QHash> class KPluginFactoryPrivate { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/plugin/kpluginloader.cpp new/kcoreaddons-5.45.0/src/lib/plugin/kpluginloader.cpp --- old/kcoreaddons-5.44.0/src/lib/plugin/kpluginloader.cpp 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/plugin/kpluginloader.cpp 2018-04-07 21:33:50.000000000 +0200 @@ -21,10 +21,10 @@ #include "kpluginfactory.h" #include "kpluginmetadata.h" -#include <QtCore/QLibrary> -#include <QtCore/QDir> +#include <QLibrary> +#include <QDir> #include <QDirIterator> -#include <QtCore/QFileInfo> +#include <QFileInfo> #include "kcoreaddons_debug.h" #include <QCoreApplication> #include <QMutex> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/plugin/kpluginloader.h new/kcoreaddons-5.45.0/src/lib/plugin/kpluginloader.h --- old/kcoreaddons-5.44.0/src/lib/plugin/kpluginloader.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/plugin/kpluginloader.h 2018-04-07 21:33:50.000000000 +0200 @@ -20,8 +20,8 @@ #include <kexportplugin.h> -#include <QtCore/QPluginLoader> -#include <QtCore/QtPlugin> +#include <QPluginLoader> +#include <QtPlugin> #include <functional> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/randomness/krandom.cpp new/kcoreaddons-5.45.0/src/lib/randomness/krandom.cpp --- old/kcoreaddons-5.44.0/src/lib/randomness/krandom.cpp 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/randomness/krandom.cpp 2018-04-07 21:33:50.000000000 +0200 @@ -34,7 +34,7 @@ #endif // Q_OS_WIN #include <fcntl.h> -#include <QtCore/QFile> +#include <QFile> #include <QThread> #include <QThreadStorage> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/randomness/krandom.h new/kcoreaddons-5.45.0/src/lib/randomness/krandom.h --- old/kcoreaddons-5.44.0/src/lib/randomness/krandom.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/randomness/krandom.h 2018-04-07 21:33:50.000000000 +0200 @@ -24,7 +24,7 @@ #include <kcoreaddons_export.h> -#include <QtCore/QString> +#include <QString> /** * \headerfile krandom.h <KRandom> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/randomness/krandomsequence.h new/kcoreaddons-5.45.0/src/lib/randomness/krandomsequence.h --- old/kcoreaddons-5.44.0/src/lib/randomness/krandomsequence.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/randomness/krandomsequence.h 2018-04-07 21:33:50.000000000 +0200 @@ -19,7 +19,7 @@ #define K_RANDOM_SEQUENCE_H #include <kcoreaddons_export.h> -#include <QtCore/QList> +#include <QList> /** * \class KRandomSequence krandomsequence.h <KRandomSequence> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/text/kmacroexpander.cpp new/kcoreaddons-5.45.0/src/lib/text/kmacroexpander.cpp --- old/kcoreaddons-5.44.0/src/lib/text/kmacroexpander.cpp 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/text/kmacroexpander.cpp 2018-04-07 21:33:50.000000000 +0200 @@ -22,8 +22,8 @@ #include "kmacroexpander_p.h" -#include <QtCore/QHash> -#include <QtCore/QStringList> +#include <QHash> +#include <QStringList> KMacroExpanderBase::KMacroExpanderBase(QChar c) : d(new KMacroExpanderBasePrivate(c)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/text/kmacroexpander.h new/kcoreaddons-5.45.0/src/lib/text/kmacroexpander.h --- old/kcoreaddons-5.44.0/src/lib/text/kmacroexpander.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/text/kmacroexpander.h 2018-04-07 21:33:50.000000000 +0200 @@ -23,7 +23,7 @@ #define KMACROEXPANDER_H #include <kcoreaddons_export.h> -#include <QtCore/QChar> +#include <QChar> class QString; class QStringList; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/text/kmacroexpander_unix.cpp new/kcoreaddons-5.45.0/src/lib/text/kmacroexpander_unix.cpp --- old/kcoreaddons-5.44.0/src/lib/text/kmacroexpander_unix.cpp 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/text/kmacroexpander_unix.cpp 2018-04-07 21:33:50.000000000 +0200 @@ -22,9 +22,9 @@ #include "kmacroexpander_p.h" -#include <QtCore/QStringList> -#include <QtCore/QStack> -#include <QtCore/QRegExp> +#include <QStringList> +#include <QStack> +#include <QRegExp> namespace KMacroExpander { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/text/kstringhandler.cpp new/kcoreaddons-5.45.0/src/lib/text/kstringhandler.cpp --- old/kcoreaddons-5.44.0/src/lib/text/kstringhandler.cpp 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/text/kstringhandler.cpp 2018-04-07 21:33:50.000000000 +0200 @@ -23,10 +23,10 @@ #include <stdlib.h> // random() -#include <QtCore/QRegExp> // for the word ranges -#include <QtCore/QCharRef> -#include <QtCore/QMutableStringListIterator> -#include <QtCore/QVector> +#include <QRegExp> // for the word ranges +#include <QCharRef> +#include <QMutableStringListIterator> +#include <QVector> // // Capitalization routines diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/text/kstringhandler.h new/kcoreaddons-5.45.0/src/lib/text/kstringhandler.h --- old/kcoreaddons-5.44.0/src/lib/text/kstringhandler.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/text/kstringhandler.h 2018-04-07 21:33:50.000000000 +0200 @@ -23,7 +23,7 @@ #include <kcoreaddons_export.h> -#include <QtCore/qnamespace.h> +#include <qnamespace.h> class QChar; class QRegExp; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/text/ktexttohtml.cpp new/kcoreaddons-5.45.0/src/lib/text/ktexttohtml.cpp --- old/kcoreaddons-5.44.0/src/lib/text/ktexttohtml.cpp 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/text/ktexttohtml.cpp 2018-04-07 21:33:50.000000000 +0200 @@ -285,6 +285,7 @@ if (isEmptyUrl(url) || (url.length() > mMaxUrlLen)) { mPos = start; url.clear(); + return url; } else { --mPos; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/util/kshell.cpp new/kcoreaddons-5.45.0/src/lib/util/kshell.cpp --- old/kcoreaddons-5.44.0/src/lib/util/kshell.cpp 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/util/kshell.cpp 2018-04-07 21:33:50.000000000 +0200 @@ -23,7 +23,7 @@ #include "kshell_p.h" #include "kuser.h" -#include <QtCore/QDir> +#include <QDir> QString KShell::homeDir(const QString &user) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/util/kshell_unix.cpp new/kcoreaddons-5.45.0/src/lib/util/kshell_unix.cpp --- old/kcoreaddons-5.44.0/src/lib/util/kshell_unix.cpp 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/util/kshell_unix.cpp 2018-04-07 21:33:50.000000000 +0200 @@ -24,8 +24,8 @@ #include <kuser.h> -#include <QtCore/QChar> -#include <QtCore/QStringList> +#include <QChar> +#include <QStringList> static int fromHex(QChar cUnicode) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/util/kshell_win.cpp new/kcoreaddons-5.45.0/src/lib/util/kshell_win.cpp --- old/kcoreaddons-5.44.0/src/lib/util/kshell_win.cpp 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/util/kshell_win.cpp 2018-04-07 21:33:50.000000000 +0200 @@ -25,7 +25,7 @@ #include <QString> #include <QStringList> -#include <QtCore/QDir> +#include <QDir> /* * A short introduction into cmd semantics: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/util/kuser.h new/kcoreaddons-5.45.0/src/lib/util/kuser.h --- old/kcoreaddons-5.44.0/src/lib/util/kuser.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/util/kuser.h 2018-04-07 21:33:50.000000000 +0200 @@ -26,7 +26,7 @@ #include <kcoreaddons_export.h> #include <QSharedDataPointer> -#include <QtCore/QVariant> +#include <QVariant> class KUserGroup; class QString; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/lib/util/kuser_unix.cpp new/kcoreaddons-5.45.0/src/lib/util/kuser_unix.cpp --- old/kcoreaddons-5.44.0/src/lib/util/kuser_unix.cpp 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/lib/util/kuser_unix.cpp 2018-04-07 21:33:50.000000000 +0200 @@ -23,8 +23,8 @@ #include "config-getgrouplist.h" #include "config-accountsservice.h" -#include <QtCore/QMutableStringListIterator> -#include <QtCore/QDir> +#include <QMutableStringListIterator> +#include <QDir> #include <pwd.h> #include <unistd.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/src/mimetypes/kde5.xml new/kcoreaddons-5.45.0/src/mimetypes/kde5.xml --- old/kcoreaddons-5.44.0/src/mimetypes/kde5.xml 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/src/mimetypes/kde5.xml 2018-04-07 21:33:50.000000000 +0200 @@ -1438,7 +1438,7 @@ <comment xml:lang="ca">Llista del connector carregador de llista de fitxers del Kate</comment> <comment xml:lang="ca@valencia">Llista del connector carregador de llista de fitxers del Kate</comment> <comment xml:lang="da">Liste over plugins til fillisteindlæsning i Kate</comment> - <comment xml:lang="de">Kate-Dateilistenlade-Modulliste</comment> + <comment xml:lang="de">Kate-Dateilisten-Modul</comment> <comment xml:lang="el">Λίστα αρχείου φόρτωσης λίστας πρόσθετων Kate</comment> <comment xml:lang="en_GB">Kate file list loader plugin list</comment> <comment xml:lang="es">Lista de complementos de carga de listas de archivos de Kate</comment> @@ -1452,7 +1452,7 @@ <comment xml:lang="hr">Kate lista od priključka učitavača liste datoteka</comment> <comment xml:lang="hu">Kate-listafájl (fájllista vagy bővítménylista)</comment> <comment xml:lang="ia">Kate: Lista de plugin de cargator de lista de file</comment> - <comment xml:lang="id">Daftar fail Kate pemuat daftar plugin</comment> + <comment xml:lang="id">Daftar file Kate pemuat daftar plugin</comment> <comment xml:lang="is">Kate skráahleðsluíforritalisti</comment> <comment xml:lang="it">elenco delle estensioni del caricatore di elenchi di file di Kate</comment> <comment xml:lang="ja">Kate ファイルリストローダプラグインリスト</comment> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/tests/kdirwatchtest.cpp new/kcoreaddons-5.45.0/tests/kdirwatchtest.cpp --- old/kcoreaddons-5.44.0/tests/kdirwatchtest.cpp 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/tests/kdirwatchtest.cpp 2018-04-07 21:33:50.000000000 +0200 @@ -18,8 +18,8 @@ #include "kdirwatchtest.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QFile> +#include <QCoreApplication> +#include <QFile> #include <QStringList> #include <QDebug> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/tests/kdirwatchtest.h new/kcoreaddons-5.45.0/tests/kdirwatchtest.h --- old/kcoreaddons-5.44.0/tests/kdirwatchtest.h 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/tests/kdirwatchtest.h 2018-04-07 21:33:50.000000000 +0200 @@ -21,7 +21,7 @@ #include <stdlib.h> #include <stdio.h> -#include <QtCore/QObject> +#include <QObject> #include "kdirwatch.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.44.0/tests/krandomsequencetest.cpp new/kcoreaddons-5.45.0/tests/krandomsequencetest.cpp --- old/kcoreaddons-5.44.0/tests/krandomsequencetest.cpp 2018-03-06 09:12:31.000000000 +0100 +++ new/kcoreaddons-5.45.0/tests/krandomsequencetest.cpp 2018-04-07 21:33:50.000000000 +0200 @@ -16,8 +16,8 @@ Boston, MA 02110-1301, USA. */ -#include <QtCore/QList> -#include <QtCore/QString> +#include <QList> +#include <QString> #include "krandomsequence.h" #include "krandom.h"
