Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kmime for openSUSE:Factory checked in at 2021-08-16 10:06:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmime (Old) and /work/SRC/openSUSE:Factory/.kmime.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmime" Mon Aug 16 10:06:38 2021 rev:73 rq:911701 version:21.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kmime/kmime.changes 2021-07-09 23:59:02.616662482 +0200 +++ /work/SRC/openSUSE:Factory/.kmime.new.1899/kmime.changes 2021-08-16 10:07:54.547358980 +0200 @@ -1,0 +2,25 @@ +Fri Aug 6 09:39:21 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.08.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/21.08.0 +- No code change since 21.07.90 + +------------------------------------------------------------------- +Fri Jul 30 10:05:11 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.07.90 + * New feature release +- No code change since 21.07.80 + +------------------------------------------------------------------- +Sat Jul 17 20:06:18 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.07.80 + * New feature release +- Changes since 21.04.3: + * Use more target-centric cmake code +- Only install the license files once + +------------------------------------------------------------------- Old: ---- kmime-21.04.3.tar.xz kmime-21.04.3.tar.xz.sig New: ---- kmime-21.08.0.tar.xz kmime-21.08.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmime.spec ++++++ --- /var/tmp/diff_new_pack.4se8Ia/_old 2021-08-16 10:07:56.755356338 +0200 +++ /var/tmp/diff_new_pack.4se8Ia/_new 2021-08-16 10:07:56.759356333 +0200 @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kmime -Version: 21.04.3 +Version: 21.08.0 Release: 0 Summary: KDE PIM libraries MIME support License: LGPL-2.1-or-later @@ -84,7 +84,6 @@ %{_kf5_debugdir}/kmime.categories %files devel -%license LICENSES/* %{_kf5_cmakedir}/KF5Mime/ %{_kf5_includedir}/KMime/ %{_kf5_includedir}/kmime_version.h @@ -93,7 +92,6 @@ %if %{with lang} %files lang -f %{name}.lang -%license LICENSES/* %endif %changelog ++++++ kmime-21.04.3.tar.xz -> kmime-21.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/.gitignore new/kmime-21.08.0/.gitignore --- old/kmime-21.04.3/.gitignore 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/.gitignore 2021-07-30 14:44:45.000000000 +0200 @@ -19,3 +19,8 @@ CMakeLists.txt.user* *.unc-backup* compile_commands.json +.clang-format +.clangd +.idea +/cmake-build* +.cache diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/CMakeLists.txt new/kmime-21.08.0/CMakeLists.txt --- old/kmime-21.04.3/CMakeLists.txt 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/CMakeLists.txt 2021-07-30 14:44:45.000000000 +0200 @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.5 FATAL_ERROR) -set(PIM_VERSION "5.17.3") +cmake_minimum_required(VERSION 3.16 FATAL_ERROR) +set(PIM_VERSION "5.18.0") project(KMime VERSION ${PIM_VERSION}) # ECM setup -set(KF5_MIN_VERSION "5.79.0") +set(KF5_MIN_VERSION "5.83.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${KMime_SOURCE_DIR}/cmake ${ECM_MODULE_PATH}) @@ -23,7 +23,7 @@ set(KMIME_LIB_VERSION ${PIM_VERSION}) -set(QT_REQUIRED_VERSION "5.14.0") +set(QT_REQUIRED_VERSION "5.15.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core) ecm_setup_version(PROJECT VARIABLE_PREFIX KMIME @@ -37,18 +37,14 @@ find_package(KF5Codecs ${KF5_MIN_VERSION} CONFIG REQUIRED) add_definitions(-DTRANSLATION_DOMAIN=\"libkmime5\") add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055000) -set(CMAKE_CXX_STANDARD 14) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055400) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" FALSE) +option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF) -set(COMPILE_WITH_UNITY_CMAKE_SUPPORT false) +set(COMPILE_WITH_UNITY_CMAKE_SUPPORT OFF) if (USE_UNITY_CMAKE_SUPPORT) - if(${CMAKE_VERSION} VERSION_LESS "3.16.0") - message(STATUS "CMAKE version is less than 3.16.0 . We can't use cmake unify build support") - else() - set(COMPILE_WITH_UNITY_CMAKE_SUPPORT true) - endif() + set(COMPILE_WITH_UNITY_CMAKE_SUPPORT ON) endif() ########### Targets ########### add_subdirectory(src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/CMakePresets.json new/kmime-21.08.0/CMakePresets.json --- old/kmime-21.04.3/CMakePresets.json 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/CMakePresets.json 2021-07-30 14:44:45.000000000 +0200 @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "configurePresets": [ { "name": "dev", @@ -23,6 +23,20 @@ } }, { + "name": "dev-clang", + "displayName": "dev-clang", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-clang", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "environment": { + "CXX": "clang++", + "CCACHE_DISABLE": "ON" + } + }, + { "name": "unity", "displayName": "Build with CMake unity support.", "generator": "Ninja", @@ -51,6 +65,64 @@ "CMAKE_BUILD_TYPE": "RelWithDebInfo", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" } + }, + { + "name": "clazy", + "displayName": "clazy", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-clazy", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug" + }, + "environment": { + "CXX": "clazy", + "CCACHE_DISABLE": "ON" + } + } + + ], + "buildPresets": [ + { + "name": "dev", + "configurePreset": "dev" + }, + { + "name": "release", + "configurePreset": "release" + }, + { + "name": "dev-clang", + "configurePreset": "dev-clang" + }, + { + "name": "asan", + "configurePreset": "asan" + }, + { + "name": "unity", + "configurePreset": "unity" + }, + { + "name": "clazy", + "configurePreset": "clazy", + "environment": { + "CLAZY_CHECKS" : "level0,level1,detaching-member,ifndef-define-typo,isempty-vs-count,qrequiredresult-candidates,reserve-candidates,signal-with-return-value,unneeded-cast,function-args-by-ref,function-args-by-value,returning-void-expression,no-ctor-missing-parent-argument,isempty-vs-count,qhash-with-char-pointer-key,raw-environment-function,qproperty-type-mismatch,old-style-connect,qstring-allocations,container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,qstring-varargs,level2,detaching-member,heap-allocated-small-trivial-type,isempty-vs-count,qstring-varargs,qvariant-template-instantiation,raw-environment-function,reserve-candidates,signal-with-return-value,thread-with-slots,no-ctor-missing-parent-argument,no-missing-typeinfo", + "CCACHE_DISABLE" : "ON" + } } + ], + "testPresets": [ + { + "name": "dev", + "configurePreset": "dev", + "output": {"outputOnFailure": true}, + "execution": {"noTestsAction": "error", "stopOnFailure": false} + }, + { + "name": "asan", + "configurePreset": "asan", + "output": {"outputOnFailure": true}, + "execution": {"noTestsAction": "error", "stopOnFailure": true} + } ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/autotests/CMakeLists.txt new/kmime-21.08.0/autotests/CMakeLists.txt --- old/kmime-21.04.3/autotests/CMakeLists.txt 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/autotests/CMakeLists.txt 2021-07-30 14:44:45.000000000 +0200 @@ -18,7 +18,7 @@ add_test(NAME kmime-${_testName} COMMAND ${_testName}) target_link_libraries(${_testName} KF5Mime - Qt5::Test + Qt::Test KF5::Codecs ) set_target_properties(${_testName} PROPERTIES COMPILE_FLAGS -DTEST_DATA_DIR="\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\"" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/autotests/attachmenttest.h new/kmime-21.08.0/autotests/attachmenttest.h --- old/kmime-21.04.3/autotests/attachmenttest.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/autotests/attachmenttest.h 2021-07-30 14:44:45.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef UTIL_TEST_H -#define UTIL_TEST_H +#pragma once #include <QObject> @@ -23,5 +22,4 @@ void testAttachment2(); }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/autotests/charfreqtest.h new/kmime-21.08.0/autotests/charfreqtest.h --- old/kmime-21.04.3/autotests/charfreqtest.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/autotests/charfreqtest.h 2021-07-30 14:44:45.000000000 +0200 @@ -3,8 +3,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef CHARSET_TEST_H -#define CHARSET_TEST_H +#pragma once #include <QObject> @@ -20,4 +19,3 @@ void testLeadingFrom(); }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/autotests/contentindextest.h new/kmime-21.08.0/autotests/contentindextest.h --- old/kmime-21.04.3/autotests/contentindextest.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/autotests/contentindextest.h 2021-07-30 14:44:45.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef CONTENTINDEXTEXT_H -#define CONTENTINDEXTEXT_H +#pragma once #include <QObject> @@ -19,4 +18,3 @@ void testNavigation(); }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/autotests/contenttest.h new/kmime-21.08.0/autotests/contenttest.h --- old/kmime-21.04.3/autotests/contenttest.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/autotests/contenttest.h 2021-07-30 14:44:45.000000000 +0200 @@ -3,8 +3,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef CONTENT_TEST_H -#define CONTENT_TEST_H +#pragma once #include <QObject> @@ -35,4 +34,3 @@ void testContentTypeMimetype(); }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/autotests/headerfactorytest.h new/kmime-21.08.0/autotests/headerfactorytest.h --- old/kmime-21.04.3/autotests/headerfactorytest.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/autotests/headerfactorytest.h 2021-07-30 14:44:45.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef HEADERFACTORYTEST_H -#define HEADERFACTORYTEST_H +#pragma once #include <QObject> @@ -16,4 +15,3 @@ void testBuiltInHeaders(); }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/autotests/headertest.h new/kmime-21.08.0/autotests/headertest.h --- old/kmime-21.04.3/autotests/headertest.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/autotests/headertest.h 2021-07-30 14:44:45.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef HEADERTEST_H -#define HEADERTEST_H +#pragma once #include <QObject> @@ -42,4 +41,3 @@ void noAbstractHeaders(); }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/autotests/messagetest.h new/kmime-21.08.0/autotests/messagetest.h --- old/kmime-21.04.3/autotests/messagetest.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/autotests/messagetest.h 2021-07-30 14:44:45.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef MESSAGE_TEST_H -#define MESSAGE_TEST_H +#pragma once #include "kmime_message.h" #include <QObject> @@ -44,4 +43,3 @@ KMime::Message::Ptr readAndParseMail(const QString &mailFile) const; }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/autotests/parsedatetimetest.h new/kmime-21.08.0/autotests/parsedatetimetest.h --- old/kmime-21.04.3/autotests/parsedatetimetest.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/autotests/parsedatetimetest.h 2021-07-30 14:44:45.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef PARSEDATETIMETEST_H -#define PARSEDATETIMETEST_H +#pragma once #include <QObject> @@ -17,4 +16,3 @@ void testParseDateTime_data(); }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/autotests/rfc2047test.h new/kmime-21.08.0/autotests/rfc2047test.h --- old/kmime-21.04.3/autotests/rfc2047test.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/autotests/rfc2047test.h 2021-07-30 14:44:45.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef RFC2047TEST_H -#define RFC2047TEST_H +#pragma once #include <QObject> @@ -16,5 +15,4 @@ void testRFC2047encode(); }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/autotests/rfc2231test.h new/kmime-21.08.0/autotests/rfc2231test.h --- old/kmime-21.04.3/autotests/rfc2231test.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/autotests/rfc2231test.h 2021-07-30 14:44:45.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.0-only */ -#ifndef RFC2231TEST_H -#define RFC2231TEST_H +#pragma once #include <QObject> @@ -18,5 +17,4 @@ void testRFC2231encode(); }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/autotests/utiltest.h new/kmime-21.08.0/autotests/utiltest.h --- old/kmime-21.04.3/autotests/utiltest.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/autotests/utiltest.h 2021-07-30 14:44:45.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef UTIL_TEST_H -#define UTIL_TEST_H +#pragma once #include <QObject> @@ -28,5 +27,4 @@ void testLFCRLF_performance(); }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/metainfo.yaml.license new/kmime-21.08.0/metainfo.yaml.license --- old/kmime-21.04.3/metainfo.yaml.license 1970-01-01 01:00:00.000000000 +0100 +++ new/kmime-21.08.0/metainfo.yaml.license 2021-07-30 14:44:45.000000000 +0200 @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: none +SPDX-License-Identifier: CC0-1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/po/ar/libkmime5.po new/kmime-21.08.0/po/ar/libkmime5.po --- old/kmime-21.04.3/po/ar/libkmime5.po 2021-07-06 07:26:48.000000000 +0200 +++ new/kmime-21.08.0/po/ar/libkmime5.po 2021-08-06 02:22:39.000000000 +0200 @@ -2,21 +2,22 @@ # ???????? ?????? Mohamed SAAD <[email protected]>, 2006. # Youssef Chahibi <[email protected]>, 2007. # Safa Alfulaij <[email protected]>, 2018. +# Zayed Al-Saidi <[email protected]>, 2021. msgid "" msgstr "" "Project-Id-Version: libkmime\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-01-19 02:42+0100\n" -"PO-Revision-Date: 2018-02-01 00:08+0300\n" -"Last-Translator: Safa Alfulaij <[email protected]>\n" -"Language-Team: Arabic <[email protected]>\n" +"PO-Revision-Date: 2021-06-19 21:22+0400\n" +"Last-Translator: Zayed Al-Saidi <[email protected]>\n" +"Language-Team: Arabic <[email protected]>\n" "Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 21.07.70\n" #: kmime_dateformatter.cpp:250 #, kde-format @@ -89,7 +90,7 @@ "???????? ???????????? ?????? ???????????? ???????? ???? ?????? ????." #: kmime_mdn.cpp:80 -#, fuzzy, kde-format +#, kde-format msgid "" "Generation of a Message Disposition Notification for the message sent on " "${date} to ${to} with subject \"${subject}\" failed. Reason is given in the " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/po/hi/libkmime5.po new/kmime-21.08.0/po/hi/libkmime5.po --- old/kmime-21.04.3/po/hi/libkmime5.po 2021-07-06 07:26:48.000000000 +0200 +++ new/kmime-21.08.0/po/hi/libkmime5.po 2021-08-06 02:22:40.000000000 +0200 @@ -4,13 +4,14 @@ # # Ravishankar Shrivastava <[email protected]>, 2008. # G Karunakar <[email protected]>, 2020. +# Sameer Singh <[email protected]>, 2021. # Raghavendra Kamath <[email protected]>, 2021. msgid "" msgstr "" "Project-Id-Version: libkmime\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-01-19 02:42+0100\n" -"PO-Revision-Date: 2021-06-29 18:30+0530\n" +"PO-Revision-Date: 2021-06-27 14:20+0530\n" "Last-Translator: Raghavendra Kamath <[email protected]>\n" "Language-Team: kde-hindi\n" "Language: hi\n" @@ -48,8 +49,8 @@ "The message sent on ${date} to ${to} with subject \"${subject}\" has been " "displayed. This is no guarantee that the message has been read or understood." msgstr "" -"?????? ?????????????????? ${date} ?????? ${to} ?????? \"${subject}\" ???????????? ?????? ????????? ??????????????????????????? ???????????? ???????????????." -"???????????? ????????? ????????????????????? ???????????? ?????? ?????? ?????????????????? ?????? ???????????? ?????? ???????????? ????????? ??????." +"?????? ?????????????????? ${date} ?????? ${to} ?????? \"${subject}\" ???????????? ?????? ????????? ??????????????????????????? ???????????? ?????????????????? " +"???????????? ????????? ????????????????????? ???????????? ?????? ?????? ?????????????????? ?????? ???????????? ?????? ???????????? ????????? ?????????" #: kmime_mdn.cpp:56 #, kde-format @@ -59,8 +60,8 @@ "\" and nonetheless read later on." msgstr "" "?????? ?????????????????? ${date} ?????? ${to} ?????? \"${subject}\" ???????????? ?????? ????????? ???????????? ???????????? ????????? ???????????? ????????? " -"?????? ???????????? ????????? ????????????????????? ???????????? ?????? ?????? ?????????????????? ????????? ????????? ???????????? ???????????? ???????????? ?????? ?????? ????????? ????????? ???????????? ???????????? " -"??????????????? ." +"????????? ???????????? ????????? ????????????????????? ???????????? ?????? ?????? ?????????????????? ????????? ????????? ???????????? ???????????? ???????????? ?????? ?????? ????????? ????????? ???????????? ???????????? " +"??????????????????" #: kmime_mdn.cpp:63 #, kde-format @@ -68,8 +69,8 @@ "The message sent on ${date} to ${to} with subject \"${subject}\" has been " "dispatched. This is no guarantee that the message will not be read later on." msgstr "" -"?????? ?????????????????? ${date} ?????? ${to} ?????? \"${subject}\" ???????????? ?????? ????????? ????????? ???????????? ????????? ??????. ???????????? " -"????????? ????????????????????? ???????????? ?????? ?????? ?????????????????? ????????? ????????? ????????? ????????? ???????????? ???????????? ???????????????." +"?????? ?????????????????? ${date} ?????? ${to} ?????? \"${subject}\" ???????????? ?????? ????????? ????????? ???????????? ????????? ????????? ???????????? " +"????????? ????????????????????? ???????????? ?????? ?????? ?????????????????? ????????? ????????? ???????????? ???????????? ??????????????????" #: kmime_mdn.cpp:69 #, kde-format @@ -78,7 +79,7 @@ "processed by some automatic means." msgstr "" "${date} ?????? ${to} ?????? \"${subject}\" ???????????? ?????? ????????? ???????????? ?????? ?????????????????? ????????????????????? ?????????????????? ?????? " -"????????????????????? ?????? ????????? ??????." +"????????????????????? ?????? ????????? ?????????" #: kmime_mdn.cpp:74 #, kde-format @@ -87,8 +88,8 @@ "acted upon. The sender does not wish to disclose more details to you than " "that." msgstr "" -"${date} ?????? ${to} ?????? \"${subject}\" ???????????? ?????? ????????? ???????????? ?????? ?????????????????? ?????? ?????????????????? ?????? ?????? ??????." -"?????????????????? ???????????? ???????????? ????????? ?????? ????????? ??????????????? ???????????? ???????????????." +"${date} ?????? ${to} ?????? \"${subject}\" ???????????? ?????? ????????? ???????????? ?????? ?????????????????? ?????? ?????????????????? ?????? ?????? ????????? " +"?????????????????? ???????????? ???????????? ????????? ?????? ????????? ??????????????? ???????????? ??????????????????" #: kmime_mdn.cpp:80 #, kde-format @@ -98,4 +99,4 @@ "Failure: header field below." msgstr "" "${date} ?????? ${to} ??????, \"${subject}\" ???????????? ?????? ????????? ???????????? ?????? ?????????????????? ?????? ????????????????????? ??????????????? ?????? " -"???????????? ???????????? ?????? ????????? ??????.???????????? ???????????? ?????????????????????????????? ??????." +"???????????? ???????????? ?????? ????????? ????????? ???????????? ???????????? ?????????????????????????????? ?????????" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/po/zh_CN/libkmime5.po new/kmime-21.08.0/po/zh_CN/libkmime5.po --- old/kmime-21.04.3/po/zh_CN/libkmime5.po 2021-07-06 07:26:48.000000000 +0200 +++ new/kmime-21.08.0/po/zh_CN/libkmime5.po 2021-08-06 02:22:40.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-01-19 02:42+0100\n" -"PO-Revision-Date: 2021-06-20 07:37\n" +"PO-Revision-Date: 2021-07-26 13:49\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/sanitizers.supp new/kmime-21.08.0/sanitizers.supp --- old/kmime-21.04.3/sanitizers.supp 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/sanitizers.supp 2021-07-30 14:44:45.000000000 +0200 @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: 2021 Laurent Montel <[email protected]> +# SPDX-License-Identifier: CC0-1.0 # Suppression file for ASAN/LSAN leak:libspeechd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/src/CMakeLists.txt new/kmime-21.08.0/src/CMakeLists.txt --- old/kmime-21.04.3/src/CMakeLists.txt 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/src/CMakeLists.txt 2021-07-30 14:44:45.000000000 +0200 @@ -6,8 +6,10 @@ kde_enable_exceptions() ########### next target ############### +add_library(KF5Mime) +add_library(KF5::Mime ALIAS KF5Mime) -set(kmime_LIB_SRCS +target_sources(KF5Mime PRIVATE kmime_charfreq.cpp kmime_util.cpp kmime_mdn.cpp @@ -24,21 +26,17 @@ kmime_types.cpp ) - -ecm_qt_declare_logging_category(kmime_LIB_SRCS +ecm_qt_declare_logging_category(KF5Mime HEADER kmime_debug.h IDENTIFIER KMIME_LOG CATEGORY_NAME org.kde.pim.kmime DESCRIPTION "kmime (pim lib)" EXPORT KMIME) -add_library(KF5Mime ${kmime_LIB_SRCS}) if (COMPILE_WITH_UNITY_CMAKE_SUPPORT) set_target_properties(KF5Mime PROPERTIES UNITY_BUILD ON) endif() generate_export_header(KF5Mime BASE_NAME KMime) -add_library(KF5::Mime ALIAS KF5Mime) - target_include_directories(KF5Mime INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KMime>") target_include_directories(KF5Mime PUBLIC "$<BUILD_INTERFACE:${KMime_SOURCE_DIR}/src;${KMime_BINARY_DIR}/src;${KMime_BINARY_DIR}>") @@ -48,7 +46,7 @@ target_link_libraries(KF5Mime PUBLIC - Qt5::Core + Qt::Core PRIVATE KF5::I18n KF5::Codecs @@ -56,7 +54,7 @@ ) set_target_properties(KF5Mime PROPERTIES - VERSION ${KMIME_VERSION_STRING} + VERSION ${KMIME_VERSION} SOVERSION ${KMIME_SOVERSION} EXPORT_NAME Mime ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/src/kmime_charfreq.h new/kmime-21.08.0/src/kmime_charfreq.h --- old/kmime-21.04.3/src/kmime_charfreq.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/src/kmime_charfreq.h 2021-07-30 14:44:45.000000000 +0200 @@ -41,8 +41,7 @@ no lines longer than 998 characters, and either only LFs, or only CRLFs. */ -#ifndef __KMIME_CHARFREQ_H__ -#define __KMIME_CHARFREQ_H__ +#pragma once #include <QByteArray> #undef None @@ -169,4 +168,3 @@ } // namespace KMime -#endif /* __KMIME_CHARFREQ_H__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/src/kmime_codecs.h new/kmime-21.08.0/src/kmime_codecs.h --- old/kmime-21.04.3/src/kmime_codecs.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/src/kmime_codecs.h 2021-07-30 14:44:45.000000000 +0200 @@ -7,8 +7,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef __KMIME_CODECS_H__ -#define __KMIME_CODECS_H__ +#pragma once #include <QByteArray> #include <QString> @@ -66,4 +65,3 @@ } // namespace KMime -#endif /* __KMIME_CODEC_H__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/src/kmime_content.cpp new/kmime-21.08.0/src/kmime_content.cpp --- old/kmime-21.04.3/src/kmime_content.cpp 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/src/kmime_content.cpp 2021-07-30 14:44:45.000000000 +0200 @@ -197,7 +197,7 @@ { Q_D(Content); QByteArray newHead; - for (const Headers::Base *h : qAsConst(d->headers)) { + for (const Headers::Base *h : std::as_const(d->headers)) { if (!h->isEmpty()) { newHead += h->as7BitString() + '\n'; } @@ -296,7 +296,7 @@ } //add all (encoded) contents separated by boundaries - for (Content *c : qAsConst(d->multipartContents)) { + for (Content *c : std::as_const(d->multipartContents)) { e += boundary + '\n'; e += c->encodedContent(false); // don't convert LFs here, we do that later!!!!! } @@ -612,7 +612,7 @@ { Q_ASSERT(type && *type); - for (Headers::Base *h : qAsConst(d_ptr->headers)) { + for (Headers::Base *h : std::as_const(d_ptr->headers)) { if (h->is(type)) { return h; // Found. } @@ -627,7 +627,7 @@ QVector<Headers::Base*> result; - for (Headers::Base *h : qAsConst(d_ptr->headers)) { + for (Headers::Base *h : std::as_const(d_ptr->headers)) { if (h->is(type)) { result << h; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/src/kmime_content.h new/kmime-21.08.0/src/kmime_content.h --- old/kmime-21.04.3/src/kmime_content.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/src/kmime_content.h 2021-07-30 14:44:45.000000000 +0200 @@ -32,8 +32,7 @@ broken-down object representation */ -#ifndef __KMIME_CONTENT_H__ -#define __KMIME_CONTENT_H__ +#pragma once #include "kmime_export.h" #include "kmime_contentindex.h" @@ -699,4 +698,3 @@ Q_DECLARE_METATYPE(KMime::Content*) -#endif // __KMIME_CONTENT_H__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/src/kmime_content_p.h new/kmime-21.08.0/src/kmime_content_p.h --- old/kmime-21.04.3/src/kmime_content_p.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/src/kmime_content_p.h 2021-07-30 14:44:45.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef KMIME_CONTENT_P_H -#define KMIME_CONTENT_P_H +#pragma once //@cond PRIVATE @@ -65,4 +64,3 @@ //@endcond -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/src/kmime_contentindex.cpp new/kmime-21.08.0/src/kmime_contentindex.cpp --- old/kmime-21.04.3/src/kmime_contentindex.cpp 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/src/kmime_contentindex.cpp 2021-07-30 14:44:45.000000000 +0200 @@ -85,7 +85,7 @@ { QStringList l; l.reserve(d->index.count()); - for (unsigned int i : qAsConst(d->index)) { + for (unsigned int i : std::as_const(d->index)) { l.append(QString::number(i)); } return l.join(QLatin1Char('.')); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/src/kmime_contentindex.h new/kmime-21.08.0/src/kmime_contentindex.h --- old/kmime-21.04.3/src/kmime_contentindex.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/src/kmime_contentindex.h 2021-07-30 14:44:45.000000000 +0200 @@ -18,8 +18,7 @@ Internet Message Access Protocol (IMAP)</a>. */ -#ifndef KMIME_CONTENTINDEX_H -#define KMIME_CONTENTINDEX_H +#pragma once #include "kmime_export.h" @@ -133,4 +132,3 @@ Q_DECLARE_METATYPE(KMime::ContentIndex) -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/src/kmime_dateformatter.h new/kmime-21.08.0/src/kmime_dateformatter.h --- old/kmime-21.04.3/src/kmime_dateformatter.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/src/kmime_dateformatter.h 2021-07-30 14:44:45.000000000 +0200 @@ -31,8 +31,7 @@ ASCII string of the form "Sun Mar 31 02:08:35 2002". */ -#ifndef __KMIME_DATEFORMATTER_H__ -#define __KMIME_DATEFORMATTER_H__ +#pragma once #include <time.h> #include <QDateTime> @@ -186,4 +185,3 @@ } // namespace KMime -#endif /* __KMIME_DATEFORMATTER_H__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/src/kmime_header_parsing.h new/kmime-21.08.0/src/kmime_header_parsing.h --- old/kmime-21.04.3/src/kmime_header_parsing.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/src/kmime_header_parsing.h 2021-07-30 14:44:45.000000000 +0200 @@ -7,8 +7,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef __KMIME_HEADER_PARSING_H__ -#define __KMIME_HEADER_PARSING_H__ +#pragma once #include "kmime_export.h" #include "kmime_types.h" @@ -255,5 +254,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(KMime::HeaderParsing::ParseTokenFlags) -#endif // __KMIME_HEADER_PARSING_H__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/src/kmime_header_parsing_p.h new/kmime-21.08.0/src/kmime_header_parsing_p.h --- old/kmime-21.04.3/src/kmime_header_parsing_p.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/src/kmime_header_parsing_p.h 2021-07-30 14:44:45.000000000 +0200 @@ -3,8 +3,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef KMIME_HEADER_PARSING_P_H -#define KMIME_HEADER_PARSING_P_H +#pragma once #include <QVector> @@ -26,4 +25,3 @@ } -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/src/kmime_headerfactory_p.h new/kmime-21.08.0/src/kmime_headerfactory_p.h --- old/kmime-21.04.3/src/kmime_headerfactory_p.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/src/kmime_headerfactory_p.h 2021-07-30 14:44:45.000000000 +0200 @@ -17,8 +17,7 @@ @authors Constantin Berzan \<[email protected]\> */ -#ifndef __KMIME_HEADERFACTORY_H__ -#define __KMIME_HEADERFACTORY_H__ +#pragma once #include "kmime_export.h" @@ -44,4 +43,3 @@ } // namespace KMime -#endif /* __KMIME_HEADERFACTORY_H__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/src/kmime_headers.cpp new/kmime-21.08.0/src/kmime_headers.cpp --- old/kmime-21.04.3/src/kmime_headers.cpp 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/src/kmime_headers.cpp 2021-07-30 14:44:45.000000000 +0200 @@ -311,7 +311,7 @@ if (withHeaderType) { rv = typeIntro(); } - for (const Types::Mailbox &mbox : qAsConst(d->mailboxList)) { + for (const Types::Mailbox &mbox : std::as_const(d->mailboxList)) { rv += mbox.as7BitString(d->encCS); rv += ", "; } @@ -375,7 +375,7 @@ Q_D(const MailboxList); QStringList rv; rv.reserve(d->mailboxList.count()); - for (const Types::Mailbox &mbox : qAsConst(d->mailboxList)) { + for (const Types::Mailbox &mbox : std::as_const(d->mailboxList)) { if (mbox.hasName()) rv.append(mbox.name()); else @@ -420,7 +420,7 @@ d->mailboxList.reserve(maybeAddressList.count()); // extract the mailboxes and complain if there are groups: - for (const auto &it : qAsConst(maybeAddressList)) { + for (const auto &it : std::as_const(maybeAddressList)) { if (!(it).displayName.isEmpty()) { KMIME_WARN << "mailbox groups in header disallowing them! Name: \"" << (it).displayName << "\"" @@ -475,7 +475,7 @@ if (withHeaderType) { rv = typeIntro(); } - for (const Types::Address &addr : qAsConst(d->addressList)) { + for (const Types::Address &addr : std::as_const(d->addressList)) { const auto mailBoxList = addr.mailboxList; for (const Types::Mailbox &mbox : mailBoxList) { rv += mbox.as7BitString(d->encCS); @@ -497,7 +497,7 @@ { Q_D(const AddressList); QStringList rv; - for (const Types::Address &addr : qAsConst(d->addressList)) { + for (const Types::Address &addr : std::as_const(d->addressList)) { rv.reserve(rv.size() + addr.mailboxList.size()); const auto mailboxList = addr.mailboxList; for (const Types::Mailbox &mbox : mailboxList) { @@ -555,7 +555,7 @@ { Q_D(const AddressList); QStringList rv; - for (const Types::Address &addr : qAsConst(d->addressList)) { + for (const Types::Address &addr : std::as_const(d->addressList)) { const auto mailboxList = addr.mailboxList; for (const Types::Mailbox &mbox : mailboxList) { if (mbox.hasName()) @@ -924,7 +924,7 @@ if (withHeaderType) { rv = typeIntro(); } - for (const Types::AddrSpec &addr : qAsConst(d->msgIdList)) { + for (const Types::AddrSpec &addr : std::as_const(d->msgIdList)) { if (!addr.isEmpty()) { const QString asString = addr.asString(); rv += '<'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/src/kmime_headers.h new/kmime-21.08.0/src/kmime_headers.h --- old/kmime-21.04.3/src/kmime_headers.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/src/kmime_headers.h 2021-07-30 14:44:45.000000000 +0200 @@ -24,8 +24,7 @@ Volker Krause \<[email protected]\> */ -#ifndef __KMIME_HEADERS_H__ -#define __KMIME_HEADERS_H__ +#pragma once #include "kmime_export.h" #include "kmime_header_parsing.h" @@ -1447,4 +1446,3 @@ Q_DECLARE_METATYPE(KMime::Headers::Cc*) Q_DECLARE_METATYPE(KMime::Headers::Bcc*) -#endif // __KMIME_HEADERS_H__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/src/kmime_headers_p.h new/kmime-21.08.0/src/kmime_headers_p.h --- old/kmime-21.04.3/src/kmime_headers_p.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/src/kmime_headers_p.h 2021-07-30 14:44:45.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef KMIME_HEADERS_P_H -#define KMIME_HEADERS_P_H +#pragma once #include <QMap> //@cond PRIVATE @@ -194,4 +193,3 @@ //@endcond -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/src/kmime_mdn.h new/kmime-21.08.0/src/kmime_mdn.h --- old/kmime-21.04.3/src/kmime_mdn.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/src/kmime_mdn.h 2021-07-30 14:44:45.000000000 +0200 @@ -30,8 +30,7 @@ An Extensible Message Format for Message Disposition Notifications</a>. */ -#ifndef __KMIME_MDN_H__ -#define __KMIME_MDN_H__ +#pragma once #include "kmime_export.h" #include <QString> @@ -182,4 +181,3 @@ } // namespace KMime -#endif // __KMIME_MDN_H__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/src/kmime_message.h new/kmime-21.08.0/src/kmime_message.h --- old/kmime-21.04.3/src/kmime_message.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/src/kmime_message.h 2021-07-30 14:44:45.000000000 +0200 @@ -7,8 +7,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef __KMIME_MESSAGE_H__ -#define __KMIME_MESSAGE_H__ +#pragma once #include "kmime_export.h" #include "kmime_content.h" @@ -188,4 +187,3 @@ Q_DECLARE_METATYPE(KMime::Message*) Q_DECLARE_METATYPE(KMime::Message::Ptr) -#endif // __KMIME_MESSAGE_H__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/src/kmime_newsarticle.h new/kmime-21.08.0/src/kmime_newsarticle.h --- old/kmime-21.04.3/src/kmime_newsarticle.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/src/kmime_newsarticle.h 2021-07-30 14:44:45.000000000 +0200 @@ -7,8 +7,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef __KMIME_NEWSARTICLE_H__ -#define __KMIME_NEWSARTICLE_H__ +#pragma once #include "kmime_export.h" #include "kmime_message.h" @@ -84,4 +83,3 @@ } // namespace KMime -#endif // __KMIME_NEWSARTICLE_H__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/src/kmime_parsers.h new/kmime-21.08.0/src/kmime_parsers.h --- old/kmime-21.04.3/src/kmime_parsers.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/src/kmime_parsers.h 2021-07-30 14:44:45.000000000 +0200 @@ -7,8 +7,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef __KMIME_PARSERS__ -#define __KMIME_PARSERS__ +#pragma once #include <QByteArray> #include <QVector> @@ -135,4 +134,3 @@ } // namespace KMime -#endif // __KMIME_PARSERS__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/src/kmime_types.cpp new/kmime-21.08.0/src/kmime_types.cpp --- old/kmime-21.04.3/src/kmime_types.cpp 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/src/kmime_types.cpp 2021-07-30 14:44:45.000000000 +0200 @@ -212,7 +212,7 @@ } res.reserve(maybeAddressList.size()); - for (const auto &it : qAsConst(maybeAddressList)) { + for (const auto &it : std::as_const(maybeAddressList)) { res += (it).mailboxList; } return res; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/src/kmime_types.h new/kmime-21.08.0/src/kmime_types.h --- old/kmime-21.04.3/src/kmime_types.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/src/kmime_types.h 2021-07-30 14:44:45.000000000 +0200 @@ -7,8 +7,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef __KMIME_TYPES_H__ -#define __KMIME_TYPES_H__ +#pragma once #include <QString> #include <QVector> @@ -164,5 +163,4 @@ Q_DECLARE_TYPEINFO(KMime::Types::Address, Q_MOVABLE_TYPE); Q_DECLARE_TYPEINFO(KMime::Types::AddrSpec, Q_MOVABLE_TYPE); -#endif // __KMIME_HEADER_PARSING_H__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/src/kmime_util.cpp new/kmime-21.08.0/src/kmime_util.cpp --- old/kmime-21.04.3/src/kmime_util.cpp 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/src/kmime_util.cpp 2021-07-30 14:44:45.000000000 +0200 @@ -38,7 +38,7 @@ QByteArray cachedCharset(const QByteArray &name) { - for (const QByteArray &charset : qAsConst(c_harsetCache)) { + for (const QByteArray &charset : std::as_const(c_harsetCache)) { if (qstricmp(name.data(), charset.data()) == 0) { return charset; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/src/kmime_util.h new/kmime-21.08.0/src/kmime_util.h --- old/kmime-21.04.3/src/kmime_util.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/src/kmime_util.h 2021-07-30 14:44:45.000000000 +0200 @@ -7,8 +7,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef __KMIME_UTIL_H__ -#define __KMIME_UTIL_H__ +#pragma once #include "kmime_export.h" #include "kmime_headers.h" @@ -309,4 +308,3 @@ } // namespace KMime -#endif /* __KMIME_UTIL_H__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/src/kmime_util_p.h new/kmime-21.08.0/src/kmime_util_p.h --- old/kmime-21.04.3/src/kmime_util_p.h 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/src/kmime_util_p.h 2021-07-30 14:44:45.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef KMIME_UTIL_P_H -#define KMIME_UTIL_P_H +#pragma once // @cond PRIVATE @@ -70,4 +69,3 @@ // @endcond -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-21.04.3/tests/test_kmime_header_parsing.cpp new/kmime-21.08.0/tests/test_kmime_header_parsing.cpp --- old/kmime-21.04.3/tests/test_kmime_header_parsing.cpp 2021-06-08 21:05:09.000000000 +0200 +++ new/kmime-21.08.0/tests/test_kmime_header_parsing.cpp 2021-07-30 14:44:45.000000000 +0200 @@ -324,7 +324,7 @@ << "result.displayName:\n" << result.displayName << endl; int i = 0; - for (const auto &it : qAsConst(result.mailboxList)) { + for (const auto &it : std::as_const(result.mailboxList)) { cout << "result.mailboxList[" << i << "].displayName:\n" << (it).name() << endl << "result.mailboxList[" << i << "].addrSpec.localPart:\n" @@ -364,7 +364,7 @@ cout << (ok ? "OK" : "BAD") << endl; int j = 0; - for (const auto &jt : qAsConst(result)) { + for (const auto &jt : std::as_const(result)) { cout << "result[" << j << "].displayName:\n" << (jt).displayName << endl;
