Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kcontacts for openSUSE:Factory checked in at 2021-09-16 23:13:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcontacts (Old) and /work/SRC/openSUSE:Factory/.kcontacts.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcontacts" Thu Sep 16 23:13:53 2021 rev:72 rq:919180 version:5.86.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kcontacts/kcontacts.changes 2021-08-16 10:11:30.823103594 +0200 +++ /work/SRC/openSUSE:Factory/.kcontacts.new.1899/kcontacts.changes 2021-09-16 23:15:35.447855408 +0200 @@ -1,0 +2,15 @@ +Wed Sep 15 08:24:00 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Drop the unneeded baselibs.conf. + +------------------------------------------------------------------- +Mon Sep 6 06:21:57 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.86.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.86.0 +- Changes since 5.85.0: + * Port from QStringRef (deprecated) to QStringView + +------------------------------------------------------------------- Old: ---- baselibs.conf kcontacts-5.85.0.tar.xz kcontacts-5.85.0.tar.xz.sig New: ---- kcontacts-5.86.0.tar.xz kcontacts-5.86.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcontacts.spec ++++++ --- /var/tmp/diff_new_pack.qNn6WQ/_old 2021-09-16 23:15:36.019856000 +0200 +++ /var/tmp/diff_new_pack.qNn6WQ/_new 2021-09-16 23:15:36.019856000 +0200 @@ -16,14 +16,14 @@ # -%define _tar_path 5.85 +%define _tar_path 5.86 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kcontacts -Version: 5.85.0 +Version: 5.86.0 Release: 0 Summary: KDE Frameworks based address book API License: LGPL-2.1-or-later @@ -34,7 +34,6 @@ Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif -Source99: baselibs.conf BuildRequires: extra-cmake-modules >= %{_kf5_version} BuildRequires: kf5-filesystem BuildRequires: cmake(KF5Codecs) >= %{_kf5_version} ++++++ kcontacts-5.85.0.tar.xz -> kcontacts-5.86.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.85.0/CMakeLists.txt new/kcontacts-5.86.0/CMakeLists.txt --- old/kcontacts-5.85.0/CMakeLists.txt 2021-08-06 11:01:27.000000000 +0200 +++ new/kcontacts-5.86.0/CMakeLists.txt 2021-09-04 18:57:31.000000000 +0200 @@ -1,20 +1,20 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.85.0") # handled by release scripts -set(KF_DEP_VERSION "5.85.0") # handled by release scripts +set(KF_VERSION "5.86.0") # handled by release scripts +set(KF_DEP_VERSION "5.86.0") # handled by release scripts project(KContacts VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.85.0 NO_MODULE) +find_package(ECM 5.86.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) set(CMAKE_AUTORCC ON) -set(REQUIRED_QT_VERSION 5.15.0) +set(REQUIRED_QT_VERSION 5.15.2) include(KDEInstallDirs) include(KDECMakeSettings) @@ -51,7 +51,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kcontacts5\") ki18n_install(po) -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100) add_subdirectory(src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.85.0/autotests/addresseetest.cpp new/kcontacts-5.86.0/autotests/addresseetest.cpp --- old/kcontacts-5.85.0/autotests/addresseetest.cpp 2021-08-06 11:01:27.000000000 +0200 +++ new/kcontacts-5.86.0/autotests/addresseetest.cpp 2021-09-04 18:57:31.000000000 +0200 @@ -126,7 +126,8 @@ void AddresseeTest::equalsTest() { - KContacts::Addressee addressee1, addressee2; + KContacts::Addressee addressee1; + KContacts::Addressee addressee2; KContacts::Picture logo(QStringLiteral("http://scottlandyard.info/pics/logo.png";)); KContacts::Picture photo(QStringLiteral("http://scottlandyard.info/~sinclair/photo.png";)); @@ -213,7 +214,8 @@ void AddresseeTest::differsTest() { - KContacts::Addressee addressee1, addressee2; + KContacts::Addressee addressee1; + KContacts::Addressee addressee2; addressee1.setNameFromString(QStringLiteral("John Sinclair")); addressee2.setNameFromString(QStringLiteral("Suko")); @@ -223,7 +225,8 @@ void AddresseeTest::assignmentTest() { - KContacts::Addressee addressee1, addressee2; + KContacts::Addressee addressee1; + KContacts::Addressee addressee2; KContacts::Picture logo(QStringLiteral("http://scottlandyard.info/pics/logo.png";)); KContacts::Picture photo(QStringLiteral("http://scottlandyard.info/~sinclair/photo.png";)); @@ -281,7 +284,8 @@ void AddresseeTest::serializeTest() { - KContacts::Addressee addressee1, addressee2; + KContacts::Addressee addressee1; + KContacts::Addressee addressee2; KContacts::Picture logo(QStringLiteral("http://scottlandyard.info/pics/logo.png";)); KContacts::Picture photo(QStringLiteral("http://scottlandyard.info/~sinclair/photo.png";)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.85.0/autotests/addresstest.cpp new/kcontacts-5.86.0/autotests/addresstest.cpp --- old/kcontacts-5.85.0/autotests/addresstest.cpp 2021-08-06 11:01:27.000000000 +0200 +++ new/kcontacts-5.86.0/autotests/addresstest.cpp 2021-09-04 18:57:31.000000000 +0200 @@ -63,7 +63,8 @@ void AddressTest::equalsTest() { - KContacts::Address address1, address2; + KContacts::Address address1; + KContacts::Address address2; address1.setId(QStringLiteral("My Id")); address1.setType(KContacts::Address::Home); @@ -100,7 +101,8 @@ void AddressTest::assignmentTest() { - KContacts::Address address1, address2; + KContacts::Address address1; + KContacts::Address address2; address1.setId(QStringLiteral("My Id")); address1.setType(KContacts::Address::Home); @@ -120,7 +122,8 @@ void AddressTest::serializeTest() { - KContacts::Address address1, address2; + KContacts::Address address1; + KContacts::Address address2; address1.setType(KContacts::Address::Work); address1.setPostOfficeBox(QStringLiteral("1234")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.85.0/autotests/datetimetest.cpp new/kcontacts-5.86.0/autotests/datetimetest.cpp --- old/kcontacts-5.85.0/autotests/datetimetest.cpp 2021-08-06 11:01:27.000000000 +0200 +++ new/kcontacts-5.86.0/autotests/datetimetest.cpp 2021-09-04 18:57:31.000000000 +0200 @@ -22,7 +22,8 @@ { using namespace KContacts; - QDateTime expected, dt; + QDateTime expected; + QDateTime dt; bool timeIsValid; dt = VCardTool::parseDateTime(QStringLiteral("2016-01-20T12:33:30+0200")); @@ -82,7 +83,8 @@ using namespace KContacts; QDateTime dt; - QString str, expected; + QString str; + QString expected; dt = QDateTime(QDate(2016, 1, 20), QTime(12, 33, 30), Qt::UTC); str = VCardTool::createDateTime(dt, VCard::v4_0); @@ -135,7 +137,8 @@ using namespace KContacts; QDate d; - QString str, expected; + QString str; + QString expected; d = QDate(2016, 1, 20); str = VCardTool::createDate(d, VCard::v3_0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.85.0/autotests/emailtest.cpp new/kcontacts-5.86.0/autotests/emailtest.cpp --- old/kcontacts-5.85.0/autotests/emailtest.cpp 2021-08-06 11:01:27.000000000 +0200 +++ new/kcontacts-5.86.0/autotests/emailtest.cpp 2021-09-04 18:57:31.000000000 +0200 @@ -178,7 +178,8 @@ KContacts::Addressee addr2; addr2.setUid(QStringLiteral("testuid")); - KContacts::Email email1, email2; + KContacts::Email email1; + KContacts::Email email2; email1.setEmail(QStringLiteral("[email protected]")); email1.setType(KContacts::Email::Work); email1.setPreferred(true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.85.0/autotests/keytest.cpp new/kcontacts-5.86.0/autotests/keytest.cpp --- old/kcontacts-5.85.0/autotests/keytest.cpp 2021-08-06 11:01:27.000000000 +0200 +++ new/kcontacts-5.86.0/autotests/keytest.cpp 2021-09-04 18:57:31.000000000 +0200 @@ -31,7 +31,8 @@ void KeyTest::equalsTest() { - KContacts::Key key1, key2; + KContacts::Key key1; + KContacts::Key key2; key1.setId(QStringLiteral("My Id")); key1.setType(KContacts::Key::Custom); @@ -56,7 +57,8 @@ void KeyTest::assignmentTest() { - KContacts::Key key1, key2; + KContacts::Key key1; + KContacts::Key key2; key1.setId(QStringLiteral("My Id")); key1.setType(KContacts::Key::Custom); @@ -70,7 +72,8 @@ void KeyTest::serializeTest() { - KContacts::Key key1, key2; + KContacts::Key key1; + KContacts::Key key2; key1.setId(QStringLiteral("My Id")); key1.setType(KContacts::Key::Custom); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.85.0/autotests/phonenumbertest.cpp new/kcontacts-5.86.0/autotests/phonenumbertest.cpp --- old/kcontacts-5.85.0/autotests/phonenumbertest.cpp 2021-08-06 11:01:27.000000000 +0200 +++ new/kcontacts-5.86.0/autotests/phonenumbertest.cpp 2021-09-04 18:57:31.000000000 +0200 @@ -45,7 +45,8 @@ void PhoneNumberTest::equalsTest() { - KContacts::PhoneNumber number1, number2; + KContacts::PhoneNumber number1; + KContacts::PhoneNumber number2; number1.setId(QStringLiteral("My Id")); number1.setType(KContacts::PhoneNumber::Work | KContacts::PhoneNumber::Cell); @@ -68,7 +69,8 @@ void PhoneNumberTest::assignmentTest() { - KContacts::PhoneNumber number1, number2; + KContacts::PhoneNumber number1; + KContacts::PhoneNumber number2; number1.setId(QStringLiteral("My Id")); number1.setType(KContacts::PhoneNumber::Work | KContacts::PhoneNumber::Cell); @@ -81,7 +83,8 @@ void PhoneNumberTest::serializeTest() { - KContacts::PhoneNumber number1, number2; + KContacts::PhoneNumber number1; + KContacts::PhoneNumber number2; number1.setId(QStringLiteral("My Id")); number1.setType(KContacts::PhoneNumber::Work | KContacts::PhoneNumber::Cell); @@ -119,7 +122,7 @@ } // combine all with Pref - for (KContacts::PhoneNumber::Type type : qAsConst(types)) { + for (KContacts::PhoneNumber::Type type : std::as_const(types)) { KContacts::PhoneNumber::Type combinedType = type | KContacts::PhoneNumber::Pref; const KContacts::PhoneNumber phone(QLatin1String("1"), combinedType); QCOMPARE(phone.type(), combinedType); @@ -135,7 +138,7 @@ } // combine all with Fax - for (KContacts::PhoneNumber::Type type : qAsConst(types)) { + for (KContacts::PhoneNumber::Type type : std::as_const(types)) { KContacts::PhoneNumber::Type combinedType = type | KContacts::PhoneNumber::Fax; const KContacts::PhoneNumber phone(QLatin1String("1"), combinedType); QCOMPARE(phone.type(), combinedType); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.85.0/autotests/picturetest.cpp new/kcontacts-5.86.0/autotests/picturetest.cpp --- old/kcontacts-5.85.0/autotests/picturetest.cpp 2021-08-06 11:01:27.000000000 +0200 +++ new/kcontacts-5.86.0/autotests/picturetest.cpp 2021-09-04 18:57:31.000000000 +0200 @@ -99,7 +99,8 @@ void PictureTest::equalsTestInternImage() { - KContacts::Picture picture1, picture2; + KContacts::Picture picture1; + KContacts::Picture picture2; picture1.setData(testImage()); @@ -114,7 +115,8 @@ void PictureTest::equalsTestInternRawData() { - KContacts::Picture picture1, picture2; + KContacts::Picture picture1; + KContacts::Picture picture2; picture1.setRawData(testImageRawPNG(), QStringLiteral("png")); @@ -129,7 +131,8 @@ void PictureTest::equalsTestInternImageAndRawData() { - KContacts::Picture picture1, picture2; + KContacts::Picture picture1; + KContacts::Picture picture2; picture1.setData(testImage()); @@ -140,7 +143,8 @@ void PictureTest::equalsTestExtern() { - KContacts::Picture picture1, picture2; + KContacts::Picture picture1; + KContacts::Picture picture2; picture1.setUrl(QStringLiteral("http://myhomepage.com/foto.png";), QStringLiteral("png")); @@ -151,7 +155,8 @@ void PictureTest::differsTest() { - KContacts::Picture picture1, picture2; + KContacts::Picture picture1; + KContacts::Picture picture2; picture1.setUrl(QStringLiteral("http://myhomepage.com/foto.png";), QStringLiteral("png")); @@ -162,7 +167,8 @@ void PictureTest::differsTestInternRawData() { - KContacts::Picture picture1, picture2; + KContacts::Picture picture1; + KContacts::Picture picture2; picture1.setRawData(testImageRawJPEG(), QStringLiteral("jpeg")); @@ -174,7 +180,8 @@ void PictureTest::differsTestExtern() { - KContacts::Picture picture1, picture2; + KContacts::Picture picture1; + KContacts::Picture picture2; picture1.setUrl(QStringLiteral("http://myhomepage.com/foto.png";), QStringLiteral("png")); @@ -185,7 +192,8 @@ void PictureTest::assignmentTestIntern() { - KContacts::Picture picture1, picture2; + KContacts::Picture picture1; + KContacts::Picture picture2; picture1.setData(testImage()); @@ -196,7 +204,8 @@ void PictureTest::assignmentTestExtern() { - KContacts::Picture picture1, picture2; + KContacts::Picture picture1; + KContacts::Picture picture2; picture1.setUrl(QStringLiteral("http://myhomepage.com/foto.png";), QStringLiteral("png")); @@ -207,7 +216,8 @@ void PictureTest::serializeTestInternImage() { - KContacts::Picture picture1, picture2; + KContacts::Picture picture1; + KContacts::Picture picture2; picture1.setData(testImage()); @@ -223,7 +233,8 @@ void PictureTest::serializeTestInternRawData() { - KContacts::Picture picture1, picture2; + KContacts::Picture picture1; + KContacts::Picture picture2; picture1.setRawData(testImageRawPNG(), QStringLiteral("png")); @@ -239,7 +250,8 @@ void PictureTest::serializeTestExtern() { - KContacts::Picture picture1, picture2; + KContacts::Picture picture1; + KContacts::Picture picture2; picture1.setUrl(QStringLiteral("http://myhomepage.com/foto.png";), QStringLiteral("png")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.85.0/autotests/secrecytest.cpp new/kcontacts-5.86.0/autotests/secrecytest.cpp --- old/kcontacts-5.85.0/autotests/secrecytest.cpp 2021-08-06 11:01:27.000000000 +0200 +++ new/kcontacts-5.86.0/autotests/secrecytest.cpp 2021-09-04 18:57:31.000000000 +0200 @@ -30,7 +30,8 @@ void SecrecyTest::equalsTest() { - KContacts::Secrecy secrecy1, secrecy2; + KContacts::Secrecy secrecy1; + KContacts::Secrecy secrecy2; secrecy1.setType(KContacts::Secrecy::Confidential); secrecy2.setType(KContacts::Secrecy::Confidential); @@ -48,7 +49,8 @@ void SecrecyTest::assignmentTest() { - KContacts::Secrecy secrecy1, secrecy2; + KContacts::Secrecy secrecy1; + KContacts::Secrecy secrecy2; secrecy1.setType(KContacts::Secrecy::Confidential); secrecy1 = secrecy2; @@ -58,7 +60,8 @@ void SecrecyTest::serializeTest() { - KContacts::Secrecy secrecy1, secrecy2; + KContacts::Secrecy secrecy1; + KContacts::Secrecy secrecy2; secrecy1.setType(KContacts::Secrecy::Confidential); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.85.0/autotests/soundtest.cpp new/kcontacts-5.86.0/autotests/soundtest.cpp --- old/kcontacts-5.85.0/autotests/soundtest.cpp 2021-08-06 11:01:27.000000000 +0200 +++ new/kcontacts-5.86.0/autotests/soundtest.cpp 2021-09-04 18:57:31.000000000 +0200 @@ -55,7 +55,8 @@ void SoundTest::equalsTestIntern() { - KContacts::Sound sound1, sound2; + KContacts::Sound sound1; + KContacts::Sound sound2; sound1.setData(testData()); sound2.setData(testData()); @@ -65,7 +66,8 @@ void SoundTest::equalsTestExtern() { - KContacts::Sound sound1, sound2; + KContacts::Sound sound1; + KContacts::Sound sound2; sound1.setUrl(QStringLiteral("http://myhomepage.com/sound.wav";)); sound2.setUrl(QStringLiteral("http://myhomepage.com/sound.wav";)); @@ -75,7 +77,8 @@ void SoundTest::differsTest() { - KContacts::Sound sound1, sound2; + KContacts::Sound sound1; + KContacts::Sound sound2; sound1.setUrl(QStringLiteral("http://myhomepage.com/sound.wav";)); sound2.setData(testData()); @@ -85,7 +88,8 @@ void SoundTest::assignmentTestIntern() { - KContacts::Sound sound1, sound2; + KContacts::Sound sound1; + KContacts::Sound sound2; sound1.setData(testData()); @@ -96,7 +100,8 @@ void SoundTest::assignmentTestExtern() { - KContacts::Sound sound1, sound2; + KContacts::Sound sound1; + KContacts::Sound sound2; sound1.setUrl(QStringLiteral("http://myhomepage.com/sound.wav";)); @@ -107,7 +112,8 @@ void SoundTest::serializeTest() { - KContacts::Sound sound1, sound2; + KContacts::Sound sound1; + KContacts::Sound sound2; sound1.setUrl(QStringLiteral("http://myhomepage.com/sound.wav";)); sound1.setData(testData()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.85.0/autotests/testroundtrip.cpp new/kcontacts-5.86.0/autotests/testroundtrip.cpp --- old/kcontacts-5.85.0/autotests/testroundtrip.cpp 2021-08-06 11:01:27.000000000 +0200 +++ new/kcontacts-5.86.0/autotests/testroundtrip.cpp 2021-09-04 18:57:31.000000000 +0200 @@ -72,7 +72,7 @@ QString outFile21Pattern = QLatin1String("%1.2_1ref"); QString outFile4Pattern = QLatin1String("v4_0.%1.ref"); QString outFilePattern = QLatin1String("%1.ref"); - for (const QString &inputFile : qAsConst(mInputFiles)) { + for (const QString &inputFile : std::as_const(mInputFiles)) { const QString outFile = outFilePattern.arg(inputFile); const QString outFileV2_1 = outFile21Pattern.arg(inputFile); const QString outFileV4 = outFile4Pattern.arg(inputFile); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.85.0/autotests/timezonetest.cpp new/kcontacts-5.86.0/autotests/timezonetest.cpp --- old/kcontacts-5.85.0/autotests/timezonetest.cpp 2021-08-06 11:01:27.000000000 +0200 +++ new/kcontacts-5.86.0/autotests/timezonetest.cpp 2021-09-04 18:57:31.000000000 +0200 @@ -30,7 +30,8 @@ void TimeZoneTest::equalsTest() { - KContacts::TimeZone timezone1, timezone2; + KContacts::TimeZone timezone1; + KContacts::TimeZone timezone2; timezone1.setOffset(2); timezone2.setOffset(2); @@ -49,7 +50,8 @@ void TimeZoneTest::assignmentTest() { - KContacts::TimeZone timezone1, timezone2; + KContacts::TimeZone timezone1; + KContacts::TimeZone timezone2; timezone1.setOffset(2); timezone1 = timezone2; @@ -59,7 +61,8 @@ void TimeZoneTest::serializeTest() { - KContacts::TimeZone timezone1, timezone2; + KContacts::TimeZone timezone1; + KContacts::TimeZone timezone2; timezone1.setOffset(2); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.85.0/po/zh_CN/kcontacts5.po new/kcontacts-5.86.0/po/zh_CN/kcontacts5.po --- old/kcontacts-5.85.0/po/zh_CN/kcontacts5.po 2021-08-06 11:01:27.000000000 +0200 +++ new/kcontacts-5.86.0/po/zh_CN/kcontacts5.po 2021-09-04 18:57:31.000000000 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-06-12 00:14+0000\n" -"PO-Revision-Date: 2021-07-26 13:47\n" +"PO-Revision-Date: 2021-08-30 11:43\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.85.0/src/contactgrouptool.cpp new/kcontacts-5.86.0/src/contactgrouptool.cpp --- old/kcontacts-5.85.0/src/contactgrouptool.cpp 2021-08-06 11:01:27.000000000 +0200 +++ new/kcontacts-5.86.0/src/contactgrouptool.cpp 2021-09-04 18:57:31.000000000 +0200 @@ -201,13 +201,13 @@ bool XmlContactGroupReader::readGroup(ContactGroup &group) { const QXmlStreamAttributes elementAttributes = attributes(); - const QStringRef uid = elementAttributes.value(QLatin1String("uid")); + const auto uid = elementAttributes.value(QLatin1String("uid")); if (uid.isEmpty()) { raiseError(QStringLiteral("ContactGroup is missing a uid")); return false; } - const QStringRef groupName = elementAttributes.value(QLatin1String("name")); + const auto groupName = elementAttributes.value(QLatin1String("name")); if (groupName.isEmpty()) { raiseError(QStringLiteral("ContactGroup is missing a name")); return false; @@ -255,13 +255,13 @@ bool XmlContactGroupReader::readData(ContactGroup::Data &data) { const QXmlStreamAttributes elementAttributes = attributes(); - const QStringRef email = elementAttributes.value(QLatin1String("email")); + const auto email = elementAttributes.value(QLatin1String("email")); if (email.isEmpty()) { raiseError(QStringLiteral("ContactData is missing an email address")); return false; } - const QStringRef name = elementAttributes.value(QLatin1String("name")); + const auto name = elementAttributes.value(QLatin1String("name")); data.setName(name.toString()); data.setEmail(email.toString()); @@ -272,13 +272,13 @@ bool XmlContactGroupReader::readContactReference(ContactGroup::ContactReference &reference) { const QXmlStreamAttributes elementAttributes = attributes(); - const QStringRef uid = elementAttributes.value(QLatin1String("uid")); - const QStringRef gid = elementAttributes.value(QLatin1String("gid")); + const auto uid = elementAttributes.value(QLatin1String("uid")); + const auto gid = elementAttributes.value(QLatin1String("gid")); if (uid.isEmpty() && gid.isEmpty()) { raiseError(QStringLiteral("ContactReference is missing both uid and gid")); return false; } - const QStringRef preferredEmail = elementAttributes.value(QLatin1String("preferredEmail")); + const auto preferredEmail = elementAttributes.value(QLatin1String("preferredEmail")); reference.setUid(uid.toString()); reference.setGid(gid.toString()); @@ -290,7 +290,7 @@ bool XmlContactGroupReader::readContactGroupReference(ContactGroup::ContactGroupReference &reference) { const QXmlStreamAttributes elementAttributes = attributes(); - const QStringRef uid = elementAttributes.value(QLatin1String("uid")); + const auto uid = elementAttributes.value(QLatin1String("uid")); if (uid.isEmpty()) { raiseError(QStringLiteral("ContactGroupReference is missing a uid")); return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.85.0/src/converter/ldifconverter.cpp new/kcontacts-5.86.0/src/converter/ldifconverter.cpp --- old/kcontacts-5.85.0/src/converter/ldifconverter.cpp 2021-08-06 11:01:27.000000000 +0200 +++ new/kcontacts-5.86.0/src/converter/ldifconverter.cpp 2021-09-04 18:57:31.000000000 +0200 @@ -260,11 +260,13 @@ return true; } - bool endldif = false, end = false; + bool endldif = false; + bool end = false; Ldif ldif; Ldif::ParseValue ret; Addressee a; - Address homeAddr, workAddr; + Address homeAddr; + Address workAddr; int birthday = -1; int birthmonth = -1; int birthyear = -1; @@ -572,7 +574,8 @@ if (fieldname == QLatin1String("member")) { // this is a mozilla list member (cn=xxx, mail=yyy) const QStringList list = value.split(QLatin1Char(',')); - QString name, email; + QString name; + QString email; QStringList::ConstIterator it; const QStringList::ConstIterator end(list.constEnd()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.85.0/src/converter/vcardconverter.cpp new/kcontacts-5.86.0/src/converter/vcardconverter.cpp --- old/kcontacts-5.85.0/src/converter/vcardconverter.cpp 2021-08-06 11:01:27.000000000 +0200 +++ new/kcontacts-5.86.0/src/converter/vcardconverter.cpp 2021-09-04 18:57:31.000000000 +0200 @@ -108,11 +108,21 @@ d = d.remove(QLatin1Char('-')).remove(QLatin1Char(':')); if (d.length() >= 8) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + const QStringView strView(d); + date = QDate(strView.mid(0, 4).toUInt(), strView.mid(4, 2).toUInt(), strView.mid(6, 2).toUInt()); +#else date = QDate(d.midRef(0, 4).toUInt(), d.midRef(4, 2).toUInt(), d.midRef(6, 2).toUInt()); +#endif } if (d.length() > 9 && d[8].toUpper() == QLatin1Char('T')) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + const QStringView strView(d); + time = QTime(strView.mid(9, 2).toUInt(), strView.mid(11, 2).toUInt(), strView.mid(13, 2).toUInt()); +#else time = QTime(d.midRef(9, 2).toUInt(), d.midRef(11, 2).toUInt(), d.midRef(13, 2).toUInt()); +#endif } return QDateTime(date, time); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.85.0/src/vcardparser/vcardparser.cpp new/kcontacts-5.86.0/src/vcardparser/vcardparser.cpp --- old/kcontacts-5.85.0/src/vcardparser/vcardparser.cpp 2021-08-06 11:01:27.000000000 +0200 +++ new/kcontacts-5.86.0/src/vcardparser/vcardparser.cpp 2021-09-04 18:57:31.000000000 +0200 @@ -398,7 +398,8 @@ } } - QByteArray input, output; + QByteArray input; + QByteArray output; bool checkMultibyte = false; // avoid splitting a multibyte character // handle charset diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.85.0/src/vcardtool.cpp new/kcontacts-5.86.0/src/vcardtool.cpp --- old/kcontacts-5.85.0/src/vcardtool.cpp 2021-08-06 11:01:27.000000000 +0200 +++ new/kcontacts-5.86.0/src/vcardtool.cpp 2021-09-04 18:57:31.000000000 +0200 @@ -1084,8 +1084,14 @@ const QString date = (*lineIt).value().toString(); if (!date.isEmpty()) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + const QStringView dateView(date); + int hours = dateView.mid(1, 2).toInt(); + int minutes = dateView.mid(4, 2).toInt(); +#else int hours = date.midRef(1, 2).toInt(); int minutes = date.midRef(4, 2).toInt(); +#endif int offset = (hours * 60) + minutes; offset = offset * (date[0] == QLatin1Char('+') ? 1 : -1);
![http://scottlandyard.info/pics/logo.png"](http://scottlandyard.info/pics/logo.png"){kind=link}
![http://scottlandyard.info/~sinclair/photo.png"](http://scottlandyard.info/~sinclair/photo.png"){kind=link}
![http://myhomepage.com/foto.png"](http://myhomepage.com/foto.png"){kind=link}