Hello community, here is the log from the commit of package akonadi-mime for openSUSE:Factory checked in at 2017-08-24 17:41:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadi-mime (Old) and /work/SRC/openSUSE:Factory/.akonadi-mime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadi-mime" Thu Aug 24 17:41:32 2017 rev:13 rq:516277 version:17.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/akonadi-mime/akonadi-mime.changes 2017-07-25 11:25:39.161267494 +0200 +++ /work/SRC/openSUSE:Factory/.akonadi-mime.new/akonadi-mime.changes 2017-08-24 17:41:33.300056815 +0200 @@ -1,0 +2,23 @@ +Fri Aug 11 22:44:45 UTC 2017 - [email protected] + +- 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 : + * Increase version + * Remove warning + * Use nullptr + * Add more definitions QT_NO_URL_CAST_FROM_STRING + * Don't use deprecated method + * Port to for(...:...) + * Activate by default QT_NO_NARROWING_CONVERSIONS_IN_CONNECT + +------------------------------------------------------------------- +Sat Aug 5 18:16:25 UTC 2017 - [email protected] + +- Update to KDE Applications 17.07.90 + * KDE Applications 17.07.90 + * https://www.kde.org/announcements/announce-applications-17.07.90.php + + +------------------------------------------------------------------- Old: ---- akonadi-mime-17.04.3.tar.xz New: ---- akonadi-mime-17.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-mime.spec ++++++ --- /var/tmp/diff_new_pack.thAP56/_old 2017-08-24 17:41:34.063949268 +0200 +++ /var/tmp/diff_new_pack.thAP56/_new 2017-08-24 17:41:34.067948705 +0200 @@ -21,10 +21,10 @@ %define sonum 5 %define kf5_version 5.23.0 Name: akonadi-mime -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: KDE PIM Libraries License: LGPL-2.1+ @@ -46,7 +46,9 @@ BuildRequires: shared-mime-info BuildRequires: pkgconfig(Qt5Test) >= 5.6.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.6.0 +%if %{with lang} Recommends: %{name}-lang +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -101,19 +103,19 @@ %doc COPYING* %dir %{_kf5_configkcfgdir} %{_kf5_configkcfgdir}/specialmailcollections.kcfg -%{_libdir}/qt5/mkspecs/modules/qt_AkonadiMime.pri -%{_datadir}/mime/packages/x-vnd.kde.contactgroup.xml +%{_kf5_mkspecsdir}/qt_AkonadiMime.pri +%{_kf5_sharedir}/mime/packages/x-vnd.kde.contactgroup.xml %files devel %defattr(-,root,root) %doc COPYING* -%{_kf5_libdir}/cmake/KF5AkonadiMime/ -%{_kf5_libdir}/libKF5AkonadiMime.so %dir %{_kf5_includedir}/Akonadi %dir %{_kf5_includedir}/akonadi %{_kf5_includedir}/Akonadi/KMime/ -%{_kf5_includedir}/akonadi/kmime/ %{_kf5_includedir}/akonadi-mime_version.h +%{_kf5_includedir}/akonadi/kmime/ +%{_kf5_cmakedir}/KF5AkonadiMime/ +%{_kf5_libdir}/libKF5AkonadiMime.so %if %{with lang} %files lang -f %{name}.lang ++++++ akonadi-mime-17.04.3.tar.xz -> akonadi-mime-17.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/.gitignore new/akonadi-mime-17.08.0/.gitignore --- old/akonadi-mime-17.04.3/.gitignore 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/.gitignore 2017-08-07 11:57:02.000000000 +0200 @@ -6,3 +6,4 @@ .*.swp /build/ CMakeLists.txt.user* +*.unc-backup* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/CMakeLists.txt new/akonadi-mime-17.08.0/CMakeLists.txt --- old/akonadi-mime-17.04.3/CMakeLists.txt 2017-07-11 02:26:39.000000000 +0200 +++ new/akonadi-mime-17.08.0/CMakeLists.txt 2017-08-11 02:51:16.000000000 +0200 @@ -1,13 +1,13 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.5.3") +set(PIM_VERSION "5.6.0") project(Akonadi-Mime VERSION ${PIM_VERSION}) # ECM setup -set(KF5_VERSION "5.32.0") +set(KF5_VERSION "5.35.0") find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) -set(QT_REQUIRED_VERSION "5.6.0") +set(QT_REQUIRED_VERSION "5.7.0") include(GenerateExportHeader) include(ECMGenerateHeaders) include(ECMGeneratePriFile) @@ -22,8 +22,8 @@ set(AKONADI_MIME_VERSION ${PIM_VERSION}) -set(AKONADI_VERSION "5.5.3") -set(KF5_MIME_VERSION "5.5.3") +set(AKONADI_VERSION "5.6.0") +set(KF5_MIME_VERSION "5.6.0") ecm_setup_version(PROJECT VARIABLE_PREFIX AKONADIMIME VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/akonadi-mime_version.h" @@ -42,7 +42,7 @@ find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED) -set( SHARED_MIME_INFO_MINIMUM_VERSION "0.40" ) +set( SHARED_MIME_INFO_MINIMUM_VERSION "1.0" ) find_package( SharedMimeInfo REQUIRED ) find_package(LibXslt) @@ -57,6 +57,9 @@ add_definitions(-DTRANSLATION_DOMAIN=\"libakonadi-kmime5\") 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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/autotests/benchmarker/maildir/maildir20percentread.h new/akonadi-mime-17.08.0/autotests/benchmarker/maildir/maildir20percentread.h --- old/akonadi-mime-17.04.3/autotests/benchmarker/maildir/maildir20percentread.h 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/autotests/benchmarker/maildir/maildir20percentread.h 2017-08-07 11:57:02.000000000 +0200 @@ -28,6 +28,6 @@ public: MailDir20PercentAsRead(); - void runTest() Q_DECL_OVERRIDE; + void runTest() override; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/autotests/benchmarker/maildir/maildirfetchallheaders.h new/akonadi-mime-17.08.0/autotests/benchmarker/maildir/maildirfetchallheaders.h --- old/akonadi-mime-17.04.3/autotests/benchmarker/maildir/maildirfetchallheaders.h 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/autotests/benchmarker/maildir/maildirfetchallheaders.h 2017-08-07 11:57:02.000000000 +0200 @@ -28,6 +28,6 @@ public: MailDirFetchAllHeaders(); - void runTest() Q_DECL_OVERRIDE; + void runTest() override; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/autotests/benchmarker/maildir/maildirfetchunreadheaders.h new/akonadi-mime-17.08.0/autotests/benchmarker/maildir/maildirfetchunreadheaders.h --- old/akonadi-mime-17.04.3/autotests/benchmarker/maildir/maildirfetchunreadheaders.h 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/autotests/benchmarker/maildir/maildirfetchunreadheaders.h 2017-08-07 11:57:02.000000000 +0200 @@ -28,6 +28,6 @@ public: MailDirFetchUnreadHeaders(); - void runTest() Q_DECL_OVERRIDE; + void runTest() override; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/autotests/benchmarker/maildir/maildirimport.h new/akonadi-mime-17.08.0/autotests/benchmarker/maildir/maildirimport.h --- old/akonadi-mime-17.04.3/autotests/benchmarker/maildir/maildirimport.h 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/autotests/benchmarker/maildir/maildirimport.h 2017-08-07 11:57:02.000000000 +0200 @@ -28,6 +28,6 @@ Q_OBJECT public: MailDirImport(const QString &dir); - void runTest() Q_DECL_OVERRIDE; + void runTest() override; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/autotests/benchmarker/maildir/maildirremovereadmessages.h new/akonadi-mime-17.08.0/autotests/benchmarker/maildir/maildirremovereadmessages.h --- old/akonadi-mime-17.04.3/autotests/benchmarker/maildir/maildirremovereadmessages.h 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/autotests/benchmarker/maildir/maildirremovereadmessages.h 2017-08-07 11:57:02.000000000 +0200 @@ -28,6 +28,6 @@ public: MailDirRemoveReadMessages(); - void runTest() Q_DECL_OVERRIDE; + void runTest() override; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/autotests/benchmarker/vcard/vcardimport.h new/akonadi-mime-17.08.0/autotests/benchmarker/vcard/vcardimport.h --- old/akonadi-mime-17.04.3/autotests/benchmarker/vcard/vcardimport.h 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/autotests/benchmarker/vcard/vcardimport.h 2017-08-07 11:57:02.000000000 +0200 @@ -27,7 +27,7 @@ Q_OBJECT public: VCardImport(const QString &dir); - void runTest() Q_DECL_OVERRIDE; + void runTest() override; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/autotests/collectionjobtest.h new/akonadi-mime-17.08.0/autotests/collectionjobtest.h --- old/akonadi-mime-17.04.3/autotests/collectionjobtest.h 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/autotests/collectionjobtest.h 2017-08-07 11:57:02.000000000 +0200 @@ -20,7 +20,7 @@ #ifndef COLLECTIONJOBTEST_H #define COLLECTIONJOBTEST_H -#include <QtCore/QObject> +#include <QObject> class CollectionJobTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/autotests/localfoldersrequestjobtest.h new/akonadi-mime-17.08.0/autotests/localfoldersrequestjobtest.h --- old/akonadi-mime-17.04.3/autotests/localfoldersrequestjobtest.h 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/autotests/localfoldersrequestjobtest.h 2017-08-07 11:57:02.000000000 +0200 @@ -20,7 +20,7 @@ #ifndef LOCALFOLDERSREQUESTJOBTEST_H #define LOCALFOLDERSREQUESTJOBTEST_H -#include <QtCore/QObject> +#include <QObject> /** */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/autotests/localfolderstest.h new/akonadi-mime-17.08.0/autotests/localfolderstest.h --- old/akonadi-mime-17.04.3/autotests/localfolderstest.h 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/autotests/localfolderstest.h 2017-08-07 11:57:02.000000000 +0200 @@ -20,8 +20,8 @@ #ifndef LOCALFOLDERSTEST_H #define LOCALFOLDERSTEST_H -#include <QtCore/QMap> -#include <QtCore/QObject> +#include <QMap> +#include <QObject> /** */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/autotests/messagetests/messagetest.h new/akonadi-mime-17.08.0/autotests/messagetests/messagetest.h --- old/akonadi-mime-17.04.3/autotests/messagetests/messagetest.h 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/autotests/messagetests/messagetest.h 2017-08-07 11:57:02.000000000 +0200 @@ -21,7 +21,7 @@ #define MESSAGETEST_TEST_H #include <kmime/kmime_message.h> -#include <QtCore/QObject> +#include <QObject> class MessageTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/autotests/racetest.h new/akonadi-mime-17.08.0/autotests/racetest.h --- old/akonadi-mime-17.04.3/autotests/racetest.h 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/autotests/racetest.h 2017-08-07 11:57:02.000000000 +0200 @@ -20,7 +20,7 @@ #ifndef RACETEST_H #define RACETEST_H -#include <QtCore/QObject> +#include <QObject> #include <QList> class KProcess; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/po/tr/libakonadi-kmime5.po new/akonadi-mime-17.08.0/po/tr/libakonadi-kmime5.po --- old/akonadi-mime-17.04.3/po/tr/libakonadi-kmime5.po 2017-07-11 02:26:39.000000000 +0200 +++ new/akonadi-mime-17.08.0/po/tr/libakonadi-kmime5.po 2017-08-11 02:51:16.000000000 +0200 @@ -29,7 +29,8 @@ #: emptytrashcommand.cpp:61 #, kde-format msgid "Are you sure you want to empty the trash folders of all accounts?" -msgstr "Tüm hesaplardaki çöp dizinlerini boşaltmak istediğinizden emin misiniz?" +msgstr "" +"Tüm hesaplardaki çöp dizinlerini boşaltmak istediğinizden emin misiniz?" #: markascommand.cpp:142 #, kde-format @@ -209,8 +210,10 @@ msgid "Do you really want to delete this folder and all its sub-folders?" msgid_plural "" "Do you really want to delete %1 folders and all their sub-folders?" -msgstr[0] "Bu klasör ve tüm alt klasörlerini silmek istediğinizden emin misiniz?" -msgstr[1] "%1 klasörü ve tüm alt klasörlerini silmek istediğinizden emin misiniz?" +msgstr[0] "" +"Bu klasör ve tüm alt klasörlerini silmek istediğinizden emin misiniz?" +msgstr[1] "" +"%1 klasörü ve tüm alt klasörlerini silmek istediğinizden emin misiniz?" #: standardmailactionmanager.cpp:169 #, kde-format @@ -649,7 +652,8 @@ #~ msgstr "başlık getirme uygulaması" #~ msgid "Run test on multipart data (default is singlepart)." -#~ msgstr "Çok parçalı veri üzerinde testi çalıştır (varsayılan tekli parçadır)." +#~ msgstr "" +#~ "Çok parçalı veri üzerinde testi çalıştır (varsayılan tekli parçadır)." #~ msgid "IMAP server" #~ msgstr "IMAP sunucu" @@ -696,7 +700,8 @@ #~ msgid "Define if we reuse host and login configuration" #~ msgstr "" -#~ "Host ve login yapılandırmasını yeniden kullanıp kullanmayacağımızı tanımlar" +#~ "Host ve login yapılandırmasını yeniden kullanıp kullanmayacağımızı " +#~ "tanımlar" #~ msgid "Define sieve port" #~ msgstr "Sieve portunu tanımlar" @@ -709,4 +714,5 @@ #~ msgid "" #~ "Id of the maildir resource containing the default special collections." -#~ msgstr "Öntanımlı özel koleksiyon içeren maildir kaynağının kimlik numarası." +#~ msgstr "" +#~ "Öntanımlı özel koleksiyon içeren maildir kaynağının kimlik numarası." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/po/zh_CN/libakonadi-kmime5.po new/akonadi-mime-17.08.0/po/zh_CN/libakonadi-kmime5.po --- old/akonadi-mime-17.04.3/po/zh_CN/libakonadi-kmime5.po 2017-07-11 02:26:39.000000000 +0200 +++ new/akonadi-mime-17.08.0/po/zh_CN/libakonadi-kmime5.po 2017-08-11 02:51:16.000000000 +0200 @@ -1,21 +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 <[email protected]>, 2014, 2015. 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-22 03:59+0100\n" -"PO-Revision-Date: 2015-09-08 15:39UTC-0800\n" -"Last-Translator: Xuetian Weng <[email protected]>\n" -"Language-Team: Chinese <[email protected]>\n" +"PO-Revision-Date: 2017-08-05 09:34-0400\n" +"Last-Translator: guoyunhebrave <[email protected]>\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/libakonadi-kmime5.pot\n" #: emptytrashcommand.cpp:60 #, kde-format @@ -28,20 +27,16 @@ msgstr "您确定要清空全部账户的废件夹吗？" #: markascommand.cpp:142 -#, fuzzy, kde-format -#| msgid "Do you really want to delete this folder and all its sub-folders?" -#| msgid_plural "" -#| "Do you really want to delete %1 folders and all their sub-folders?" +#, kde-format msgid "" "Are you sure you want to mark all messages in this folder and all its " "subfolders?" -msgstr "您确定要删除 %1 个文件夹及其子文件夹吗？" +msgstr "" #: markascommand.cpp:143 -#, fuzzy, kde-format -#| msgid "Mark All as Read" +#, kde-format msgid "Mark All Recursively" -msgstr "全部标为已读" +msgstr "" #: messagemodel.cpp:93 #, kde-format @@ -492,22 +487,19 @@ msgstr "标记所有信件为已读。" #: standardmailactionmanager.cpp:797 -#, fuzzy, kde-format -#| msgid "Mark &All Messages as Read" +#, kde-format msgid "Mark &All Messages as Read Recursively" -msgstr "标记所有信件为已读(&A)" +msgstr "" #: standardmailactionmanager.cpp:798 -#, fuzzy, kde-format -#| msgid "Mark All as Read" +#, kde-format msgid "Mark All as Read Recursively" -msgstr "全部标为已读" +msgstr "" #: standardmailactionmanager.cpp:799 standardmailactionmanager.cpp:800 -#, fuzzy, kde-format -#| msgid "Mark all messages as read." +#, kde-format msgid "Mark all messages as read recursively." -msgstr "标记所有信件为已读。" +msgstr "" #: standardmailactionmanager.cpp:809 #, kde-format @@ -603,9 +595,3 @@ #, kde-format msgid "Permanently delete all messages from the trash folder." msgstr "从废件箱永久删除所有信件。" - -#~ msgid "&Mark Mail as Important" -#~ msgstr "将信件标为重要(&M)" - -#~ msgid "&Mark Mail as Action Item" -#~ msgstr "将信件标为活动项(&M)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/src/addressattribute.h new/akonadi-mime-17.08.0/src/addressattribute.h --- old/akonadi-mime-17.04.3/src/addressattribute.h 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/src/addressattribute.h 2017-08-07 11:57:02.000000000 +0200 @@ -22,8 +22,8 @@ #include "akonadi-mime_export.h" -#include <QtCore/QString> -#include <QtCore/QStringList> +#include <QString> +#include <QStringList> #include <attribute.h> @@ -57,10 +57,10 @@ virtual ~AddressAttribute(); /* reimpl */ - AddressAttribute *clone() const Q_DECL_OVERRIDE; - QByteArray type() const Q_DECL_OVERRIDE; - QByteArray serialized() const Q_DECL_OVERRIDE; - void deserialize(const QByteArray &data) Q_DECL_OVERRIDE; + AddressAttribute *clone() const override; + QByteArray type() const override; + QByteArray serialized() const override; + void deserialize(const QByteArray &data) override; /** Returns the address of the sender. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/src/commandbase.h new/akonadi-mime-17.08.0/src/commandbase.h --- old/akonadi-mime-17.04.3/src/commandbase.h 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/src/commandbase.h 2017-08-07 11:57:02.000000000 +0200 @@ -20,7 +20,7 @@ #ifndef COMMANDBASE_H #define COMMANDBASE_H -#include <QtCore/QObject> +#include <QObject> #include "akonadi-mime_export.h" namespace Akonadi { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/src/emptytrashcommand.cpp new/akonadi-mime-17.08.0/src/emptytrashcommand.cpp --- old/akonadi-mime-17.04.3/src/emptytrashcommand.cpp 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/src/emptytrashcommand.cpp 2017-08-07 11:57:02.000000000 +0200 @@ -59,7 +59,7 @@ if (!mFolder.isValid()) { //expunge all const QString title = i18n("Empty Trash"); const QString text = i18n("Are you sure you want to empty the trash folders of all accounts?"); - if (KMessageBox::warningContinueCancel(0, text, title, + if (KMessageBox::warningContinueCancel(nullptr, text, title, KStandardGuiItem::cont(), KStandardGuiItem::cancel(), QStringLiteral("confirm_empty_trash")) != KMessageBox::Continue) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/src/emptytrashcommand.h new/akonadi-mime-17.08.0/src/emptytrashcommand.h --- old/akonadi-mime-17.04.3/src/emptytrashcommand.h 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/src/emptytrashcommand.h 2017-08-07 11:57:02.000000000 +0200 @@ -36,14 +36,14 @@ public: EmptyTrashCommand(const QAbstractItemModel *model, QObject *parent); EmptyTrashCommand(const Akonadi::Collection &folder, QObject *parent); - void execute() Q_DECL_OVERRIDE; + void execute() override; private Q_SLOTS: void slotExpungeJob(KJob *job); void slotDeleteJob(KJob *job); protected Q_SLOTS: - void emitResult(Result result) Q_DECL_OVERRIDE; + void emitResult(Result result) override; private: void expunge(const Akonadi::Collection &col); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/src/markascommand.h new/akonadi-mime-17.08.0/src/markascommand.h --- old/akonadi-mime-17.04.3/src/markascommand.h 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/src/markascommand.h 2017-08-07 11:57:02.000000000 +0200 @@ -40,7 +40,7 @@ MarkAsCommand(const Akonadi::MessageStatus &targetStatus, const Akonadi::Item::List &msgList, bool invert = false, QObject *parent = nullptr); MarkAsCommand(const Akonadi::MessageStatus &targetStatus, const Akonadi::Collection::List &folders, bool invert = false, bool recursive = false, QObject *parent = nullptr); ~MarkAsCommand(); - void execute() Q_DECL_OVERRIDE; + void execute() override; private Q_SLOTS: void slotCollectionFetchDone(KJob *job); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/src/messagefolderattribute.h new/akonadi-mime-17.08.0/src/messagefolderattribute.h --- old/akonadi-mime-17.04.3/src/messagefolderattribute.h 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/src/messagefolderattribute.h 2017-08-07 11:57:02.000000000 +0200 @@ -24,7 +24,7 @@ #include <attribute.h> -#include <QtCore/QByteArray> +#include <QByteArray> namespace Akonadi { @@ -66,10 +66,10 @@ void setOutboundFolder(bool outbound); // reimpl. - QByteArray type() const Q_DECL_OVERRIDE; - MessageFolderAttribute *clone() const Q_DECL_OVERRIDE; - QByteArray serialized() const Q_DECL_OVERRIDE; - void deserialize(const QByteArray &data) Q_DECL_OVERRIDE; + QByteArray type() const override; + MessageFolderAttribute *clone() const override; + QByteArray serialized() const override; + void deserialize(const QByteArray &data) override; private: class Private; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/src/messagemodel.h new/akonadi-mime-17.08.0/src/messagemodel.h --- old/akonadi-mime-17.04.3/src/messagemodel.h 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/src/messagemodel.h 2017-08-07 11:57:02.000000000 +0200 @@ -68,27 +68,27 @@ /** Reimplemented from QAbstractItemModel. */ - int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; /** Reimplemented from QAbstractItemModel. */ - int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; /** Reimplemented from QAbstractItemModel. */ - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; /** Reimplemented from QAbstractItemModel. */ - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; /** Reimplemented from QAbstractItemModel. */ - QStringList mimeTypes() const Q_DECL_OVERRIDE; + QStringList mimeTypes() const override; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/src/messagestatus.cpp new/akonadi-mime-17.08.0/src/messagestatus.cpp --- old/akonadi-mime-17.04.3/src/messagestatus.cpp 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/src/messagestatus.cpp 2017-08-07 11:57:02.000000000 +0200 @@ -24,7 +24,7 @@ #include "messageflags.h" -#include <QtCore/QString> +#include <QString> /** The message status format. These can be or'd together. Note, that the StatusIgnored implies the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/src/messagestatus.h new/akonadi-mime-17.08.0/src/messagestatus.h --- old/akonadi-mime-17.04.3/src/messagestatus.h 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/src/messagestatus.h 2017-08-07 11:57:02.000000000 +0200 @@ -22,7 +22,7 @@ #ifndef AKONADI_KMIME_MESSAGESTATUS_H #define AKONADI_KMIME_MESSAGESTATUS_H -#include <QtCore/QSet> +#include <QSet> #include "akonadi-mime_export.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/src/metatype.h new/akonadi-mime-17.08.0/src/metatype.h --- old/akonadi-mime-17.04.3/src/metatype.h 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/src/metatype.h 2017-08-07 11:57:02.000000000 +0200 @@ -19,10 +19,10 @@ #ifndef POP3_METATYPE_H #define POP3_METATYPE_H -#include <QtCore/QObject> -#include <QtCore/QList> +#include <QObject> +#include <QList> -#include <QtCore/QMetaType> +#include <QMetaType> Q_DECLARE_METATYPE(QList<int>) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/src/movecommand.h new/akonadi-mime-17.08.0/src/movecommand.h --- old/akonadi-mime-17.04.3/src/movecommand.h 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/src/movecommand.h 2017-08-07 11:57:02.000000000 +0200 @@ -37,7 +37,7 @@ public: MoveCommand(const Akonadi::Collection &destFolder, const Akonadi::Item::List &msgList, QObject *parent = nullptr); ~MoveCommand(); - void execute() Q_DECL_OVERRIDE; + void execute() override; private Q_SLOTS: void slotMoveResult(KJob *job); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/src/movetotrashcommand.h new/akonadi-mime-17.08.0/src/movetotrashcommand.h --- old/akonadi-mime-17.04.3/src/movetotrashcommand.h 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/src/movetotrashcommand.h 2017-08-07 11:57:02.000000000 +0200 @@ -38,7 +38,7 @@ MoveToTrashCommand(const QAbstractItemModel *model, const Akonadi::Item::List &msgList, QObject *parent = nullptr); MoveToTrashCommand(const QAbstractItemModel *model, const Akonadi::Collection::List &folders, QObject *parent = nullptr); - void execute() Q_DECL_OVERRIDE; + void execute() override; private Q_SLOTS: void slotFetchDone(KJob *job); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/src/removeduplicatesjob.h new/akonadi-mime-17.08.0/src/removeduplicatesjob.h --- old/akonadi-mime-17.04.3/src/removeduplicatesjob.h 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/src/removeduplicatesjob.h 2017-08-07 11:57:02.000000000 +0200 @@ -65,8 +65,8 @@ virtual ~RemoveDuplicatesJob(); protected: - void doStart() Q_DECL_OVERRIDE; - bool doKill() Q_DECL_OVERRIDE; + void doStart() override; + bool doKill() override; private: class Private; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/src/standardmailactionmanager.cpp new/akonadi-mime-17.08.0/src/standardmailactionmanager.cpp --- old/akonadi-mime-17.04.3/src/standardmailactionmanager.cpp 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/src/standardmailactionmanager.cpp 2017-08-07 11:57:02.000000000 +0200 @@ -49,7 +49,7 @@ #include <KLocalizedString> -#include <QtCore/QPointer> +#include <QPointer> #include <QItemSelectionModel> using namespace Akonadi; @@ -421,7 +421,7 @@ bool canDeleteItem = true; bool isSystemFolder = false; if (collectionIsSelected) { - foreach (const Collection &collection, selectedCollections) { + for (const Collection &collection : qAsConst(selectedCollections)) { if (collection.isValid()) { const Akonadi::CollectionStatistics stats = collection.statistics(); if (!enableMarkAllAsRead) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/src/standardmailactionmanager.h new/akonadi-mime-17.08.0/src/standardmailactionmanager.h --- old/akonadi-mime-17.04.3/src/standardmailactionmanager.h 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/src/standardmailactionmanager.h 2017-08-07 11:57:02.000000000 +0200 @@ -26,7 +26,7 @@ #include <standardactionmanager.h> -#include <QtCore/QObject> +#include <QObject> class QAction; class KActionCollection; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/src/util.cpp new/akonadi-mime-17.08.0/src/util.cpp --- old/akonadi-mime-17.04.3/src/util.cpp 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/src/util.cpp 2017-08-07 11:57:02.000000000 +0200 @@ -37,8 +37,8 @@ // we can be called from the KJob::kill, where we are no longer a KIO::Job // so better safe than sorry KIO::Job *kiojob = qobject_cast<KIO::Job *>(job); - if (kiojob && kiojob->ui()) { - kiojob->ui()->showErrorMessage(); + if (kiojob && kiojob->uiDelegate()) { + kiojob->uiDelegate()->showErrorMessage(); } else { qCWarning(AKONADIMIME_LOG) << "There is no GUI delegate set for a kjob, and it failed with error:" << job->errorString(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/tests/headfetcher.cpp new/akonadi-mime-17.08.0/tests/headfetcher.cpp --- old/akonadi-mime-17.04.3/tests/headfetcher.cpp 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/tests/headfetcher.cpp 2017-08-07 11:57:02.000000000 +0200 @@ -25,7 +25,7 @@ #include "messageparts.h" -#include <QtCore/QDebug> +#include <QDebug> #include <QApplication> #include <QTimer> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-17.04.3/tests/headfetcher.h new/akonadi-mime-17.08.0/tests/headfetcher.h --- old/akonadi-mime-17.04.3/tests/headfetcher.h 2017-06-19 07:10:03.000000000 +0200 +++ new/akonadi-mime-17.08.0/tests/headfetcher.h 2017-08-07 11:57:02.000000000 +0200 @@ -20,8 +20,8 @@ #ifndef HEADFETCHER_H #define HEADFETCHER_H -#include <QtCore/QObject> -#include <QtCore/QTime> +#include <QObject> +#include <QTime> class HeadFetcher : public QObject {
