Hello community, here is the log from the commit of package kimap for openSUSE:Factory checked in at 2020-04-25 20:23:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kimap (Old) and /work/SRC/openSUSE:Factory/.kimap.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kimap" Sat Apr 25 20:23:01 2020 rev:56 rq:796942 version:20.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kimap/kimap.changes 2020-03-11 18:39:17.191154165 +0100 +++ /work/SRC/openSUSE:Factory/.kimap.new.2738/kimap.changes 2020-04-25 20:24:00.429487881 +0200 @@ -1,0 +2,35 @@ +Thu Apr 23 12:22:28 UTC 2020 - Luca Beltrame <lbeltr...@kde.org> + +- Update to 20.04.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/2020-04-apps-update +- No code change since 20.03.90 + +------------------------------------------------------------------- +Sun Apr 5 20:30:07 UTC 2020 - Luca Beltrame <lbeltr...@kde.org> + +- Update to 20.03.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/20.04-rc +- Changes since 20.03.80: + * Fix clazy warning/cppcheck warning + +------------------------------------------------------------------- +Sun Mar 22 09:17:02 UTC 2020 - Luca Beltrame <lbeltr...@kde.org> + +- Update to 20.03.80 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/20.04-beta +- Changes since 19.12.3: + * Don't use deprecated QSet::toList() + * Make it compile against qt5.15 + * Autogenerate categories file + * Make it compile against last qt5.15 without deprecated methods + * Port deprecated QSet::toList method + * remove <QtTest> which includes all of <QtCore> (scripted) + * Don't use nullptr for flags + +------------------------------------------------------------------- Old: ---- kimap-19.12.3.tar.xz kimap-19.12.3.tar.xz.sig New: ---- kimap-20.04.0.tar.xz kimap-20.04.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kimap.spec ++++++ --- /var/tmp/diff_new_pack.bUpZtv/_old 2020-04-25 20:24:01.277489629 +0200 +++ /var/tmp/diff_new_pack.bUpZtv/_new 2020-04-25 20:24:01.281489638 +0200 @@ -21,17 +21,13 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kimap -Version: 19.12.3 +Version: 20.04.0 Release: 0 Summary: KDE PIM Libraries: IMAP library License: LGPL-2.1-or-later Group: System/GUI/KDE URL: https://www.kde.org Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz -%if %{with lang} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig -Source2: applications.keyring -%endif BuildRequires: cyrus-sasl-devel BuildRequires: extra-cmake-modules >= 5.19.0 BuildRequires: kf5-filesystem @@ -40,6 +36,10 @@ BuildRequires: cmake(KF5KIO) >= %{kf5_version} BuildRequires: cmake(KF5Mime) BuildRequires: cmake(Qt5Test) +%if %{with lang} +Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source2: applications.keyring +%endif %description KIMAP provides libraries to interface and communicate with ++++++ kimap-19.12.3.tar.xz -> kimap-20.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/.gitignore new/kimap-20.04.0/.gitignore --- old/kimap-19.12.3/.gitignore 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/.gitignore 2020-04-06 06:56:10.000000000 +0200 @@ -14,8 +14,7 @@ .swp.* Doxyfile Makefile -avail -random_seed /build*/ +.cmake/ CMakeLists.txt.user* *.unc-backup* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/CMakeLists.txt new/kimap-20.04.0/CMakeLists.txt --- old/kimap-19.12.3/CMakeLists.txt 2020-03-03 01:31:56.000000000 +0100 +++ new/kimap-20.04.0/CMakeLists.txt 2020-04-17 02:37:48.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.13.3") +set(PIM_VERSION "5.14.0") project(KIMAP VERSION ${PIM_VERSION}) set(CMAKE_CXX_STANDARD 14) # ECM setup -set(KF5_MIN_VERSION "5.63.0") +set(KF5_MIN_VERSION "5.68.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -24,10 +24,10 @@ include(ECMQtDeclareLoggingCategory) -set(QT_REQUIRED_VERSION "5.11.0") +set(QT_REQUIRED_VERSION "5.12.0") set(KIMAP_LIB_VERSION ${PIM_VERSION}) -set(KMIME_LIBS_VERSION "5.13.3") +set(KMIME_LIBS_VERSION "5.14.0") ecm_setup_version(PROJECT VARIABLE_PREFIX KIMAP VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kimap_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5IMAPConfigVersion.cmake" @@ -49,7 +49,7 @@ if (EXISTS "${CMAKE_SOURCE_DIR}/.git") add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) - add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054000) + add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054400) endif() @@ -83,8 +83,5 @@ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) -install(FILES kimap.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) -install(FILES kimap.renamecategories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) ki18n_install(po) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/autotests/appendjobtest.cpp new/kimap-20.04.0/autotests/appendjobtest.cpp --- old/kimap-19.12.3/autotests/appendjobtest.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/autotests/appendjobtest.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -22,7 +22,7 @@ #include "kimap/session.h" #include "kimap/appendjob.h" -#include <QtTest> +#include <QTest> #include <QDateTime> class AppendJobTest: public QObject diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/autotests/capabilitiesjobtest.cpp new/kimap-20.04.0/autotests/capabilitiesjobtest.cpp --- old/kimap-19.12.3/autotests/capabilitiesjobtest.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/autotests/capabilitiesjobtest.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -25,7 +25,7 @@ #include "kimap/session.h" #include "kimap/capabilitiesjob.h" -#include <QtTest> +#include <QTest> class CapabilitiesJobTest: public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/autotests/createjobtest.cpp new/kimap-20.04.0/autotests/createjobtest.cpp --- old/kimap-19.12.3/autotests/createjobtest.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/autotests/createjobtest.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -25,7 +25,7 @@ #include "kimap/session.h" #include "kimap/createjob.h" -#include <QtTest> +#include <QTest> class CreateJobTest: public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/autotests/deletejobtest.cpp new/kimap-20.04.0/autotests/deletejobtest.cpp --- old/kimap-19.12.3/autotests/deletejobtest.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/autotests/deletejobtest.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -25,7 +25,7 @@ #include "kimap/session.h" #include "kimap/deletejob.h" -#include <QtTest> +#include <QTest> class DeleteJobTest: public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/autotests/expungejobtest.cpp new/kimap-20.04.0/autotests/expungejobtest.cpp --- old/kimap-19.12.3/autotests/expungejobtest.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/autotests/expungejobtest.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -22,7 +22,7 @@ #include "kimap/session.h" #include "kimap/expungejob.h" -#include <QtTest> +#include <QTest> class ExpungeJobTest: public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/autotests/fakeservertest.cpp new/kimap-20.04.0/autotests/fakeservertest.cpp --- old/kimap-19.12.3/autotests/fakeservertest.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/autotests/fakeservertest.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -23,7 +23,7 @@ #include "kimap/session.h" #include "kimap/listjob.h" -#include <QtTest> +#include <QTest> class FakeServerTest: public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/autotests/fetchjobtest.cpp new/kimap-20.04.0/autotests/fetchjobtest.cpp --- old/kimap-19.12.3/autotests/fetchjobtest.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/autotests/fetchjobtest.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -23,7 +23,7 @@ #include "kimap/session.h" #include "kimap/fetchjob.h" -#include <QtTest> +#include <QTest> Q_DECLARE_METATYPE(KIMAP::FetchJob::FetchScope) @@ -59,7 +59,7 @@ } void onMessagesReceived(const QString &/*mailbox*/, - const QMap<qint64, qint64> uids, + const QMap<qint64, qint64> &uids, const QMap<qint64, KIMAP::MessageAttribute> &attrs, const QMap<qint64, KIMAP::MessagePtr> &messages) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/autotests/getmetadatajobtest.cpp new/kimap-20.04.0/autotests/getmetadatajobtest.cpp --- old/kimap-19.12.3/autotests/getmetadatajobtest.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/autotests/getmetadatajobtest.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -22,7 +22,7 @@ #include "kimap/session.h" #include "kimap/getmetadatajob.h" -#include <QtTest> +#include <QTest> #include <QDebug> typedef QMap<QByteArray, QByteArray> MAP; @@ -138,12 +138,12 @@ fakeServer.setScenario(scenario); fakeServer.startAndWait(); - KIMAP::Session session(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session session(QStringLiteral("127.0.0.1"), 5989); //C: A000001 GETMETADATA "Folder1" (/shared) KIMAP::GetMetaDataJob *getMetadataJob = new KIMAP::GetMetaDataJob(&session); getMetadataJob->setServerCapability(KIMAP::MetaDataJobBase::Metadata); - getMetadataJob->setMailBox(QLatin1String("Folder1")); + getMetadataJob->setMailBox(QStringLiteral("Folder1")); getMetadataJob->addRequestedEntry("/shared"); getMetadataJob->setDepth(KIMAP::GetMetaDataJob::NoDepth); QVERIFY(getMetadataJob->exec()); @@ -153,7 +153,7 @@ //C: A000002 GETMETADATA "Folder1" (DEPTH 1) (/shared) getMetadataJob = new KIMAP::GetMetaDataJob(&session); getMetadataJob->setServerCapability(KIMAP::MetaDataJobBase::Metadata); - getMetadataJob->setMailBox(QLatin1String("Folder1")); + getMetadataJob->setMailBox(QStringLiteral("Folder1")); getMetadataJob->addRequestedEntry("/shared"); getMetadataJob->setDepth(KIMAP::GetMetaDataJob::OneLevel); QVERIFY(getMetadataJob->exec()); @@ -161,7 +161,7 @@ //C: A000003 GETMETADATA "Folder1" (MAXSIZE 1234) (/shared) getMetadataJob = new KIMAP::GetMetaDataJob(&session); getMetadataJob->setServerCapability(KIMAP::MetaDataJobBase::Metadata); - getMetadataJob->setMailBox(QLatin1String("Folder1")); + getMetadataJob->setMailBox(QStringLiteral("Folder1")); getMetadataJob->addRequestedEntry("/shared"); getMetadataJob->setDepth(KIMAP::GetMetaDataJob::NoDepth); getMetadataJob->setMaximumSize(1234); @@ -170,7 +170,7 @@ //C: A000004 GETMETADATA "Folder1" (DEPTH 1) (MAXSIZE 1234) (/shared) getMetadataJob = new KIMAP::GetMetaDataJob(&session); getMetadataJob->setServerCapability(KIMAP::MetaDataJobBase::Metadata); - getMetadataJob->setMailBox(QLatin1String("Folder1")); + getMetadataJob->setMailBox(QStringLiteral("Folder1")); getMetadataJob->addRequestedEntry("/shared"); getMetadataJob->setDepth(KIMAP::GetMetaDataJob::OneLevel); getMetadataJob->setMaximumSize(1234); @@ -179,7 +179,7 @@ //C: A000005 GETMETADATA "Folder1" (DEPTH 1) (MAXSIZE 1234) (/shared /shared2) getMetadataJob = new KIMAP::GetMetaDataJob(&session); getMetadataJob->setServerCapability(KIMAP::MetaDataJobBase::Metadata); - getMetadataJob->setMailBox(QLatin1String("Folder1")); + getMetadataJob->setMailBox(QStringLiteral("Folder1")); getMetadataJob->addRequestedEntry("/shared"); getMetadataJob->addRequestedEntry("/shared2"); getMetadataJob->setDepth(KIMAP::GetMetaDataJob::OneLevel); @@ -189,7 +189,7 @@ //C: A000006 GETMETADATA "Folder1" (DEPTH 1) (MAXSIZE 1234) getMetadataJob = new KIMAP::GetMetaDataJob(&session); getMetadataJob->setServerCapability(KIMAP::MetaDataJobBase::Metadata); - getMetadataJob->setMailBox(QLatin1String("Folder1")); + getMetadataJob->setMailBox(QStringLiteral("Folder1")); getMetadataJob->setDepth(KIMAP::GetMetaDataJob::OneLevel); getMetadataJob->setMaximumSize(1234); QVERIFY(getMetadataJob->exec()); @@ -197,14 +197,14 @@ //C: A000007 GETMETADATA "Folder1" (DEPTH 1) getMetadataJob = new KIMAP::GetMetaDataJob(&session); getMetadataJob->setServerCapability(KIMAP::MetaDataJobBase::Metadata); - getMetadataJob->setMailBox(QLatin1String("Folder1")); + getMetadataJob->setMailBox(QStringLiteral("Folder1")); getMetadataJob->setDepth(KIMAP::GetMetaDataJob::OneLevel); QVERIFY(getMetadataJob->exec()); //C: A000008 GETMETADATA "Folder1" (MAXSIZE 1234) getMetadataJob = new KIMAP::GetMetaDataJob(&session); getMetadataJob->setServerCapability(KIMAP::MetaDataJobBase::Metadata); - getMetadataJob->setMailBox(QLatin1String("Folder1")); + getMetadataJob->setMailBox(QStringLiteral("Folder1")); getMetadataJob->setDepth(KIMAP::GetMetaDataJob::NoDepth); getMetadataJob->setMaximumSize(1234); QVERIFY(getMetadataJob->exec()); @@ -212,7 +212,7 @@ //C: A000009 GETMETADATA "Folder1" getMetadataJob = new KIMAP::GetMetaDataJob(&session); getMetadataJob->setServerCapability(KIMAP::MetaDataJobBase::Metadata); - getMetadataJob->setMailBox(QLatin1String("Folder1")); + getMetadataJob->setMailBox(QStringLiteral("Folder1")); getMetadataJob->setDepth(KIMAP::GetMetaDataJob::NoDepth); QVERIFY(getMetadataJob->exec()); @@ -307,12 +307,12 @@ fakeServer.setScenario(scenario); fakeServer.startAndWait(); - KIMAP::Session session(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session session(QStringLiteral("127.0.0.1"), 5989); //C: A000001 GETANNOTATION "Folder1" KIMAP::GetMetaDataJob *getMetadataJob = new KIMAP::GetMetaDataJob(&session); getMetadataJob->setServerCapability(KIMAP::MetaDataJobBase::Annotatemore); - getMetadataJob->setMailBox(QLatin1String("Folder1")); + getMetadataJob->setMailBox(QStringLiteral("Folder1")); QVERIFY(getMetadataJob->exec()); QCOMPARE(getMetadataJob->allMetaData(QLatin1String("Folder1")).size(), 0); @@ -320,7 +320,7 @@ //C: A000002 GETANNOTATION "Folder1" ("/comment" "/motd") ("value.shared" "value.priv") getMetadataJob = new KIMAP::GetMetaDataJob(&session); getMetadataJob->setServerCapability(KIMAP::MetaDataJobBase::Annotatemore); - getMetadataJob->setMailBox(QLatin1String("Folder1")); + getMetadataJob->setMailBox(QStringLiteral("Folder1")); getMetadataJob->addRequestedEntry("/shared/comment"); getMetadataJob->addRequestedEntry("/private/motd"); QVERIFY(getMetadataJob->exec()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/autotests/idjobtest.cpp new/kimap-20.04.0/autotests/idjobtest.cpp --- old/kimap-19.12.3/autotests/idjobtest.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/autotests/idjobtest.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -20,7 +20,7 @@ #include "kimap/session.h" #include "kimap/idjob.h" -#include <QtTest> +#include <QTest> typedef QMap<QByteArray, QByteArray> ArrayMap; Q_DECLARE_METATYPE(ArrayMap) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/autotests/idlejobtest.cpp new/kimap-20.04.0/autotests/idlejobtest.cpp --- old/kimap-19.12.3/autotests/idlejobtest.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/autotests/idlejobtest.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -24,7 +24,8 @@ #include "kimap/selectjob.h" #include "kimap/idlejob.h" -#include <QtTest> +#include <QTest> +#include <QSignalSpy> Q_DECLARE_METATYPE(QList<int>) Q_DECLARE_METATYPE(QList<qint64>) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/autotests/imapsettest.cpp new/kimap-20.04.0/autotests/imapsettest.cpp --- old/kimap-19.12.3/autotests/imapsettest.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/autotests/imapsettest.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -20,7 +20,7 @@ #include "kimap/imapset.h" -#include <QtTest> +#include <QTest> #include <QDebug> using namespace KIMAP; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/autotests/listjobtest.cpp new/kimap-20.04.0/autotests/listjobtest.cpp --- old/kimap-19.12.3/autotests/listjobtest.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/autotests/listjobtest.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -25,7 +25,8 @@ #include "kimap/session.h" #include "kimap/listjob.h" -#include <QtTest> +#include <QTest> +#include <QSignalSpy> #include <QDebug> Q_DECLARE_METATYPE(QList<KIMAP::MailBoxDescriptor>) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/autotests/loginjobtest.cpp new/kimap-20.04.0/autotests/loginjobtest.cpp --- old/kimap-19.12.3/autotests/loginjobtest.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/autotests/loginjobtest.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -25,7 +25,7 @@ #include "kimap/session.h" #include "kimap/loginjob.h" -#include <QtTest> +#include <QTest> class TestUiProxy: public KIMAP::SessionUiProxy { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/autotests/logoutjobtest.cpp new/kimap-20.04.0/autotests/logoutjobtest.cpp --- old/kimap-19.12.3/autotests/logoutjobtest.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/autotests/logoutjobtest.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -26,7 +26,7 @@ #include "kimap/logoutjob.h" #include "kimap/loginjob.h" -#include <QtTest> +#include <QTest> class LogoutJobTest: public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/autotests/movejobtest.cpp new/kimap-20.04.0/autotests/movejobtest.cpp --- old/kimap-19.12.3/autotests/movejobtest.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/autotests/movejobtest.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -23,7 +23,7 @@ #include "kimap/imapset.h" #include "../src/movejob.h" -#include <QtTest> +#include <QTest> class MoveJobTest: public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/autotests/quotarootjobtest.cpp new/kimap-20.04.0/autotests/quotarootjobtest.cpp --- old/kimap-19.12.3/autotests/quotarootjobtest.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/autotests/quotarootjobtest.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -22,7 +22,7 @@ #include "kimap/session.h" #include "kimap/getquotarootjob.h" -#include <QtTest> +#include <QTest> Q_DECLARE_METATYPE(QList<qint64>) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/autotests/renamejobtest.cpp new/kimap-20.04.0/autotests/renamejobtest.cpp --- old/kimap-19.12.3/autotests/renamejobtest.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/autotests/renamejobtest.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -25,7 +25,7 @@ #include "kimap/session.h" #include "kimap/renamejob.h" -#include <QtTest> +#include <QTest> class RenameJobTest: public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/autotests/searchjobtest.cpp new/kimap-20.04.0/autotests/searchjobtest.cpp --- old/kimap-19.12.3/autotests/searchjobtest.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/autotests/searchjobtest.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -24,7 +24,7 @@ #include "kimap/session.h" #include "kimap/searchjob.h" -#include <QtTest> +#include <QTest> typedef QPair< KIMAP::SearchJob::SearchCriteria, QByteArray > SearchCriteriaValuePair; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/autotests/selectjobtest.cpp new/kimap-20.04.0/autotests/selectjobtest.cpp --- old/kimap-19.12.3/autotests/selectjobtest.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/autotests/selectjobtest.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -26,7 +26,7 @@ #include "kimap/session.h" #include "kimap/selectjob.h" -#include <QtTest> +#include <QTest> class SelectJobTest: public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/autotests/setmetadatajobtest.cpp new/kimap-20.04.0/autotests/setmetadatajobtest.cpp --- old/kimap-19.12.3/autotests/setmetadatajobtest.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/autotests/setmetadatajobtest.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -22,7 +22,7 @@ #include "kimap/session.h" #include "kimap/setmetadatajob.h" -#include <QtTest> +#include <QTest> typedef QMap<QByteArray, QByteArray> MAP; Q_DECLARE_METATYPE(MAP) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/autotests/storejobtest.cpp new/kimap-20.04.0/autotests/storejobtest.cpp --- old/kimap-19.12.3/autotests/storejobtest.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/autotests/storejobtest.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -25,7 +25,7 @@ #include "kimap/session.h" #include "kimap/storejob.h" -#include <QtTest> +#include <QTest> class StoreJobTest: public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/autotests/streamparsertest.cpp new/kimap-20.04.0/autotests/streamparsertest.cpp --- old/kimap-19.12.3/autotests/streamparsertest.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/autotests/streamparsertest.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -20,8 +20,8 @@ #include "imapstreamparser.h" #include <response_p.h> - -#include <QtTest> +#include <QBuffer> +#include <QTest> using namespace KIMAP; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/autotests/subscribejobtest.cpp new/kimap-20.04.0/autotests/subscribejobtest.cpp --- old/kimap-19.12.3/autotests/subscribejobtest.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/autotests/subscribejobtest.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -25,7 +25,7 @@ #include "kimap/session.h" #include "kimap/subscribejob.h" -#include <QtTest> +#include <QTest> class SubscribeJobTest: public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/autotests/testsession.cpp new/kimap-20.04.0/autotests/testsession.cpp --- old/kimap-19.12.3/autotests/testsession.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/autotests/testsession.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -23,7 +23,8 @@ #include <QEventLoop> #include <QObject> -#include <QtTest> +#include <QTest> +#include <QSignalSpy> #include "session.h" #include "job.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/autotests/unsubscribejobtest.cpp new/kimap-20.04.0/autotests/unsubscribejobtest.cpp --- old/kimap-19.12.3/autotests/unsubscribejobtest.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/autotests/unsubscribejobtest.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -25,7 +25,7 @@ #include "kimap/session.h" #include "kimap/unsubscribejob.h" -#include <QtTest> +#include <QTest> class UnsubscribeJobTest: public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/kimap.categories new/kimap-20.04.0/kimap.categories --- old/kimap-19.12.3/kimap.categories 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/kimap.categories 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -org.kde.pim.kimap kimap (pim lib) IDENTIFIER [KIMAP_LOG] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/kimap.renamecategories new/kimap-20.04.0/kimap.renamecategories --- old/kimap-19.12.3/kimap.renamecategories 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/kimap.renamecategories 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -log_kimap org.kde.pim.kimap diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/po/ca/libkimap5.po new/kimap-20.04.0/po/ca/libkimap5.po --- old/kimap-19.12.3/po/ca/libkimap5.po 2020-03-03 01:31:53.000000000 +0100 +++ new/kimap-20.04.0/po/ca/libkimap5.po 2020-04-17 02:37:47.000000000 +0200 @@ -1,9 +1,9 @@ # Translation of libkimap5.po to Catalan -# Copyright (C) 2009-2018 This_file_is_part_of_KDE +# Copyright (C) 2009-2020 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # -# Josep Ma. Ferrer <txe...@gmail.com>, 2009, 2014, 2016. +# Josep Ma. Ferrer <txe...@gmail.com>, 2009, 2014, 2016, 2020. # Manuel Tortosa Moreno <manutort...@gmail.com>, 2009, 2010. # Antoni Bella Pérez <antonibel...@yahoo.com>, 2014, 2016, 2018. msgid "" @@ -11,8 +11,8 @@ "Project-Id-Version: libkimap5\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-10-07 03:06+0200\n" -"PO-Revision-Date: 2018-06-05 09:47+0100\n" -"Last-Translator: Antoni Bella Pérez <antonibel...@yahoo.com>\n" +"PO-Revision-Date: 2020-03-30 15:05+0100\n" +"Last-Translator: Josep Ma. Ferrer <txe...@gmail.com>\n" "Language-Team: Catalan <kde-i18n...@kde.org>\n" "Language: ca\n" "MIME-Version: 1.0\n" @@ -214,6 +214,7 @@ msgid "MyRights" msgstr "ElsMeusDrets" +# skip-rule: kct-namespace #: namespacejob.cpp:77 #, kde-format msgid "Namespace" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/po/ca@valencia/libkimap5.po new/kimap-20.04.0/po/ca@valencia/libkimap5.po --- old/kimap-19.12.3/po/ca@valencia/libkimap5.po 2020-03-03 01:31:53.000000000 +0100 +++ new/kimap-20.04.0/po/ca@valencia/libkimap5.po 2020-04-17 02:37:47.000000000 +0200 @@ -1,9 +1,9 @@ # Translation of libkimap5.po to Catalan (Valencian) -# Copyright (C) 2009-2018 This_file_is_part_of_KDE +# Copyright (C) 2009-2020 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # -# Josep Ma. Ferrer <txe...@gmail.com>, 2009, 2014, 2016. +# Josep Ma. Ferrer <txe...@gmail.com>, 2009, 2014, 2016, 2020. # Manuel Tortosa Moreno <manutort...@gmail.com>, 2009, 2010. # Antoni Bella Pérez <antonibel...@yahoo.com>, 2014, 2016, 2018. msgid "" @@ -11,8 +11,8 @@ "Project-Id-Version: libkimap5\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-10-07 03:06+0200\n" -"PO-Revision-Date: 2018-06-05 09:47+0100\n" -"Last-Translator: Antoni Bella Pérez <antonibel...@yahoo.com>\n" +"PO-Revision-Date: 2020-03-30 15:05+0100\n" +"Last-Translator: Josep Ma. Ferrer <txe...@gmail.com>\n" "Language-Team: Catalan <kde-i18n...@kde.org>\n" "Language: ca@valencia\n" "MIME-Version: 1.0\n" @@ -214,6 +214,7 @@ msgid "MyRights" msgstr "ElsMeusDrets" +# skip-rule: kct-namespace #: namespacejob.cpp:77 #, kde-format msgid "Namespace" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/po/en_GB/libkimap5.po new/kimap-20.04.0/po/en_GB/libkimap5.po --- old/kimap-19.12.3/po/en_GB/libkimap5.po 2020-03-03 01:31:54.000000000 +0100 +++ new/kimap-20.04.0/po/en_GB/libkimap5.po 2020-04-17 02:37:47.000000000 +0200 @@ -9,7 +9,7 @@ "POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2018-06-30 13:33+0000\n" "Last-Translator: Steve Allewell <steve.allew...@gmail.com>\n" -"Language-Team: British English <kde-i18n-...@kde.org>\n" +"Language-Team: British English <kde-l10n-en...@kde.org>\n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/po/et/libkimap5.po new/kimap-20.04.0/po/et/libkimap5.po --- old/kimap-19.12.3/po/et/libkimap5.po 2020-03-03 01:31:54.000000000 +0100 +++ new/kimap-20.04.0/po/et/libkimap5.po 2020-04-17 02:37:47.000000000 +0200 @@ -2,20 +2,20 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Marek Laane <b...@smail.ee>, 2009, 2010, 2014, 2016. +# Marek Laane <b...@smail.ee>, 2009, 2010, 2014, 2016, 2019. msgid "" msgstr "" "Project-Id-Version: libkimap\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-10-07 03:06+0200\n" -"PO-Revision-Date: 2016-12-09 21:40+0200\n" +"PO-Revision-Date: 2019-11-17 00:57+0200\n" "Last-Translator: Marek Laane <qiila...@gmail.com>\n" -"Language-Team: Estonian <kde...@linux.ee>\n" +"Language-Team: Estonian <kde...@lists.linux.ee>\n" "Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 19.08.1\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: acljobbase.cpp:69 @@ -157,7 +157,7 @@ #: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." -msgstr "" +msgstr "STARTTLS ei ole serveris toetatud, selle asemel kasutatakse SSL/TLS." #: loginjob.cpp:375 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/po/ia/libkimap5.po new/kimap-20.04.0/po/ia/libkimap5.po --- old/kimap-19.12.3/po/ia/libkimap5.po 2020-03-03 01:31:55.000000000 +0100 +++ new/kimap-20.04.0/po/ia/libkimap5.po 2020-04-17 02:37:47.000000000 +0200 @@ -7,14 +7,14 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-10-07 03:06+0200\n" -"PO-Revision-Date: 2020-02-07 23:35+0100\n" -"Last-Translator: Giovanni Sora <g.s...@tiscali.it>\n" -"Language-Team: Interlingua <kde-i18n-...@kde.org>\n" +"PO-Revision-Date: 2020-02-12 16:05+0100\n" +"Last-Translator: giovanni <g.s...@tiscali.it>\n" +"Language-Team: Interlingua <kde-i18n...@kde.org>\n" "Language: ia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 18.12.3\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: acljobbase.cpp:69 @@ -95,7 +95,7 @@ #: idjob.cpp:43 #, kde-format msgid "Id" -msgstr "Id" +msgstr "id" #: idlejob.cpp:77 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/po/nb/libkimap5.po new/kimap-20.04.0/po/nb/libkimap5.po --- old/kimap-19.12.3/po/nb/libkimap5.po 2020-03-03 01:31:55.000000000 +0100 +++ new/kimap-20.04.0/po/nb/libkimap5.po 2020-04-17 02:37:47.000000000 +0200 @@ -8,7 +8,7 @@ "POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2014-09-23 22:05+0200\n" "Last-Translator: Bjørn Steensrud <bjor...@skogkatt.homelinux.org>\n" -"Language-Team: Norwegian Bokmål <i18n...@lister.ping.uio.no>\n" +"Language-Team: Norwegian Bokmål <l10n...@lister.huftis.org>\n" "Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/po/nn/libkimap5.po new/kimap-20.04.0/po/nn/libkimap5.po --- old/kimap-19.12.3/po/nn/libkimap5.po 2020-03-03 01:31:55.000000000 +0100 +++ new/kimap-20.04.0/po/nn/libkimap5.po 2020-04-17 02:37:48.000000000 +0200 @@ -9,7 +9,7 @@ "POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2010-04-20 22:06+0200\n" "Last-Translator: Eirik U. Birkeland <eir...@gmail.com>\n" -"Language-Team: Norwegian Nynorsk <i18n...@lister.ping.uio.no>\n" +"Language-Team: Norwegian Nynorsk <l10n...@lister.huftis.org>\n" "Language: nn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/po/uk/libkimap5.po new/kimap-20.04.0/po/uk/libkimap5.po --- old/kimap-19.12.3/po/uk/libkimap5.po 2020-03-03 01:31:56.000000000 +0100 +++ new/kimap-20.04.0/po/uk/libkimap5.po 2020-04-17 02:37:48.000000000 +0200 @@ -1,5 +1,5 @@ # Translation of libkimap5.po to Ukrainian -# Copyright (C) 2014-2018 This_file_is_part_of_KDE +# Copyright (C) 2018 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/po/zh_CN/libkimap5.po new/kimap-20.04.0/po/zh_CN/libkimap5.po --- old/kimap-19.12.3/po/zh_CN/libkimap5.po 2020-03-03 01:31:56.000000000 +0100 +++ new/kimap-20.04.0/po/zh_CN/libkimap5.po 2020-04-17 02:37:48.000000000 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-10-07 03:06+0200\n" -"PO-Revision-Date: 2020-01-20 21:56\n" +"PO-Revision-Date: 2020-03-25 19:56\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/src/CMakeLists.txt new/kimap-20.04.0/src/CMakeLists.txt --- old/kimap-19.12.3/src/CMakeLists.txt 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/src/CMakeLists.txt 2020-04-06 06:56:10.000000000 +0200 @@ -49,7 +49,10 @@ unsubscribejob.cpp ) -ecm_qt_declare_logging_category(kimap_SRCS HEADER kimap_debug.h IDENTIFIER KIMAP_LOG CATEGORY_NAME org.kde.pim.kimap) +ecm_qt_declare_logging_category(kimap_SRCS HEADER kimap_debug.h IDENTIFIER KIMAP_LOG CATEGORY_NAME org.kde.pim.kimap + OLD_CATEGORY_NAMES log_kimap + DESCRIPTION "kimap (pim lib)" EXPORT KIMAP) + add_library(KF5IMAP ${kimap_SRCS}) @@ -147,6 +150,6 @@ COMPONENT Devel ) - +ecm_qt_install_logging_categories(EXPORT KIMAP FILE kimap.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) ecm_generate_pri_file(BASE_NAME KIMAP LIB_NAME KF5IMAP DEPS "Mime" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KIMAP) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/src/getmetadatajob.cpp new/kimap-20.04.0/src/getmetadatajob.cpp --- old/kimap-19.12.3/src/getmetadatajob.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/src/getmetadatajob.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -57,7 +57,7 @@ static QList<QByteArray> sort(const QSet<QByteArray> &set) { - QList<QByteArray> sortedEntries = set.toList(); + QList<QByteArray> sortedEntries = set.values(); std::sort(sortedEntries.begin(), sortedEntries.end()); return sortedEntries; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/src/imapstreamparser.cpp new/kimap-20.04.0/src/imapstreamparser.cpp --- old/kimap-19.12.3/src/imapstreamparser.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/src/imapstreamparser.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -29,11 +29,11 @@ using namespace KIMAP; ImapStreamParser::ImapStreamParser(QIODevice *socket, bool serverModeEnabled) + : m_position(0) + , m_literalSize(0) { m_socket = socket; m_isServerModeEnabled = serverModeEnabled; - m_position = 0; - m_literalSize = 0; } QString ImapStreamParser::readUtf8String() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/src/rfccodecs.cpp new/kimap-20.04.0/src/rfccodecs.cpp --- old/kimap-19.12.3/src/rfccodecs.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/src/rfccodecs.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -41,7 +41,7 @@ #include <QTextCodec> #include <QByteArray> #include <QLatin1Char> -#include <kcodecs.h> +#include <KCodecs> using namespace KIMAP; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/src/sessionthread.cpp new/kimap-20.04.0/src/sessionthread.cpp --- old/kimap-19.12.3/src/sessionthread.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/src/sessionthread.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -208,8 +208,13 @@ this, &SessionThread::slotSocketDisconnected, Qt::QueuedConnection); connect(m_socket.get(), &QSslSocket::connected, this, &SessionThread::socketConnected); +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) connect(m_socket.get(), QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::error), +#else + connect(m_socket.get(), QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::errorOccurred), +#endif this, &SessionThread::slotSocketError); + connect(m_socket.get(), &QIODevice::bytesWritten, this, &SessionThread::socketActivity); connect(m_socket.get(), &QSslSocket::encryptedBytesWritten, @@ -285,14 +290,23 @@ return; } QSslCipher cipher = m_socket->sessionCipher(); - - if (!m_socket->sslErrors().isEmpty() || !m_socket->isEncrypted() +#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) + if (!m_socket->sslErrors().isEmpty() +#else + if (!m_socket->sslHandshakeErrors().isEmpty() +#endif + || !m_socket->isEncrypted() || cipher.isNull() || cipher.usedBits() == 0) { qCDebug(KIMAP_LOG) << "Initial SSL handshake failed. cipher.isNull() is" << cipher.isNull() << ", cipher.usedBits() is" << cipher.usedBits() << ", the socket says:" << m_socket->errorString() << "and the list of SSL errors contains" - << m_socket->sslErrors().count() << "items."; + #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) + << m_socket->sslErrors().count() + #else + << m_socket->sslHandshakeErrors().count() + #endif + << "items."; KSslErrorUiData errorData(m_socket.get()); emit sslError(errorData); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-19.12.3/src/setmetadatajob.cpp new/kimap-20.04.0/src/setmetadatajob.cpp --- old/kimap-19.12.3/src/setmetadatajob.cpp 2020-02-16 09:58:48.000000000 +0100 +++ new/kimap-20.04.0/src/setmetadatajob.cpp 2020-04-06 06:56:10.000000000 +0200 @@ -32,7 +32,7 @@ class SetMetaDataJobPrivate : public MetaDataJobBasePrivate { public: - SetMetaDataJobPrivate(Session *session, const QString &name) : MetaDataJobBasePrivate(session, name), metaDataErrors(nullptr), maxAcceptedSize(-1) { } + SetMetaDataJobPrivate(Session *session, const QString &name) : MetaDataJobBasePrivate(session, name), metaDataErrors({}), maxAcceptedSize(-1) { } ~SetMetaDataJobPrivate() { } QMap<QByteArray, QByteArray> entries;
