Hello community, here is the log from the commit of package kcontacts for openSUSE:Factory checked in at 2017-08-24 17:51:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcontacts (Old) and /work/SRC/openSUSE:Factory/.kcontacts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcontacts" Thu Aug 24 17:51:58 2017 rev:23 rq:516593 version:17.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kcontacts/kcontacts.changes 2017-07-25 11:28:09.983967932 +0200 +++ /work/SRC/openSUSE:Factory/.kcontacts.new/kcontacts.changes 2017-08-24 17:52:00.895670055 +0200 @@ -1,0 +2,31 @@ +Sat Aug 12 10:28:30 UTC 2017 - jeng...@inai.de + +- Remove time-sensitive wording from summaries + +------------------------------------------------------------------- +Fri Aug 11 22:45:15 UTC 2017 - christo...@krop.fr + +- Update to KDE Applications 17.08.0 + * New feature release + * https://www.kde.org/announcements/announce-applications-17.08.0.php +- Changes since 17.04.3 : + * Apply patch from McPain + * Try to implement vcard4 support for logo not success yet + * Use DQT_NO_URL_CAST_FROM_STRING + * Use contains here + * Remove module name + * USe Q_FALLTHROUGH + * Remove deprecated method + * Add .gitignore + * Activate by default QT_NO_NARROWING_CONVERSIONS_IN_CONNECT + * Minor optimization + +------------------------------------------------------------------- +Sat Aug 5 18:17:20 UTC 2017 - christo...@krop.fr + +- Update to KDE Applications 17.07.90 + * KDE Applications 17.07.90 + * https://www.kde.org/announcements/announce-applications-17.07.90.php + + +------------------------------------------------------------------- Old: ---- kcontacts-17.04.3.tar.xz New: ---- kcontacts-17.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcontacts.spec ++++++ --- /var/tmp/diff_new_pack.y1hMZj/_old 2017-08-24 17:52:02.135495425 +0200 +++ /var/tmp/diff_new_pack.y1hMZj/_new 2017-08-24 17:52:02.143494298 +0200 @@ -20,12 +20,12 @@ %define kf5_version 5.5.0 Name: kcontacts -Version: 17.04.3 +Version: 17.08.0 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) +# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} -Summary: New address book API for KDE +Summary: Address book API for KDE License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org @@ -47,9 +47,11 @@ Libkcontacts provides an API for address book data. %package -n libKF5Contacts5 -Summary: New address book API for KDE -Group: Development/Libraries/KDE +Summary: Address book API for KDE +Group: System/Libraries +%if %{with lang} Recommends: %{name}-lang +%endif Provides: %{name} = %{version} %description -n libKF5Contacts5 @@ -96,10 +98,10 @@ %files devel %defattr(-,root,root) %doc COPYING* -%{_kf5_libdir}/cmake/KF5Contacts/ -%{_kf5_libdir}/libKF5Contacts.so +%{_kf5_cmakedir}/KF5Contacts/ %{_kf5_includedir}/KContacts/ %{_kf5_includedir}/kcontacts_version.h +%{_kf5_libdir}/libKF5Contacts.so %{_kf5_mkspecsdir}/qt_KContacts.pri %if %{with lang} ++++++ kcontacts-17.04.3.tar.xz -> kcontacts-17.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/.gitignore new/kcontacts-17.08.0/.gitignore --- old/kcontacts-17.04.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/kcontacts-17.08.0/.gitignore 2017-08-04 20:45:05.000000000 +0200 @@ -0,0 +1,21 @@ +# Ignore the following files +*~ +*.[oa] +*.diff +*.kate-swp +*.kdev4 +.kdev_include_paths +*.kdevelop.pcs +*.moc +*.moc.cpp +*.orig +*.user +.*.swp +.swp.* +Doxyfile +Makefile +avail +random_seed +/build/ +CMakeLists.txt.user* +*.unc-backup* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/CMakeLists.txt new/kcontacts-17.08.0/CMakeLists.txt --- old/kcontacts-17.04.3/CMakeLists.txt 2017-07-11 02:26:01.000000000 +0200 +++ new/kcontacts-17.08.0/CMakeLists.txt 2017-08-11 02:49:37.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.5.3") +set(PIM_VERSION "5.6.0") project(KContacts VERSION ${PIM_VERSION}) # ECM setup -set(QT_REQUIRED_VERSION "5.6.0") -set(KF5_VERSION "5.32.0") +set(QT_REQUIRED_VERSION "5.7.0") +set(KF5_VERSION "5.35.0") find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${KContacts_SOURCE_DIR}/cmake) @@ -39,6 +39,9 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kcontacts5\") add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII") +add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) +add_definitions(-DQT_NO_URL_CAST_FROM_STRING) add_subdirectory(src) if(BUILD_TESTING) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/autotests/CMakeLists.txt new/kcontacts-17.08.0/autotests/CMakeLists.txt --- old/kcontacts-17.04.3/autotests/CMakeLists.txt 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/autotests/CMakeLists.txt 2017-08-04 20:45:05.000000000 +0200 @@ -1,6 +1,6 @@ include(ECMAddTests) -set(QT_REQUIRED_VERSION "5.6.0") +set(QT_REQUIRED_VERSION "5.7.0") find_package(Qt5Test ${QT_REQUIRED_VERSION} CONFIG REQUIRED) ########### next target ############### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/autotests/addresseetest.h new/kcontacts-17.08.0/autotests/addresseetest.h --- old/kcontacts-17.04.3/autotests/addresseetest.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/autotests/addresseetest.h 2017-08-04 20:45:05.000000000 +0200 @@ -21,7 +21,7 @@ #ifndef ADDRESSEE_TEST_H #define ADDRESSEE_TEST_H -#include <QtCore/QObject> +#include <QObject> class AddresseeTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/autotests/addresstest.h new/kcontacts-17.08.0/autotests/addresstest.h --- old/kcontacts-17.04.3/autotests/addresstest.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/autotests/addresstest.h 2017-08-04 20:45:05.000000000 +0200 @@ -21,7 +21,7 @@ #ifndef ADDRESS_TEST_H #define ADDRESS_TEST_H -#include <QtCore/QObject> +#include <QObject> class AddressTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/autotests/geotest.h new/kcontacts-17.08.0/autotests/geotest.h --- old/kcontacts-17.04.3/autotests/geotest.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/autotests/geotest.h 2017-08-04 20:45:05.000000000 +0200 @@ -21,7 +21,7 @@ #ifndef GEOTEST_H #define GEOTEST_H -#include <QtCore/QObject> +#include <QObject> class GeoTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/autotests/helper_p.h new/kcontacts-17.08.0/autotests/helper_p.h --- old/kcontacts-17.04.3/autotests/helper_p.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/autotests/helper_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,81 +0,0 @@ -/* - Copyright (c) 2017 Laurent Montel <mon...@kde.org> - - This library is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published by - the Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public - License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. -*/ - -#ifndef _HELPER_H -#define _HELPER_H -#include <qglobal.h> - -#if QT_VERSION < QT_VERSION_CHECK(5,7,0) -template <typename... Args> -struct QNonConstOverload -{ - template <typename R, typename T> - Q_DECL_CONSTEXPR auto operator()(R (T::*ptr)(Args...)) const Q_DECL_NOTHROW -> decltype(ptr) - { return ptr; } - - template <typename R, typename T> - static Q_DECL_CONSTEXPR auto of(R (T::*ptr)(Args...)) Q_DECL_NOTHROW -> decltype(ptr) - { return ptr; } -}; - -template <typename... Args> -struct QConstOverload -{ - template <typename R, typename T> - Q_DECL_CONSTEXPR auto operator()(R (T::*ptr)(Args...) const) const Q_DECL_NOTHROW -> decltype(ptr) - { return ptr; } - - template <typename R, typename T> - static Q_DECL_CONSTEXPR auto of(R (T::*ptr)(Args...) const) Q_DECL_NOTHROW -> decltype(ptr) - { return ptr; } -}; - -template <typename... Args> -struct QOverload : QConstOverload<Args...>, QNonConstOverload<Args...> -{ - using QConstOverload<Args...>::of; - using QConstOverload<Args...>::operator(); - using QNonConstOverload<Args...>::of; - using QNonConstOverload<Args...>::operator(); - - template <typename R> - Q_DECL_CONSTEXPR auto operator()(R (*ptr)(Args...)) const Q_DECL_NOTHROW -> decltype(ptr) - { return ptr; } - - template <typename R> - static Q_DECL_CONSTEXPR auto of(R (*ptr)(Args...)) Q_DECL_NOTHROW -> decltype(ptr) - { return ptr; } -}; - -namespace QtPrivate -{ -template <typename T> struct QAddConst { - typedef const T Type; -}; -} - -// this adds const to non-const objects (like std::as_const) -template <typename T> -Q_DECL_CONSTEXPR typename QtPrivate::QAddConst<T>::Type &qAsConst(T &t) Q_DECL_NOTHROW { return t; } -// prevent rvalue arguments: -template <typename T> -void qAsConst(const T &&) Q_DECL_EQ_DELETE; -#endif - -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/autotests/importexportvcardtest.cpp new/kcontacts-17.08.0/autotests/importexportvcardtest.cpp --- old/kcontacts-17.04.3/autotests/importexportvcardtest.cpp 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/autotests/importexportvcardtest.cpp 2017-08-04 20:45:05.000000000 +0200 @@ -197,6 +197,30 @@ compareBuffers(result, vcardexpected); } +void ImportExportVCardTest::shouldExportMissingNewlineVcard4() +{ + QByteArray vcarddata("BEGIN:VCARD" + "VERSION:4.0\r\n" + "KIND:group\r\n" + "FN:Funky distribution list\r\n" + "UID:c80cf296-0825-4eb0-ab16-1fac1d522...@xxxxxx.xx\r\n" + "END:VCARD"); + + QByteArray vcardexpected("BEGIN:VCARD\r\n" + "VERSION:4.0\r\n" + "FN:Funky distribution list\r\n" + "KIND:group\r\n" + "N:;;;;\r\n" + "UID:c80cf296-0825-4eb0-ab16-1fac1d522...@xxxxxx.xx\r\n" + "END:VCARD\r\n\r\n"); + + KContacts::VCardTool vcard; + const KContacts::AddresseeList lst = vcard.parseVCards(vcarddata); + + const QByteArray result = vcard.exportVCards(lst, KContacts::VCard::v4_0); + compareBuffers(result, vcardexpected); +} + // TODO please make this data driven before copy/pasting more methods here... QTEST_MAIN(ImportExportVCardTest) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/autotests/importexportvcardtest.h new/kcontacts-17.08.0/autotests/importexportvcardtest.h --- old/kcontacts-17.04.3/autotests/importexportvcardtest.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/autotests/importexportvcardtest.h 2017-08-04 20:45:05.000000000 +0200 @@ -33,6 +33,7 @@ void shouldExportFullTestVcard4(); void shouldExportMiscElementVcard4(); void shouldExportMemberElementVcard4(); + void shouldExportMissingNewlineVcard4(); }; #endif // IMPORTEXPORTVCARDTEST_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/autotests/keytest.h new/kcontacts-17.08.0/autotests/keytest.h --- old/kcontacts-17.04.3/autotests/keytest.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/autotests/keytest.h 2017-08-04 20:45:05.000000000 +0200 @@ -22,7 +22,7 @@ #ifndef KEY_TEST_H #define KEY_TEST_H -#include <QtCore/QObject> +#include <QObject> class KeyTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/autotests/phonenumbertest.cpp new/kcontacts-17.08.0/autotests/phonenumbertest.cpp --- old/kcontacts-17.04.3/autotests/phonenumbertest.cpp 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/autotests/phonenumbertest.cpp 2017-08-04 20:45:05.000000000 +0200 @@ -24,7 +24,7 @@ #include <addresseelist.h> #include <qtest.h> #include <vcardtool.h> -#include "helper_p.h" + QTEST_MAIN(PhoneNumberTest) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/autotests/phonenumbertest.h new/kcontacts-17.08.0/autotests/phonenumbertest.h --- old/kcontacts-17.04.3/autotests/phonenumbertest.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/autotests/phonenumbertest.h 2017-08-04 20:45:05.000000000 +0200 @@ -21,7 +21,7 @@ #ifndef PHONENUMBER_TEST_H #define PHONENUMBER_TEST_H -#include <QtCore/QObject> +#include <QObject> class PhoneNumberTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/autotests/picturetest.h new/kcontacts-17.08.0/autotests/picturetest.h --- old/kcontacts-17.04.3/autotests/picturetest.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/autotests/picturetest.h 2017-08-04 20:45:05.000000000 +0200 @@ -21,7 +21,7 @@ #ifndef PICTURE_TEST_H #define PICTURE_TEST_H -#include <QtCore/QObject> +#include <QObject> class PictureTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/autotests/secrecytest.h new/kcontacts-17.08.0/autotests/secrecytest.h --- old/kcontacts-17.04.3/autotests/secrecytest.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/autotests/secrecytest.h 2017-08-04 20:45:05.000000000 +0200 @@ -21,7 +21,7 @@ #ifndef SECRECY_TEST_H #define SECRECY_TEST_H -#include <QtCore/QObject> +#include <QObject> class SecrecyTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/autotests/soundtest.h new/kcontacts-17.08.0/autotests/soundtest.h --- old/kcontacts-17.04.3/autotests/soundtest.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/autotests/soundtest.h 2017-08-04 20:45:05.000000000 +0200 @@ -21,7 +21,7 @@ #ifndef SOUND_TEST_H #define SOUND_TEST_H -#include <QtCore/QObject> +#include <QObject> class SoundTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/autotests/testroundtrip.cpp new/kcontacts-17.08.0/autotests/testroundtrip.cpp --- old/kcontacts-17.04.3/autotests/testroundtrip.cpp 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/autotests/testroundtrip.cpp 2017-08-04 20:45:05.000000000 +0200 @@ -19,7 +19,7 @@ */ #include "addressee.h" -#include "helper_p.h" + #include "converter/vcardconverter.h" #include <qtest.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/autotests/timezonetest.h new/kcontacts-17.08.0/autotests/timezonetest.h --- old/kcontacts-17.04.3/autotests/timezonetest.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/autotests/timezonetest.h 2017-08-04 20:45:05.000000000 +0200 @@ -21,7 +21,7 @@ #ifndef TIMEZONE_TEST_H #define TIMEZONE_TEST_H -#include <QtCore/QObject> +#include <QObject> class TimeZoneTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/po/zh_CN/kcontacts5.po new/kcontacts-17.08.0/po/zh_CN/kcontacts5.po --- old/kcontacts-17.04.3/po/zh_CN/kcontacts5.po 2017-07-11 02:26:01.000000000 +0200 +++ new/kcontacts-17.08.0/po/zh_CN/kcontacts5.po 2017-08-11 02:49:37.000000000 +0200 @@ -1,22 +1,20 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. -# -# Xuetian Weng <xw...@cs.stonybrook.edu>, 2014. -# Weng Xuetian <wen...@gmail.com>, 2016. msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-02-17 04:01+0100\n" -"PO-Revision-Date: 2016-03-11 20:48-0800\n" -"Last-Translator: Weng Xuetian <wen...@gmail.com>\n" -"Language-Team: Chinese <kde-i18n-...@kde.org>\n" +"PO-Revision-Date: 2017-08-05 09:34-0400\n" +"Last-Translator: guoyunhebrave <guoyunhebr...@gmail.com>\n" +"Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: crowdin.com\n" +"X-Crowdin-Project: kdeorg\n" +"X-Crowdin-Language: zh-CN\n" +"X-Crowdin-File: /kf5-stable/messages/pim/kcontacts5.pot\n" #: address.cpp:402 #, kde-format @@ -583,10 +581,3 @@ msgctxt "unknown secrecy type" msgid "Unknown type" msgstr "未知类型" - -#~ msgctxt "Preferred address" -#~ msgid "Preferred" -#~ msgstr "首选" - -#~ msgid "List of Emails" -#~ msgstr "电子邮件列表" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/address.cpp new/kcontacts-17.08.0/src/address.cpp --- old/kcontacts-17.04.3/src/address.cpp 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/address.cpp 2017-08-04 20:45:05.000000000 +0200 @@ -28,13 +28,13 @@ #include <kconfiggroup.h> -#include <QtCore/QFile> -#include <QtCore/QMap> -#include <QtCore/QTextStream> -#include <QtCore/QSharedData> -#include <QtCore/QStandardPaths> -#include <QtCore/QLocale> -#include <QtCore/QDataStream> +#include <QFile> +#include <QMap> +#include <QTextStream> +#include <QSharedData> +#include <QStandardPaths> +#include <QLocale> +#include <QDataStream> using namespace KContacts; @@ -136,7 +136,7 @@ // The following macro needs QString for R_FIELD // It substitutes !_P_! for empty fields so conditional tags work later #define REPLTAG(R_TAG,R_FIELD) \ - if ( result.indexOf( R_TAG ) != -1 ) { \ + if ( result.contains( R_TAG ) ) { \ QString rpl = R_FIELD.isEmpty() ? QStringLiteral( "!_P_!" ) : R_FIELD; \ result.replace( R_TAG, rpl ); \ if ( !R_FIELD.isEmpty() ) { \ @@ -560,9 +560,7 @@ QString Address::toString() const { - QString str; - - str += QLatin1String("Address {\n"); + QString str = QLatin1String("Address {\n"); str += QStringLiteral(" IsEmpty: %1\n"). arg(d->mEmpty ? QStringLiteral("true") : QStringLiteral("false")); str += QStringLiteral(" Id: %1\n").arg(d->mId); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/address.h new/kcontacts-17.08.0/src/address.h --- old/kcontacts-17.04.3/src/address.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/address.h 2017-08-04 20:45:05.000000000 +0200 @@ -21,9 +21,9 @@ #ifndef KCONTACTS_ADDRESS_H #define KCONTACTS_ADDRESS_H -#include <QtCore/QSharedDataPointer> -#include <QtCore/QString> -#include <QtCore/QVector> +#include <QSharedDataPointer> +#include <QString> +#include <QVector> #include "kcontacts_export.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/addressee.cpp new/kcontacts-17.08.0/src/addressee.cpp --- old/kcontacts-17.04.3/src/addressee.cpp 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/addressee.cpp 2017-08-04 20:45:05.000000000 +0200 @@ -20,10 +20,10 @@ Boston, MA 02110-1301, USA. */ -#include <QtCore/QList> -#include <QtCore/QRegExp> -#include <QtCore/QSharedData> -#include <QtCore/QUuid> +#include <QList> +#include <QRegExp> +#include <QSharedData> +#include <QUuid> #include "kcontacts_debug.h" #include <klocalizedstring.h> @@ -1919,9 +1919,7 @@ QString Addressee::toString() const { - QString str; - - str += QLatin1String("Addressee {\n"); + QString str = QLatin1String("Addressee {\n"); str += QStringLiteral(" Uid: %1\n").arg(uid()); str += QStringLiteral(" Name: %1\n").arg(name()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/addressee.h new/kcontacts-17.08.0/src/addressee.h --- old/kcontacts-17.04.3/src/addressee.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/addressee.h 2017-08-04 20:45:05.000000000 +0200 @@ -22,11 +22,11 @@ #ifndef KCONTACTS_ADDRESSEE_H #define KCONTACTS_ADDRESSEE_H -#include <QtCore/QDateTime> -#include <QtCore/QStringList> -#include <QtCore/QSharedDataPointer> -#include <QtCore/QUrl> -#include <QtCore/QMap> +#include <QDateTime> +#include <QStringList> +#include <QSharedDataPointer> +#include <QUrl> +#include <QMap> #include "address.h" #include "geo.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/addresseehelper.h new/kcontacts-17.08.0/src/addresseehelper.h --- old/kcontacts-17.04.3/src/addresseehelper.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/addresseehelper.h 2017-08-04 20:45:05.000000000 +0200 @@ -22,9 +22,9 @@ #include "kcontacts_export.h" -#include <QtCore/QObject> -#include <QtCore/QStringList> -#include <QtCore/QSet> +#include <QObject> +#include <QStringList> +#include <QSet> namespace KContacts { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/addresseelist.cpp new/kcontacts-17.08.0/src/addresseelist.cpp --- old/kcontacts-17.04.3/src/addresseelist.cpp 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/addresseelist.cpp 2017-08-04 20:45:05.000000000 +0200 @@ -24,7 +24,7 @@ #include "sortmode.h" #include "kcontacts_debug.h" -#include <QtCore/QSharedData> +#include <QSharedData> using namespace KContacts; @@ -333,7 +333,7 @@ KContacts::FieldSortMode *mode = new KContacts::FieldSortMode(sActiveField, !d->mReverseSorting); KContacts::Addressee::setSortMode(mode); - qSort(*this); + std::sort((*this).begin(), (*this).end()); KContacts::Addressee::setSortMode(nullptr); delete mode; @@ -346,7 +346,7 @@ } KContacts::Addressee::setSortMode(mode); - qSort(*this); + std::sort((*this).begin(), (*this).end()); KContacts::Addressee::setSortMode(nullptr); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/addresseelist.h new/kcontacts-17.08.0/src/addresseelist.h --- old/kcontacts-17.04.3/src/addresseelist.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/addresseelist.h 2017-08-04 20:45:05.000000000 +0200 @@ -23,8 +23,8 @@ #define KCONTACTS_ADDRESSEELIST_H #include "kcontacts_export.h" -#include <QtCore/QSharedDataPointer> -#include <QtCore/QVector> +#include <QSharedDataPointer> +#include <QVector> namespace KContacts { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/calendarurl.h new/kcontacts-17.08.0/src/calendarurl.h --- old/kcontacts-17.04.3/src/calendarurl.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/calendarurl.h 2017-08-04 20:45:05.000000000 +0200 @@ -22,9 +22,9 @@ #define CALENDARURL_H #include "kcontacts_export.h" -#include <QtCore/QSharedDataPointer> -#include <QtCore/QString> -#include <QtCore/QMap> +#include <QSharedDataPointer> +#include <QString> +#include <QMap> class QUrl; /** @short Class that holds a Calendar Url (FBURL/CALADRURI/CALURI) * @since 4.14.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/clientpidmap.h new/kcontacts-17.08.0/src/clientpidmap.h --- old/kcontacts-17.04.3/src/clientpidmap.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/clientpidmap.h 2017-08-04 20:45:05.000000000 +0200 @@ -22,9 +22,9 @@ #define CLIENTPIDMAP_H #include "kcontacts_export.h" -#include <QtCore/QSharedDataPointer> -#include <QtCore/QString> -#include <QtCore/QMap> +#include <QSharedDataPointer> +#include <QString> +#include <QMap> /** @short Class that holds a ClientPidMap for a contact. * @since 5.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/contactgroup.cpp new/kcontacts-17.08.0/src/contactgroup.cpp --- old/kcontacts-17.04.3/src/contactgroup.cpp 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/contactgroup.cpp 2017-08-04 20:45:05.000000000 +0200 @@ -21,10 +21,10 @@ #include "contactgroup.h" -#include <QtCore/QMap> -#include <QtCore/QSharedData> -#include <QtCore/QString> -#include <QtCore/QUuid> +#include <QMap> +#include <QSharedData> +#include <QString> +#include <QUuid> using namespace KContacts; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/contactgroup.h new/kcontacts-17.08.0/src/contactgroup.h --- old/kcontacts-17.04.3/src/contactgroup.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/contactgroup.h 2017-08-04 20:45:05.000000000 +0200 @@ -21,9 +21,9 @@ #ifndef KCONTACTS_CONTACTGROUP_H #define KCONTACTS_CONTACTGROUP_H -#include <QtCore/QVector> -#include <QtCore/QSharedDataPointer> -#include <QtCore/QMetaType> +#include <QVector> +#include <QSharedDataPointer> +#include <QMetaType> #include "kcontacts_export.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/contactgrouptool.cpp new/kcontacts-17.08.0/src/contactgrouptool.cpp --- old/kcontacts-17.04.3/src/contactgrouptool.cpp 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/contactgrouptool.cpp 2017-08-04 20:45:05.000000000 +0200 @@ -22,12 +22,12 @@ #include "contactgrouptool.h" #include "contactgroup.h" -#include <QtCore/QIODevice> -#include <QtCore/QString> -#include <QtCore/QDebug> +#include <QIODevice> +#include <QString> +#include <QDebug> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QXmlStreamWriter> +#include <QXmlStreamReader> +#include <QXmlStreamWriter> using namespace KContacts; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/converter/ldifconverter.cpp new/kcontacts-17.08.0/src/converter/ldifconverter.cpp --- old/kcontacts-17.04.3/src/converter/ldifconverter.cpp 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/converter/ldifconverter.cpp 2017-08-04 20:45:05.000000000 +0200 @@ -42,9 +42,9 @@ #include <klocalizedstring.h> -#include <QtCore/QStringList> -#include <QtCore/QTextCodec> -#include <QtCore/QTextStream> +#include <QStringList> +#include <QTextCodec> +#include <QTextStream> using namespace KContacts; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/converter/ldifconverter.h new/kcontacts-17.08.0/src/converter/ldifconverter.h --- old/kcontacts-17.04.3/src/converter/ldifconverter.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/converter/ldifconverter.h 2017-08-04 20:45:05.000000000 +0200 @@ -23,8 +23,8 @@ #include "addressee.h" #include "contactgroup.h" -#include <QtCore/QDateTime> -#include <QtCore/QString> +#include <QDateTime> +#include <QString> namespace KContacts { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/converter/vcardconverter.h new/kcontacts-17.08.0/src/converter/vcardconverter.h --- old/kcontacts-17.04.3/src/converter/vcardconverter.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/converter/vcardconverter.h 2017-08-04 20:45:05.000000000 +0200 @@ -23,7 +23,7 @@ #include "kcontacts_export.h" #include "kcontacts/addressee.h" -#include <QtCore/QString> +#include <QString> namespace KContacts { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/email.h new/kcontacts-17.08.0/src/email.h --- old/kcontacts-17.04.3/src/email.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/email.h 2017-08-04 20:45:05.000000000 +0200 @@ -22,9 +22,9 @@ #define EMAIL_H #include "kcontacts_export.h" -#include <QtCore/QSharedDataPointer> -#include <QtCore/QString> -#include <QtCore/QMap> +#include <QSharedDataPointer> +#include <QString> +#include <QMap> /** @short Class that holds a Email for a contact. * @since 4.14.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/field.h new/kcontacts-17.08.0/src/field.h --- old/kcontacts-17.04.3/src/field.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/field.h 2017-08-04 20:45:05.000000000 +0200 @@ -22,7 +22,7 @@ #define KCONTACTS_FIELD_H #include "addressee.h" -#include <QtCore/QString> +#include <QString> class KConfigGroup; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/fieldgroup.h new/kcontacts-17.08.0/src/fieldgroup.h --- old/kcontacts-17.04.3/src/fieldgroup.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/fieldgroup.h 2017-08-04 20:45:05.000000000 +0200 @@ -22,9 +22,9 @@ #define FIELDGROUP_H #include "kcontacts_export.h" -#include <QtCore/QSharedDataPointer> -#include <QtCore/QString> -#include <QtCore/QMap> +#include <QSharedDataPointer> +#include <QString> +#include <QMap> /** @short Class that holds a FieldGroup for a contact. * @since 5.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/gender.h new/kcontacts-17.08.0/src/gender.h --- old/kcontacts-17.04.3/src/gender.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/gender.h 2017-08-04 20:45:05.000000000 +0200 @@ -21,8 +21,8 @@ #ifndef GENDER_H #define GENDER_H #include "kcontacts_export.h" -#include <QtCore/QSharedDataPointer> -#include <QtCore/QString> +#include <QSharedDataPointer> +#include <QString> /** @short Class that holds a Gender for a contact. * @since 4.14.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/geo.cpp new/kcontacts-17.08.0/src/geo.cpp --- old/kcontacts-17.04.3/src/geo.cpp 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/geo.cpp 2017-08-04 20:45:05.000000000 +0200 @@ -20,8 +20,8 @@ #include "geo.h" -#include <QtCore/QDataStream> -#include <QtCore/QSharedData> +#include <QDataStream> +#include <QSharedData> using namespace KContacts; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/geo.h new/kcontacts-17.08.0/src/geo.h --- old/kcontacts-17.04.3/src/geo.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/geo.h 2017-08-04 20:45:05.000000000 +0200 @@ -22,8 +22,8 @@ #define KCONTACTS_GEO_H #include "kcontacts_export.h" -#include <QtCore/QSharedDataPointer> -#include <QtCore/QString> +#include <QSharedDataPointer> +#include <QString> namespace KContacts { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/impp.h new/kcontacts-17.08.0/src/impp.h --- old/kcontacts-17.04.3/src/impp.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/impp.h 2017-08-04 20:45:05.000000000 +0200 @@ -22,9 +22,9 @@ #define IMPP_H #include "kcontacts_export.h" -#include <QtCore/QSharedDataPointer> -#include <QtCore/QString> -#include <QtCore/QMap> +#include <QSharedDataPointer> +#include <QString> +#include <QMap> /** @short Class that holds a IMPP for a contact. * @since 4.14.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/key.cpp new/kcontacts-17.08.0/src/key.cpp --- old/kcontacts-17.04.3/src/key.cpp 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/key.cpp 2017-08-04 20:45:05.000000000 +0200 @@ -23,8 +23,8 @@ #include <klocalizedstring.h> #include <krandom.h> -#include <QtCore/QDataStream> -#include <QtCore/QSharedData> +#include <QDataStream> +#include <QSharedData> using namespace KContacts; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/key.h new/kcontacts-17.08.0/src/key.h --- old/kcontacts-17.04.3/src/key.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/key.h 2017-08-04 20:45:05.000000000 +0200 @@ -23,8 +23,8 @@ #include "kcontacts_export.h" -#include <QtCore/QDataStream> -#include <QtCore/QSharedDataPointer> +#include <QDataStream> +#include <QSharedDataPointer> namespace KContacts { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/lang.h new/kcontacts-17.08.0/src/lang.h --- old/kcontacts-17.04.3/src/lang.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/lang.h 2017-08-04 20:45:05.000000000 +0200 @@ -22,9 +22,9 @@ #define LANG_H #include "kcontacts_export.h" -#include <QtCore/QSharedDataPointer> -#include <QtCore/QString> -#include <QtCore/QMap> +#include <QSharedDataPointer> +#include <QString> +#include <QMap> /** @short Class that holds a Language for a contact. * @since 4.14.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/ldapdn_p.h new/kcontacts-17.08.0/src/ldapdn_p.h --- old/kcontacts-17.04.3/src/ldapdn_p.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/ldapdn_p.h 2017-08-04 20:45:05.000000000 +0200 @@ -23,7 +23,7 @@ #ifndef LDAPDN_P_H #define LDAPDN_P_H -#include <QtCore/QStringList> +#include <QStringList> class LdapDN { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/ldif_p.h new/kcontacts-17.08.0/src/ldif_p.h --- old/kcontacts-17.04.3/src/ldif_p.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/ldif_p.h 2017-08-04 20:45:05.000000000 +0200 @@ -23,8 +23,8 @@ #ifndef LDIF_P_H #define LDIF_P_H -#include <QtCore/QString> -#include <QtCore/QByteArray> +#include <QString> +#include <QByteArray> #include "ldapdn_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/nickname.h new/kcontacts-17.08.0/src/nickname.h --- old/kcontacts-17.04.3/src/nickname.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/nickname.h 2017-08-04 20:45:05.000000000 +0200 @@ -22,9 +22,9 @@ #define NICKNAME_H #include "kcontacts_export.h" -#include <QtCore/QSharedDataPointer> -#include <QtCore/QString> -#include <QtCore/QMap> +#include <QSharedDataPointer> +#include <QString> +#include <QMap> /** @short Class that holds a NickName for a contact. * @since 5.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/note.h new/kcontacts-17.08.0/src/note.h --- old/kcontacts-17.04.3/src/note.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/note.h 2017-08-04 20:45:05.000000000 +0200 @@ -22,9 +22,9 @@ #define NOTE_H #include "kcontacts_export.h" -#include <QtCore/QSharedDataPointer> -#include <QtCore/QString> -#include <QtCore/QMap> +#include <QSharedDataPointer> +#include <QString> +#include <QMap> /** @short Class that holds a Note for a contact. * @since 5.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/org.h new/kcontacts-17.08.0/src/org.h --- old/kcontacts-17.04.3/src/org.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/org.h 2017-08-04 20:45:05.000000000 +0200 @@ -22,9 +22,9 @@ #define ORG_H #include "kcontacts_export.h" -#include <QtCore/QSharedDataPointer> -#include <QtCore/QString> -#include <QtCore/QMap> +#include <QSharedDataPointer> +#include <QString> +#include <QMap> /** @short Class that holds a Organization for a contact. * @since 5.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/phonenumber.cpp new/kcontacts-17.08.0/src/phonenumber.cpp --- old/kcontacts-17.04.3/src/phonenumber.cpp 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/phonenumber.cpp 2017-08-04 20:45:05.000000000 +0200 @@ -23,8 +23,8 @@ #include <klocalizedstring.h> #include <krandom.h> -#include <QtCore/QDataStream> -#include <QtCore/QSharedData> +#include <QDataStream> +#include <QSharedData> using namespace KContacts; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/phonenumber.h new/kcontacts-17.08.0/src/phonenumber.h --- old/kcontacts-17.04.3/src/phonenumber.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/phonenumber.h 2017-08-04 20:45:05.000000000 +0200 @@ -23,10 +23,10 @@ #include "kcontacts_export.h" -#include <QtCore/QSharedDataPointer> -#include <QtCore/QString> -#include <QtCore/QVector> -#include <QtCore/QMap> +#include <QSharedDataPointer> +#include <QString> +#include <QVector> +#include <QMap> namespace KContacts { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/picture.cpp new/kcontacts-17.08.0/src/picture.cpp --- old/kcontacts-17.04.3/src/picture.cpp 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/picture.cpp 2017-08-04 20:45:05.000000000 +0200 @@ -20,10 +20,10 @@ #include "picture.h" -#include <QtCore/QBuffer> -#include <QtCore/QSharedData> +#include <QBuffer> +#include <QSharedData> -#include <QtGui/QImage> +#include <QImage> namespace KContacts { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/picture.h new/kcontacts-17.08.0/src/picture.h --- old/kcontacts-17.04.3/src/picture.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/picture.h 2017-08-04 20:45:05.000000000 +0200 @@ -23,9 +23,9 @@ #include "kcontacts_export.h" -#include <QtCore/QDataStream> -#include <QtCore/QString> -#include <QtCore/QSharedDataPointer> +#include <QDataStream> +#include <QString> +#include <QSharedDataPointer> class QImage; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/related.h new/kcontacts-17.08.0/src/related.h --- old/kcontacts-17.04.3/src/related.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/related.h 2017-08-04 20:45:05.000000000 +0200 @@ -22,9 +22,9 @@ #define RELATED_H #include "kcontacts_export.h" -#include <QtCore/QSharedDataPointer> -#include <QtCore/QString> -#include <QtCore/QMap> +#include <QSharedDataPointer> +#include <QString> +#include <QMap> namespace KContacts { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/resourcelocatorurl.h new/kcontacts-17.08.0/src/resourcelocatorurl.h --- old/kcontacts-17.04.3/src/resourcelocatorurl.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/resourcelocatorurl.h 2017-08-04 20:45:05.000000000 +0200 @@ -23,9 +23,9 @@ #include "kcontacts_export.h" -#include <QtCore/QSharedDataPointer> -#include <QtCore/QString> -#include <QtCore/QMap> +#include <QSharedDataPointer> +#include <QString> +#include <QMap> class QUrl; /** @short Class that holds a Resource Locator * @since 5.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/role.h new/kcontacts-17.08.0/src/role.h --- old/kcontacts-17.04.3/src/role.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/role.h 2017-08-04 20:45:05.000000000 +0200 @@ -22,9 +22,9 @@ #define ROLE_H #include "kcontacts_export.h" -#include <QtCore/QSharedDataPointer> -#include <QtCore/QString> -#include <QtCore/QMap> +#include <QSharedDataPointer> +#include <QString> +#include <QMap> /** @short Class that holds a Role for a contact. * @since 5.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/secrecy.cpp new/kcontacts-17.08.0/src/secrecy.cpp --- old/kcontacts-17.04.3/src/secrecy.cpp 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/secrecy.cpp 2017-08-04 20:45:05.000000000 +0200 @@ -22,8 +22,8 @@ #include <klocalizedstring.h> -#include <QtCore/QDataStream> -#include <QtCore/QSharedData> +#include <QDataStream> +#include <QSharedData> using namespace KContacts; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/secrecy.h new/kcontacts-17.08.0/src/secrecy.h --- old/kcontacts-17.04.3/src/secrecy.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/secrecy.h 2017-08-04 20:45:05.000000000 +0200 @@ -22,8 +22,8 @@ #define KCONTACTS_SECRECY_H #include "kcontacts_export.h" -#include <QtCore/QVector> -#include <QtCore/QSharedDataPointer> +#include <QVector> +#include <QSharedDataPointer> namespace KContacts { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/sortmode.h new/kcontacts-17.08.0/src/sortmode.h --- old/kcontacts-17.04.3/src/sortmode.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/sortmode.h 2017-08-04 20:45:05.000000000 +0200 @@ -88,7 +88,7 @@ /** Returns whether the first contact is 'smaller' then the second. */ - bool lesser(const KContacts::Addressee &first, const KContacts::Addressee &second) const Q_DECL_OVERRIDE; + bool lesser(const KContacts::Addressee &first, const KContacts::Addressee &second) const override; private: class Private; @@ -123,7 +123,7 @@ /** Returns whether the first contact is 'smaller' then the second. */ - bool lesser(const KContacts::Addressee &first, const KContacts::Addressee &second) const Q_DECL_OVERRIDE; + bool lesser(const KContacts::Addressee &first, const KContacts::Addressee &second) const override; private: class Private; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/sound.cpp new/kcontacts-17.08.0/src/sound.cpp --- old/kcontacts-17.04.3/src/sound.cpp 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/sound.cpp 2017-08-04 20:45:05.000000000 +0200 @@ -20,8 +20,8 @@ #include "sound.h" -#include <QtCore/QDataStream> -#include <QtCore/QSharedData> +#include <QDataStream> +#include <QSharedData> using namespace KContacts; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/sound.h new/kcontacts-17.08.0/src/sound.h --- old/kcontacts-17.04.3/src/sound.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/sound.h 2017-08-04 20:45:05.000000000 +0200 @@ -22,8 +22,8 @@ #define KCONTACTS_SOUND_H #include "kcontacts_export.h" -#include <QtCore/QString> -#include <QtCore/QSharedDataPointer> +#include <QString> +#include <QSharedDataPointer> namespace KContacts { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/timezone.cpp new/kcontacts-17.08.0/src/timezone.cpp --- old/kcontacts-17.04.3/src/timezone.cpp 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/timezone.cpp 2017-08-04 20:45:05.000000000 +0200 @@ -20,8 +20,8 @@ #include "timezone.h" -#include <QtCore/QDataStream> -#include <QtCore/QSharedData> +#include <QDataStream> +#include <QSharedData> using namespace KContacts; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/timezone.h new/kcontacts-17.08.0/src/timezone.h --- old/kcontacts-17.04.3/src/timezone.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/timezone.h 2017-08-04 20:45:05.000000000 +0200 @@ -22,8 +22,8 @@ #define KCONTACTS_TIMEZONE_H #include "kcontacts_export.h" -#include <QtCore/QSharedDataPointer> -#include <QtCore/QString> +#include <QSharedDataPointer> +#include <QString> namespace KContacts { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/title.h new/kcontacts-17.08.0/src/title.h --- old/kcontacts-17.04.3/src/title.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/title.h 2017-08-04 20:45:05.000000000 +0200 @@ -22,9 +22,9 @@ #define TITLE_H #include "kcontacts_export.h" -#include <QtCore/QSharedDataPointer> -#include <QtCore/QString> -#include <QtCore/QMap> +#include <QSharedDataPointer> +#include <QString> +#include <QMap> /** @short Class that holds a Title for a contact. * @since 5.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/vcardparser/vcard.h new/kcontacts-17.08.0/src/vcardparser/vcard.h --- old/kcontacts-17.04.3/src/vcardparser/vcard.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/vcardparser/vcard.h 2017-08-04 20:45:05.000000000 +0200 @@ -21,8 +21,8 @@ #ifndef VCARDPARSER_VCARD_H #define VCARDPARSER_VCARD_H -#include <QtCore/QMap> -#include <QtCore/QStringList> +#include <QMap> +#include <QStringList> #include "vcardline.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/vcardparser/vcardline.h new/kcontacts-17.08.0/src/vcardparser/vcardline.h --- old/kcontacts-17.04.3/src/vcardparser/vcardline.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/vcardparser/vcardline.h 2017-08-04 20:45:05.000000000 +0200 @@ -21,10 +21,10 @@ #ifndef VCARDLINE_H #define VCARDLINE_H -#include <QtCore/QMap> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QVariant> +#include <QMap> +#include <QString> +#include <QStringList> +#include <QVariant> #include "kcontacts_export.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/vcardparser/vcardparser.cpp new/kcontacts-17.08.0/src/vcardparser/vcardparser.cpp --- old/kcontacts-17.04.3/src/vcardparser/vcardparser.cpp 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/vcardparser/vcardparser.cpp 2017-08-04 20:45:05.000000000 +0200 @@ -21,7 +21,7 @@ #include "vcardparser.h" #include <kcodecs.h> #include "kcontacts_debug.h" -#include <QtCore/QTextCodec> +#include <QTextCodec> #include <functional> // This cache for QString::fromLatin1() isn't about improving speed, but about reducing memory usage by sharing common strings @@ -183,6 +183,9 @@ start = pos + 1; } // fall-through intended +#if QT_VERSION >= QT_VERSION_CHECK(5,8,0) + Q_FALLTHROUGH(); +#endif case StateAfterParamValue: if (ch == ';') { state = StateParamKey; @@ -273,7 +276,7 @@ bool inVCard = false; StringCache cache; - for (; lineEnd != -1; lineStart = lineEnd + 1, lineEnd = text.indexOf('\n', lineStart)) { + for (; lineStart != text.size() + 1; lineStart = lineEnd + 1, lineEnd = (text.indexOf('\n', lineStart) == -1) ? text.size() : text.indexOf('\n', lineStart)) { QByteArray cur = text.mid(lineStart, lineEnd - lineStart); // remove the trailing \r, left from \r\n if (cur.endsWith('\r')) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/vcardparser/vcardparser.h new/kcontacts-17.08.0/src/vcardparser/vcardparser.h --- old/kcontacts-17.04.3/src/vcardparser/vcardparser.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/vcardparser/vcardparser.h 2017-08-04 20:45:05.000000000 +0200 @@ -22,7 +22,7 @@ #define VCARDPARSER_H #include "vcard.h" -#include <QtCore/QByteArray> +#include <QByteArray> namespace KContacts { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/src/vcardtool.cpp new/kcontacts-17.08.0/src/vcardtool.cpp --- old/kcontacts-17.04.3/src/vcardtool.cpp 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/src/vcardtool.cpp 2017-08-04 20:45:05.000000000 +0200 @@ -29,8 +29,8 @@ #include "related.h" #include "fieldgroup.h" #include "kcontacts_debug.h" -#include <QtCore/QString> -#include <QtCore/QBuffer> +#include <QString> +#include <QBuffer> #include <QDebug> #include <QRegularExpression> @@ -1404,9 +1404,13 @@ if (version == VCard::v2_1) { line.addParameter(QStringLiteral("ENCODING"), QStringLiteral("BASE64")); line.addParameter(pic.type(), QString()); - } else { + } else /*if (version == VCard::v3_0) */ { line.addParameter(QStringLiteral("encoding"), QStringLiteral("b")); line.addParameter(QStringLiteral("type"), pic.type()); +#if 0 + } else { //version 4.0 + line.addParameter(QStringLiteral("data") + QStringLiteral(":image/") + pic.type(), QStringLiteral("base64")); +#endif } } else { line.setValue(pic.url()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/tests/testread.cpp new/kcontacts-17.08.0/tests/testread.cpp --- old/kcontacts-17.04.3/tests/testread.cpp 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/tests/testread.cpp 2017-08-04 20:45:05.000000000 +0200 @@ -21,7 +21,7 @@ #include <iostream> #include <stdlib.h> -#include <QtCore/QFile> +#include <QFile> #include <qdebug.h> #include <KAboutData> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/tests/testutils.cpp new/kcontacts-17.08.0/tests/testutils.cpp --- old/kcontacts-17.04.3/tests/testutils.cpp 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/tests/testutils.cpp 2017-08-04 20:45:05.000000000 +0200 @@ -18,7 +18,7 @@ Boston, MA 02110-1301, USA. */ -#include <QtCore/QFile> +#include <QFile> #include <kcontacts/addressee.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/tests/testutils.h new/kcontacts-17.08.0/tests/testutils.h --- old/kcontacts-17.04.3/tests/testutils.h 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/tests/testutils.h 2017-08-04 20:45:05.000000000 +0200 @@ -21,8 +21,8 @@ #ifndef TESTUTILS_H #define TESTUTILS_H -#include <QtCore/QByteArray> -#include <QtCore/QString> +#include <QByteArray> +#include <QString> #include <kcontacts/addressee.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-17.04.3/tests/testwrite.cpp new/kcontacts-17.08.0/tests/testwrite.cpp --- old/kcontacts-17.04.3/tests/testwrite.cpp 2017-06-09 06:49:39.000000000 +0200 +++ new/kcontacts-17.08.0/tests/testwrite.cpp 2017-08-04 20:45:05.000000000 +0200 @@ -18,7 +18,7 @@ Boston, MA 02110-1301, USA. */ -#include <QtCore/QFile> +#include <QFile> #include <kaboutdata.h> #include <klocalizedstring.h>
