Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package akonadi-import-wizard for
openSUSE:Factory checked in at 2021-12-13 20:39:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/akonadi-import-wizard (Old)
and /work/SRC/openSUSE:Factory/.akonadi-import-wizard.new.2520 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadi-import-wizard"
Mon Dec 13 20:39:05 2021 rev:65 rq:937858 version:21.12.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/akonadi-import-wizard/akonadi-import-wizard.changes
2021-11-06 18:14:15.484766941 +0100
+++
/work/SRC/openSUSE:Factory/.akonadi-import-wizard.new.2520/akonadi-import-wizard.changes
2021-12-13 20:39:08.272446429 +0100
@@ -1,0 +2,32 @@
+Fri Dec 3 19:21:18 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Update to 21.12.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/gear/21.12.0/
+- Changes since 21.11.90:
+ * Enable new GitLab CI on stable branch.
+
+-------------------------------------------------------------------
+Sat Nov 27 10:10:12 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Update to 21.11.90
+ * New feature release
+- No code change since 21.11.80
+
+-------------------------------------------------------------------
+Sat Nov 13 17:54:07 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Update to 21.11.80
+ * New feature release
+- Changes since 21.08.3:
+ * Allow to show header in qtc6
+ * Remove some qOverload as we remove deprecated qt5.15 signal
+ * Fix akonadi includes
+ * Add KDE CI file
+ * Use qOverload directly (scripted)
+ * Fix instanciate plugins
+ * Fix logic
+ * Port to KPluginFactory::instantiatePlugin
+
+-------------------------------------------------------------------
Old:
----
akonadi-import-wizard-21.08.3.tar.xz
akonadi-import-wizard-21.08.3.tar.xz.sig
New:
----
akonadi-import-wizard-21.12.0.tar.xz
akonadi-import-wizard-21.12.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ akonadi-import-wizard.spec ++++++
--- /var/tmp/diff_new_pack.3PmCdV/_old 2021-12-13 20:39:09.204446543 +0100
+++ /var/tmp/diff_new_pack.3PmCdV/_new 2021-12-13 20:39:09.208446544 +0100
@@ -22,7 +22,7 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print
$1"."$2}')}
%bcond_without lang
Name: akonadi-import-wizard
-Version: 21.08.3
+Version: 21.12.0
Release: 0
Summary: Assistant to import PIM data
License: GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -112,7 +112,6 @@
%dir %{_kf5_plugindir}/importwizard
%dir %{_kf5_sharedir}/importwizard
%dir %{_kf5_sharedir}/importwizard/pics
-%dir %{_kf5_sharedir}/kconf_update/
%doc %lang(en) %{_kf5_htmldir}/en/importwizard/
%{_kf5_applicationsdir}/org.kde.akonadiimportwizard.desktop
%{_kf5_bindir}/akonadiimportwizard
@@ -121,8 +120,6 @@
%{_kf5_iconsdir}/hicolor/*/apps/kontact-import-wizard.png
%{_kf5_plugindir}/importwizard/*.so
%{_kf5_sharedir}/importwizard/pics/step1.png
-%{_kf5_sharedir}/kconf_update/importwizard-15.08-kickoff.sh
-%{_kf5_sharedir}/kconf_update/importwizard.upd
%files -n %{lname}
%{_kf5_libdir}/libKPimImportWizard.so.5*
++++++ akonadi-import-wizard-21.08.3.tar.xz ->
akonadi-import-wizard-21.12.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-import-wizard-21.08.3/.gitlab-ci.yml
new/akonadi-import-wizard-21.12.0/.gitlab-ci.yml
--- old/akonadi-import-wizard-21.08.3/.gitlab-ci.yml 2021-10-09
09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/.gitlab-ci.yml 2021-11-30
21:59:28.000000000 +0100
@@ -1,34 +1,6 @@
# SPDX-FileCopyrightText: 2020-2021 Laurent Montel <[email protected]>
-# SPDX-FileCopyrightText: 2021 Laurent Montel <[email protected]>
# SPDX-License-Identifier: CC0-1.0
include:
- - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-before.yml
- -
https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-applications-linux.yml
-
-build_clazy_clang_tidy:
- stage: build
- image: kdeorg/ci-suse-qt515
- extends: .linux
- #only:
- # - merge_requests
- before_script:
- - zypper install -y clazy
- - git clone --depth=1 https://invent.kde.org/sysadmin/ci-tooling.git
$CI_TOOLING
- - git clone --depth=1 https://invent.kde.org/sysadmin/repo-metadata.git
$CI_TOOLING/repo-metadata
- - git clone --depth=1
https://invent.kde.org/sysadmin/kde-build-metadata.git
$CI_TOOLING/kde-build-metadata
- - git clone --depth=1 https://invent.kde.org/sdk/kde-dev-scripts.git
$CI_TOOLING/kde-dev-scripts
-
- script:
- - export CXX=clazy
- - export CC=clang
- - export CXXFLAGS="-Wno-deprecated-declarations"
- - export CLAZY_HEADER_FILTER='^(?!ui_)\w+.h\$'
- - export
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"
- - python3 -u $CI_TOOLING/helpers/prepare-dependencies.py --product
$PRODUCT --project $PROJECT --branchGroup $BRANCH_GROUP --environment
production --platform $PLATFORM --installTo $INSTALL_PREFIX
- - python3 -u $CI_TOOLING/helpers/configure-build.py --product $PRODUCT
--project $PROJECT --branchGroup $BRANCH_GROUP --platform $PLATFORM --installTo
$INSTALL_PREFIX
- - python3 -u $CI_TOOLING/helpers/compile-build.py --product $PRODUCT
--project $PROJECT --branchGroup $BRANCH_GROUP --platform $PLATFORM
--usingInstall $INSTALL_PREFIX
- - cd build && run-clang-tidy
- variables:
- PLATFORM: SUSEQt5.15
- BRANCH_GROUP: stable-kf5-qt5
+ -
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
+ -
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-import-wizard-21.08.3/.kde-ci.yml
new/akonadi-import-wizard-21.12.0/.kde-ci.yml
--- old/akonadi-import-wizard-21.08.3/.kde-ci.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/akonadi-import-wizard-21.12.0/.kde-ci.yml 2021-11-30
21:59:28.000000000 +0100
@@ -0,0 +1,16 @@
+# SPDX-FileCopyrightText: None
+# SPDX-License-Identifier: CC0-1.0
+
+Dependencies:
+- 'on': ['@all']
+ 'require':
+ 'frameworks/extra-cmake-modules': '@latest'
+ 'frameworks/kcontacts' : '@latest'
+ 'pim/akonadi' : '@same'
+ 'pim/kidentitymanagement' : '@same'
+ 'pim/kmailtransport' : '@same'
+ 'pim/libkdepim' : '@same'
+ 'pim/mailcommon' : '@same'
+ 'pim/mailimporter' : '@same'
+ 'pim/messagelib' : '@same'
+ 'pim/pimcommon' : '@same'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-import-wizard-21.08.3/CMakeLists.txt
new/akonadi-import-wizard-21.12.0/CMakeLists.txt
--- old/akonadi-import-wizard-21.08.3/CMakeLists.txt 2021-10-09
09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/CMakeLists.txt 2021-11-30
21:59:28.000000000 +0100
@@ -1,9 +1,9 @@
cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
-set(PIM_VERSION "5.18.3")
+set(PIM_VERSION "5.19.0")
project(AkonadiImportWizard VERSION ${PIM_VERSION})
-set(KF5_MIN_VERSION "5.83.0")
+set(KF5_MIN_VERSION "5.87.0")
find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
@@ -18,18 +18,20 @@
include(FeatureSummary)
include(KDEGitCommitHooks)
+include(KDEClangFormat)
+file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h *.c)
+kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
include(CheckFunctionExists)
-include(ECMGeneratePriFile)
include(KDEInstallDirs)
include(KDECMakeSettings)
-include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+include(KDECompilerSettings NO_POLICY_SCOPE)
include(ECMAddAppIcon)
include(ECMQtDeclareLoggingCategory)
# Do NOT add quote
-set(KDEPIM_DEV_VERSION )
-set(RELEASE_SERVICE_VERSION "21.08.3")
+set(KDEPIM_DEV_VERSION)
+set(RELEASE_SERVICE_VERSION "21.12.0")
# add an extra space
if(DEFINED KDEPIM_DEV_VERSION)
@@ -41,20 +43,19 @@
set(KDEPIM_VERSION "${PIM_VERSION}${KDEPIM_DEV_VERSION}
(${RELEASE_SERVICE_VERSION})")
-set(KMAILTRANSPORT_LIB_VERSION "5.18.3")
-set(AKONADI_VERSION "5.18.3")
+set(KMAILTRANSPORT_LIB_VERSION "5.19.0")
+set(AKONADI_VERSION "5.19.0")
set(KDEPIM_LIB_VERSION "${PIM_VERSION}")
set(KDEPIM_LIB_SOVERSION "5")
-set(QT_REQUIRED_VERSION "5.15.0")
+set(QT_REQUIRED_VERSION "5.15.2")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Gui)
-set(MAILIMPORTER_VERSION "5.18.3")
-set(MAILCOMMON_LIB_VERSION "5.18.3")
-set(MESSAGELIB_LIB_VERSION "5.18.3")
-set(PIMCOMMON_LIB_VERSION "5.18.3")
-set(IDENTITYMANAGEMENT_LIB_VERSION "5.18.3")
-set(GRANTLEETHEME_LIB_VERSION "5.18.3")
+set(MAILIMPORTER_VERSION "5.19.0")
+set(MAILCOMMON_LIB_VERSION "5.19.0")
+set(MESSAGELIB_LIB_VERSION "5.19.0")
+set(PIMCOMMON_LIB_VERSION "5.19.0")
+set(IDENTITYMANAGEMENT_LIB_VERSION "5.19.0")
# Find KF5 package
find_package(KF5Config ${KF5_MIN_VERSION} CONFIG REQUIRED)
@@ -69,7 +70,6 @@
find_package(KF5Contacts ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5IdentityManagement ${IDENTITYMANAGEMENT_LIB_VERSION} CONFIG
REQUIRED)
find_package(KF5MailTransport ${KMAILTRANSPORT_LIB_VERSION} CONFIG REQUIRED)
-find_package(KF5GrantleeTheme ${GRANTLEETHEME_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5MailCommon ${MAILCOMMON_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5MailImporterAkonadi ${MAILIMPORTER_VERSION} CONFIG REQUIRED)
@@ -86,14 +86,12 @@
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
add_definitions(-DQT_USE_QSTRINGBUILDER)
-add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00)
-add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055400)
+add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02)
+add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055800)
if(BUILD_TESTING)
add_definitions(-DBUILD_TESTING)
endif()
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile
time)" OFF)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-import-wizard-21.08.3/CMakePresets.json
new/akonadi-import-wizard-21.12.0/CMakePresets.json
--- old/akonadi-import-wizard-21.08.3/CMakePresets.json 2021-10-09
09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/CMakePresets.json 2021-11-30
21:59:28.000000000 +0100
@@ -1,5 +1,5 @@
{
- "version": 2,
+ "version": 3,
"configurePresets": [
{
"name": "dev",
@@ -8,8 +8,21 @@
"binaryDir": "${sourceDir}/build",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
- "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
- }
+ "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+ },
+ "installDir": "$env{KF5}"
+ },
+ {
+ "name": "dev-disable-deprecated",
+ "displayName": "Build as without deprecated methods",
+ "generator": "Ninja",
+ "binaryDir": "${sourceDir}/build-disable-deprecated",
+ "cacheVariables": {
+ "CMAKE_BUILD_TYPE": "Debug",
+ "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
+ "CMAKE_CXX_FLAGS_INIT":
"-DQT_DISABLE_DEPRECATED_BEFORE=0x060000
-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000"
+ },
+ "installDir": "$env{KF5}"
},
{
"name": "asan",
@@ -19,8 +32,21 @@
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"ECM_ENABLE_SANITIZERS" : "'address;undefined'",
- "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
- }
+ "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+ },
+ "installDir": "$env{KF5}"
+ },
+ {
+ "name": "pch",
+ "displayName": "Build with PCH support.",
+ "generator": "Ninja",
+ "binaryDir": "${sourceDir}/build-pch",
+ "cacheVariables": {
+ "CMAKE_BUILD_TYPE": "Debug",
+ "COMPILE_WITH_CMAKE_PCH_SUPPORT": "ON",
+ "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+ },
+ "installDir": "$env{KF5}"
},
{
"name": "dev-clang",
@@ -34,7 +60,8 @@
"environment": {
"CXX": "clang++",
"CCACHE_DISABLE": "ON"
- }
+ },
+ "installDir": "$env{KF5}"
},
{
"name": "unity",
@@ -43,9 +70,10 @@
"binaryDir": "${sourceDir}/build-unity",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
- "USE_UNITY_CMAKE_SUPPORT": "ON",
- "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
- }
+ "USE_UNITY_CMAKE_SUPPORT": "ON",
+ "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+ },
+ "installDir": "$env{KF5}"
},
{
"name": "release",
@@ -54,7 +82,8 @@
"binaryDir": "${sourceDir}/build-release",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release"
- }
+ },
+ "installDir": "$env{KF5}"
},
{
"name": "profile",
@@ -63,8 +92,9 @@
"binaryDir": "${sourceDir}/build-profile",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "RelWithDebInfo",
- "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
- }
+ "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+ },
+ "installDir": "$env{KF5}"
},
{
"name": "clazy",
@@ -77,7 +107,8 @@
"environment": {
"CXX": "clazy",
"CCACHE_DISABLE": "ON"
- }
+ },
+ "installDir": "$env{KF5}"
}
],
@@ -87,6 +118,14 @@
"configurePreset": "dev"
},
{
+ "name": "dev-disable-deprecated",
+ "configurePreset": "dev-disable-deprecated"
+ },
+ {
+ "name": "pch",
+ "configurePreset": "pch"
+ },
+ {
"name": "release",
"configurePreset": "release"
},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/po/ar/akonadiimportwizard.po
new/akonadi-import-wizard-21.12.0/po/ar/akonadiimportwizard.po
--- old/akonadi-import-wizard-21.08.3/po/ar/akonadiimportwizard.po
2021-11-02 01:17:44.000000000 +0100
+++ new/akonadi-import-wizard-21.12.0/po/ar/akonadiimportwizard.po
2021-12-03 01:16:15.000000000 +0100
@@ -2,21 +2,22 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Safa Alfulaij <[email protected]>, 2015, 2018.
+# Zayed Al-Saidi <[email protected]>, 2021.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2021-04-20 00:18+0000\n"
-"PO-Revision-Date: 2018-01-30 18:24+0300\n"
-"Last-Translator: Safa Alfulaij <[email protected]>\n"
-"Language-Team: Arabic <[email protected]>\n"
+"PO-Revision-Date: 2021-07-26 22:54+0400\n"
+"Last-Translator: Zayed Al-Saidi <[email protected]>\n"
+"Language-Team: ar\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"
#, kde-format
msgctxt "NAME OF TRANSLATORS"
@@ -34,8 +35,7 @@
msgstr "???? ?????????? ?????? ??????????."
#: importwizard.cpp:42
-#, fuzzy, kde-format
-#| msgid "PIM Import Tool"
+#, kde-format
msgctxt "@title:window"
msgid "PIM Import Tool"
msgstr "???????? ?????????????? PIM"
@@ -176,8 +176,7 @@
msgstr "???????? ???????????????? ????????????..."
#: libimportwizard/abstractaddressbook.cpp:36
-#, fuzzy, kde-format
-#| msgid "Select Address Book"
+#, kde-format
msgctxt "@title:window"
msgid "Select Address Book"
msgstr "???????????? ???????? ????????????"
@@ -254,10 +253,9 @@
msgstr "???????? ?????????????? PIM"
#: main.cpp:43
-#, fuzzy, kde-format
-#| msgid "Copyright ?? 2012-2018 ImportWizard authors"
+#, kde-format
msgid "Copyright ?? 2012-2021 ImportWizard authors"
-msgstr "???????????? ???????????? ?? ????????-???????? ??????????????
?????????? ????????????????????"
+msgstr "???????????? ???????????? ?? ????????-???????? ??????????????
?????????? ????????????????????"
#: main.cpp:45
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/po/az/akonadiimportwizard.po
new/akonadi-import-wizard-21.12.0/po/az/akonadiimportwizard.po
--- old/akonadi-import-wizard-21.08.3/po/az/akonadiimportwizard.po
2021-11-02 01:17:44.000000000 +0100
+++ new/akonadi-import-wizard-21.12.0/po/az/akonadiimportwizard.po
2021-12-03 01:16:15.000000000 +0100
@@ -7,7 +7,7 @@
"Project-Id-Version: akonadi-import-wizard\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2021-04-20 00:18+0000\n"
-"PO-Revision-Date: 2021-07-21 01:31+0400\n"
+"PO-Revision-Date: 2021-07-21 01:23+0400\n"
"Last-Translator: Kheyyam Gojayev <[email protected]>\n"
"Language-Team: Azerbaijani <[email protected]>\n"
"Language: az\n"
@@ -101,52 +101,52 @@
#: importwizard.cpp:211
#, kde-format
msgid "Import addressbook from %1..."
-msgstr "??nvan_kitab??as??n?? %1-d??n idxal etm??k..."
+msgstr "%1 ??nvan kitab??as??n??n idxal??..."
#: importwizard.cpp:214
#, kde-format
msgid "Import addressbook from %1: Done"
-msgstr "??nvan_kitab??as??n?? %1-d??n idxal edilm??si: Ba??a ??atd??"
+msgstr "%1 ??nvan kitab??as??n??n idxal??: Ba??a ??atd??"
#: importwizard.cpp:220
#, kde-format
msgid "Import filters from %1..."
-msgstr "Filtirl??rin %1-d??n idxal edilm??si"
+msgstr "%1 ??nvan??ndan s??zg??cl??rin idxal??..."
#: importwizard.cpp:223
#, kde-format
msgid "Import filters from %1: Done"
-msgstr "Filtirl??rin %1-d??n idxal edilm??si: Ba??a ??atd??"
+msgstr "%1 s??zg??cl??rinin idxal??: Ba??a ??atd??"
#: importwizard.cpp:229
#, kde-format
msgid "Import mails from %1..."
-msgstr "Po??tlar??n %1 ??nvan??ndan idxal??..."
+msgstr "M??ktublar??n %1 po??tundan idxal??..."
#: importwizard.cpp:232
#, kde-format
msgid "Import mails from %1: Done"
-msgstr "Po??tlar??n %1 ??nvan??ndan idxal??: Ba??a ??atd??"
+msgstr "M??ktublar??n %1 po??tundan idxal??: Ba??a ??atd??"
#: importwizard.cpp:238
#, kde-format
msgid "Import settings from %1..."
-msgstr "Ayarlar??n %1 m??nb??yind??n idxal??..."
+msgstr "%1 ayarlar??n??n idxal edilm??si..."
#: importwizard.cpp:241
#, kde-format
msgid "Import settings from %1: Done"
-msgstr "Ayarlar??n %1 m??nb??yind??n idxal??: Ba??a ??atd??"
+msgstr "%1 ayarlar??n??n idxal edilm??si: Ba??a ??atd??"
#: importwizard.cpp:247
#, kde-format
msgid "Import calendar from %1..."
-msgstr "T??qviml??rin %1 m??nb??yind??n idxal??..."
+msgstr "%1 t??qviml??rinin idxal edilm??si..."
#: importwizard.cpp:250
#, kde-format
msgid "Import calendar from %1: Done"
-msgstr "T??qviml??rin %1 m??nb??yind??n idxal??: Ba??a ??atd??"
+msgstr "%1 t??qviml??rinin idxal edilm??si: Ba??a ??atd??"
#: importwizard.cpp:339 plugins/balsa/balsaimportdata.cpp:48
#: plugins/claws-mail/clawsmailimportdata.cpp:49
@@ -194,7 +194,7 @@
#: libimportwizard/abstractaddressbook.cpp:69
#, kde-format
msgid "Imported from \"%1\""
-msgstr "\"%1\" m??nb??yind??n idxal edildi"
+msgstr "\"%1\" fayl??ndan idxal edildi"
#: libimportwizard/abstractaddressbook.cpp:88
#, kde-format
@@ -209,19 +209,19 @@
#: libimportwizard/abstractimporter.cpp:67
#, kde-format
msgid "Importing of filters from \"%1\" was canceled."
-msgstr "\"%1\" m??nb??yind??n s??zg??cl??rin idxal?? l????v edildi."
+msgstr "\"%1\" s??zg??cl????rinin idxal?? l????v edildi."
#: libimportwizard/abstractimporter.cpp:69
#, kde-format
msgid "1 filter was imported from \"%2\""
msgid_plural "%1 filters were imported from \"%2\""
-msgstr[0] "%1 s??zg??ci \"%2\" m??nb??yind??n idxal edildi"
-msgstr[1] "%1 s??zg??ci \"%2\" m??nb??yind??n idxal edildi"
+msgstr[0] "\"%2\", %1 s??zg??ci idxal edildi"
+msgstr[1] "\"%2\", %1 s??zg??ci idxal edildi"
#: libimportwizard/abstractimporter.cpp:73
#, kde-format
msgid "Filters file was not found"
-msgstr "S??zg??cl??r fayl?? tap??lmad??"
+msgstr "Filtrl??r fayl?? tap??lmad??"
#: libimportwizard/abstractsettings.cpp:38
#, kde-format
@@ -300,8 +300,8 @@
"Evolution address book will be exported as vCard. Import vCard in "
"KAddressBook."
msgstr ""
-"Evolution ??nvan kitab??alar?? VCard kimi ixrac edil??c??k. VCard-??n
KAddressBook-"
-"a idxal olunmas??."
+"Evolution ??nvan kitab??alar?? VCard kimi ixrac edil??c??k. VCard-??
KAddressBook-"
+"a idxal edin."
#: plugins/evolutionv3/evolutionaddressbook.cpp:27
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/po/ca/docs/importwizard/index.docbook
new/akonadi-import-wizard-21.12.0/po/ca/docs/importwizard/index.docbook
--- old/akonadi-import-wizard-21.08.3/po/ca/docs/importwizard/index.docbook
2021-11-02 01:17:44.000000000 +0100
+++ new/akonadi-import-wizard-21.12.0/po/ca/docs/importwizard/index.docbook
2021-12-03 01:16:16.000000000 +0100
@@ -128,7 +128,7 @@
>Aplicacions de correu detectades</title>
<para
->L'assistent d'importaci?? detectar?? totes les aplicacions de correu
electr??nic implementades, i en far?? una llista a la finestra. Seleccioneu
l'aplicaci?? de la que voleu importar i feu clic al bot?? <guibutton
+>L'assistent d'importaci?? detectar?? totes les aplicacions de correu
electr??nic implementades, i en far?? una llista a la finestra. Seleccioneu
l'aplicaci?? des de la qual voleu importar i feu clic al bot?? <guibutton
>Seg??ent</guibutton
>. L'assistent us demanar?? si ho voleu importar tot, o us donar?? opcions per
>a seleccionar els tipus de material que voleu importar.</para>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/po/sk/akonadiimportwizard.po
new/akonadi-import-wizard-21.12.0/po/sk/akonadiimportwizard.po
--- old/akonadi-import-wizard-21.08.3/po/sk/akonadiimportwizard.po
2021-11-02 01:17:44.000000000 +0100
+++ new/akonadi-import-wizard-21.12.0/po/sk/akonadiimportwizard.po
2021-12-03 01:16:16.000000000 +0100
@@ -1,19 +1,19 @@
# translation of importwizard.po to Slovak
-# Roman Paholik <[email protected]>, 2012, 2013, 2014, 2015, 2016, 2017.
+# Roman Paholik <[email protected]>, 2012, 2013, 2014, 2015, 2016, 2017,
2021.
# Matej Mrenica <[email protected]>, 2019.
msgid ""
msgstr ""
"Project-Id-Version: importwizard\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2021-04-20 00:18+0000\n"
-"PO-Revision-Date: 2019-07-17 16:14+0200\n"
-"Last-Translator: Matej Mrenica <[email protected]>\n"
-"Language-Team: Slovak <[email protected]>\n"
+"PO-Revision-Date: 2021-11-18 17:33+0100\n"
+"Last-Translator: Roman Paholik <[email protected]>\n"
+"Language-Team: Slovak <[email protected]>\n"
"Language: sk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 19.04.3\n"
+"X-Generator: Lokalize 21.08.3\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#, kde-format
@@ -32,8 +32,7 @@
msgstr "Nen??jden?? program."
#: importwizard.cpp:42
-#, fuzzy, kde-format
-#| msgid "PIM Import Tool"
+#, kde-format
msgctxt "@title:window"
msgid "PIM Import Tool"
msgstr "Importovac?? n??stroj PIM"
@@ -176,8 +175,7 @@
msgstr "Vytv??ram nov?? kontakt..."
#: libimportwizard/abstractaddressbook.cpp:36
-#, fuzzy, kde-format
-#| msgid "Select Address Book"
+#, kde-format
msgctxt "@title:window"
msgid "Select Address Book"
msgstr "Vybra?? knihu adries"
@@ -251,10 +249,9 @@
msgstr "Importovac?? n??stroj PIM"
#: main.cpp:43
-#, fuzzy, kde-format
-#| msgid "Copyright ?? 2012-2018 ImportWizard authors"
+#, kde-format
msgid "Copyright ?? 2012-2021 ImportWizard authors"
-msgstr "Copyright ?? 2012-2018 Autori ImportWizard"
+msgstr "Copyright ?? 2012-2021 Autori ImportWizard"
#: main.cpp:45
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/po/zh_CN/akonadiimportwizard.po
new/akonadi-import-wizard-21.12.0/po/zh_CN/akonadiimportwizard.po
--- old/akonadi-import-wizard-21.08.3/po/zh_CN/akonadiimportwizard.po
2021-11-02 01:17:44.000000000 +0100
+++ new/akonadi-import-wizard-21.12.0/po/zh_CN/akonadiimportwizard.po
2021-12-03 01:16:16.000000000 +0100
@@ -3,7 +3,7 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2021-04-20 00:18+0000\n"
-"PO-Revision-Date: 2021-10-29 13:27\n"
+"PO-Revision-Date: 2021-11-30 15:23\n"
"Last-Translator: \n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-import-wizard-21.08.3/src/CMakeLists.txt
new/akonadi-import-wizard-21.12.0/src/CMakeLists.txt
--- old/akonadi-import-wizard-21.08.3/src/CMakeLists.txt 2021-10-09
09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/CMakeLists.txt 2021-11-30
21:59:28.000000000 +0100
@@ -2,7 +2,6 @@
configure_file(importwizard-version.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/importwizard-version.h @ONLY)
add_subdirectory(icons)
-add_subdirectory(kconf_update)
add_subdirectory(libimportwizard)
file(GLOB ICONS_SRCS
"${CMAKE_CURRENT_SOURCE_DIR}/icons/*-apps-kontact-import-wizard.png")
@@ -28,6 +27,25 @@
autodetect/selectcomponentpage.cpp
autodetect/importfilterinfogui.cpp
autodetect/importcalendarpage.cpp
+
+ importmailpluginmanager.h
+ autodetect/importaddressbookpage.h
+ autodetect/selectprogrampage.h
+ autodetect/importfilterpage.h
+ autodetect/selectcomponentpage.h
+ autodetect/importfinishpage.h
+ autodetect/importmailpage.h
+ autodetect/widgets/selectprogramlistwidget.h
+ autodetect/importsettingpage.h
+ autodetect/importfilterinfogui.h
+ autodetect/importcalendarpage.h
+ importwizardkernel.h
+ importwizarddisplayinfo.h
+ libimportwizard_private_export.h
+ importwizard.h
+ manual/manualselectfilterpage.h
+ manual/manualimportmailpage.h
+ manual/importwizardfilterinfogui.h
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/autodetect/importaddressbookpage.h
new/akonadi-import-wizard-21.12.0/src/autodetect/importaddressbookpage.h
--- old/akonadi-import-wizard-21.08.3/src/autodetect/importaddressbookpage.h
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/autodetect/importaddressbookpage.h
2021-11-30 21:59:28.000000000 +0100
@@ -19,7 +19,7 @@
public:
explicit ImportAddressbookPage(QWidget *parent = nullptr);
- ~ImportAddressbookPage();
+ ~ImportAddressbookPage() override;
void addImportInfo(const QString &log);
void addImportError(const QString &log);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/autodetect/importcalendarpage.h
new/akonadi-import-wizard-21.12.0/src/autodetect/importcalendarpage.h
--- old/akonadi-import-wizard-21.08.3/src/autodetect/importcalendarpage.h
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/autodetect/importcalendarpage.h
2021-11-30 21:59:28.000000000 +0100
@@ -19,7 +19,7 @@
public:
explicit ImportCalendarPage(QWidget *parent = nullptr);
- ~ImportCalendarPage();
+ ~ImportCalendarPage() override;
void addImportInfo(const QString &log);
void addImportError(const QString &log);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/autodetect/importfilterpage.h
new/akonadi-import-wizard-21.12.0/src/autodetect/importfilterpage.h
--- old/akonadi-import-wizard-21.08.3/src/autodetect/importfilterpage.h
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/autodetect/importfilterpage.h
2021-11-30 21:59:28.000000000 +0100
@@ -18,7 +18,7 @@
Q_OBJECT
public:
explicit ImportFilterPage(QWidget *parent = nullptr);
- ~ImportFilterPage();
+ ~ImportFilterPage() override;
void addImportInfo(const QString &log);
void addImportError(const QString &log);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/autodetect/importfinishpage.h
new/akonadi-import-wizard-21.12.0/src/autodetect/importfinishpage.h
--- old/akonadi-import-wizard-21.08.3/src/autodetect/importfinishpage.h
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/autodetect/importfinishpage.h
2021-11-30 21:59:28.000000000 +0100
@@ -17,7 +17,7 @@
Q_OBJECT
public:
explicit ImportFinishPage(QWidget *parent = nullptr);
- ~ImportFinishPage();
+ ~ImportFinishPage() override;
void addImportInfo(const QString &log);
void addImportError(const QString &log);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/autodetect/importmailpage.h
new/akonadi-import-wizard-21.12.0/src/autodetect/importmailpage.h
--- old/akonadi-import-wizard-21.08.3/src/autodetect/importmailpage.h
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/autodetect/importmailpage.h
2021-11-30 21:59:28.000000000 +0100
@@ -28,7 +28,7 @@
Q_OBJECT
public:
explicit ImportMailPage(QWidget *parent = nullptr);
- ~ImportMailPage();
+ ~ImportMailPage() override;
MailImporter::ImportMailsWidget *mailWidget();
Akonadi::Collection selectedCollection() const;
void setImportButtonEnabled(bool enabled);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/autodetect/importsettingpage.h
new/akonadi-import-wizard-21.12.0/src/autodetect/importsettingpage.h
--- old/akonadi-import-wizard-21.08.3/src/autodetect/importsettingpage.h
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/autodetect/importsettingpage.h
2021-11-30 21:59:28.000000000 +0100
@@ -18,7 +18,7 @@
Q_OBJECT
public:
explicit ImportSettingPage(QWidget *parent = nullptr);
- ~ImportSettingPage();
+ ~ImportSettingPage() override;
void addImportInfo(const QString &log);
void addImportError(const QString &log);
void setImportButtonEnabled(bool enabled);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/autodetect/selectcomponentpage.h
new/akonadi-import-wizard-21.12.0/src/autodetect/selectcomponentpage.h
--- old/akonadi-import-wizard-21.08.3/src/autodetect/selectcomponentpage.h
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/autodetect/selectcomponentpage.h
2021-11-30 21:59:28.000000000 +0100
@@ -19,7 +19,7 @@
public:
explicit SelectComponentPage(QWidget *parent = nullptr);
- ~SelectComponentPage();
+ ~SelectComponentPage() override;
void
setEnabledComponent(LibImportWizard::AbstractImporter::TypeSupportedOptions
options);
LibImportWizard::AbstractImporter::TypeSupportedOptions
selectedComponents() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/autodetect/selectprogrampage.h
new/akonadi-import-wizard-21.12.0/src/autodetect/selectprogrampage.h
--- old/akonadi-import-wizard-21.08.3/src/autodetect/selectprogrampage.h
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/autodetect/selectprogrampage.h
2021-11-30 21:59:28.000000000 +0100
@@ -21,7 +21,7 @@
public:
explicit SelectProgramPage(QWidget *parent = nullptr);
- ~SelectProgramPage();
+ ~SelectProgramPage() override;
void setFoundProgram(const QStringList &list);
void disableSelectProgram();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/importmailpluginmanager.cpp
new/akonadi-import-wizard-21.12.0/src/importmailpluginmanager.cpp
--- old/akonadi-import-wizard-21.08.3/src/importmailpluginmanager.cpp
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/importmailpluginmanager.cpp
2021-11-30 21:59:28.000000000 +0100
@@ -7,9 +7,8 @@
#include "importmailpluginmanager.h"
#include "abstractimporter.h"
#include "importwizard_debug.h"
-
+#include "kcoreaddons_version.h"
#include <KPluginFactory>
-#include <KPluginLoader>
#include <KPluginMetaData>
#include <QFileInfo>
@@ -40,8 +39,7 @@
bool ImportMailPluginManager::initializePluginList()
{
- const QVector<KPluginMetaData> plugins =
KPluginLoader::findPlugins(QStringLiteral("importwizard"));
-
+ const QVector<KPluginMetaData> plugins =
KPluginMetaData::findPlugins(QStringLiteral("importwizard"));
QVectorIterator<KPluginMetaData> i(plugins);
i.toBack();
while (i.hasPrevious()) {
@@ -50,9 +48,8 @@
// 1) get plugin data => name/description etc.
info.pluginData = createPluginMetaData(data);
- // 2) look at if plugin is activated
- info.metaDataFileNameBaseName = QFileInfo(data.fileName()).baseName();
info.metaDataFileName = data.fileName();
+ info.data = data;
if (pluginVersion() == data.version()) {
info.plugin = nullptr;
mPluginList.push_back(info);
@@ -69,9 +66,8 @@
void ImportMailPluginManager::loadPlugin(ImportMailPluginManagerInfo *item)
{
- KPluginLoader pluginLoader(item->metaDataFileName);
- if (pluginLoader.factory()) {
- item->plugin =
pluginLoader.factory()->create<LibImportWizard::AbstractImporter>(this,
QVariantList() << item->metaDataFileNameBaseName);
+ if (auto plugin =
KPluginFactory::instantiatePlugin<LibImportWizard::AbstractImporter>(item->data,
this, QVariantList() << item->metaDataFileName).plugin) {
+ item->plugin = plugin;
mPluginDataList.append(item->pluginData);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/importmailpluginmanager.h
new/akonadi-import-wizard-21.12.0/src/importmailpluginmanager.h
--- old/akonadi-import-wizard-21.08.3/src/importmailpluginmanager.h
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/importmailpluginmanager.h
2021-11-30 21:59:28.000000000 +0100
@@ -33,9 +33,9 @@
{
}
- QString metaDataFileNameBaseName;
QString metaDataFileName;
PluginUtilData pluginData;
+ KPluginMetaData data;
LibImportWizard::AbstractImporter *plugin = nullptr;
};
@@ -44,7 +44,7 @@
Q_OBJECT
public:
explicit ImportMailPluginManager(QObject *parent = nullptr);
- ~ImportMailPluginManager();
+ ~ImportMailPluginManager() override;
static ImportMailPluginManager *self();
bool initializePluginList();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/importwizard-version.h.cmake
new/akonadi-import-wizard-21.12.0/src/importwizard-version.h.cmake
--- old/akonadi-import-wizard-21.08.3/src/importwizard-version.h.cmake
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/importwizard-version.h.cmake
2021-11-30 21:59:28.000000000 +0100
@@ -15,10 +15,5 @@
build against older kdelibs releases.
*/
-#ifndef IMPORTWIZARD_VERSION_H
-#define IMPORTWIZARD_VERSION_H
-
-
+#pragma once
#define KDEPIM_VERSION "@KDEPIM_VERSION@"
-
-#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-import-wizard-21.08.3/src/importwizard.cpp
new/akonadi-import-wizard-21.12.0/src/importwizard.cpp
--- old/akonadi-import-wizard-21.08.3/src/importwizard.cpp 2021-10-09
09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/importwizard.cpp 2021-11-30
21:59:28.000000000 +0100
@@ -24,7 +24,7 @@
#include <MailImporterAkonadi/FilterImporterAkonadi>
#include "importwizard_debug.h"
-#include <AkonadiWidgets/controlgui.h>
+#include <Akonadi/ControlGui>
#include <KAboutData>
#include <KConfigGroup>
#include <KHelpMenu>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/importwizardkernel.cpp
new/akonadi-import-wizard-21.12.0/src/importwizardkernel.cpp
--- old/akonadi-import-wizard-21.08.3/src/importwizardkernel.cpp
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/importwizardkernel.cpp
2021-11-30 21:59:28.000000000 +0100
@@ -5,11 +5,11 @@
*/
#include "importwizardkernel.h"
-#include <AkonadiCore/changerecorder.h>
-#include <AkonadiCore/entitymimetypefiltermodel.h>
-#include <AkonadiCore/entitytreemodel.h>
-#include <AkonadiCore/session.h>
-#include <KIdentityManagement/kidentitymanagement/identitymanager.h>
+#include <Akonadi/ChangeRecorder>
+#include <Akonadi/EntityMimeTypeFilterModel>
+#include <Akonadi/EntityTreeModel>
+#include <Akonadi/Session>
+#include <KIdentityManagement/IdentityManager>
#include <KSharedConfig>
#include <MailCommon/FolderCollectionMonitor>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/kconf_update/CMakeLists.txt
new/akonadi-import-wizard-21.12.0/src/kconf_update/CMakeLists.txt
--- old/akonadi-import-wizard-21.08.3/src/kconf_update/CMakeLists.txt
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/kconf_update/CMakeLists.txt
1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-install(FILES importwizard.upd
- DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}
-)
-install(PROGRAMS importwizard-15.08-kickoff.sh
- DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}
-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/kconf_update/importwizard-15.08-kickoff.sh
new/akonadi-import-wizard-21.12.0/src/kconf_update/importwizard-15.08-kickoff.sh
---
old/akonadi-import-wizard-21.08.3/src/kconf_update/importwizard-15.08-kickoff.sh
2021-10-09 09:23:02.000000000 +0200
+++
new/akonadi-import-wizard-21.12.0/src/kconf_update/importwizard-15.08-kickoff.sh
1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-kickoffrcname=`qtpaths --locate-file GenericConfigLocation kickoffrc`
-if [ -f "$kickoffrcname" ]; then
- sed -i "s/\/importwizard.desktop/\/org.kde.importwizard.desktop/"
$kickoffrcname
-fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/kconf_update/importwizard.upd
new/akonadi-import-wizard-21.12.0/src/kconf_update/importwizard.upd
--- old/akonadi-import-wizard-21.08.3/src/kconf_update/importwizard.upd
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/kconf_update/importwizard.upd
1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-Version=5
-
-# Update entry in kickoffrc after the .desktop file has been renamed in 15.08
-Id=importwizard-15.08-kickoff
-Script=importwizard-15.08-kickoff.sh,sh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/libimportwizard/CMakeLists.txt
new/akonadi-import-wizard-21.12.0/src/libimportwizard/CMakeLists.txt
--- old/akonadi-import-wizard-21.08.3/src/libimportwizard/CMakeLists.txt
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/libimportwizard/CMakeLists.txt
2021-11-30 21:59:28.000000000 +0100
@@ -46,6 +46,14 @@
abstractdisplayinfo.cpp
importwizardutil.cpp
importwizardsavepasswordjob.cpp
+ abstractsettings.h
+ abstractbase.h
+ importwizardutil.h
+ abstractaddressbook.h
+ importwizardsavepasswordjob.h
+ abstractimporter.h
+ abstractdisplayinfo.h
+ abstractcalendar.h
)
ecm_qt_declare_logging_category(KPimImportWizard HEADER
libimportwizard_debug.h IDENTIFIER LIBIMPORTWIZARD_LOG CATEGORY_NAME
org.kde.pim.importwizard.lib
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/libimportwizard/abstractaddressbook.cpp
new/akonadi-import-wizard-21.12.0/src/libimportwizard/abstractaddressbook.cpp
---
old/akonadi-import-wizard-21.08.3/src/libimportwizard/abstractaddressbook.cpp
2021-10-09 09:23:02.000000000 +0200
+++
new/akonadi-import-wizard-21.12.0/src/libimportwizard/abstractaddressbook.cpp
2021-11-30 21:59:28.000000000 +0100
@@ -7,12 +7,12 @@
#include "abstractdisplayinfo.h"
#include "libimportwizard_debug.h"
-#include <AkonadiCore/Item>
-#include <AkonadiCore/ItemCreateJob>
-#include <AkonadiWidgets/CollectionDialog>
+#include <Akonadi/CollectionDialog>
+#include <Akonadi/Item>
+#include <Akonadi/ItemCreateJob>
#include <KContacts/Addressee>
+#include <KContacts/ContactGroup>
#include <KLocalizedString>
-#include <kcontacts/contactgroup.h>
#include <QPointer>
using namespace LibImportWizard;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/libimportwizard/abstractaddressbook.h
new/akonadi-import-wizard-21.12.0/src/libimportwizard/abstractaddressbook.h
--- old/akonadi-import-wizard-21.08.3/src/libimportwizard/abstractaddressbook.h
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/libimportwizard/abstractaddressbook.h
2021-11-30 21:59:28.000000000 +0100
@@ -8,7 +8,7 @@
#include "abstractbase.h"
#include "libimportwizard_export.h"
-#include <AkonadiCore/Collection>
+#include <Akonadi/Collection>
namespace KContacts
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/libimportwizard/abstractbase.cpp
new/akonadi-import-wizard-21.12.0/src/libimportwizard/abstractbase.cpp
--- old/akonadi-import-wizard-21.08.3/src/libimportwizard/abstractbase.cpp
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/libimportwizard/abstractbase.cpp
2021-11-30 21:59:28.000000000 +0100
@@ -9,9 +9,9 @@
#include <KSharedConfig>
-#include <AkonadiCore/agentinstancecreatejob.h>
-#include <AkonadiCore/agentmanager.h>
-#include <AkonadiCore/agenttype.h>
+#include <Akonadi/AgentInstanceCreateJob>
+#include <Akonadi/AgentManager>
+#include <Akonadi/AgentType>
#include <QMetaMethod>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/libimportwizard/abstractbase.h
new/akonadi-import-wizard-21.12.0/src/libimportwizard/abstractbase.h
--- old/akonadi-import-wizard-21.08.3/src/libimportwizard/abstractbase.h
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/libimportwizard/abstractbase.h
2021-11-30 21:59:28.000000000 +0100
@@ -24,7 +24,7 @@
Q_OBJECT
public:
explicit AbstractBase();
- virtual ~AbstractBase();
+ ~AbstractBase() override;
QString createResource(const QString &resources, const QString &name,
const QMap<QString, QVariant> &settings);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/libimportwizard/abstractimporter.h
new/akonadi-import-wizard-21.12.0/src/libimportwizard/abstractimporter.h
--- old/akonadi-import-wizard-21.08.3/src/libimportwizard/abstractimporter.h
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/libimportwizard/abstractimporter.h
2021-11-30 21:59:28.000000000 +0100
@@ -32,7 +32,7 @@
Q_DECLARE_FLAGS(TypeSupportedOptions, TypeSupportedOption)
explicit AbstractImporter(QObject *parent);
- virtual ~AbstractImporter();
+ ~AbstractImporter() override;
/**
* Return true if mail found on system
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/libimportwizard/abstractsettings.cpp
new/akonadi-import-wizard-21.12.0/src/libimportwizard/abstractsettings.cpp
--- old/akonadi-import-wizard-21.08.3/src/libimportwizard/abstractsettings.cpp
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/libimportwizard/abstractsettings.cpp
2021-11-30 21:59:28.000000000 +0100
@@ -6,15 +6,15 @@
#include "abstractsettings.h"
#include "abstractdisplayinfo.h"
-#include <KIdentityManagement/kidentitymanagement/identity.h>
-#include <KIdentityManagement/kidentitymanagement/identitymanager.h>
+#include <KIdentityManagement/Identity>
+#include <KIdentityManagement/IdentityManager>
#include <MailTransport/TransportManager>
#include <KLocalizedString>
-#include <AkonadiCore/agentinstancecreatejob.h>
-#include <AkonadiCore/agentmanager.h>
-#include <AkonadiCore/agenttype.h>
+#include <Akonadi/AgentInstanceCreateJob>
+#include <Akonadi/AgentManager>
+#include <Akonadi/AgentType>
#include <QMetaMethod>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/libimportwizard/importwizardsavepasswordjob.h
new/akonadi-import-wizard-21.12.0/src/libimportwizard/importwizardsavepasswordjob.h
---
old/akonadi-import-wizard-21.08.3/src/libimportwizard/importwizardsavepasswordjob.h
2021-10-09 09:23:02.000000000 +0200
+++
new/akonadi-import-wizard-21.12.0/src/libimportwizard/importwizardsavepasswordjob.h
2021-11-30 21:59:28.000000000 +0100
@@ -14,7 +14,7 @@
Q_OBJECT
public:
explicit ImportWizardSavePasswordJob(QObject *parent = nullptr);
- ~ImportWizardSavePasswordJob();
+ ~ImportWizardSavePasswordJob() override;
Q_REQUIRED_RESULT bool canStart() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/libimportwizard/importwizardutil.cpp
new/akonadi-import-wizard-21.12.0/src/libimportwizard/importwizardutil.cpp
--- old/akonadi-import-wizard-21.08.3/src/libimportwizard/importwizardutil.cpp
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/libimportwizard/importwizardutil.cpp
2021-11-30 21:59:28.000000000 +0100
@@ -7,9 +7,9 @@
#include "importwizardutil.h"
#include "importwizardsavepasswordjob.h"
#include "libimportwizard_debug.h"
-#include <AkonadiCore/Tag>
-#include <AkonadiCore/TagAttribute>
-#include <AkonadiCore/TagCreateJob>
+#include <Akonadi/Tag>
+#include <Akonadi/TagAttribute>
+#include <Akonadi/TagCreateJob>
#include <KConfigGroup>
#include <KSharedConfig>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/manual/manualimportmailpage.h
new/akonadi-import-wizard-21.12.0/src/manual/manualimportmailpage.h
--- old/akonadi-import-wizard-21.08.3/src/manual/manualimportmailpage.h
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/manual/manualimportmailpage.h
2021-11-30 21:59:28.000000000 +0100
@@ -13,7 +13,7 @@
Q_OBJECT
public:
explicit ManualImportMailPage(QWidget *parent = nullptr);
- ~ManualImportMailPage();
+ ~ManualImportMailPage() override;
Ui::ManualImportMailPage *widget() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/manual/manualselectfilterpage.cpp
new/akonadi-import-wizard-21.12.0/src/manual/manualselectfilterpage.cpp
--- old/akonadi-import-wizard-21.08.3/src/manual/manualselectfilterpage.cpp
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/manual/manualselectfilterpage.cpp
2021-11-30 21:59:28.000000000 +0100
@@ -46,7 +46,7 @@
{
mWidget->setupUi(this);
mWidget->mIntroSidebar->setPixmap(QStandardPaths::locate(QStandardPaths::GenericDataLocation,
QStringLiteral("importwizard/pics/step1.png")));
- connect(mWidget->mFilterCombo, QOverload<int>::of(&QComboBox::activated),
this, &ManualSelectFilterPage::filterSelected);
+ connect(mWidget->mFilterCombo, &QComboBox::activated, this,
&ManualSelectFilterPage::filterSelected);
addFilter(new MailImporter::FilterKMailArchive);
addFilter(new MailImporter::FilterMBox);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/manual/manualselectfilterpage.h
new/akonadi-import-wizard-21.12.0/src/manual/manualselectfilterpage.h
--- old/akonadi-import-wizard-21.08.3/src/manual/manualselectfilterpage.h
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/manual/manualselectfilterpage.h
2021-11-30 21:59:28.000000000 +0100
@@ -18,7 +18,7 @@
Q_OBJECT
public:
explicit ManualSelectFilterPage(QWidget *parent = nullptr);
- ~ManualSelectFilterPage();
+ ~ManualSelectFilterPage() override;
void addFilter(MailImporter::Filter *f);
MailImporter::Filter *getSelectedFilter() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/plugins/balsa/CMakeLists.txt
new/akonadi-import-wizard-21.12.0/src/plugins/balsa/CMakeLists.txt
--- old/akonadi-import-wizard-21.08.3/src/plugins/balsa/CMakeLists.txt
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/plugins/balsa/CMakeLists.txt
2021-11-30 21:59:28.000000000 +0100
@@ -2,6 +2,10 @@
balsaaddressbook.cpp
balsaimportdata.cpp
balsasettings.cpp
+ balsasettings.h
+ balsaimportdata.h
+ balsaaddressbook.h
+
)
ecm_qt_declare_logging_category(balsaimporter_SRCS HEADER balsaplugin_debug.h
IDENTIFIER BALSAPLUGIN_LOG CATEGORY_NAME
org.kde.pim.importwizard.balsaplugin
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/plugins/balsa/balsaaddressbook.h
new/akonadi-import-wizard-21.12.0/src/plugins/balsa/balsaaddressbook.h
--- old/akonadi-import-wizard-21.08.3/src/plugins/balsa/balsaaddressbook.h
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/plugins/balsa/balsaaddressbook.h
2021-11-30 21:59:28.000000000 +0100
@@ -14,7 +14,7 @@
{
public:
explicit BalsaAddressBook(const QString &filename);
- ~BalsaAddressBook();
+ ~BalsaAddressBook() override;
void importAddressBook();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/plugins/balsa/balsasettings.cpp
new/akonadi-import-wizard-21.12.0/src/plugins/balsa/balsasettings.cpp
--- old/akonadi-import-wizard-21.08.3/src/plugins/balsa/balsasettings.cpp
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/plugins/balsa/balsasettings.cpp
2021-11-30 21:59:28.000000000 +0100
@@ -10,8 +10,8 @@
#include <MailTransport/TransportManager>
#include <MessageViewer/KXFace>
-#include <KIdentityManagement/kidentitymanagement/identity.h>
-#include <KIdentityManagement/kidentitymanagement/signature.h>
+#include <KIdentityManagement/Identity>
+#include <KIdentityManagement/Signature>
#include <KConfig>
#include <KConfigGroup>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/plugins/balsa/balsasettings.h
new/akonadi-import-wizard-21.12.0/src/plugins/balsa/balsasettings.h
--- old/akonadi-import-wizard-21.08.3/src/plugins/balsa/balsasettings.h
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/plugins/balsa/balsasettings.h
2021-11-30 21:59:28.000000000 +0100
@@ -14,7 +14,7 @@
{
public:
explicit BalsaSettings(const QString &filename);
- ~BalsaSettings();
+ ~BalsaSettings() override;
void importSettings();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/plugins/claws-mail/CMakeLists.txt
new/akonadi-import-wizard-21.12.0/src/plugins/claws-mail/CMakeLists.txt
--- old/akonadi-import-wizard-21.08.3/src/plugins/claws-mail/CMakeLists.txt
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/plugins/claws-mail/CMakeLists.txt
2021-11-30 21:59:28.000000000 +0100
@@ -5,6 +5,9 @@
../sylpheed/sylpheedaddressbook.cpp
../sylpheed/sylpheedsettings.cpp
../sylpheed/sylpheedsettingsutils.cpp
+ clawsmailimportdata.h
+ clawsmailaddressbook.h
+ clawsmailsettings.h
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/plugins/claws-mail/clawsmailaddressbook.h
new/akonadi-import-wizard-21.12.0/src/plugins/claws-mail/clawsmailaddressbook.h
---
old/akonadi-import-wizard-21.08.3/src/plugins/claws-mail/clawsmailaddressbook.h
2021-10-09 09:23:02.000000000 +0200
+++
new/akonadi-import-wizard-21.12.0/src/plugins/claws-mail/clawsmailaddressbook.h
2021-11-30 21:59:28.000000000 +0100
@@ -13,6 +13,6 @@
{
public:
explicit ClawsMailAddressBook(const QDir &dir);
- ~ClawsMailAddressBook();
+ ~ClawsMailAddressBook() override;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/plugins/claws-mail/clawsmailsettings.cpp
new/akonadi-import-wizard-21.12.0/src/plugins/claws-mail/clawsmailsettings.cpp
---
old/akonadi-import-wizard-21.08.3/src/plugins/claws-mail/clawsmailsettings.cpp
2021-10-09 09:23:02.000000000 +0200
+++
new/akonadi-import-wizard-21.12.0/src/plugins/claws-mail/clawsmailsettings.cpp
2021-11-30 21:59:28.000000000 +0100
@@ -10,8 +10,8 @@
#include <MailCommon/MailUtil>
#include <MailTransport/TransportManager>
-#include <KIdentityManagement/kidentitymanagement/identity.h>
-#include <KIdentityManagement/kidentitymanagement/signature.h>
+#include <KIdentityManagement/Identity>
+#include <KIdentityManagement/Signature>
#include "clawsmailplugin_debug.h"
#include <KConfig>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/plugins/evolutionv3/CMakeLists.txt
new/akonadi-import-wizard-21.12.0/src/plugins/evolutionv3/CMakeLists.txt
--- old/akonadi-import-wizard-21.08.3/src/plugins/evolutionv3/CMakeLists.txt
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/plugins/evolutionv3/CMakeLists.txt
2021-11-30 21:59:28.000000000 +0100
@@ -4,6 +4,11 @@
evolutionsettings.cpp
evolutioncalendar.cpp
evolutionutil.cpp
+ evolutionsettings.h
+ evolutionv3importdata.h
+ evolutionutil.h
+ evolutioncalendar.h
+ evolutionaddressbook.h
)
ecm_qt_declare_logging_category(evolutionv3importer_SRCS HEADER
evolutionv3plugin_debug.h
IDENTIFIER EVOLUTIONPLUGIN_LOG CATEGORY_NAME
org.kde.pim.importwizard.evolutionplugin
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/plugins/evolutionv3/evolutionaddressbook.h
new/akonadi-import-wizard-21.12.0/src/plugins/evolutionv3/evolutionaddressbook.h
---
old/akonadi-import-wizard-21.08.3/src/plugins/evolutionv3/evolutionaddressbook.h
2021-10-09 09:23:02.000000000 +0200
+++
new/akonadi-import-wizard-21.12.0/src/plugins/evolutionv3/evolutionaddressbook.h
2021-11-30 21:59:28.000000000 +0100
@@ -13,7 +13,7 @@
Q_OBJECT
public:
EvolutionAddressBook();
- ~EvolutionAddressBook();
+ ~EvolutionAddressBook() override;
void exportEvolutionAddressBook();
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/plugins/evolutionv3/evolutioncalendar.h
new/akonadi-import-wizard-21.12.0/src/plugins/evolutionv3/evolutioncalendar.h
---
old/akonadi-import-wizard-21.08.3/src/plugins/evolutionv3/evolutioncalendar.h
2021-10-09 09:23:02.000000000 +0200
+++
new/akonadi-import-wizard-21.12.0/src/plugins/evolutionv3/evolutioncalendar.h
2021-11-30 21:59:28.000000000 +0100
@@ -14,7 +14,7 @@
{
public:
EvolutionCalendar();
- ~EvolutionCalendar();
+ ~EvolutionCalendar() override;
void loadCalendar(const QString &filename);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/plugins/evolutionv3/evolutionsettings.cpp
new/akonadi-import-wizard-21.12.0/src/plugins/evolutionv3/evolutionsettings.cpp
---
old/akonadi-import-wizard-21.08.3/src/plugins/evolutionv3/evolutionsettings.cpp
2021-10-09 09:23:02.000000000 +0200
+++
new/akonadi-import-wizard-21.12.0/src/plugins/evolutionv3/evolutionsettings.cpp
2021-11-30 21:59:28.000000000 +0100
@@ -9,7 +9,7 @@
#include "importwizardutil.h"
#include <MailCommon/MailUtil>
-#include <KIdentityManagement/kidentitymanagement/identity.h>
+#include <KIdentityManagement/Identity>
#include <MailTransport/TransportManager>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/plugins/evolutionv3/evolutionsettings.h
new/akonadi-import-wizard-21.12.0/src/plugins/evolutionv3/evolutionsettings.h
---
old/akonadi-import-wizard-21.08.3/src/plugins/evolutionv3/evolutionsettings.h
2021-10-09 09:23:02.000000000 +0200
+++
new/akonadi-import-wizard-21.12.0/src/plugins/evolutionv3/evolutionsettings.h
2021-11-30 21:59:28.000000000 +0100
@@ -7,7 +7,7 @@
#pragma once
#include "abstractsettings.h"
-#include <KIdentityManagement/kidentitymanagement/signature.h>
+#include <KIdentityManagement/Signature>
#include <QString>
class QDomElement;
@@ -16,7 +16,7 @@
{
public:
EvolutionSettings();
- ~EvolutionSettings();
+ ~EvolutionSettings() override;
void loadAccount(const QString &filename);
void loadLdap(const QString &filename);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/plugins/icedove/CMakeLists.txt
new/akonadi-import-wizard-21.12.0/src/plugins/icedove/CMakeLists.txt
--- old/akonadi-import-wizard-21.08.3/src/plugins/icedove/CMakeLists.txt
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/plugins/icedove/CMakeLists.txt
2021-11-30 21:59:28.000000000 +0100
@@ -3,7 +3,7 @@
../thunderbird/thunderbirdaddressbook.cpp
../thunderbird/thunderbirdsettings.cpp
../thunderbird/addressbook/MorkParser.cpp
-
+ icedoveimportdata.h
)
ecm_qt_declare_logging_category(icedoveimporter_SRCS HEADER
thunderbirdplugin_debug.h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/plugins/seamonkey/CMakeLists.txt
new/akonadi-import-wizard-21.12.0/src/plugins/seamonkey/CMakeLists.txt
--- old/akonadi-import-wizard-21.08.3/src/plugins/seamonkey/CMakeLists.txt
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/plugins/seamonkey/CMakeLists.txt
2021-11-30 21:59:28.000000000 +0100
@@ -3,7 +3,7 @@
../thunderbird/thunderbirdaddressbook.cpp
../thunderbird/thunderbirdsettings.cpp
../thunderbird/addressbook/MorkParser.cpp
-
+ seamonkeyimportdata.h
)
ecm_qt_declare_logging_category(seamonkeyimporter_SRCS HEADER
thunderbirdplugin_debug.h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/plugins/sylpheed/CMakeLists.txt
new/akonadi-import-wizard-21.12.0/src/plugins/sylpheed/CMakeLists.txt
--- old/akonadi-import-wizard-21.08.3/src/plugins/sylpheed/CMakeLists.txt
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/plugins/sylpheed/CMakeLists.txt
2021-11-30 21:59:28.000000000 +0100
@@ -3,6 +3,11 @@
sylpheedimportdata.cpp
sylpheedsettings.cpp
sylpheedsettingsutils.cpp
+ sylpheedimportdata.h
+ sylpheedsettings.h
+ sylpheedaddressbook.h
+ sylpheedsettingsutils.h
+
)
ecm_qt_declare_logging_category(sylpheedimporter_SRCS HEADER
sylpheedplugin_debug.h
IDENTIFIER SYLPHEEDPLUGIN_LOG CATEGORY_NAME
org.kde.pim.importwizard.sylpheedplugin
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/plugins/sylpheed/sylpheedaddressbook.cpp
new/akonadi-import-wizard-21.12.0/src/plugins/sylpheed/sylpheedaddressbook.cpp
---
old/akonadi-import-wizard-21.08.3/src/plugins/sylpheed/sylpheedaddressbook.cpp
2021-10-09 09:23:02.000000000 +0200
+++
new/akonadi-import-wizard-21.12.0/src/plugins/sylpheed/sylpheedaddressbook.cpp
2021-11-30 21:59:28.000000000 +0100
@@ -6,7 +6,7 @@
#include "sylpheedaddressbook.h"
#include <KContacts/Addressee>
-#include <kcontacts/contactgroup.h>
+#include <KContacts/ContactGroup>
#include "sylpheedplugin_debug.h"
#include <KLocalizedString>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/plugins/sylpheed/sylpheedaddressbook.h
new/akonadi-import-wizard-21.12.0/src/plugins/sylpheed/sylpheedaddressbook.h
---
old/akonadi-import-wizard-21.08.3/src/plugins/sylpheed/sylpheedaddressbook.h
2021-10-09 09:23:02.000000000 +0200
+++
new/akonadi-import-wizard-21.12.0/src/plugins/sylpheed/sylpheedaddressbook.h
2021-11-30 21:59:28.000000000 +0100
@@ -16,7 +16,7 @@
Q_OBJECT
public:
explicit SylpheedAddressBook(const QDir &dir);
- ~SylpheedAddressBook();
+ ~SylpheedAddressBook() override;
void importAddressBook();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/plugins/sylpheed/sylpheedsettings.cpp
new/akonadi-import-wizard-21.12.0/src/plugins/sylpheed/sylpheedsettings.cpp
--- old/akonadi-import-wizard-21.08.3/src/plugins/sylpheed/sylpheedsettings.cpp
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/plugins/sylpheed/sylpheedsettings.cpp
2021-11-30 21:59:28.000000000 +0100
@@ -10,8 +10,8 @@
#include <MailTransport/TransportManager>
#include <QFileInfo>
-#include <KIdentityManagement/kidentitymanagement/identity.h>
-#include <KIdentityManagement/kidentitymanagement/signature.h>
+#include <KIdentityManagement/Identity>
+#include <KIdentityManagement/Signature>
#include "sylpheedplugin_debug.h"
#include <KConfig>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/plugins/sylpheed/sylpheedsettings.h
new/akonadi-import-wizard-21.12.0/src/plugins/sylpheed/sylpheedsettings.h
--- old/akonadi-import-wizard-21.08.3/src/plugins/sylpheed/sylpheedsettings.h
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/plugins/sylpheed/sylpheedsettings.h
2021-11-30 21:59:28.000000000 +0100
@@ -17,7 +17,7 @@
{
public:
SylpheedSettings();
- ~SylpheedSettings();
+ ~SylpheedSettings() override;
virtual void importSettings(const QString &filename, const QString &path);
protected:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/plugins/thunderbird/CMakeLists.txt
new/akonadi-import-wizard-21.12.0/src/plugins/thunderbird/CMakeLists.txt
--- old/akonadi-import-wizard-21.08.3/src/plugins/thunderbird/CMakeLists.txt
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/plugins/thunderbird/CMakeLists.txt
2021-11-30 21:59:28.000000000 +0100
@@ -3,6 +3,10 @@
thunderbirdimportdata.cpp
thunderbirdsettings.cpp
addressbook/MorkParser.cpp
+ thunderbirdaddressbook.h
+ thunderbirdimportdata.h
+ addressbook/MorkParser.h
+ thunderbirdsettings.h
)
ecm_qt_declare_logging_category(thunderbirdimporter_SRCS HEADER
thunderbirdplugin_debug.h
IDENTIFIER THUNDERBIRDPLUGIN_LOG CATEGORY_NAME
org.kde.pim.importwizard.thunderbirdplugin
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/plugins/thunderbird/addressbook/MorkParser.cpp
new/akonadi-import-wizard-21.12.0/src/plugins/thunderbird/addressbook/MorkParser.cpp
---
old/akonadi-import-wizard-21.08.3/src/plugins/thunderbird/addressbook/MorkParser.cpp
2021-10-09 09:23:02.000000000 +0200
+++
new/akonadi-import-wizard-21.12.0/src/plugins/thunderbird/addressbook/MorkParser.cpp
2021-11-30 21:59:28.000000000 +0100
@@ -315,7 +315,8 @@
{
bool Result = true;
QString TextId;
- int Id = 0, Scope = 0;
+ int Id = 0;
+ int Scope = 0;
char cur = nextChar();
@@ -354,7 +355,8 @@
}
}
- int JustIdNum = 0, JustScopeNum = 0;
+ int JustIdNum = 0;
+ int JustScopeNum = 0;
parseScopeId(JustId, JustIdNum, JustScopeNum);
setCurrentRow(Scope, Id, JustScopeNum, JustIdNum);
@@ -415,7 +417,8 @@
{
bool Result = true;
QString TextId;
- int Id = 0, Scope = 0;
+ int Id = 0;
+ int Scope = 0;
nowParsing_ = NPRows;
char cur = nextChar();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/plugins/thunderbird/thunderbirdaddressbook.h
new/akonadi-import-wizard-21.12.0/src/plugins/thunderbird/thunderbirdaddressbook.h
---
old/akonadi-import-wizard-21.08.3/src/plugins/thunderbird/thunderbirdaddressbook.h
2021-10-09 09:23:02.000000000 +0200
+++
new/akonadi-import-wizard-21.12.0/src/plugins/thunderbird/thunderbirdaddressbook.h
2021-11-30 21:59:28.000000000 +0100
@@ -14,7 +14,7 @@
Q_OBJECT
public:
explicit ThunderBirdAddressBook(const QDir &dir);
- ~ThunderBirdAddressBook();
+ ~ThunderBirdAddressBook() override;
void importAddressBook();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/plugins/thunderbird/thunderbirdsettings.cpp
new/akonadi-import-wizard-21.12.0/src/plugins/thunderbird/thunderbirdsettings.cpp
---
old/akonadi-import-wizard-21.08.3/src/plugins/thunderbird/thunderbirdsettings.cpp
2021-10-09 09:23:02.000000000 +0200
+++
new/akonadi-import-wizard-21.12.0/src/plugins/thunderbird/thunderbirdsettings.cpp
2021-11-30 21:59:28.000000000 +0100
@@ -8,8 +8,8 @@
#include <MailCommon/MailUtil>
#include <MailTransport/TransportManager>
-#include <KIdentityManagement/kidentitymanagement/identity.h>
-#include <KIdentityManagement/kidentitymanagement/signature.h>
+#include <KIdentityManagement/Identity>
+#include <KIdentityManagement/Signature>
#include "thunderbirdplugin_debug.h"
#include <KContacts/VCardConverter>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/plugins/thunderbird/thunderbirdsettings.h
new/akonadi-import-wizard-21.12.0/src/plugins/thunderbird/thunderbirdsettings.h
---
old/akonadi-import-wizard-21.08.3/src/plugins/thunderbird/thunderbirdsettings.h
2021-10-09 09:23:02.000000000 +0200
+++
new/akonadi-import-wizard-21.12.0/src/plugins/thunderbird/thunderbirdsettings.h
2021-11-30 21:59:28.000000000 +0100
@@ -15,7 +15,7 @@
{
public:
explicit ThunderbirdSettings(const QString &filename);
- ~ThunderbirdSettings();
+ ~ThunderbirdSettings() override;
void importSettings();
private:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/plugins/trojita/CMakeLists.txt
new/akonadi-import-wizard-21.12.0/src/plugins/trojita/CMakeLists.txt
--- old/akonadi-import-wizard-21.08.3/src/plugins/trojita/CMakeLists.txt
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/plugins/trojita/CMakeLists.txt
2021-11-30 21:59:28.000000000 +0100
@@ -2,6 +2,9 @@
trojitaaddressbook.cpp
trojitaimportdata.cpp
trojitasettings.cpp
+ trojitasettings.h
+ trojitaimportdata.h
+ trojitaaddressbook.h
)
ecm_qt_declare_logging_category(trojitaimporter_SRCS HEADER
trojitaplugin_debug.h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/plugins/trojita/trojitaaddressbook.h
new/akonadi-import-wizard-21.12.0/src/plugins/trojita/trojitaaddressbook.h
--- old/akonadi-import-wizard-21.08.3/src/plugins/trojita/trojitaaddressbook.h
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/plugins/trojita/trojitaaddressbook.h
2021-11-30 21:59:28.000000000 +0100
@@ -14,7 +14,7 @@
{
public:
explicit TrojitaAddressBook(const QString &filename);
- ~TrojitaAddressBook();
+ ~TrojitaAddressBook() override;
void readAddressBook();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/plugins/trojita/trojitasettings.cpp
new/akonadi-import-wizard-21.12.0/src/plugins/trojita/trojitasettings.cpp
--- old/akonadi-import-wizard-21.08.3/src/plugins/trojita/trojitasettings.cpp
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/plugins/trojita/trojitasettings.cpp
2021-11-30 21:59:28.000000000 +0100
@@ -9,8 +9,8 @@
#include <MailTransport/TransportManager>
-#include <KIdentityManagement/kidentitymanagement/identity.h>
-#include <KIdentityManagement/kidentitymanagement/signature.h>
+#include <KIdentityManagement/Identity>
+#include <KIdentityManagement/Signature>
#include "trojitaplugin_debug.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-21.08.3/src/plugins/trojita/trojitasettings.h
new/akonadi-import-wizard-21.12.0/src/plugins/trojita/trojitasettings.h
--- old/akonadi-import-wizard-21.08.3/src/plugins/trojita/trojitasettings.h
2021-10-09 09:23:02.000000000 +0200
+++ new/akonadi-import-wizard-21.12.0/src/plugins/trojita/trojitasettings.h
2021-11-30 21:59:28.000000000 +0100
@@ -14,7 +14,7 @@
{
public:
explicit TrojitaSettings(const QString &filename);
- ~TrojitaSettings();
+ ~TrojitaSettings() override;
void importSettings();
private:
