Hello community, here is the log from the commit of package mailimporter for openSUSE:Factory checked in at 2018-08-22 14:15:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mailimporter (Old) and /work/SRC/openSUSE:Factory/.mailimporter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mailimporter" Wed Aug 22 14:15:32 2018 rev:29 rq:630167 version:18.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/mailimporter/mailimporter.changes 2018-07-18 22:45:54.856557438 +0200 +++ /work/SRC/openSUSE:Factory/.mailimporter.new/mailimporter.changes 2018-08-22 14:15:34.901673448 +0200 @@ -1,0 +2,22 @@ +Thu Aug 16 22:07:51 UTC 2018 - [email protected] + +- Update to 18.08.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.08.0.php +- Changes since 18.07.80: + * None + +------------------------------------------------------------------- +Thu Jul 26 13:01:03 UTC 2018 - [email protected] + +- Update to 18.07.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.07.80.php +- Changes since 18.04.3: + * Use Q_REQUIRED_RESULT + * Use override + * Fix metainfo.yaml + +------------------------------------------------------------------- Old: ---- mailimporter-18.04.3.tar.xz New: ---- mailimporter-18.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mailimporter.spec ++++++ --- /var/tmp/diff_new_pack.qBWVNM/_old 2018-08-22 14:15:35.301674396 +0200 +++ /var/tmp/diff_new_pack.qBWVNM/_new 2018-08-22 14:15:35.301674396 +0200 @@ -19,11 +19,11 @@ %bcond_without lang Name: mailimporter -Version: 18.04.3 +Version: 18.08.0 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) -%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} +%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Mail import functionality for KDE PIM License: GPL-2.0-only Group: Development/Libraries/C and C++ ++++++ mailimporter-18.04.3.tar.xz -> mailimporter-18.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/CMakeLists.txt new/mailimporter-18.08.0/CMakeLists.txt --- old/mailimporter-18.04.3/CMakeLists.txt 2018-07-10 02:15:54.000000000 +0200 +++ new/mailimporter-18.08.0/CMakeLists.txt 2018-08-10 02:15:21.000000000 +0200 @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.8.3") +set(PIM_VERSION "5.9.0") project(MailImporter VERSION ${PIM_VERSION}) -set(KF5_VERSION "5.44.0") +set(KF5_VERSION "5.47.0") find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -26,11 +26,11 @@ set(MAILIMPORTER_LIB ${PIM_VERSION}) -set(AKONADIMIME_LIB_VERSION "5.8.3") -set(KDEPIM_LIB_VERSION "5.8.3") -set(QT_REQUIRED_VERSION "5.8.0") -set(KMIME_LIB_VERSION "5.8.3") -set(AKONADI_VERSION "5.8.3") +set(AKONADIMIME_LIB_VERSION "5.9.0") +set(KDEPIM_LIB_VERSION "5.9.0") +set(QT_REQUIRED_VERSION "5.9.0") +set(KMIME_LIB_VERSION "5.9.0") +set(AKONADI_VERSION "5.9.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test Xml) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/metainfo.yaml new/mailimporter-18.08.0/metainfo.yaml --- old/mailimporter-18.04.3/metainfo.yaml 2018-06-29 07:04:38.000000000 +0200 +++ new/mailimporter-18.08.0/metainfo.yaml 2018-08-06 07:14:22.000000000 +0200 @@ -1,5 +1,6 @@ name: mailimporter -description: Mail Importer Library +description: Mail Importer Library implements importing of emails from various other email clients +maintainer: mlaurent group: kdepim platforms: - name: All @@ -12,14 +13,3 @@ cmake: "KF5::MailImporterAkonadi" cmakename: KF5MailImporterAkonadi irc: akonadi - -group_info: - fancyname: KDE PIM - maintainer: - - mlaurent - irc: kontact - mailinglist: kde-pim - platforms: - - All - description: MailImporter Library provides a set of libraries to importer several mailer format. - logo: docs/kontact.svg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/po/da/libmailimporter.po new/mailimporter-18.08.0/po/da/libmailimporter.po --- old/mailimporter-18.04.3/po/da/libmailimporter.po 2018-07-10 02:15:53.000000000 +0200 +++ new/mailimporter-18.08.0/po/da/libmailimporter.po 2018-08-10 02:15:20.000000000 +0200 @@ -1,7 +1,7 @@ # Danish translation of kmailcvt # Copyright (C) # -# Erik Kjær Pedersen <[email protected]>, 1998-2002,2003, 2004, 2005. +# Erik Kjær Pedersen <[email protected]>, 1998-2002, 2003, 2004, 2005. # Martin Schlander <[email protected]>, 2008, 2009, 2010, 2012, 2013. msgid "" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/po/ru/libmailimporter.po new/mailimporter-18.08.0/po/ru/libmailimporter.po --- old/mailimporter-18.04.3/po/ru/libmailimporter.po 2018-07-10 02:15:54.000000000 +0200 +++ new/mailimporter-18.08.0/po/ru/libmailimporter.po 2018-08-10 02:15:20.000000000 +0200 @@ -7,13 +7,14 @@ # Alexander Potashev <[email protected]>, 2010, 2011, 2014, 2015. # Julia Dronova <[email protected]>, 2012. # Alexander Lakhin <[email protected]>, 2013. +# Alexander Yavorsky <[email protected]>, 2018. msgid "" msgstr "" "Project-Id-Version: kmailcvt\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-11-03 03:13+0100\n" -"PO-Revision-Date: 2015-10-04 03:24+0300\n" -"Last-Translator: Alexander Potashev <[email protected]>\n" +"PO-Revision-Date: 2018-08-04 21:36+0300\n" +"Last-Translator: Alexander Yavorsky <[email protected]>\n" "Language-Team: Russian <[email protected]>\n" "Language: ru\n" "MIME-Version: 1.0\n" @@ -46,7 +47,7 @@ #, kde-format msgctxt "name of balsa application" msgid "Balsa" -msgstr "" +msgstr "Balsa" #: mailimporter/filters/filterbalsa.cpp:109 #: mailimporter/filters/filterevolution.cpp:73 @@ -175,12 +176,10 @@ "импортированы статусы писем (новые, пересланные и тому подобные).</p>" #: mailimporter/filters/filterclawsmail.cpp:51 -#, fuzzy, kde-format -#| msgctxt "define folder name where we will import clawsmail mails" -#| msgid "ClawsMail-Import" +#, kde-format msgctxt "name of clawsMail application" msgid "ClawsMail" -msgstr "Импорт ClawsMail" +msgstr "ClawsMail" #: mailimporter/filters/filterclawsmail.cpp:105 #, kde-format @@ -212,12 +211,10 @@ "импортированных папок будет воссоздана в папке «Evolution-Import».</p>" #: mailimporter/filters/filterevolution.cpp:48 -#, fuzzy, kde-format -#| msgctxt "define folder name where we import evolution mails" -#| msgid "Evolution-Import" +#, kde-format msgctxt "name of evolution application" msgid "Evolution" -msgstr "Evolution-Import" +msgstr "Evolution" #: mailimporter/filters/filterevolution.cpp:144 #: mailimporter/filters/filterevolution_v2.cpp:200 @@ -270,7 +267,7 @@ #, kde-format msgctxt "name of evolution application" msgid "Evolution (v2)" -msgstr "" +msgstr "Evolution (версия 2)" #: mailimporter/filters/filterevolution_v2.cpp:130 #: mailimporter/filters/filterevolution_v2.cpp:169 @@ -302,7 +299,7 @@ #, kde-format msgctxt "name of evolution application" msgid "Evolution (v3)" -msgstr "" +msgstr "Evolution (версия 3)" #: mailimporter/filters/filtericedove.cpp:25 #, kde-format @@ -331,7 +328,7 @@ #, kde-format msgctxt "name of icedove application" msgid "Icedove" -msgstr "" +msgstr "Icedove" #: mailimporter/filters/filterkmail_maildir.cpp:39 #, kde-format @@ -403,10 +400,9 @@ msgstr "Выберите архивированный файл KMail для импорта" #: mailimporter/filters/filterkmailarchive.cpp:177 -#, fuzzy, kde-format -#| msgid "Import KMail Archive File" +#, kde-format msgid "KMail Archive Files " -msgstr "Импорт архивированных файлов KMail" +msgstr "Архивированные файлы KMail" #: mailimporter/filters/filterkmailarchive.cpp:179 #, kde-format @@ -414,10 +410,9 @@ msgstr "Выберите архивированный файл, который следует импортировать." #: mailimporter/filters/filterkmailarchive.cpp:188 -#, fuzzy, kde-format -#| msgid "No files selected." +#, kde-format msgid "No archive selected." -msgstr "Файлы не выбраны." +msgstr "Архив не выбран." #: mailimporter/filters/filterkmailarchive.cpp:202 #, kde-format @@ -557,10 +552,9 @@ "именем исходного файла и с префиксом «MAILMAN-».</p>" #: mailimporter/filters/filtermailmangzip.cpp:46 -#, fuzzy, kde-format -#| msgid "gzip Files (*.txt.gz)" +#, kde-format msgid "gzip Files" -msgstr "Файлы gzip (*.txt.gz)" +msgstr "Файлы gzip" #: mailimporter/filters/filtermailmangzip.cpp:66 #, kde-format @@ -595,10 +589,9 @@ "папки будут иметь префикс MBOX-</p>" #: mailimporter/filters/filtermbox.cpp:47 -#, fuzzy, kde-format -#| msgid "mbox Files (*.mbox)" +#, kde-format msgid "mbox Files" -msgstr "Файлы mbox (*.mbox)" +msgstr "Файлы mbox" #: mailimporter/filters/filteroe.cpp:40 #, kde-format @@ -687,7 +680,7 @@ #, kde-format msgctxt "name of opera application" msgid "Opera" -msgstr "" +msgstr "Opera" #: mailimporter/filters/filteropera.cpp:81 #: mailimporter/filters/filterplain.cpp:61 @@ -786,20 +779,12 @@ msgstr "Обработка структуры папок..." #: mailimporter/filters/filterseamonkey.cpp:25 -#, fuzzy, kde-format -#| msgid "Import Icedove Mails and Folder Structure" +#, kde-format msgid "Import SeaMonkey Mails and Folder Structure" -msgstr "Импорт папок и писем из Icedove" +msgstr "Импорт папок и писем из SeaMonkey" #: mailimporter/filters/filterseamonkey.cpp:27 -#, fuzzy, kde-format -#| msgid "" -#| "<p><b>Icedove import filter</b></p><p>Select your base Icedove mailfolder " -#| "(usually ~/.icedove/*.default/Mail/Local Folders/).</p><p><b>Note:</b> " -#| "Never choose a Folder which <u>does not</u> contain mbox-files (for " -#| "example, a maildir): if you do, you will get many new folders.</" -#| "p><p>Since it is possible to recreate the folder structure, the folders " -#| "will be stored under: \"Icedove-Import\".</p>" +#, kde-format msgid "" "<p><b>SeaMonkey import filter</b></p><p>Select your base SeaMonkey " "mailfolder (usually ~/.icedove/*.default/Mail/Local Folders/).</p><p><b>Note:" @@ -808,12 +793,12 @@ "it is possible to recreate the folder structure, the folders will be stored " "under: \"SeaMonkey-Import\".</p>" msgstr "" -"<p><b>Импорт локальных папок и писем из Icedove</b></p><p>Необходимо указать " -"папку, в которой хранится почта Icedove (обычно это ~/.icedove/*.default/" -"Mail/Local Folders/).</p><p><b>Примечание:</b> <u>не пытайтесь</u> " +"<p><b>Импорт локальных папок и писем из SeaMonkey</b></p><p>Необходимо " +"указать папку, в которой хранится почта SeaMonkey (обычно это ~/.icedove/*." +"default/Mail/Local Folders/).</p><p><b>Примечание: </b><u>не пытайтесь</u> " "импортировать почту в формате, отличном от mbox (например, почту в формате " "maildir). В этом случае образуется огромное количество новых папок.</" -"p><p>Структура импортированных папок будет воссоздана в папке «Icedove-" +"p><p>Структура импортированных папок будет воссоздана в папке «SeaMonkey-" "Import».</p>" #: mailimporter/filters/filtersylpheed.cpp:41 @@ -836,12 +821,10 @@ "статусы писем (новые, пересланные и т.п.).</p>" #: mailimporter/filters/filtersylpheed.cpp:63 -#, fuzzy, kde-format -#| msgctxt "define folder name where we will import sylpheed mails" -#| msgid "Sylpheed-Import" +#, kde-format msgctxt "name of sylpheed application" msgid "Sylpheed" -msgstr "Sylpheed-Import" +msgstr "Sylpheed" #: mailimporter/filters/filtersylpheed.cpp:201 #, kde-format @@ -903,19 +886,19 @@ #, kde-format msgctxt "name of thunderbird application" msgid "Thunderbird" -msgstr "" +msgstr "Thunderbird" #: mailimporter/othermailerutil.cpp:29 #, kde-format msgctxt "name of trojira application" msgid "Trojita" -msgstr "" +msgstr "Trojita" #: mailimporter/othermailerutil.cpp:33 mailimporter/othermailerutil.cpp:37 #, kde-format msgctxt "name of geary application" msgid "Geary" -msgstr "" +msgstr "Geary" #: mailimporter/selectthunderbirdprofilewidget.cpp:31 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/po/zh_CN/libmailimporter.po new/mailimporter-18.08.0/po/zh_CN/libmailimporter.po --- old/mailimporter-18.04.3/po/zh_CN/libmailimporter.po 2018-07-10 02:15:54.000000000 +0200 +++ new/mailimporter-18.08.0/po/zh_CN/libmailimporter.po 2018-08-10 02:15:21.000000000 +0200 @@ -13,7 +13,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-11-03 03:13+0100\n" -"PO-Revision-Date: 2018-07-03 17:40\n" +"PO-Revision-Date: 2018-07-24 08:46\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/po/zh_TW/libmailimporter.po new/mailimporter-18.08.0/po/zh_TW/libmailimporter.po --- old/mailimporter-18.04.3/po/zh_TW/libmailimporter.po 2018-07-10 02:15:54.000000000 +0200 +++ new/mailimporter-18.08.0/po/zh_TW/libmailimporter.po 2018-08-10 02:15:21.000000000 +0200 @@ -978,198 +978,3 @@ #, kde-format msgid "Unable to retrieve folder for folder path %1." msgstr "無法從資料夾路徑 %1 中取得資料夾。" - -#, fuzzy -#~| msgid "KMail Archive Files (*.tar, *.tar.gz, *.tar.bz2, *.zip)" -#~ msgid "KMail Archive Files (*.tar *.tar.gz *.tar.bz2 *.zip)" -#~ msgstr "KMail 歸檔 (*.tar, *.tar.gz, *.tar.bz2, *.zip)" - -#~ msgid "Import Outlook Emails" -#~ msgstr "匯入 Outlook 的信件" - -#~ msgid "" -#~ "<p><b>Outlook email import filter</b></p><p>This filter will import mails " -#~ "from a Outlook pst-file. You will need to locate the folder where the pst-" -#~ "file has been stored by searching for .pst files under: <i>C:\\Documents " -#~ "and Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will " -#~ "be imported into a folder named after the account they came from, " -#~ "prefixed with OUTLOOK-</p>" -#~ msgstr "" -#~ "<p><b>Outlook 信件匯入過濾器</b></p><p>這個過濾器會讀取 Outlook 的 pst 檔" -#~ "並匯入信件。若您使用的是 Windows 2000 或之後的系統，您必須在 <i>C:" -#~ "\\Documents and Settings</i> 中找尋 .pst 檔。</p><p><b>注意：</b>這個過濾" -#~ "器會產生一個新的信件夾，名稱為 pst 檔的檔名前面加上 OUTLOOK-。</p>" - -#~ msgid "Counting mail..." -#~ msgstr "計算信件中..." - -#~ msgctxt "'directories' means directories on hard disc, not email-folders." -#~ msgid "Counting directories..." -#~ msgstr "計算目錄中..." - -#~ msgctxt "'folders' means email-folders, not folders on disc." -#~ msgid "Counting folders..." -#~ msgstr "計算資料夾中..." - -#~ msgid "<p><i>Written by %1.</i></p>" -#~ msgstr "<p><i>這個過濾器是由 %1 所撰寫</i></p>" - -#~ msgid "KMailCVT Import Tool" -#~ msgstr "KMailCVT 郵件匯入工具" - -#~ msgid "Step 1: Select Filter" -#~ msgstr "步驟一：選擇匯入過濾器" - -#~ msgid "Step 2: Importing..." -#~ msgstr "步驟二：匯入信件" - -#~ msgid "Import in progress" -#~ msgstr "匯入中..." - -#~ msgid "Import finished" -#~ msgstr "信件已匯入完成" - -#~ msgctxt "NAME OF TRANSLATORS" -#~ msgid "Your names" -#~ msgstr "曾賢舜，高嘉璘" - -#~ msgctxt "EMAIL OF TRANSLATORS" -#~ msgid "Your emails" -#~ msgstr "[email protected], [email protected]" - -#~ msgid "Click 'Back' to import more emails or contacts" -#~ msgstr "按「上一頁」可以繼續匯入其他的郵件跟聯絡人等" - -#, fuzzy -#~| msgid "" -#~| "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/"; -#~| "TR/REC-html40/strict.dtd\">\n" -#~| "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/" -#~| "css\">\n" -#~| "p, li { white-space: pre-wrap; }\n" -#~| "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; " -#~| "font-weight:400; font-style:normal;\">\n" -#~| "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-" -#~| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-" -#~| "family:'DejaVu Sans'; font-size:8pt; font-weight:600;\">Welcome to " -#~| "KMailCVT - The Mail Import Tool</span><span style=\" font-family:'DejaVu " -#~| "Sans'; font-size:8pt;\"> <br /><br />This program will help you import " -#~| "your email from your previous email program.<br /><br /><br /><br /" -#~| ">Please select the program you would like to import from. Next, select " -#~| "the folder you would like to import to, then click 'Next'.</span></p></" -#~| "body></html>" -#~ msgid "" -#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"; -#~ "REC-html40/strict.dtd\">\n" -#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/" -#~ "css\">\n" -#~ "p, li { white-space: pre-wrap; }\n" -#~ "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; " -#~ "font-weight:400; font-style:normal;\">\n" -#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-" -#~ "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-" -#~ "family:'DejaVu Sans'; font-size:9pt; font-weight:600;\">Welcome to " -#~ "KMailCVT - The Mail Import Tool</span><span style=\" font-family:'DejaVu " -#~ "Sans'; font-size:9pt;\"> <br /><br />This program will help you import " -#~ "your email from your previous email program.<br /><br />Please select the " -#~ "program you would like to import from. Next, select the folder you would " -#~ "like to import to, then click 'Next'.</span></p></body></html>" -#~ msgstr "" -#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"; -#~ "REC-html40/strict.dtd\">\n" -#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/" -#~ "css\">\n" -#~ "p, li { white-space: pre-wrap; }\n" -#~ "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; " -#~ "font-weight:400; font-style:normal;\">\n" -#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-" -#~ "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-" -#~ "family:'DejaVu Sans'; font-size:8pt; font-weight:600;\">歡迎來到 KMailCVT " -#~ "─ 郵件匯入工具</span><span style=\" font-family:'DejaVu Sans'; font-" -#~ "size:8pt;\"> <br /><br />這個程式會協助您將您的信件從之前的電子郵件程式匯" -#~ "入 KMail。<br /><br /><br /><br />請選擇您要匯入哪裡的郵件。接著，選擇您要" -#~ "匯入哪個資料夾，再按「下一步」。</span></p></body></html>" - -#~ msgid "Please select the folder to import to:" -#~ msgstr "請選擇要匯入哪個資料夾：" - -#~ msgid "Remove &duplicate messages during import" -#~ msgstr "匯入過程中移除重複的信件 (&d)" - -#~ msgid "KMailCVT" -#~ msgstr "KMailCVT" - -#~ msgid "Mail Import Tool" -#~ msgstr "郵件匯入工具" - -#, fuzzy -#~| msgid "Copyright © 2000–2010 KMailCVT authors" -#~ msgid "Copyright © 2000–2012 KMailCVT authors" -#~ msgstr "Copyright © 2000–2010 KMailCVT 作者群" - -#~ msgid "Hans Dijkema" -#~ msgstr "Hans Dijkema" - -#~ msgid "Original author" -#~ msgstr "作者" - -#~ msgid "Danny Kukawka" -#~ msgstr "Danny Kukawka" - -#~ msgid "Maintainer & New filters" -#~ msgstr "維護者及新的過濾器" - -#~ msgid "Laurence Anderson" -#~ msgstr "Laurence Anderson" - -#~ msgid "New GUI & cleanups" -#~ msgstr "新的 GUI 設計" - -#~ msgid "Daniel Molkentin" -#~ msgstr "Daniel Molkentin" - -#~ msgid "Matthew James Leach" -#~ msgstr "Matthew James Leach" - -#~ msgid "Port to Akonadi" -#~ msgstr "移植到 Akonadi" - -#, fuzzy -#~| msgid "New GUI & cleanups" -#~ msgid "New filter & cleanups" -#~ msgstr "新的 GUI 設計" - -#, fuzzy -#~| msgid "(c) 2000-2009, The KMailCVT developers" -#~ msgid "(c) 2000-2010, The KMailCVT developers" -#~ msgstr "(c) 2000-2009, KMailCVT 開發者" - -#~ msgid "" -#~ "<b>Fatal:</b> Unable to start KMail for D-Bus communication: %1; %2<br /" -#~ ">Make sure <i>kmail</i> is installed." -#~ msgstr "" -#~ "<b>嚴重錯誤：</b>無法啟動 KMail D-Bus 通訊：%1；%2請確定您有安裝 " -#~ "<i>KMail</i>。" - -#~ msgid "Cannot make folder %1 in KMail" -#~ msgstr "無法在 KMail 中建立信件夾 %1 " - -#~ msgid "Cannot add message to folder %1 in KMail" -#~ msgstr "無法在 %1 信件夾新增郵件" - -#~ msgid "KMail Import Filters" -#~ msgstr "KMail 信件匯入過濾器" - -#~ msgid "" -#~ "<b>Welcome to KMailCVT - The KMail Import Tool</b>\n" -#~ "<br><br>\n" -#~ "This program will help you import your email from your previous email " -#~ "program into KMail.<br><br><br><br>\n" -#~ " Please select the program you would like to import from, then click " -#~ "'Next'." -#~ msgstr "" -#~ "<b>歡迎使用 KMailCVT - KMail 的郵件匯入工具</b>\n" -#~ "<br><br>\n" -#~ "這個工具會幫忙您將您之前使用的收發信軟體中的信件搬到 KMail 中。" -#~ "<br><br><br><br>\n" -#~ "請選擇您要使用的匯入過濾器，並按「下一頁」。" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/src/mailimporter/filterimporterbase.h new/mailimporter-18.08.0/src/mailimporter/filterimporterbase.h --- old/mailimporter-18.04.3/src/mailimporter/filterimporterbase.h 2018-06-29 07:04:38.000000000 +0200 +++ new/mailimporter-18.08.0/src/mailimporter/filterimporterbase.h 2018-08-06 07:14:22.000000000 +0200 @@ -30,12 +30,12 @@ public: explicit FilterImporterBase(MailImporter::FilterInfo *info); virtual ~FilterImporterBase(); - virtual bool importMessage(const QString &folderName, const QString &msgPath, bool duplicateCheck, const MailImporter::MessageStatus &status); - virtual bool importMessage(const KArchiveFile *file, const QString &folderPath, int &nbTotal, int &fileDone); + Q_REQUIRED_RESULT virtual bool importMessage(const QString &folderName, const QString &msgPath, bool duplicateCheck, const MailImporter::MessageStatus &status); + Q_REQUIRED_RESULT virtual bool importMessage(const KArchiveFile *file, const QString &folderPath, int &nbTotal, int &fileDone); virtual void clear(); virtual void clearCountDuplicate(); - virtual int countDuplicates() const; - virtual QString topLevelFolder() const; + Q_REQUIRED_RESULT virtual int countDuplicates() const; + Q_REQUIRED_RESULT virtual QString topLevelFolder() const; protected: MailImporter::FilterInfo *mInfo = nullptr; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/src/mailimporter/filterinfo.h new/mailimporter-18.08.0/src/mailimporter/filterinfo.h --- old/mailimporter-18.04.3/src/mailimporter/filterinfo.h 2018-06-29 07:04:38.000000000 +0200 +++ new/mailimporter-18.08.0/src/mailimporter/filterinfo.h 2018-08-06 07:14:22.000000000 +0200 @@ -45,12 +45,12 @@ void alert(const QString &message); static void terminateASAP(); - bool shouldTerminate() const; - QString rootCollectionName() const; + Q_REQUIRED_RESULT bool shouldTerminate() const; + Q_REQUIRED_RESULT QString rootCollectionName() const; QWidget *parentWidget() const; void setRemoveDupMessage(bool removeDupMessage); - bool removeDupMessage() const; + Q_REQUIRED_RESULT bool removeDupMessage() const; private: class Private; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/src/mailimporter/filters/filterbalsa.h new/mailimporter-18.08.0/src/mailimporter/filters/filterbalsa.h --- old/mailimporter-18.04.3/src/mailimporter/filters/filterbalsa.h 2018-06-29 07:04:38.000000000 +0200 +++ new/mailimporter-18.08.0/src/mailimporter/filters/filterbalsa.h 2018-08-06 07:14:22.000000000 +0200 @@ -25,12 +25,12 @@ { public: FilterBalsa(); - ~FilterBalsa(); + ~FilterBalsa() override; void import() override; void importMails(const QString &maildir); - static QString defaultSettingsPath(); - static QString isMailerFound(); + Q_REQUIRED_RESULT static QString defaultSettingsPath(); + Q_REQUIRED_RESULT static QString isMailerFound(); QString localMailDirPath(); private: void importDirContents(const QString &); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/src/mailimporter/filters/filterclawsmail.h new/mailimporter-18.08.0/src/mailimporter/filters/filterclawsmail.h --- old/mailimporter-18.04.3/src/mailimporter/filters/filterclawsmail.h 2018-06-29 07:04:38.000000000 +0200 +++ new/mailimporter-18.08.0/src/mailimporter/filters/filterclawsmail.h 2018-08-06 07:14:22.000000000 +0200 @@ -30,16 +30,16 @@ { public: FilterClawsMail(); - ~FilterClawsMail(); + ~FilterClawsMail() override; - static QString defaultSettingsPath(); - static QString isMailerFound(); + Q_REQUIRED_RESULT static QString defaultSettingsPath(); + Q_REQUIRED_RESULT static QString isMailerFound(); /* return local mail dir from folderlist.xml*/ - QString localMailDirPath() override; - bool excludeFile(const QString &file) override; - QString defaultInstallFolder() const override; - QString markFile() const override; + Q_REQUIRED_RESULT QString localMailDirPath() override; + Q_REQUIRED_RESULT bool excludeFile(const QString &file) override; + Q_REQUIRED_RESULT QString defaultInstallFolder() const override; + Q_REQUIRED_RESULT QString markFile() const override; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/src/mailimporter/filters/filterevolution.h new/mailimporter-18.08.0/src/mailimporter/filters/filterevolution.h --- old/mailimporter-18.04.3/src/mailimporter/filters/filterevolution.h 2018-06-29 07:04:38.000000000 +0200 +++ new/mailimporter-18.08.0/src/mailimporter/filters/filterevolution.h 2018-08-06 07:14:22.000000000 +0200 @@ -31,12 +31,12 @@ { public: FilterEvolution(); - ~FilterEvolution(); + ~FilterEvolution() override; void import() override; void importMails(const QString &maildir); - static QString defaultSettingsPath(); - static QString isMailerFound(); + Q_REQUIRED_RESULT static QString defaultSettingsPath(); + Q_REQUIRED_RESULT static QString isMailerFound(); private: void importDirContents(const QString &, const QString &, const QString &); void importMBox(const QString &, const QString &, const QString &); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/src/mailimporter/filters/filterevolution_v2.h new/mailimporter-18.08.0/src/mailimporter/filters/filterevolution_v2.h --- old/mailimporter-18.04.3/src/mailimporter/filters/filterevolution_v2.h 2018-06-29 07:04:38.000000000 +0200 +++ new/mailimporter-18.08.0/src/mailimporter/filters/filterevolution_v2.h 2018-08-06 07:14:22.000000000 +0200 @@ -29,17 +29,17 @@ { public: FilterEvolution_v2(); - ~FilterEvolution_v2(); + ~FilterEvolution_v2() override; void import() override; void importMails(const QString &maildir); - static QString defaultSettingsPath(); - static QString isMailerFound(); + Q_REQUIRED_RESULT static QString defaultSettingsPath(); + Q_REQUIRED_RESULT static QString isMailerFound(); private: void importDirContents(const QString &, const QString &, const QString &); void importMBox(const QString &, const QString &, const QString &); - bool excludeFiles(const QString &file); + Q_REQUIRED_RESULT bool excludeFiles(const QString &file); }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/src/mailimporter/filters/filterevolution_v3.h new/mailimporter-18.08.0/src/mailimporter/filters/filterevolution_v3.h --- old/mailimporter-18.04.3/src/mailimporter/filters/filterevolution_v3.h 2018-06-29 07:04:38.000000000 +0200 +++ new/mailimporter-18.08.0/src/mailimporter/filters/filterevolution_v3.h 2018-08-06 07:14:22.000000000 +0200 @@ -25,12 +25,12 @@ { public: FilterEvolution_v3(); - ~FilterEvolution_v3(); + ~FilterEvolution_v3() override; void import() override; void importMails(const QString &maildir); - static QString defaultSettingsPath(); - static QString isMailerFound(); + Q_REQUIRED_RESULT static QString defaultSettingsPath(); + Q_REQUIRED_RESULT static QString isMailerFound(); private: void importDirContents(const QString &); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/src/mailimporter/filters/filtericedove.h new/mailimporter-18.08.0/src/mailimporter/filters/filtericedove.h --- old/mailimporter-18.04.3/src/mailimporter/filters/filtericedove.h 2018-06-29 07:04:38.000000000 +0200 +++ new/mailimporter-18.08.0/src/mailimporter/filters/filtericedove.h 2018-08-06 07:14:22.000000000 +0200 @@ -24,13 +24,13 @@ { public: FilterIcedove(); - ~FilterIcedove(); + ~FilterIcedove() override; - static QString defaultSettingsPath(); - static QString isMailerFound(); + Q_REQUIRED_RESULT static QString defaultSettingsPath(); + Q_REQUIRED_RESULT static QString isMailerFound(); protected: - QString defaultInstallFolder() const override; - QString settingsPath() override; + Q_REQUIRED_RESULT QString defaultInstallFolder() const override; + Q_REQUIRED_RESULT QString settingsPath() override; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/src/mailimporter/filters/filterkmail_maildir.h new/mailimporter-18.08.0/src/mailimporter/filters/filterkmail_maildir.h --- old/mailimporter-18.04.3/src/mailimporter/filters/filterkmail_maildir.h 2018-06-29 07:04:38.000000000 +0200 +++ new/mailimporter-18.08.0/src/mailimporter/filters/filterkmail_maildir.h 2018-08-06 07:14:22.000000000 +0200 @@ -30,7 +30,7 @@ { public: FilterKMail_maildir(); - ~FilterKMail_maildir(); + ~FilterKMail_maildir() override; void import() override; void importMails(const QString &maildir); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/src/mailimporter/filters/filterkmailarchive.h new/mailimporter-18.08.0/src/mailimporter/filters/filterkmailarchive.h --- old/mailimporter-18.04.3/src/mailimporter/filters/filterkmailarchive.h 2018-06-29 07:04:38.000000000 +0200 +++ new/mailimporter-18.08.0/src/mailimporter/filters/filterkmailarchive.h 2018-08-06 07:14:22.000000000 +0200 @@ -30,15 +30,15 @@ { public: FilterKMailArchive(); - ~FilterKMailArchive(); + ~FilterKMailArchive() override; void import() override; void importMails(const QString &archiveFile); private: - bool importDirectory(const KArchiveDirectory *directory, const QString &folderPath); - bool importFolder(const KArchiveDirectory *folder, const QString &folderPath); - bool importMessage(const KArchiveFile *file, const QString &folderPath); + Q_REQUIRED_RESULT bool importDirectory(const KArchiveDirectory *directory, const QString &folderPath); + Q_REQUIRED_RESULT bool importFolder(const KArchiveDirectory *folder, const QString &folderPath); + Q_REQUIRED_RESULT bool importMessage(const KArchiveFile *file, const QString &folderPath); int countFiles(const KArchiveDirectory *directory) const; FilterKMailArchivePrivate *const d; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/src/mailimporter/filters/filterlnotes.h new/mailimporter-18.08.0/src/mailimporter/filters/filterlnotes.h --- old/mailimporter-18.04.3/src/mailimporter/filters/filterlnotes.h 2018-06-29 07:04:38.000000000 +0200 +++ new/mailimporter-18.08.0/src/mailimporter/filters/filterlnotes.h 2018-08-06 07:14:22.000000000 +0200 @@ -28,7 +28,7 @@ { public: FilterLNotes(); - ~FilterLNotes(); + ~FilterLNotes() override; /** Standard import filter... starting line for our import */ void import() override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/src/mailimporter/filters/filtermailapp.h new/mailimporter-18.08.0/src/mailimporter/filters/filtermailapp.h --- old/mailimporter-18.04.3/src/mailimporter/filters/filtermailapp.h 2018-06-29 07:04:38.000000000 +0200 +++ new/mailimporter-18.08.0/src/mailimporter/filters/filtermailapp.h 2018-08-06 07:14:22.000000000 +0200 @@ -33,7 +33,7 @@ { public: FilterMailApp(); - ~FilterMailApp(); + ~FilterMailApp() override; void import() override; void importMails(const QString &maildir); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/src/mailimporter/filters/filtermailmangzip.h new/mailimporter-18.08.0/src/mailimporter/filters/filtermailmangzip.h --- old/mailimporter-18.04.3/src/mailimporter/filters/filtermailmangzip.h 2018-06-29 07:04:38.000000000 +0200 +++ new/mailimporter-18.08.0/src/mailimporter/filters/filtermailmangzip.h 2018-08-06 07:14:22.000000000 +0200 @@ -25,7 +25,7 @@ { public: FilterMailmanGzip(); - ~FilterMailmanGzip(); + ~FilterMailmanGzip() override; void importMails(const QStringList &filenames); void import() override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/src/mailimporter/filters/filtermbox.h new/mailimporter-18.08.0/src/mailimporter/filters/filtermbox.h --- old/mailimporter-18.04.3/src/mailimporter/filters/filtermbox.h 2018-06-29 07:04:38.000000000 +0200 +++ new/mailimporter-18.08.0/src/mailimporter/filters/filtermbox.h 2018-08-06 07:14:22.000000000 +0200 @@ -29,7 +29,7 @@ { public: FilterMBox(); - ~FilterMBox(); + ~FilterMBox() override; void importMails(const QStringList &filenames); void import() override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/src/mailimporter/filters/filteroe.h new/mailimporter-18.08.0/src/mailimporter/filters/filteroe.h --- old/mailimporter-18.04.3/src/mailimporter/filters/filteroe.h 2018-06-29 07:04:38.000000000 +0200 +++ new/mailimporter-18.08.0/src/mailimporter/filters/filteroe.h 2018-08-06 07:14:22.000000000 +0200 @@ -32,7 +32,7 @@ { public: FilterOE(); - ~FilterOE(); + ~FilterOE() override; void import() override; void importMails(const QString &maildir); @@ -46,8 +46,8 @@ void dbxReadEmail(QDataStream &ds, int filePos); /** helperfunctions for folder structure support */ - QString parseFolderOEString(QDataStream &ds, int filePos); - QString getFolderName(const QString &filename); + Q_REQUIRED_RESULT QString parseFolderOEString(QDataStream &ds, int filePos); + Q_REQUIRED_RESULT QString getFolderName(const QString &filename); /** which file (of totalFiles) is now in the work? */ int currentFile; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/src/mailimporter/filters/filteropera.h new/mailimporter-18.08.0/src/mailimporter/filters/filteropera.h --- old/mailimporter-18.04.3/src/mailimporter/filters/filteropera.h 2018-06-29 07:04:38.000000000 +0200 +++ new/mailimporter-18.08.0/src/mailimporter/filters/filteropera.h 2018-08-06 07:14:22.000000000 +0200 @@ -29,12 +29,12 @@ { public: FilterOpera(); - ~FilterOpera(); + ~FilterOpera() override; void import() override; void importMails(const QString &maildir); - static QString defaultSettingsPath(); - static QString isMailerFound(); + Q_REQUIRED_RESULT static QString defaultSettingsPath(); + Q_REQUIRED_RESULT static QString isMailerFound(); private: void importBox(const QDir &importDir, const QStringList &, const QString &accountName = QString()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/src/mailimporter/filters/filterplain.h new/mailimporter-18.08.0/src/mailimporter/filters/filterplain.h --- old/mailimporter-18.04.3/src/mailimporter/filters/filterplain.h 2018-06-29 07:04:38.000000000 +0200 +++ new/mailimporter-18.08.0/src/mailimporter/filters/filterplain.h 2018-08-06 07:14:22.000000000 +0200 @@ -28,7 +28,7 @@ { public: FilterPlain(); - ~FilterPlain(); + ~FilterPlain() override; void import() override; void importMails(const QString &mailDir); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/src/mailimporter/filters/filterpmail.h new/mailimporter-18.08.0/src/mailimporter/filters/filterpmail.h --- old/mailimporter-18.04.3/src/mailimporter/filters/filterpmail.h 2018-06-29 07:04:38.000000000 +0200 +++ new/mailimporter-18.08.0/src/mailimporter/filters/filterpmail.h 2018-08-06 07:14:22.000000000 +0200 @@ -27,7 +27,7 @@ { public: FilterPMail(); - ~FilterPMail(); + ~FilterPMail() override; void import() override; void importMails(const QString &chosenDir); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/src/mailimporter/filters/filterseamonkey.h new/mailimporter-18.08.0/src/mailimporter/filters/filterseamonkey.h --- old/mailimporter-18.04.3/src/mailimporter/filters/filterseamonkey.h 2018-06-29 07:04:38.000000000 +0200 +++ new/mailimporter-18.08.0/src/mailimporter/filters/filterseamonkey.h 2018-08-06 07:14:22.000000000 +0200 @@ -24,12 +24,12 @@ { public: FilterSeaMonkey(); - ~FilterSeaMonkey(); + ~FilterSeaMonkey() override; - static QString defaultSettingsPath(); + Q_REQUIRED_RESULT static QString defaultSettingsPath(); protected: - QString defaultInstallFolder() const override; - QString settingsPath() override; + Q_REQUIRED_RESULT QString defaultInstallFolder() const override; + Q_REQUIRED_RESULT QString settingsPath() override; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/src/mailimporter/filters/filtersylpheed.h new/mailimporter-18.08.0/src/mailimporter/filters/filtersylpheed.h --- old/mailimporter-18.04.3/src/mailimporter/filters/filtersylpheed.h 2018-06-29 07:04:38.000000000 +0200 +++ new/mailimporter-18.08.0/src/mailimporter/filters/filtersylpheed.h 2018-08-06 07:14:22.000000000 +0200 @@ -32,17 +32,17 @@ { public: FilterSylpheed(); - ~FilterSylpheed(); + ~FilterSylpheed() override; - static QString defaultSettingsPath(); - static QString isMailerFound(); + Q_REQUIRED_RESULT static QString defaultSettingsPath(); + Q_REQUIRED_RESULT static QString isMailerFound(); void import() override; virtual void importMails(const QString &maildir); /* return local mail dir from folderlist.xml*/ virtual QString localMailDirPath(); - virtual bool excludeFile(const QString &file); + Q_REQUIRED_RESULT virtual bool excludeFile(const QString &file); virtual QString defaultInstallFolder() const; virtual QString markFile() const; private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/src/mailimporter/filters/filterthebat.h new/mailimporter-18.08.0/src/mailimporter/filters/filterthebat.h --- old/mailimporter-18.04.3/src/mailimporter/filters/filterthebat.h 2018-06-29 07:04:38.000000000 +0200 +++ new/mailimporter-18.08.0/src/mailimporter/filters/filterthebat.h 2018-08-06 07:14:22.000000000 +0200 @@ -31,7 +31,7 @@ { public: FilterTheBat(); - ~FilterTheBat(); + ~FilterTheBat() override; void import() override; void importMails(const QString &maildir); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/src/mailimporter/filters/filterthunderbird.h new/mailimporter-18.08.0/src/mailimporter/filters/filterthunderbird.h --- old/mailimporter-18.04.3/src/mailimporter/filters/filterthunderbird.h 2018-06-29 07:04:38.000000000 +0200 +++ new/mailimporter-18.08.0/src/mailimporter/filters/filterthunderbird.h 2018-08-06 07:14:22.000000000 +0200 @@ -30,24 +30,24 @@ { public: FilterThunderbird(); - ~FilterThunderbird(); + ~FilterThunderbird() override; void import() override; void importMails(const QString &maildir); - static QString defaultSettingsPath(); - static QString defaultProfile(const QString &defaultSettingPath, QWidget *parent = nullptr); - static QMap<QString, QString> listProfile(QString ¤tProfile, const QString &defaultSettingPath); + Q_REQUIRED_RESULT static QString defaultSettingsPath(); + Q_REQUIRED_RESULT static QString defaultProfile(const QString &defaultSettingPath, QWidget *parent = nullptr); + Q_REQUIRED_RESULT static QMap<QString, QString> listProfile(QString ¤tProfile, const QString &defaultSettingPath); - static QString isMailerFound(); + Q_REQUIRED_RESULT static QString isMailerFound(); protected: - virtual QString defaultInstallFolder() const; - virtual QString settingsPath(); + Q_REQUIRED_RESULT virtual QString defaultInstallFolder() const; + Q_REQUIRED_RESULT virtual QString settingsPath(); private: void importDirContents(const QString &, const QString &, const QString &); void importMBox(const QString &, const QString &, const QString &); - bool excludeFiles(const QString &file); + Q_REQUIRED_RESULT bool excludeFiles(const QString &file); }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/src/mailimporter/filters.h new/mailimporter-18.08.0/src/mailimporter/filters.h --- old/mailimporter-18.04.3/src/mailimporter/filters.h 2018-06-29 07:04:38.000000000 +0200 +++ new/mailimporter-18.08.0/src/mailimporter/filters.h 2018-08-06 07:14:22.000000000 +0200 @@ -39,9 +39,9 @@ virtual ~Filter(); virtual void import() = 0; - QString author() const; - QString name() const; - QString info() const; + Q_REQUIRED_RESULT QString author() const; + Q_REQUIRED_RESULT QString name() const; + Q_REQUIRED_RESULT QString info() const; void setAuthor(const QString &); void setName(const QString &); @@ -56,10 +56,10 @@ MailImporter::FilterImporterBase *filterImporter() const; void clearCountDuplicate(); - int countDuplicates() const; + Q_REQUIRED_RESULT int countDuplicates() const; void setMailDir(const QString &mailDir); - QString mailDir() const; + Q_REQUIRED_RESULT QString mailDir() const; protected: static int countDirectory(const QDir &dir, bool searchHiddenDirectory); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/src/mailimporter/messagestatus.h new/mailimporter-18.08.0/src/mailimporter/messagestatus.h --- old/mailimporter-18.04.3/src/mailimporter/messagestatus.h 2018-06-29 07:04:38.000000000 +0200 +++ new/mailimporter-18.08.0/src/mailimporter/messagestatus.h 2018-08-06 07:14:22.000000000 +0200 @@ -19,6 +19,7 @@ #define MESSAGESTATUS_H #include "mailimporter_export.h" +#include <QtGlobal> namespace MailImporter { class MAILIMPORTER_EXPORT MessageStatus @@ -28,16 +29,16 @@ ~MessageStatus(); void setRead(bool state); - bool isRead() const; + Q_REQUIRED_RESULT bool isRead() const; void setDeleted(bool state); - bool isDeleted() const; + Q_REQUIRED_RESULT bool isDeleted() const; void setReplied(bool state); - bool isReplied() const; + Q_REQUIRED_RESULT bool isReplied() const; void setForwarded(bool state); - bool isForwarded() const; + Q_REQUIRED_RESULT bool isForwarded() const; private: bool mRead = false; bool mDeleted = false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/src/mailimporter/othermailerutil.h new/mailimporter-18.08.0/src/mailimporter/othermailerutil.h --- old/mailimporter-18.04.3/src/mailimporter/othermailerutil.h 2018-06-29 07:04:38.000000000 +0200 +++ new/mailimporter-18.08.0/src/mailimporter/othermailerutil.h 2018-08-06 07:14:22.000000000 +0200 @@ -23,10 +23,10 @@ namespace MailImporter { namespace OtherMailerUtil { -MAILIMPORTER_EXPORT QString trojitaDefaultPath(); -MAILIMPORTER_EXPORT QString gearyDefaultPath(); -MAILIMPORTER_EXPORT QStringList isMailerFound(); -MAILIMPORTER_EXPORT QString nylasMailDefaultPath(); +Q_REQUIRED_RESULT MAILIMPORTER_EXPORT QString trojitaDefaultPath(); +Q_REQUIRED_RESULT MAILIMPORTER_EXPORT QString gearyDefaultPath(); +Q_REQUIRED_RESULT MAILIMPORTER_EXPORT QStringList isMailerFound(); +Q_REQUIRED_RESULT MAILIMPORTER_EXPORT QString nylasMailDefaultPath(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/src/mailimporter/selectthunderbirdprofilewidget.h new/mailimporter-18.08.0/src/mailimporter/selectthunderbirdprofilewidget.h --- old/mailimporter-18.04.3/src/mailimporter/selectthunderbirdprofilewidget.h 2018-06-29 07:04:38.000000000 +0200 +++ new/mailimporter-18.08.0/src/mailimporter/selectthunderbirdprofilewidget.h 2018-08-06 07:14:22.000000000 +0200 @@ -37,7 +37,7 @@ ~SelectThunderbirdProfileWidget(); void fillProfile(const QMap<QString, QString> &map, const QString &defaultProfile); - QString selectedProfile() const; + Q_REQUIRED_RESULT QString selectedProfile() const; private: Ui::SelectThunderbirdProfileWidget *ui = nullptr; @@ -49,7 +49,7 @@ public: explicit SelectThunderbirdProfileDialog(QWidget *parent = nullptr); ~SelectThunderbirdProfileDialog(); - QString selectedProfile() const; + Q_REQUIRED_RESULT QString selectedProfile() const; void fillProfile(const QMap<QString, QString> &map, const QString &defaultProfile); private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-18.04.3/src/mailimporterakonadi/filterimporterakonadi.h new/mailimporter-18.08.0/src/mailimporterakonadi/filterimporterakonadi.h --- old/mailimporter-18.04.3/src/mailimporterakonadi/filterimporterakonadi.h 2018-06-29 07:04:38.000000000 +0200 +++ new/mailimporter-18.08.0/src/mailimporterakonadi/filterimporterakonadi.h 2018-08-06 07:14:22.000000000 +0200 @@ -29,7 +29,7 @@ { public: FilterImporterAkonadi(MailImporter::FilterInfo *info); - ~FilterImporterAkonadi(); + ~FilterImporterAkonadi() override; bool importMessage(const QString &folderName, const QString &msgPath, bool duplicateCheck, const MailImporter::MessageStatus &status) override; void clear() override;
