Hello community, here is the log from the commit of package kdepim-apps-libs for openSUSE:Factory checked in at 2018-04-25 09:49:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim-apps-libs (Old) and /work/SRC/openSUSE:Factory/.kdepim-apps-libs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim-apps-libs" Wed Apr 25 09:49:19 2018 rev:26 rq:599030 version:18.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim-apps-libs/kdepim-apps-libs.changes 2018-03-20 21:37:54.530179034 +0100 +++ /work/SRC/openSUSE:Factory/.kdepim-apps-libs.new/kdepim-apps-libs.changes 2018-04-25 09:49:21.361242531 +0200 @@ -1,0 +2,26 @@ +Wed Apr 18 07:49:06 CEST 2018 - lbeltr...@kde.org + +- Update to 18.04.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.04.0.php +- Changes since 18.03.90: + * None + +------------------------------------------------------------------- +Fri Apr 06 07:09:17 CEST 2018 - lbeltr...@kde.org + +- Update to 18.03.90 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.03.90.php +- Changes since 17.12.3: + * USe override directly + * Fix some warnings + * Use QLatin1String + * Use QLatin1String + * Start adding progressdialog indicator + * Fix endif + * Remove this copy. + +------------------------------------------------------------------- Old: ---- kdepim-apps-libs-17.12.3.tar.xz New: ---- kdepim-apps-libs-18.04.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim-apps-libs.spec ++++++ --- /var/tmp/diff_new_pack.XKdab3/_old 2018-04-25 09:49:22.485201316 +0200 +++ /var/tmp/diff_new_pack.XKdab3/_new 2018-04-25 09:49:22.489201169 +0200 @@ -19,7 +19,7 @@ %bcond_without lang Name: kdepim-apps-libs -Version: 17.12.3 +Version: 18.04.0 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) ++++++ kdepim-apps-libs-17.12.3.tar.xz -> kdepim-apps-libs-18.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/CMakeLists.txt new/kdepim-apps-libs-18.04.0/CMakeLists.txt --- old/kdepim-apps-libs-17.12.3/CMakeLists.txt 2018-03-06 01:31:50.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/CMakeLists.txt 2018-04-13 02:16:31.000000000 +0200 @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.7.3") +set(PIM_VERSION "5.8.0") project(kdepim-apps-lib VERSION ${PIM_VERSION}) -set(KF5_VERSION "5.39.0") +set(KF5_VERSION "5.44.0") find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -29,12 +29,12 @@ set(QT_REQUIRED_VERSION "5.8.0") -set(AKONADI_VERSION "5.7.3") -set(GRANTLEETHEME_LIB_VERSION "5.7.3") -set(KCONTACTS_LIB_VERSION "5.7.3") -set(AKONADICONTACT_LIB_VERSION "5.7.3") -set(LIBKLEO_LIB_VERSION "5.7.3") -set(PIMCOMMON_LIB_VERSION "5.7.3") +set(AKONADI_VERSION "5.8.0") +set(GRANTLEETHEME_LIB_VERSION "5.8.0") +set(KCONTACTS_LIB_VERSION "5.8.0") +set(AKONADICONTACT_LIB_VERSION "5.8.0") +set(LIBKLEO_LIB_VERSION "5.8.0") +set(PIMCOMMON_LIB_VERSION "5.8.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Gui) @@ -61,7 +61,7 @@ if(BUILD_TESTING) find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Test) add_definitions(-DBUILD_TESTING) -endif(BUILD_TESTING) +endif() add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII") add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/contactobject/contactgrantleeaddressobject.cpp new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/contactobject/contactgrantleeaddressobject.cpp --- old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/contactobject/contactgrantleeaddressobject.cpp 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/contactobject/contactgrantleeaddressobject.cpp 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2013-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/contactobject/contactgrantleeaddressobject.h new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/contactobject/contactgrantleeaddressobject.h --- old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/contactobject/contactgrantleeaddressobject.h 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/contactobject/contactgrantleeaddressobject.h 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2013-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/contactobject/contactgrantleecryptoobject.cpp new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/contactobject/contactgrantleecryptoobject.cpp --- old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/contactobject/contactgrantleecryptoobject.cpp 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/contactobject/contactgrantleecryptoobject.cpp 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2014-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/contactobject/contactgrantleecryptoobject.h new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/contactobject/contactgrantleecryptoobject.h --- old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/contactobject/contactgrantleecryptoobject.h 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/contactobject/contactgrantleecryptoobject.h 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2014-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/contactobject/contactgrantleeemail.cpp new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/contactobject/contactgrantleeemail.cpp --- old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/contactobject/contactgrantleeemail.cpp 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/contactobject/contactgrantleeemail.cpp 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2016-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2016-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -41,7 +41,7 @@ { const QStringList value = mEmail.parameters().value(QStringLiteral("type")); //Validate PREF and pref - return value.contains(QStringLiteral("pref"), Qt::CaseInsensitive); + return value.contains(QLatin1String("pref"), Qt::CaseInsensitive); } QString ContactGrantleeEmail::emailFormatted() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/contactobject/contactgrantleeemail.h new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/contactobject/contactgrantleeemail.h --- old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/contactobject/contactgrantleeemail.h 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/contactobject/contactgrantleeemail.h 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2016-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2016-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/contactobject/contactgrantleegeoobject.cpp new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/contactobject/contactgrantleegeoobject.cpp --- old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/contactobject/contactgrantleegeoobject.cpp 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/contactobject/contactgrantleegeoobject.cpp 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2014-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/contactobject/contactgrantleegeoobject.h new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/contactobject/contactgrantleegeoobject.h --- old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/contactobject/contactgrantleegeoobject.h 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/contactobject/contactgrantleegeoobject.h 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2014-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/contactobject/contactgrantleeimobject.cpp new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/contactobject/contactgrantleeimobject.cpp --- old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/contactobject/contactgrantleeimobject.cpp 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/contactobject/contactgrantleeimobject.cpp 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2013-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/contactobject/contactgrantleeimobject.h new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/contactobject/contactgrantleeimobject.h --- old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/contactobject/contactgrantleeimobject.h 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/contactobject/contactgrantleeimobject.h 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2013-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/contactobject/contactgrantleephoneobject.cpp new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/contactobject/contactgrantleephoneobject.cpp --- old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/contactobject/contactgrantleephoneobject.cpp 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/contactobject/contactgrantleephoneobject.cpp 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2013-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/contactobject/contactgrantleephoneobject.h new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/contactobject/contactgrantleephoneobject.h --- old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/contactobject/contactgrantleephoneobject.h 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/contactobject/contactgrantleephoneobject.h 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2013-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/contactobject/contactgrantleewebsite.cpp new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/contactobject/contactgrantleewebsite.cpp --- old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/contactobject/contactgrantleewebsite.cpp 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/contactobject/contactgrantleewebsite.cpp 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2016-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2016-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -41,5 +41,5 @@ { const QStringList value = mResourceLocator.parameters().value(QStringLiteral("type")); //Validate PREF and pref - return value.contains(QStringLiteral("pref"), Qt::CaseInsensitive); + return value.contains(QLatin1String("pref"), Qt::CaseInsensitive); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/contactobject/contactgrantleewebsite.h new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/contactobject/contactgrantleewebsite.h --- old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/contactobject/contactgrantleewebsite.h 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/contactobject/contactgrantleewebsite.h 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2016-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2016-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp --- old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp 2018-04-10 13:51:20.000000000 +0200 @@ -326,7 +326,7 @@ QVariantList imAddresses; const QStringList customs = rawContact.customs(); for (const QString &custom : customs) { - if (custom.startsWith(QStringLiteral("messaging/"))) { + if (custom.startsWith(QLatin1String("messaging/"))) { int pos = custom.indexOf(QLatin1Char(':')); QString key = custom.left(pos); key.remove(QStringLiteral("-All")); @@ -343,8 +343,8 @@ const KContacts::ResourceLocatorUrl::List extraUrlList = rawContact.extraUrlList(); for (const KContacts::ResourceLocatorUrl &resourceLocator : extraUrlList) { QString url = resourceLocator.url().url(); - if (!url.startsWith(QStringLiteral("http://";)) - && !url.startsWith(QStringLiteral("https://";))) { + if (!url.startsWith(QLatin1String("http://";)) + && !url.startsWith(QLatin1String("https://";))) { url = QStringLiteral("http://";) + url; } websites.append(KStringHandler::tagUrls(url)); @@ -467,7 +467,7 @@ if (!customs.empty()) { for (QString custom : qAsConst(customs)) { //krazy:exclude=foreach - if (custom.startsWith(QStringLiteral("KADDRESSBOOK-"))) { + if (custom.startsWith(QLatin1String("KADDRESSBOOK-"))) { custom.remove(QStringLiteral("KADDRESSBOOK-X-")); custom.remove(QStringLiteral("KADDRESSBOOK-")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/formatter/grantleecontactformatter.h new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.h --- old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/formatter/grantleecontactformatter.h 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.h 2018-04-10 13:51:20.000000000 +0200 @@ -46,7 +46,7 @@ /** * Destroys the grantlee contact formatter. */ - virtual ~GrantleeContactFormatter(); + ~GrantleeContactFormatter() override; void setAbsoluteThemePath(const QString &path); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.h new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.h --- old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.h 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.h 2018-04-10 13:51:20.000000000 +0200 @@ -49,7 +49,7 @@ /** * Destroys the grantlee contact group formatter. */ - virtual ~GrantleeContactGroupFormatter(); + ~GrantleeContactGroupFormatter() override; /** * Returns the contact group formatted as HTML diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/formatter/grantleecontactutils.cpp new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/formatter/grantleecontactutils.cpp --- old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/formatter/grantleecontactutils.cpp 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/formatter/grantleecontactutils.cpp 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2013-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/formatter/grantleecontactutils.h new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/formatter/grantleecontactutils.h --- old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/formatter/grantleecontactutils.h 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/formatter/grantleecontactutils.h 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2013-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.cpp new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.cpp --- old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.cpp 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.cpp 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2015-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.h new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.h --- old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.h 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.h 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2015-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.cpp new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.cpp --- old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.cpp 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.cpp 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2013-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -66,7 +66,7 @@ const QStringList customs = mAddress.customs(); for (const QString &custom : customs) { - if (custom.startsWith(QStringLiteral("messaging/"))) { + if (custom.startsWith(QLatin1String("messaging/"))) { const int pos = custom.indexOf(QLatin1Char(':')); QString key = custom.left(pos); key.remove(QStringLiteral("-All")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.h new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.h --- old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.h 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.h 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2013-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/printing/grantleeprint.cpp new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/printing/grantleeprint.cpp --- old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/printing/grantleeprint.cpp 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/printing/grantleeprint.cpp 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2015-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/printing/grantleeprint.h new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/printing/grantleeprint.h --- old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/printing/grantleeprint.h 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/printing/grantleeprint.h 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2015-2017 Montel Laurent <mon...@kde.org> + Copyright (c) 2015-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/widget/grantleecontactviewer.cpp new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/widget/grantleecontactviewer.cpp --- old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/widget/grantleecontactviewer.cpp 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/widget/grantleecontactviewer.cpp 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2013-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/widget/grantleecontactviewer.h new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/widget/grantleecontactviewer.h --- old/kdepim-apps-libs-17.12.3/kaddressbookgrantlee/src/widget/grantleecontactviewer.h 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookgrantlee/src/widget/grantleecontactviewer.h 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2013-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.cpp new/kdepim-apps-libs-18.04.0/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.cpp --- old/kdepim-apps-libs-17.12.3/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.cpp 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.cpp 2018-04-10 13:51:20.000000000 +0200 @@ -1,6 +1,6 @@ /* Copyright (c) 2009 Tobias Koenig <to...@kde.org> - Copyright (c) 2015-2017 Laurent Montel <mon...@kde.org> + Copyright (C) 2015-2018 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.h new/kdepim-apps-libs-18.04.0/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.h --- old/kdepim-apps-libs-17.12.3/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.h 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.h 2018-04-10 13:51:20.000000000 +0200 @@ -1,6 +1,6 @@ /* Copyright (c) 2009 Tobias Koenig <to...@kde.org> - Copyright (C) 2015-2017 Laurent Montel <mon...@kde.org> + Copyright (C) 2015-2018 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookimportexport/src/kaddressbookcontactselectionwidget.cpp new/kdepim-apps-libs-18.04.0/kaddressbookimportexport/src/kaddressbookcontactselectionwidget.cpp --- old/kdepim-apps-libs-17.12.3/kaddressbookimportexport/src/kaddressbookcontactselectionwidget.cpp 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookimportexport/src/kaddressbookcontactselectionwidget.cpp 2018-04-10 13:51:20.000000000 +0200 @@ -1,6 +1,6 @@ /* Copyright (c) 2009 Tobias Koenig <to...@kde.org> - Copyright (C) 2016-2017 Laurent Montel <mon...@kde.org> + Copyright (C) 2016-2018 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 @@ -35,8 +35,10 @@ #include <QGroupBox> #include <QItemSelectionModel> #include <QLabel> +#include <QProgressDialog> #include <QRadioButton> #include <QVBoxLayout> +#include <QApplication> using namespace KAddressBookImportExport; KAddressBookContactSelectionWidget::KAddressBookContactSelectionWidget(QItemSelectionModel *selectionModel, QWidget *parent) @@ -187,6 +189,14 @@ = new Akonadi::RecursiveItemFetchJob(Akonadi::Collection::root(), QStringList() << KContacts::Addressee::mimeType()); job->fetchScope().fetchFullPayload(); + QProgressDialog progressDialog(nullptr); + progressDialog.setWindowTitle(i18n("Collect Contacts")); + progressDialog.setAutoClose(true); + progressDialog.setMinimumDuration(1000); + progressDialog.setLabelText(i18n("Fetch Contacts")); + progressDialog.show(); + + qApp->processEvents(); if (!job->exec()) { return Akonadi::Item::List(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookimportexport/src/kaddressbookcontactselectionwidget.h new/kdepim-apps-libs-18.04.0/kaddressbookimportexport/src/kaddressbookcontactselectionwidget.h --- old/kdepim-apps-libs-17.12.3/kaddressbookimportexport/src/kaddressbookcontactselectionwidget.h 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookimportexport/src/kaddressbookcontactselectionwidget.h 2018-04-10 13:51:20.000000000 +0200 @@ -1,6 +1,6 @@ /* Copyright (c) 2009 Tobias Koenig <to...@kde.org> - Copyright (C) 2016-2017 Laurent Montel <mon...@kde.org> + Copyright (C) 2016-2018 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookimportexport/src/kaddressbookexportselectionwidget.cpp new/kdepim-apps-libs-18.04.0/kaddressbookimportexport/src/kaddressbookexportselectionwidget.cpp --- old/kdepim-apps-libs-17.12.3/kaddressbookimportexport/src/kaddressbookexportselectionwidget.cpp 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookimportexport/src/kaddressbookexportselectionwidget.cpp 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2015-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookimportexport/src/kaddressbookexportselectionwidget.h new/kdepim-apps-libs-18.04.0/kaddressbookimportexport/src/kaddressbookexportselectionwidget.h --- old/kdepim-apps-libs-17.12.3/kaddressbookimportexport/src/kaddressbookexportselectionwidget.h 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookimportexport/src/kaddressbookexportselectionwidget.h 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2015-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookimportexport/src/kaddressbookimportexportcontactlist.cpp new/kdepim-apps-libs-18.04.0/kaddressbookimportexport/src/kaddressbookimportexportcontactlist.cpp --- old/kdepim-apps-libs-17.12.3/kaddressbookimportexport/src/kaddressbookimportexportcontactlist.cpp 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookimportexport/src/kaddressbookimportexportcontactlist.cpp 2018-04-10 13:51:20.000000000 +0200 @@ -1,7 +1,7 @@ /* This file is part of KAddressBook. - Copyright (c) 2015-2017 Laurent Montel <mon...@kde.org> + Copyright (C) 2015-2018 Laurent Montel <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookimportexport/src/kaddressbookimportexportcontactlist.h new/kdepim-apps-libs-18.04.0/kaddressbookimportexport/src/kaddressbookimportexportcontactlist.h --- old/kdepim-apps-libs-17.12.3/kaddressbookimportexport/src/kaddressbookimportexportcontactlist.h 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookimportexport/src/kaddressbookimportexportcontactlist.h 2018-04-10 13:51:20.000000000 +0200 @@ -1,7 +1,7 @@ /* This file is part of KAddressBook. - Copyright (c) 2015-2017 Laurent Montel <mon...@kde.org> + Copyright (C) 2015-2018 Laurent Montel <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookimportexport/src/kaddressbookimportexportplugin.cpp new/kdepim-apps-libs-18.04.0/kaddressbookimportexport/src/kaddressbookimportexportplugin.cpp --- old/kdepim-apps-libs-17.12.3/kaddressbookimportexport/src/kaddressbookimportexportplugin.cpp 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookimportexport/src/kaddressbookimportexportplugin.cpp 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2016-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2016-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookimportexport/src/kaddressbookimportexportplugin.h new/kdepim-apps-libs-18.04.0/kaddressbookimportexport/src/kaddressbookimportexportplugin.h --- old/kdepim-apps-libs-17.12.3/kaddressbookimportexport/src/kaddressbookimportexportplugin.h 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookimportexport/src/kaddressbookimportexportplugin.h 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2016-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2016-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp new/kdepim-apps-libs-18.04.0/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp --- old/kdepim-apps-libs-17.12.3/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2016-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2016-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h new/kdepim-apps-libs-18.04.0/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h --- old/kdepim-apps-libs-17.12.3/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2016-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2016-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.cpp new/kdepim-apps-libs-18.04.0/kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.cpp --- old/kdepim-apps-libs-17.12.3/kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.cpp 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.cpp 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2016-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2016-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -97,7 +97,7 @@ bool KAddressBookImportExportPrivate::initializePlugins() { const QVector<KPluginMetaData> plugins = KPluginLoader::findPlugins(QStringLiteral("kaddressbook"), [](const KPluginMetaData &md) { - return md.serviceTypes().contains(QStringLiteral("KAddressBook/ImportExportPlugin")); + return md.serviceTypes().contains(QLatin1String("KAddressBook/ImportExportPlugin")); }); const QPair<QStringList, QStringList> pair = PimCommon::PluginUtil::loadPluginSetting(configGroupName(), configPrefixSettingKey()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.h new/kdepim-apps-libs-18.04.0/kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.h --- old/kdepim-apps-libs-17.12.3/kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.h 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.h 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2016-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2016-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/libfollowupreminder/src/followupreminderinfo.cpp new/kdepim-apps-libs-18.04.0/libfollowupreminder/src/followupreminderinfo.cpp --- old/kdepim-apps-libs-17.12.3/libfollowupreminder/src/followupreminderinfo.cpp 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/libfollowupreminder/src/followupreminderinfo.cpp 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2014-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/libfollowupreminder/src/followupreminderinfo.h new/kdepim-apps-libs-18.04.0/libfollowupreminder/src/followupreminderinfo.h --- old/kdepim-apps-libs-17.12.3/libfollowupreminder/src/followupreminderinfo.h 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/libfollowupreminder/src/followupreminderinfo.h 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2014-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/libfollowupreminder/src/followupreminderutil.cpp new/kdepim-apps-libs-18.04.0/libfollowupreminder/src/followupreminderutil.cpp --- old/kdepim-apps-libs-17.12.3/libfollowupreminder/src/followupreminderutil.cpp 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/libfollowupreminder/src/followupreminderutil.cpp 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2014-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/libfollowupreminder/src/followupreminderutil.h new/kdepim-apps-libs-18.04.0/libfollowupreminder/src/followupreminderutil.h --- old/kdepim-apps-libs-17.12.3/libfollowupreminder/src/followupreminderutil.h 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/libfollowupreminder/src/followupreminderutil.h 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2014-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/libkdepimdbusinterfaces/src/urihandler.cpp new/kdepim-apps-libs-18.04.0/libkdepimdbusinterfaces/src/urihandler.cpp --- old/kdepim-apps-libs-17.12.3/libkdepimdbusinterfaces/src/urihandler.cpp 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/libkdepimdbusinterfaces/src/urihandler.cpp 2018-04-10 13:51:20.000000000 +0200 @@ -40,7 +40,7 @@ { qCDebug(KDEPIMDBUSINTERFACE_LOG) << uri; - if (uri.startsWith(QStringLiteral("kmail:"))) { + if (uri.startsWith(QLatin1String("kmail:"))) { // make sure kmail is running or the part is shown const QString desktopFile = QStandardPaths::locate(QStandardPaths::ApplicationsLocation, QStringLiteral("org.kde.kmail2.desktop")); QString error; @@ -58,10 +58,10 @@ qCWarning(KDEPIMDBUSINTERFACE_LOG) << "Failure starting kmail:" << error; return false; } - } else if (uri.startsWith(QStringLiteral("mailto:";))) { + } else if (uri.startsWith(QLatin1String("mailto:";))) { QDesktopServices::openUrl(QUrl(uri)); return true; - } else if (uri.startsWith(QStringLiteral("uid:"))) { + } else if (uri.startsWith(QLatin1String("uid:"))) { if (item.isValid()) { Akonadi::ContactEditorDialog *dlg = new Akonadi::ContactEditorDialog(Akonadi::ContactEditorDialog::EditMode, (QWidget *)nullptr); dlg->setContact(item); @@ -72,7 +72,7 @@ qCDebug(KDEPIMDBUSINTERFACE_LOG) << "Item is not valid."; return false; } - } else if (uri.startsWith(QStringLiteral("urn:x-ical"))) { + } else if (uri.startsWith(QLatin1String("urn:x-ical"))) { // make sure korganizer is running or the part is shown const QString desktopFile = QStandardPaths::locate(QStandardPaths::ApplicationsLocation, QStringLiteral("org.kde.korganizer.desktop")); QString error; @@ -87,7 +87,7 @@ qCWarning(KDEPIMDBUSINTERFACE_LOG) << "Failure starting korganizer:" << error; return false; } - } else if (uri.startsWith(QStringLiteral("akonadi:"))) { + } else if (uri.startsWith(QLatin1String("akonadi:"))) { const QUrl url(uri); const QString mimeType = QUrlQuery(url).queryItemValue(QStringLiteral("type")); if (mimeType.toLower() == QLatin1String("message/rfc822")) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/libsendlater/src/sendlaterdialog.cpp new/kdepim-apps-libs-18.04.0/libsendlater/src/sendlaterdialog.cpp --- old/kdepim-apps-libs-17.12.3/libsendlater/src/sendlaterdialog.cpp 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/libsendlater/src/sendlaterdialog.cpp 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2013-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -114,7 +114,7 @@ mSendLaterWidget->mRecurrence->setChecked(recurrence); slotRecurrenceClicked(recurrence); mSendLaterWidget->mRecurrenceValue->setValue(info->recurrenceEachValue()); - mSendLaterWidget->mRecurrenceComboBox->setCurrentIndex((int)info->recurrenceUnit()); + mSendLaterWidget->mRecurrenceComboBox->setCurrentIndex(static_cast<int>(info->recurrenceUnit())); } SendLater::SendLaterInfo *SendLaterDialog::info() @@ -124,7 +124,7 @@ } mInfo->setRecurrence(mSendLaterWidget->mRecurrence->isChecked()); mInfo->setRecurrenceEachValue(mSendLaterWidget->mRecurrenceValue->value()); - mInfo->setRecurrenceUnit((SendLater::SendLaterInfo::RecurrenceUnit)mSendLaterWidget->mRecurrenceComboBox->currentIndex()); + mInfo->setRecurrenceUnit(static_cast<SendLater::SendLaterInfo::RecurrenceUnit>(mSendLaterWidget->mRecurrenceComboBox->currentIndex())); if (mSendDateTime.isValid()) { mInfo->setDateTime(mSendDateTime); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/libsendlater/src/sendlaterdialog.h new/kdepim-apps-libs-18.04.0/libsendlater/src/sendlaterdialog.h --- old/kdepim-apps-libs-17.12.3/libsendlater/src/sendlaterdialog.h 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/libsendlater/src/sendlaterdialog.h 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2013-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/libsendlater/src/sendlaterinfo.cpp new/kdepim-apps-libs-18.04.0/libsendlater/src/sendlaterinfo.cpp --- old/kdepim-apps-libs-17.12.3/libsendlater/src/sendlaterinfo.cpp 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/libsendlater/src/sendlaterinfo.cpp 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2013-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -153,7 +153,7 @@ mDateTime = config.readEntry("date", QDateTime::currentDateTime()); mRecurrence = config.readEntry("recurrence", false); mRecurrenceEachValue = config.readEntry("recurrenceValue", 1); - mRecurrenceUnit = static_cast<RecurrenceUnit>(config.readEntry("recurrenceUnit", (int)Days)); + mRecurrenceUnit = static_cast<RecurrenceUnit>(config.readEntry("recurrenceUnit", static_cast<int>(Days))); mId = config.readEntry("itemId", -1); mSubject = config.readEntry("subject"); mTo = config.readEntry("to"); @@ -167,7 +167,7 @@ config.writeEntry("date", mDateTime); config.writeEntry("recurrence", mRecurrence); config.writeEntry("recurrenceValue", mRecurrenceEachValue); - config.writeEntry("recurrenceUnit", (int)mRecurrenceUnit); + config.writeEntry("recurrenceUnit", static_cast<int>(mRecurrenceUnit)); config.writeEntry("itemId", mId); config.writeEntry("subject", mSubject); config.writeEntry("to", mTo); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/libsendlater/src/sendlaterinfo.h new/kdepim-apps-libs-18.04.0/libsendlater/src/sendlaterinfo.h --- old/kdepim-apps-libs-17.12.3/libsendlater/src/sendlaterinfo.h 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/libsendlater/src/sendlaterinfo.h 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2013-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/libsendlater/src/sendlatertimedatewidget.cpp new/kdepim-apps-libs-18.04.0/libsendlater/src/sendlatertimedatewidget.cpp --- old/kdepim-apps-libs-17.12.3/libsendlater/src/sendlatertimedatewidget.cpp 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/libsendlater/src/sendlatertimedatewidget.cpp 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2013-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/libsendlater/src/sendlatertimedatewidget.h new/kdepim-apps-libs-18.04.0/libsendlater/src/sendlatertimedatewidget.h --- old/kdepim-apps-libs-17.12.3/libsendlater/src/sendlatertimedatewidget.h 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/libsendlater/src/sendlatertimedatewidget.h 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2013-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/libsendlater/src/sendlaterutil.cpp new/kdepim-apps-libs-18.04.0/libsendlater/src/sendlaterutil.cpp --- old/kdepim-apps-libs-17.12.3/libsendlater/src/sendlaterutil.cpp 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/libsendlater/src/sendlaterutil.cpp 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2013-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/libsendlater/src/sendlaterutil.h new/kdepim-apps-libs-18.04.0/libsendlater/src/sendlaterutil.h --- old/kdepim-apps-libs-17.12.3/libsendlater/src/sendlaterutil.h 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/libsendlater/src/sendlaterutil.h 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2013-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/libsendlater/src/sendlaterutil_p.h new/kdepim-apps-libs-18.04.0/libsendlater/src/sendlaterutil_p.h --- old/kdepim-apps-libs-17.12.3/libsendlater/src/sendlaterutil_p.h 2018-02-26 06:43:07.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/libsendlater/src/sendlaterutil_p.h 2018-04-10 13:51:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent <mon...@kde.org> + Copyright (C) 2013-2018 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/po/cs/libsendlater.po new/kdepim-apps-libs-18.04.0/po/cs/libsendlater.po --- old/kdepim-apps-libs-17.12.3/po/cs/libsendlater.po 2018-03-06 01:31:49.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/po/cs/libsendlater.po 2018-04-13 02:16:30.000000000 +0200 @@ -1,6 +1,6 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# Vit Pelcak <v...@pelcak.org>, 2013, 2014, 2015, 2016, 2017. +# Vit Pelcak <v...@pelcak.org>, 2013, 2014, 2015, 2016, 2017, 2018. # msgid "" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/po/gl/libsendlater.po new/kdepim-apps-libs-18.04.0/po/gl/libsendlater.po --- old/kdepim-apps-libs-17.12.3/po/gl/libsendlater.po 2018-03-06 01:31:49.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/po/gl/libsendlater.po 2018-04-13 02:16:30.000000000 +0200 @@ -61,7 +61,7 @@ #: sendlatertimedatewidget.cpp:47 #, kde-format msgid "You cannot select a date prior to the current date." -msgstr "Non é posíbel escoller unha data anterior á actual." +msgstr "Non se pode escoller unha data anterior á actual." #. i18n: ectx: property (text), widget (QLabel, mLabel) #: ui/sendlaterwidget.ui:29 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/po/zh_CN/libkaddressbookgrantlee.po new/kdepim-apps-libs-18.04.0/po/zh_CN/libkaddressbookgrantlee.po --- old/kdepim-apps-libs-17.12.3/po/zh_CN/libkaddressbookgrantlee.po 2018-03-06 01:31:50.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/po/zh_CN/libkaddressbookgrantlee.po 2018-04-13 02:16:31.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-10-13 03:27+0200\n" -"PO-Revision-Date: 2018-02-28 02:27-0500\n" +"PO-Revision-Date: 2018-04-05 09:39-0400\n" "Last-Translator: guoyunhebrave <guoyunhebr...@gmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-17.12.3/po/zh_CN/libsendlater.po new/kdepim-apps-libs-18.04.0/po/zh_CN/libsendlater.po --- old/kdepim-apps-libs-17.12.3/po/zh_CN/libsendlater.po 2018-03-06 01:31:50.000000000 +0100 +++ new/kdepim-apps-libs-18.04.0/po/zh_CN/libsendlater.po 2018-04-13 02:16:31.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-09-22 03:32+0200\n" -"PO-Revision-Date: 2018-02-28 02:28-0500\n" +"PO-Revision-Date: 2018-04-05 09:39-0400\n" "Last-Translator: guoyunhebrave <guoyunhebr...@gmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n"
