Hello community, here is the log from the commit of package kimap for openSUSE:Factory checked in at 2018-04-25 09:50:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kimap (Old) and /work/SRC/openSUSE:Factory/.kimap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kimap" Wed Apr 25 09:50:23 2018 rev:31 rq:599056 version:18.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kimap/kimap.changes 2018-03-20 21:38:33.120789997 +0100 +++ /work/SRC/openSUSE:Factory/.kimap.new/kimap.changes 2018-04-25 09:50:26.410857129 +0200 @@ -1,0 +2,34 @@ +Wed Apr 18 07:49:23 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:31 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: + * Don't add a subdirectory which was removed + * CMakeLists.txt - remove unnecessary search for Qt5 Network + * CMakeLists.txt, src/CMakeLists.txt - link to Qt5Network following changes to kio + * Move debug categories file here + * Remove extra ';' + * Fix warnings + * Fix some warning + * USe directly override keyword + * Use QLatin1String + * Port to new connect api + * Use new connect api + * Don't look for Sasl2. + * Cleanup. Add todo + * Use the same FindSasl2.cmake as kldap. +- Update package descriptions + +------------------------------------------------------------------- Old: ---- kimap-17.12.3.tar.xz New: ---- kimap-18.04.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kimap.spec ++++++ --- /var/tmp/diff_new_pack.Ip9UnW/_old 2018-04-25 09:50:27.174829112 +0200 +++ /var/tmp/diff_new_pack.Ip9UnW/_new 2018-04-25 09:50:27.174829112 +0200 @@ -20,7 +20,7 @@ %define kf5_version 5.19.0 Name: kimap -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) @@ -42,7 +42,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -This package contains additional libraries for KDE PIM applications. +KIMAP provides libraries to interface and communicate with +IMAP mail servers. %package -n libKF5IMAP5 Summary: KDE PIM Libraries: IMAP APIs @@ -51,7 +52,8 @@ Provides: %{name} = %{version} %description -n libKF5IMAP5 -This package contains the libray for IMAP support +This package provides the core library to interface and communicate with +IMAP mail servers. %package devel Summary: KDE PIM Libraries: Build Environment @@ -62,8 +64,8 @@ Requires: libKF5IMAP5 = %{version} %description devel -This package contains necessary include files and libraries needed -to develop KDE PIM applications. +This package contains development headers to add IMAP support to PIM +applications. %if %{with lang} %lang_package @@ -89,6 +91,8 @@ %defattr(-,root,root) %doc COPYING* %{_kf5_libdir}/libKF5IMAP.so.* +%{_kf5_debugdir}/*.categories +%{_kf5_debugdir}/*.renamecategories %files devel %defattr(-,root,root) ++++++ kimap-17.12.3.tar.xz -> kimap-18.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/CMakeLists.txt new/kimap-18.04.0/CMakeLists.txt --- old/kimap-17.12.3/CMakeLists.txt 2018-03-06 01:27:37.000000000 +0100 +++ new/kimap-18.04.0/CMakeLists.txt 2018-04-13 02:13:56.000000000 +0200 @@ -1,13 +1,13 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.7.3") +set(PIM_VERSION "5.8.0") project(KIMAP VERSION ${PIM_VERSION}) # ECM setup -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} ${KIMAP_SOURCE_DIR}/cmake) +set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(GenerateExportHeader) include(ECMGenerateHeaders) @@ -21,13 +21,10 @@ include(ECMQtDeclareLoggingCategory) include(ECMCoverageOption) - set(QT_REQUIRED_VERSION "5.8.0") - - set(KIMAP_LIB_VERSION ${PIM_VERSION}) -set(KMIME_LIBS_VERSION "5.7.3") +set(KMIME_LIBS_VERSION "5.8.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" @@ -35,19 +32,14 @@ ) ########### Find packages ########### +find_package(Sasl2) +set_package_properties(Sasl2 PROPERTIES TYPE REQUIRED) + find_package(KF5CoreAddons ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED) - find_package(KF5Mime ${KMIME_LIBS_VERSION} CONFIG REQUIRED) -find_package(Sasl2) -set_package_properties(Sasl2 PROPERTIES - DESCRIPTION "The Cyrus-sasl library" - URL "http://www.cyrussasl.org"; - TYPE REQUIRED -) - ########### CMake Config Files ########### set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5IMAP") add_definitions(-DTRANSLATION_DOMAIN=\"libkimap5\") @@ -71,8 +63,6 @@ add_subdirectory(tests) endif() -add_subdirectory(cmake) - ########### Install Files ########### install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KF5IMAPConfig.cmake" @@ -88,5 +78,8 @@ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) +install( FILES kimap.categories DESTINATION ${KDE_INSTALL_CONFDIR} ) +install( FILES kimap.renamecategories DESTINATION ${KDE_INSTALL_CONFDIR} ) + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) ki18n_install(po) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/KF5IMAPConfig.cmake.in new/kimap-18.04.0/KF5IMAPConfig.cmake.in --- old/kimap-17.12.3/KF5IMAPConfig.cmake.in 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/KF5IMAPConfig.cmake.in 2018-04-10 13:51:17.000000000 +0200 @@ -4,13 +4,5 @@ include(CMakeFindDependencyMacro) find_dependency(KF5CoreAddons "@KF5_VERSION@") find_dependency(KF5Mime "@KMIME_LIBS_VERSION@") -find_dependency(Sasl2) - -include(FeatureSummary) - -set_package_properties(Sasl2 PROPERTIES - DESCRIPTION "The Cyrus-sasl library" - URL "http://www.cyrussasl.org"; -) include("${CMAKE_CURRENT_LIST_DIR}/KF5IMAPTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/autotests/capabilitiesjobtest.cpp new/kimap-18.04.0/autotests/capabilitiesjobtest.cpp --- old/kimap-17.12.3/autotests/capabilitiesjobtest.cpp 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/autotests/capabilitiesjobtest.cpp 2018-04-10 13:51:17.000000000 +0200 @@ -63,7 +63,7 @@ << "S: A000001 OK CAPABILITY completed"; capabilities << QStringLiteral("IMAP4REV1") << QStringLiteral("STARTTLS") << QStringLiteral("AUTH=PLAIN"); - QTest::newRow("extra-untagged") << scenario << capabilities;; + QTest::newRow("extra-untagged") << scenario << capabilities; } void testCapabilities() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/autotests/kimaptest/fakeserver.cpp new/kimap-18.04.0/autotests/kimaptest/fakeserver.cpp --- old/kimap-17.12.3/autotests/kimaptest/fakeserver.cpp 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/autotests/kimaptest/fakeserver.cpp 2018-04-10 13:51:17.000000000 +0200 @@ -58,7 +58,11 @@ { start(); // this will block until the event queue starts +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + QMetaObject::invokeMethod(this, &FakeServer::started, Qt::BlockingQueuedConnection); +#else QMetaObject::invokeMethod(this, "started", Qt::BlockingQueuedConnection); +#endif } void FakeServer::dataAvailable() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/autotests/listjobtest.cpp new/kimap-18.04.0/autotests/listjobtest.cpp --- old/kimap-17.12.3/autotests/listjobtest.cpp 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/autotests/listjobtest.cpp 2018-04-10 13:51:17.000000000 +0200 @@ -69,7 +69,7 @@ QTest::newRow("normal") << true << scenario << listresult; - scenario.clear();; + scenario.clear(); scenario << FakeServer::preauth() << "C: A000001 LIST \"\" *" << "S: * LIST ( \\HasChildren ) / Inbox" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/cmake/CMakeLists.txt new/kimap-18.04.0/cmake/CMakeLists.txt --- old/kimap-17.12.3/cmake/CMakeLists.txt 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/cmake/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -install(FILES FindSasl2.cmake DESTINATION ${CMAKECONFIG_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/cmake/COPYING-CMAKE-SCRIPTS new/kimap-18.04.0/cmake/COPYING-CMAKE-SCRIPTS --- old/kimap-17.12.3/cmake/COPYING-CMAKE-SCRIPTS 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/cmake/COPYING-CMAKE-SCRIPTS 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/cmake/FindSasl2.cmake new/kimap-18.04.0/cmake/FindSasl2.cmake --- old/kimap-17.12.3/cmake/FindSasl2.cmake 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/cmake/FindSasl2.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -# -# - Try to find the sasl2 directory library -# Once done this will define -# -# Sasl2_FOUND - system has SASL2 -# Sasl2_INCLUDE_DIRS - the SASL2 include directory -# Sasl2_LIBRARIES - The libraries needed to use SASL2 - -# Copyright (c) 2006, 2007 Laurent Montel, <mon...@kde.org> -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -# Note: libsasl2.pc doesn't export the include dir. -find_package(PkgConfig QUIET) -pkg_check_modules(PC_Sasl2 libsasl2) - -find_path(Sasl2_INCLUDE_DIRS sasl/sasl.h -) - -# libsasl2 add for windows, because the windows package of cyrus-sasl2 -# contains a libsasl2 also for msvc which is not standard conform -find_library(Sasl2_LIBRARIES - NAMES sasl2 libsasl2 - HINTS ${PC_Sasl2_LIBRARY_DIRS} -) - -set(Sasl2_VERSION ${PC_Sasl2_VERSION}) - -if(NOT Sasl2_VERSION) - if(EXISTS ${Sasl2_INCLUDE_DIRS}/sasl/sasl.h) - file(READ ${Sasl2_INCLUDE_DIRS}/sasl/sasl.h SASL2_H_CONTENT) - string(REGEX MATCH "#define SASL_VERSION_MAJOR[ ]+[0-9]+" SASL2_VERSION_MAJOR_MATCH ${SASL2_H_CONTENT}) - string(REGEX MATCH "#define SASL_VERSION_MINOR[ ]+[0-9]+" SASL2_VERSION_MINOR_MATCH ${SASL2_H_CONTENT}) - string(REGEX MATCH "#define SASL_VERSION_STEP[ ]+[0-9]+" SASL2_VERSION_STEP_MATCH ${SASL2_H_CONTENT}) - - string(REGEX REPLACE ".*_MAJOR[ ]+(.*)" "\\1" SASL2_VERSION_MAJOR ${SASL2_VERSION_MAJOR_MATCH}) - string(REGEX REPLACE ".*_MINOR[ ]+(.*)" "\\1" SASL2_VERSION_MINOR ${SASL2_VERSION_MINOR_MATCH}) - string(REGEX REPLACE ".*_STEP[ ]+(.*)" "\\1" SASL2_VERSION_STEP ${SASL2_VERSION_STEP_MATCH}) - - set(Sasl2_VERSION "${SASL2_VERSION_MAJOR}.${SASL2_VERSION_MINOR}.${SASL2_VERSION_STEP}") - endif() -endif() - -include(FindPackageHandleStandardArgs) - -find_package_handle_standard_args(Sasl2 - FOUND_VAR Sasl2_FOUND - REQUIRED_VARS Sasl2_LIBRARIES Sasl2_INCLUDE_DIRS - VERSION_VAR Sasl2_VERSION -) - -mark_as_advanced(Sasl2_LIBRARIES Sasl2_INCLUDE_DIRS Sasl2_VERSION) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/kimap.categories new/kimap-18.04.0/kimap.categories --- old/kimap-17.12.3/kimap.categories 1970-01-01 01:00:00.000000000 +0100 +++ new/kimap-18.04.0/kimap.categories 2018-04-10 13:51:17.000000000 +0200 @@ -0,0 +1 @@ +org.kde.pim.kimap kimap (pim lib) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/kimap.renamecategories new/kimap-18.04.0/kimap.renamecategories --- old/kimap-17.12.3/kimap.renamecategories 1970-01-01 01:00:00.000000000 +0100 +++ new/kimap-18.04.0/kimap.renamecategories 2018-04-10 13:51:17.000000000 +0200 @@ -0,0 +1 @@ +log_kimap org.kde.pim.kimap diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/po/ca/libkimap5.po new/kimap-18.04.0/po/ca/libkimap5.po --- old/kimap-17.12.3/po/ca/libkimap5.po 2018-03-06 01:27:36.000000000 +0100 +++ new/kimap-18.04.0/po/ca/libkimap5.po 2018-04-13 02:13:55.000000000 +0200 @@ -271,3 +271,9 @@ #, kde-format msgid "Unsubscribe" msgstr "Cancel·la la subscripció" + +#~ msgid "SetAnnotation" +#~ msgstr "EstableixAnotació" + +#~ msgid "Mock" +#~ msgstr "Simula" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/po/ca@valencia/libkimap5.po new/kimap-18.04.0/po/ca@valencia/libkimap5.po --- old/kimap-17.12.3/po/ca@valencia/libkimap5.po 2018-03-06 01:27:36.000000000 +0100 +++ new/kimap-18.04.0/po/ca@valencia/libkimap5.po 2018-04-13 02:13:55.000000000 +0200 @@ -228,7 +228,7 @@ #, kde-format msgctxt "Name of the search job" msgid "Search" -msgstr "Busca" +msgstr "Cerca" #: selectjob.cpp:59 #, kde-format @@ -271,3 +271,9 @@ #, kde-format msgid "Unsubscribe" msgstr "Cancel·la la subscripció" + +#~ msgid "SetAnnotation" +#~ msgstr "EstableixAnotació" + +#~ msgid "Mock" +#~ msgstr "Simula" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/po/zh_CN/libkimap5.po new/kimap-18.04.0/po/zh_CN/libkimap5.po --- old/kimap-17.12.3/po/zh_CN/libkimap5.po 2018-03-06 01:27:37.000000000 +0100 +++ new/kimap-18.04.0/po/zh_CN/libkimap5.po 2018-04-13 02:13:56.000000000 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-08-15 03:41+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" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/CMakeLists.txt new/kimap-18.04.0/src/CMakeLists.txt --- old/kimap-17.12.3/src/CMakeLists.txt 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/CMakeLists.txt 2018-04-10 13:51:17.000000000 +0200 @@ -2,8 +2,6 @@ # Turn exceptions on kde_enable_exceptions() -include_directories(${Sasl2_INCLUDE_DIRS}) - set(kimap_SRCS acl.cpp acljobbase.cpp @@ -59,7 +57,7 @@ add_library(KF5::IMAP ALIAS KF5IMAP) -target_include_directories(KF5IMAP INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KIMAP;${Sasl2_INCLUDE_DIRS}>") +target_include_directories(KF5IMAP INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KIMAP>") target_include_directories(KF5IMAP PUBLIC "$<BUILD_INTERFACE:${KIMAP_SOURCE_DIR}/src;${KIMAP_BINARY_DIR}/src>") if (WIN32) @@ -70,15 +68,15 @@ PUBLIC KF5::Mime KF5::CoreAddons + Qt5::Network PRIVATE KF5::KIOCore KF5::Codecs KF5::I18n - ${Sasl2_LIBRARIES} + Sasl2::Sasl2 ${extra_LIBS} ) - set_target_properties(KF5IMAP PROPERTIES VERSION ${KIMAP_VERSION_STRING} SOVERSION ${KIMAP_SOVERSION} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/acl.cpp new/kimap-18.04.0/src/acl.cpp --- old/kimap-17.12.3/src/acl.cpp 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/acl.cpp 2018-04-10 13:51:17.000000000 +0200 @@ -94,7 +94,7 @@ for (int right = Lookup; right <= Custom9; right <<= 1) { if (rights & right) { - result += globalRights->map.key((Right)right); + result += globalRights->map.key(static_cast<Right>(right)); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/acljobbase.h new/kimap-18.04.0/src/acljobbase.h --- old/kimap-17.12.3/src/acljobbase.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/acljobbase.h 2018-04-10 13:51:17.000000000 +0200 @@ -50,7 +50,7 @@ public: AclJobBase(Session *session); - virtual ~AclJobBase(); + ~AclJobBase() override; /** * Used when subclassing to specify how the ACL will be modified. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/appendjob.h new/kimap-18.04.0/src/appendjob.h --- old/kimap-17.12.3/src/appendjob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/appendjob.h 2018-04-10 13:51:17.000000000 +0200 @@ -50,7 +50,7 @@ public: explicit AppendJob(Session *session); - virtual ~AppendJob(); + ~AppendJob() override; /** * Set the mailbox to append the message to. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/capabilitiesjob.h new/kimap-18.04.0/src/capabilitiesjob.h --- old/kimap-17.12.3/src/capabilitiesjob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/capabilitiesjob.h 2018-04-10 13:51:17.000000000 +0200 @@ -52,7 +52,7 @@ public: CapabilitiesJob(Session *session); - virtual ~CapabilitiesJob(); + ~CapabilitiesJob() override; /** * The capabilities the server claims to support. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/closejob.h new/kimap-18.04.0/src/closejob.h --- old/kimap-17.12.3/src/closejob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/closejob.h 2018-04-10 13:51:17.000000000 +0200 @@ -59,7 +59,7 @@ public: explicit CloseJob(Session *session); - virtual ~CloseJob(); + ~CloseJob() override; protected: void doStart() override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/copyjob.h new/kimap-18.04.0/src/copyjob.h --- old/kimap-17.12.3/src/copyjob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/copyjob.h 2018-04-10 13:51:17.000000000 +0200 @@ -53,7 +53,7 @@ public: explicit CopyJob(Session *session); - virtual ~CopyJob(); + ~CopyJob() override; /** * Sets the destination mailbox. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/createjob.h new/kimap-18.04.0/src/createjob.h --- old/kimap-17.12.3/src/createjob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/createjob.h 2018-04-10 13:51:17.000000000 +0200 @@ -54,7 +54,7 @@ public: explicit CreateJob(Session *session); - virtual ~CreateJob(); + ~CreateJob() override; /** * Set the name of the new mailbox diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/deleteacljob.h new/kimap-18.04.0/src/deleteacljob.h --- old/kimap-17.12.3/src/deleteacljob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/deleteacljob.h 2018-04-10 13:51:17.000000000 +0200 @@ -54,7 +54,7 @@ public: explicit DeleteAclJob(Session *session); - virtual ~DeleteAclJob(); + ~DeleteAclJob() override; /** * Sets the identifier to remove diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/deletejob.h new/kimap-18.04.0/src/deletejob.h --- old/kimap-17.12.3/src/deletejob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/deletejob.h 2018-04-10 13:51:17.000000000 +0200 @@ -53,7 +53,7 @@ public: explicit DeleteJob(Session *session); - virtual ~DeleteJob(); + ~DeleteJob() override; /** * Set the mailbox to delete. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/expungejob.h new/kimap-18.04.0/src/expungejob.h --- old/kimap-17.12.3/src/expungejob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/expungejob.h 2018-04-10 13:51:17.000000000 +0200 @@ -52,7 +52,7 @@ public: explicit ExpungeJob(Session *session); - virtual ~ExpungeJob(); + ~ExpungeJob() override; protected: void doStart() override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/fetchjob.h new/kimap-18.04.0/src/fetchjob.h --- old/kimap-17.12.3/src/fetchjob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/fetchjob.h 2018-04-10 13:51:17.000000000 +0200 @@ -187,7 +187,7 @@ }; explicit FetchJob(Session *session); - virtual ~FetchJob(); + ~FetchJob() override; /** * Set which messages to fetch data for. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/getacljob.h new/kimap-18.04.0/src/getacljob.h --- old/kimap-17.12.3/src/getacljob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/getacljob.h 2018-04-10 13:51:17.000000000 +0200 @@ -69,7 +69,7 @@ public: explicit GetAclJob(Session *session); - virtual ~GetAclJob(); + ~GetAclJob() override; /** * The identifiers present in the ACL. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/getmetadatajob.h new/kimap-18.04.0/src/getmetadatajob.h --- old/kimap-17.12.3/src/getmetadatajob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/getmetadatajob.h 2018-04-10 13:51:17.000000000 +0200 @@ -68,7 +68,7 @@ public: explicit GetMetaDataJob(Session *session); - virtual ~GetMetaDataJob(); + ~GetMetaDataJob() override; /** * Used to specify the depth of the metadata heirachy to walk. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/getquotajob.h new/kimap-18.04.0/src/getquotajob.h --- old/kimap-17.12.3/src/getquotajob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/getquotajob.h 2018-04-10 13:51:17.000000000 +0200 @@ -57,7 +57,7 @@ public: explicit GetQuotaJob(Session *session); - virtual ~GetQuotaJob(); + ~GetQuotaJob() override; /** * Set the quota root to get the resource limits for. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/getquotarootjob.h new/kimap-18.04.0/src/getquotarootjob.h --- old/kimap-17.12.3/src/getquotarootjob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/getquotarootjob.h 2018-04-10 13:51:17.000000000 +0200 @@ -57,7 +57,7 @@ public: explicit GetQuotaRootJob(Session *session); - virtual ~GetQuotaRootJob(); + ~GetQuotaRootJob() override; /** * Set the mailbox to get the quota roots for. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/idjob.cpp new/kimap-18.04.0/src/idjob.cpp --- old/kimap-17.12.3/src/idjob.cpp 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/idjob.cpp 2018-04-10 13:51:17.000000000 +0200 @@ -72,7 +72,7 @@ void IdJob::handleResponse(const Response &response) { - Q_D(IdJob); + //Q_D(IdJob); if (handleErrorReplies(response) == NotHandled) { // Ignore the response } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/idjob.h new/kimap-18.04.0/src/idjob.h --- old/kimap-17.12.3/src/idjob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/idjob.h 2018-04-10 13:51:17.000000000 +0200 @@ -44,7 +44,7 @@ public: IdJob( Session *session); - virtual ~IdJob(); + ~IdJob() override; void setField(const QByteArray &name, const QByteArray &field); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/idlejob.h new/kimap-18.04.0/src/idlejob.h --- old/kimap-17.12.3/src/idlejob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/idlejob.h 2018-04-10 13:51:17.000000000 +0200 @@ -66,7 +66,7 @@ public: explicit IdleJob(Session *session); - virtual ~IdleJob(); + ~IdleJob() override; /** * The last mailbox status that was reported. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/job.h new/kimap-18.04.0/src/job.h --- old/kimap-17.12.3/src/job.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/job.h 2018-04-10 13:51:17.000000000 +0200 @@ -40,7 +40,7 @@ friend class SessionPrivate; public: - virtual ~Job(); + ~Job() override; Session *session() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/listjob.cpp new/kimap-18.04.0/src/listjob.cpp --- old/kimap-17.12.3/src/listjob.cpp 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/listjob.cpp 2018-04-10 13:51:17.000000000 +0200 @@ -129,7 +129,6 @@ Q_D(ListJob); switch (d->option) { - break; case IncludeUnsubscribed: d->command = "LIST"; break; @@ -137,7 +136,6 @@ d->command = "XLIST"; break; case NoOption: - default: d->command = "LSUB"; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/listjob.h new/kimap-18.04.0/src/listjob.h --- old/kimap-17.12.3/src/listjob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/listjob.h 2018-04-10 13:51:17.000000000 +0200 @@ -62,7 +62,7 @@ }; explicit ListJob(Session *session); - virtual ~ListJob(); + ~ListJob() override; KIMAP_DEPRECATED void setIncludeUnsubscribed(bool include); KIMAP_DEPRECATED bool isIncludeUnsubscribed() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/listrightsjob.cpp new/kimap-18.04.0/src/listrightsjob.cpp --- old/kimap-17.12.3/src/listrightsjob.cpp 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/listrightsjob.cpp 2018-04-10 13:51:17.000000000 +0200 @@ -34,8 +34,8 @@ ListRightsJobPrivate(Session *session, const QString &name) : AclJobBasePrivate(session, name), defaultRights(Acl::None) {} ~ListRightsJobPrivate() { } - Acl::Rights defaultRights; QList<Acl::Rights> possibleRights; + Acl::Rights defaultRights; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/listrightsjob.h new/kimap-18.04.0/src/listrightsjob.h --- old/kimap-17.12.3/src/listrightsjob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/listrightsjob.h 2018-04-10 13:51:17.000000000 +0200 @@ -55,7 +55,7 @@ public: explicit ListRightsJob(Session *session); - virtual ~ListRightsJob(); + ~ListRightsJob() override; /** * Sets the identifier that should be looked up diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/loginjob.cpp new/kimap-18.04.0/src/loginjob.cpp --- old/kimap-17.12.3/src/loginjob.cpp 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/loginjob.cpp 2018-04-10 13:51:17.000000000 +0200 @@ -466,7 +466,7 @@ do { qCDebug(KIMAP_LOG) << "Trying authmod" << authMode.toLatin1(); - result = sasl_client_start(conn, authMode.toLatin1().constData(), &client_interact, capabilities.contains(QStringLiteral("SASL-IR")) ? &out : nullptr, &outlen, &mechusing); + result = sasl_client_start(conn, authMode.toLatin1().constData(), &client_interact, capabilities.contains(QLatin1String("SASL-IR")) ? &out : nullptr, &outlen, &mechusing); if (result == SASL_INTERACT) { if (!sasl_interact()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/loginjob.h new/kimap-18.04.0/src/loginjob.h --- old/kimap-17.12.3/src/loginjob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/loginjob.h 2018-04-10 13:51:17.000000000 +0200 @@ -66,7 +66,7 @@ }; explicit LoginJob(Session *session); - virtual ~LoginJob(); + ~LoginJob() override; QString userName() const; void setUserName(const QString &userName); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/logoutjob.h new/kimap-18.04.0/src/logoutjob.h --- old/kimap-17.12.3/src/logoutjob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/logoutjob.h 2018-04-10 13:51:17.000000000 +0200 @@ -39,7 +39,7 @@ public: explicit LogoutJob(Session *session); - virtual ~LogoutJob(); + ~LogoutJob() override; protected: void doStart() override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/metadatajobbase.h new/kimap-18.04.0/src/metadatajobbase.h --- old/kimap-17.12.3/src/metadatajobbase.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/metadatajobbase.h 2018-04-10 13:51:17.000000000 +0200 @@ -54,7 +54,7 @@ public: explicit MetaDataJobBase(Session *session); - virtual ~MetaDataJobBase(); + ~MetaDataJobBase() override; /** * Represents the capability level of the server. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/movejob.cpp new/kimap-18.04.0/src/movejob.cpp --- old/kimap-17.12.3/src/movejob.cpp 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/movejob.cpp 2018-04-10 13:51:17.000000000 +0200 @@ -43,8 +43,8 @@ QString mailBox; ImapSet set; - bool uidBased; ImapSet resultingUids; + bool uidBased; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/movejob.h new/kimap-18.04.0/src/movejob.h --- old/kimap-17.12.3/src/movejob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/movejob.h 2018-04-10 13:51:17.000000000 +0200 @@ -51,7 +51,7 @@ public: explicit MoveJob(Session *session); - virtual ~MoveJob(); + ~MoveJob() override; /** * Set the destination mailbox diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/myrightsjob.h new/kimap-18.04.0/src/myrightsjob.h --- old/kimap-17.12.3/src/myrightsjob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/myrightsjob.h 2018-04-10 13:51:17.000000000 +0200 @@ -63,7 +63,7 @@ public: explicit MyRightsJob(Session *session); - virtual ~MyRightsJob(); + ~MyRightsJob() override; /** * Check whether the current user has the a particular right diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/namespacejob.h new/kimap-18.04.0/src/namespacejob.h --- old/kimap-17.12.3/src/namespacejob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/namespacejob.h 2018-04-10 13:51:17.000000000 +0200 @@ -41,7 +41,7 @@ public: NamespaceJob(Session *session); - virtual ~NamespaceJob(); + ~NamespaceJob() override; QList<MailBoxDescriptor> personalNamespaces() const; QList<MailBoxDescriptor> userNamespaces() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/quotajobbase.h new/kimap-18.04.0/src/quotajobbase.h --- old/kimap-17.12.3/src/quotajobbase.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/quotajobbase.h 2018-04-10 13:51:17.000000000 +0200 @@ -49,7 +49,7 @@ public: explicit QuotaJobBase(Session *session); - virtual ~QuotaJobBase(); + ~QuotaJobBase() override; /** * Get the current usage for a resource. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/renamejob.h new/kimap-18.04.0/src/renamejob.h --- old/kimap-17.12.3/src/renamejob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/renamejob.h 2018-04-10 13:51:17.000000000 +0200 @@ -39,7 +39,7 @@ public: explicit RenameJob(Session *session); - virtual ~RenameJob(); + ~RenameJob() override; /** * Set the name of the mailbox that will be renamed. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/rfccodecs.cpp new/kimap-18.04.0/src/rfccodecs.cpp --- old/kimap-17.12.3/src/rfccodecs.cpp 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/rfccodecs.cpp 2018-04-10 13:51:17.000000000 +0200 @@ -159,7 +159,7 @@ QByteArray KIMAP::quoteIMAP(const QByteArray &src) { - uint len = src.length(); + int len = src.length(); QByteArray result; result.reserve(2 * len); for (unsigned int i = 0; i < len; i++) { @@ -322,7 +322,7 @@ QString &language) { //do we have a rfc string - if (!str.contains(QStringLiteral("=?"))) { + if (!str.contains(QLatin1String("=?"))) { return str; } @@ -390,7 +390,7 @@ if (valid) { ch = *pos; *pos = '\0'; - cstr = QByteArray(mid).left((int)(mid - pos - 1)); + cstr = QByteArray(mid).left(static_cast<int>(mid - pos - 1)); if (encoding == 'Q') { // decode quoted printable text for (i = cstr.length() - 1; i >= 0; --i) { @@ -636,7 +636,7 @@ char ch, ch2; p = 0; - while (p < (int) st.length()) { + while (p < st.length()) { if (st.at(p) == 37) { ch = st.at(p + 1).toLatin1() - 48; if (ch > 16) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/searchjob.h new/kimap-18.04.0/src/searchjob.h --- old/kimap-17.12.3/src/searchjob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/searchjob.h 2018-04-10 13:51:17.000000000 +0200 @@ -169,7 +169,7 @@ }; explicit SearchJob(Session *session); - virtual ~SearchJob(); + ~SearchJob() override; void setUidBased(bool uidBased); bool isUidBased() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/selectjob.h new/kimap-18.04.0/src/selectjob.h --- old/kimap-17.12.3/src/selectjob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/selectjob.h 2018-04-10 13:51:17.000000000 +0200 @@ -40,7 +40,7 @@ public: explicit SelectJob(Session *session); - virtual ~SelectJob(); + ~SelectJob() override; void setMailBox(const QString &mailBox); QString mailBox() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/session.cpp new/kimap-18.04.0/src/session.cpp --- old/kimap-17.12.3/src/session.cpp 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/session.cpp 2018-04-10 13:51:17.000000000 +0200 @@ -168,7 +168,11 @@ void SessionPrivate::startNext() { +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + QMetaObject::invokeMethod(this, &SessionPrivate::doStartNext); +#else QMetaObject::invokeMethod(this, "doStartNext"); +#endif } void SessionPrivate::doStartNext() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/session_p.h new/kimap-18.04.0/src/session_p.h --- old/kimap-17.12.3/src/session_p.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/session_p.h 2018-04-10 13:51:17.000000000 +0200 @@ -48,7 +48,7 @@ public: explicit SessionPrivate(Session *session); - virtual ~SessionPrivate(); + ~SessionPrivate() override; void addJob(Job *job); QByteArray sendCommand(const QByteArray &command, const QByteArray &args = QByteArray()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/sessionthread.cpp new/kimap-18.04.0/src/sessionthread.cpp --- old/kimap-17.12.3/src/sessionthread.cpp 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/sessionthread.cpp 2018-04-10 13:51:17.000000000 +0200 @@ -44,12 +44,21 @@ QThread *thread = new QThread(); moveToThread(thread); thread->start(); +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + QMetaObject::invokeMethod(this, &SessionThread::threadInit); +#else QMetaObject::invokeMethod(this, "threadInit"); +#endif + } SessionThread::~SessionThread() { +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + QMetaObject::invokeMethod(this, &SessionThread::threadQuit); +#else QMetaObject::invokeMethod(this, "threadQuit"); +#endif if (!thread()->wait(10 * 1000)) { qCWarning(KIMAP_LOG) << "Session thread refuses to die, killing harder..."; thread()->terminate(); @@ -65,7 +74,11 @@ QMutexLocker locker(&m_mutex); m_dataQueue.enqueue(payload); +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + QMetaObject::invokeMethod(this, &SessionThread::writeDataQueue); +#else QMetaObject::invokeMethod(this, "writeDataQueue"); +#endif } // Called in secondary thread @@ -130,7 +143,11 @@ } if (m_stream->availableDataSize() > 1) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + QMetaObject::invokeMethod(this, &SessionThread::readMessage, Qt::QueuedConnection); +#else QMetaObject::invokeMethod(this, "readMessage", Qt::QueuedConnection); +#endif } } @@ -138,7 +155,11 @@ // Called in main thread void SessionThread::closeSocket() { +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + QMetaObject::invokeMethod(this, &SessionThread::doCloseSocket, Qt::QueuedConnection); +#else QMetaObject::invokeMethod(this, "doCloseSocket", Qt::QueuedConnection); +#endif } // Called in secondary thread @@ -196,8 +217,11 @@ } connect(m_socket, &QIODevice::readyRead, this, &SessionThread::socketActivity); - +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + QMetaObject::invokeMethod(this, &SessionThread::reconnect, Qt::QueuedConnection); +#else QMetaObject::invokeMethod(this, "reconnect", Qt::QueuedConnection); +#endif } // Called in secondary thread @@ -214,7 +238,11 @@ // Called in primary thread void SessionThread::startSsl(KTcpSocket::SslVersion version) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + QMetaObject::invokeMethod(this, [this, version]() { doStartSsl(version); }); +#else QMetaObject::invokeMethod(this, "doStartSsl", Q_ARG(KTcpSocket::SslVersion, version)); +#endif } // Called in secondary thread (via invokeMethod) @@ -277,7 +305,12 @@ void SessionThread::sslErrorHandlerResponse(bool response) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + QMetaObject::invokeMethod(this, [this, response]() { doSslErrorHandlerResponse(response); }); +#else QMetaObject::invokeMethod(this, "doSslErrorHandlerResponse", Q_ARG(bool, response)); +#endif + } // Called in secondary thread (via invokeMethod) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/setacljob.h new/kimap-18.04.0/src/setacljob.h --- old/kimap-17.12.3/src/setacljob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/setacljob.h 2018-04-10 13:51:17.000000000 +0200 @@ -50,7 +50,7 @@ public: explicit SetAclJob(Session *session); - virtual ~SetAclJob(); + ~SetAclJob() override; /** * Sets the rights that will be changed for the identifier diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/setmetadatajob.h new/kimap-18.04.0/src/setmetadatajob.h --- old/kimap-17.12.3/src/setmetadatajob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/setmetadatajob.h 2018-04-10 13:51:17.000000000 +0200 @@ -75,7 +75,7 @@ public: explicit SetMetaDataJob(Session *session); - virtual ~SetMetaDataJob(); + ~SetMetaDataJob() override; /** * Adds a metadata entry or attribute to the list of modifications to make diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/setquotajob.h new/kimap-18.04.0/src/setquotajob.h --- old/kimap-17.12.3/src/setquotajob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/setquotajob.h 2018-04-10 13:51:17.000000000 +0200 @@ -57,7 +57,7 @@ public: explicit SetQuotaJob(Session *session); - virtual ~SetQuotaJob(); + ~SetQuotaJob() override; /** * Set a limit for a quota resource. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/storejob.h new/kimap-18.04.0/src/storejob.h --- old/kimap-17.12.3/src/storejob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/storejob.h 2018-04-10 13:51:17.000000000 +0200 @@ -49,7 +49,7 @@ }; explicit StoreJob(Session *session); - virtual ~StoreJob(); + ~StoreJob() override; void setSequenceSet(const ImapSet &set); ImapSet sequenceSet() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/subscribejob.h new/kimap-18.04.0/src/subscribejob.h --- old/kimap-17.12.3/src/subscribejob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/subscribejob.h 2018-04-10 13:51:17.000000000 +0200 @@ -39,7 +39,7 @@ public: explicit SubscribeJob(Session *session); - virtual ~SubscribeJob(); + ~SubscribeJob() override; void setMailBox(const QString &mailBox); QString mailBox() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/src/unsubscribejob.h new/kimap-18.04.0/src/unsubscribejob.h --- old/kimap-17.12.3/src/unsubscribejob.h 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/src/unsubscribejob.h 2018-04-10 13:51:17.000000000 +0200 @@ -39,7 +39,7 @@ public: explicit UnsubscribeJob(Session *session); - virtual ~UnsubscribeJob(); + ~UnsubscribeJob() override; void setMailBox(const QString &mailBox); QString mailBox() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-17.12.3/tests/testimapidle.cpp new/kimap-18.04.0/tests/testimapidle.cpp --- old/kimap-17.12.3/tests/testimapidle.cpp 2018-02-26 06:43:04.000000000 +0100 +++ new/kimap-18.04.0/tests/testimapidle.cpp 2018-04-10 13:51:17.000000000 +0200 @@ -86,7 +86,7 @@ qDebug() << capabilities->capabilities(); qDebug(); - Q_ASSERT(capabilities->capabilities().contains(QStringLiteral("IDLE"))); + Q_ASSERT(capabilities->capabilities().contains(QLatin1String("IDLE"))); qDebug() << "Selecting INBOX:"; SelectJob *select = new SelectJob(&session);
