[pim/akonadi-import-wizard] /: Add pre-commit CI support
Laurent Montel
null at kde.org
Mon Jun 9 08:15:29 BST 2025
Git commit 0233737555c735fa5afc34a098f291d377f83863 by Laurent Montel.
Committed on 09/06/2025 at 07:15.
Pushed by mlaurent into branch 'master'.
Add pre-commit CI support
M +1 -3 .gitlab-ci.yml
M +45 -25 CMakeLists.txt
M +1 -1 LICENSES/GPL-2.0-or-later.txt
M +11 -11 doc/index.docbook
M +0 -1 readme-build-ftime.txt
M +55 -47 src/CMakeLists.txt
M +57 -52 src/libimportwizard/CMakeLists.txt
M +0 -1 src/libimportwizard/KPimImportWizardConfig.cmake.in
M +1 -1 src/main.cpp
M +1 -1 src/manual/pics/CMakeLists.txt
M +0 -1 src/plugins/CMakeLists.txt
M +6 -5 src/plugins/balsa/CMakeLists.txt
M +6 -5 src/plugins/claws-mail/CMakeLists.txt
M +6 -3 src/plugins/evolutionv3/CMakeLists.txt
M +6 -2 src/plugins/icedove/CMakeLists.txt
M +6 -2 src/plugins/seamonkey/CMakeLists.txt
M +6 -3 src/plugins/sylpheed/CMakeLists.txt
M +6 -2 src/plugins/thunderbird/CMakeLists.txt
M +1 -1 src/plugins/thunderbird/addressbook/MorkParser.h
M +1 -1 src/plugins/thunderbird/thunderbirdaddressbook.cpp
M +1 -1 src/plugins/thunderbird/thunderbirdsettings.cpp
M +6 -3 src/plugins/trojita/CMakeLists.txt
https://invent.kde.org/pim/akonadi-import-wizard/-/commit/0233737555c735fa5afc34a098f291d377f83863
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e42b5be6..b6fed036 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,10 +6,8 @@ include:
file:
- /gitlab-templates/linux-qt6.yml
- /gitlab-templates/linux-qt6-next.yml
- - /gitlab-templates/json-validation.yml
- /gitlab-templates/freebsd-qt6.yml
- /gitlab-templates/cppcheck.yml
- /gitlab-templates/windows-qt6.yml
-
- - /gitlab-templates/xml-lint.yml
- /gitlab-templates/yaml-lint.yml
+ - /gitlab-templates/pre-commit.yml
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfbe2c13..5a5c943f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,24 +2,35 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
set(PIM_VERSION "6.4.40")
project(AkonadiImportWizard VERSION ${PIM_VERSION})
-
set(KF_MIN_VERSION "6.13.0")
set(QT_REQUIRED_VERSION "6.8.0")
find_package(ECM ${KF_MIN_VERSION} CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
include(ECMInstallIcons)
-
include(ECMSetupVersion)
include(ECMAddTests)
include(GenerateExportHeader)
include(ECMGenerateHeaders)
-include(KDEGitCommitHooks)
-include(KDEClangFormat)
file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES src/*.cpp src/*.h)
-kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
+
+set(PRE_COMMIT_INSTALLED FALSE)
+if(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
+ if(EXISTS "${PROJECT_SOURCE_DIR}/.git/hooks/pre-commit")
+ file(READ "${PROJECT_SOURCE_DIR}/.git/hooks/pre-commit" FILE_CONTENTS)
+ string(FIND "${FILE_CONTENTS}" "File generated by pre-commit" INDEX)
+ if(${INDEX} GREATER_EQUAL 0)
+ set(PRE_COMMIT_INSTALLED TRUE)
+ endif()
+ endif()
+endif()
+if(NOT ${PRE_COMMIT_INSTALLED})
+ include(KDEGitCommitHooks)
+ include(KDEClangFormat)
+ kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
+endif()
include(CheckFunctionExists)
include(KDEInstallDirs)
@@ -39,10 +50,10 @@ if(DEFINED KDEPIM_DEV_VERSION)
set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}")
endif()
-
set(PIM_VERSION "${PIM_VERSION}")
-set(KDEPIM_VERSION "${PIM_VERSION}${KDEPIM_DEV_VERSION} (${RELEASE_SERVICE_VERSION})")
-
+set(KDEPIM_VERSION
+ "${PIM_VERSION}${KDEPIM_DEV_VERSION} (${RELEASE_SERVICE_VERSION})"
+)
set(KMAILTRANSPORT_LIB_VERSION "6.4.40")
set(AKONADI_VERSION "6.4.40")
@@ -67,15 +78,20 @@ find_package(KF6Archive ${KF_MIN_VERSION} REQUIRED)
find_package(KF6IconThemes ${KF_MIN_VERSION} CONFIG REQUIRED)
find_package(KF6DocTools ${KF_MIN_VERSION})
-set_package_properties(KF6DocTools PROPERTIES DESCRIPTION
- "Tools to generate documentation"
- TYPE OPTIONAL
+set_package_properties(
+ KF6DocTools
+ PROPERTIES DESCRIPTION "Tools to generate documentation" TYPE OPTIONAL
)
# Find KdepimLibs Package
find_package(KPim6Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
find_package(KF6Contacts ${KF_MIN_VERSION} CONFIG REQUIRED)
-find_package(KPim6IdentityManagementCore ${IDENTITYMANAGEMENT_LIB_VERSION} CONFIG REQUIRED)
+find_package(
+ KPim6IdentityManagementCore
+ ${IDENTITYMANAGEMENT_LIB_VERSION}
+ CONFIG
+ REQUIRED
+)
find_package(KPim6MailTransport ${KMAILTRANSPORT_LIB_VERSION} CONFIG REQUIRED)
find_package(KPim6MailCommon ${MAILCOMMON_LIB_VERSION} CONFIG REQUIRED)
@@ -86,27 +102,30 @@ find_package(KPim6PimCommonAkonadi ${PIMCOMMON_LIB_VERSION} CONFIG REQUIRED)
include_directories(${importwizard_SOURCE_DIR} ${importwizard_BINARY_DIR})
find_package(Qt6Keychain ${QT6KEYCHAIN_LIB_VERSION} CONFIG)
-set_package_properties(Qt6Keychain PROPERTIES
- DESCRIPTION "Provides support for secure credentials storage"
- URL "https://github.com/frankosterfeld/qtkeychain"
- TYPE REQUIRED)
+set_package_properties(
+ Qt6Keychain
+ PROPERTIES
+ DESCRIPTION "Provides support for secure credentials storage"
+ URL "https://github.com/frankosterfeld/qtkeychain"
+ TYPE REQUIRED
+)
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
add_definitions(-DQT_USE_QSTRINGBUILDER)
add_definitions(-DQT_NO_CONTEXTLESS_CONNECT)
ecm_set_disabled_deprecation_versions(QT 6.9.0 KF 6.15.0)
include(ECMCheckOutboundLicense)
-file(GLOB_RECURSE ALL_SOURCE_FILES
-src/*.cpp
-src/*.h
-)
+file(GLOB_RECURSE ALL_SOURCE_FILES src/*.cpp src/*.h)
ecm_check_outbound_license(LICENSES GPL-2.0-only FILES ${ALL_SOURCE_FILES})
-
if(BUILD_TESTING)
- add_definitions(-DBUILD_TESTING)
+ add_definitions(-DBUILD_TESTING)
endif()
-option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF)
+option(
+ USE_UNITY_CMAKE_SUPPORT
+ "Use UNITY cmake support (speedup compile time)"
+ OFF
+)
set(COMPILE_WITH_UNITY_CMAKE_SUPPORT OFF)
if(USE_UNITY_CMAKE_SUPPORT)
@@ -121,7 +140,9 @@ ecm_qt_install_logging_categories(
DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
)
-kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
+if(DEFINED kde_configure_git_pre_commit_hook)
+ kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
+endif()
ki18n_install(po)
if(KF6DocTools_FOUND)
@@ -129,5 +150,4 @@ if(KF6DocTools_FOUND)
add_subdirectory(doc)
endif()
-
ecm_feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/LICENSES/GPL-2.0-or-later.txt b/LICENSES/GPL-2.0-or-later.txt
index 1d80ac36..96e2bf1e 100644
--- a/LICENSES/GPL-2.0-or-later.txt
+++ b/LICENSES/GPL-2.0-or-later.txt
@@ -2,7 +2,7 @@ GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
diff --git a/doc/index.docbook b/doc/index.docbook
index 82ac8c4a..20a87b1b 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -3,7 +3,7 @@
"dtd/kdedbx45.dtd" [
<!ENTITY i18n-importwizard "<application>Import Wizard</application>">
<!ENTITY % addindex "IGNORE">
- <!ENTITY % English "INCLUDE">
+ <!ENTITY % English "INCLUDE">
]>
<article id="importwizard" lang="&language;">
@@ -101,21 +101,21 @@ you will see one or more of the following screens:</para>
<itemizedlist>
<listitem><para>To import mail messages, you need to
-select the folder you want your email messages to import into.
+select the folder you want your email messages to import into.
Once selected, click the <guibutton>Import Mails</guibutton> button.
-Once the progress bar reaches 100%, click the <guibutton>Next</guibutton> button,
-or the <guibutton>Finish</guibutton> button, if this was your last material
+Once the progress bar reaches 100%, click the <guibutton>Next</guibutton> button,
+or the <guibutton>Finish</guibutton> button, if this was your last material
selection.</para></listitem>
<listitem><para>To import mail filters, click the <guibutton>Import
-Filters</guibutton> button and it will import any filters it found, once finished click
-the <guibutton>Next</guibutton> button, or the <guibutton>Finish</guibutton> button,
+Filters</guibutton> button and it will import any filters it found, once finished click
+the <guibutton>Next</guibutton> button, or the <guibutton>Finish</guibutton> button,
if this was your last material selection.</para></listitem>
<listitem><para>To import settings, click the <guibutton>Import
-Settings</guibutton> button. The wizard will ask you some questions ⪚ which folder
-to use for account folders that do not exist. The wizard will also create your identity.
-Once complete, click the <guibutton>Next</guibutton> button, or the <guibutton>Finish</guibutton>
+Settings</guibutton> button. The wizard will ask you some questions ⪚ which folder
+to use for account folders that do not exist. The wizard will also create your identity.
+Once complete, click the <guibutton>Next</guibutton> button, or the <guibutton>Finish</guibutton>
button, if this was your last material selection.</para></listitem>
<listitem><para>To import address books or calendars, click the <guibutton>Import
@@ -124,8 +124,8 @@ will import all address books or calendars it finds.
Once complete, click the <guibutton>Next</guibutton> button.</para></listitem>
</itemizedlist>
-<para>Click the <guibutton>Finish</guibutton> button to complete and exit the wizard.
-If at any time you wish to end the wizard, you can click the <guibutton>Cancel</guibutton>
+<para>Click the <guibutton>Finish</guibutton> button to complete and exit the wizard.
+If at any time you wish to end the wizard, you can click the <guibutton>Cancel</guibutton>
button.</para>
</sect2>
diff --git a/readme-build-ftime.txt b/readme-build-ftime.txt
index 833cfa00..b931a180 100644
--- a/readme-build-ftime.txt
+++ b/readme-build-ftime.txt
@@ -23,4 +23,3 @@ ClangBuildAnalyzer --analyze build-ftime.txt > analyze-build-ftime.txt
see https://aras-p.info/blog/2019/09/28/Clang-Build-Analyzer/
-
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9e6b1f10..084a12d0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,54 +1,59 @@
-
-
-configure_file(importwizard-version.h.in ${CMAKE_CURRENT_BINARY_DIR}/importwizard-version.h @ONLY)
+configure_file(
+ importwizard-version.h.in
+ ${CMAKE_CURRENT_BINARY_DIR}/importwizard-version.h
+ @ONLY
+)
add_subdirectory(icons)
add_subdirectory(libimportwizard)
-file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/*-apps-kontact-import-wizard.png")
+file(
+ GLOB ICONS_SRCS
+ "${CMAKE_CURRENT_SOURCE_DIR}/icons/*-apps-kontact-import-wizard.png"
+)
ecm_add_app_icon(importwizard_SRCS ICONS ${ICONS_SRCS})
add_executable(akonadiimportwizard)
-target_sources(akonadiimportwizard PRIVATE
- main.cpp
- importwizard.cpp
- importwizardkernel.cpp
- importmailpluginmanager.cpp
- importwizarddisplayinfo.cpp
- manual/manualimportmailpage.cpp
- manual/importwizardfilterinfogui.cpp
- manual/manualselectfilterpage.cpp
- autodetect/widgets/selectprogramlistwidget.cpp
- autodetect/selectprogrampage.cpp
- autodetect/importaddressbookpage.cpp
- autodetect/importfilterpage.cpp
- autodetect/importmailpage.cpp
- autodetect/importsettingpage.cpp
- autodetect/importfinishpage.cpp
- 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
+target_sources(
+ akonadiimportwizard
+ PRIVATE
+ main.cpp
+ importwizard.cpp
+ importwizardkernel.cpp
+ importmailpluginmanager.cpp
+ importwizarddisplayinfo.cpp
+ manual/manualimportmailpage.cpp
+ manual/importwizardfilterinfogui.cpp
+ manual/manualselectfilterpage.cpp
+ autodetect/widgets/selectprogramlistwidget.cpp
+ autodetect/selectprogrampage.cpp
+ autodetect/importaddressbookpage.cpp
+ autodetect/importfilterpage.cpp
+ autodetect/importmailpage.cpp
+ autodetect/importsettingpage.cpp
+ autodetect/importfinishpage.cpp
+ 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
)
-
ki18n_wrap_ui(akonadiimportwizard
ui/autodetect/selectprogrampage.ui
ui/autodetect/importaddressbookpage.ui
@@ -68,11 +73,11 @@ ecm_qt_declare_logging_category(akonadiimportwizard HEADER importwizard_debug.h
EXPORT IMPORTWIZARD
)
-
if(COMPILE_WITH_UNITY_CMAKE_SUPPORT)
set_target_properties(akonadiimportwizard PROPERTIES UNITY_BUILD ON)
endif()
-target_link_libraries(akonadiimportwizard
+target_link_libraries(
+ akonadiimportwizard
KPim6ImportWizard
KPim6::AkonadiCore
KF6::XmlGui
@@ -90,8 +95,11 @@ target_link_libraries(akonadiimportwizard
if(TARGET KF6::IconThemes)
target_link_libraries(akonadiimportwizard KF6::IconThemes)
endif()
-install(TARGETS akonadiimportwizard ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-install(PROGRAMS data/org.kde.akonadiimportwizard.desktop DESTINATION ${KDE_INSTALL_APPDIR})
+install(TARGETS akonadiimportwizard ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+install(
+ PROGRAMS data/org.kde.akonadiimportwizard.desktop
+ DESTINATION ${KDE_INSTALL_APPDIR}
+)
add_subdirectory(manual/pics)
add_subdirectory(plugins/)
diff --git a/src/libimportwizard/CMakeLists.txt b/src/libimportwizard/CMakeLists.txt
index 370264bd..2355e546 100644
--- a/src/libimportwizard/CMakeLists.txt
+++ b/src/libimportwizard/CMakeLists.txt
@@ -16,44 +16,46 @@ configure_package_config_file(
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
)
-install(FILES
- "${CMAKE_CURRENT_BINARY_DIR}/KPim6ImportWizardConfig.cmake"
- "${CMAKE_CURRENT_BINARY_DIR}/KPim6ImportWizardConfigVersion.cmake"
+install(
+ FILES
+ "${CMAKE_CURRENT_BINARY_DIR}/KPim6ImportWizardConfig.cmake"
+ "${CMAKE_CURRENT_BINARY_DIR}/KPim6ImportWizardConfigVersion.cmake"
DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
COMPONENT Devel
)
-install(EXPORT KPim6ImportWizardTargets
+install(
+ EXPORT KPim6ImportWizardTargets
DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
FILE KPim6ImportWizardTargets.cmake
NAMESPACE KPim6::
)
-install(FILES
- "${CMAKE_CURRENT_BINARY_DIR}/importwizard_version.h"
+install(
+ FILES "${CMAKE_CURRENT_BINARY_DIR}/importwizard_version.h"
DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim6/ImportWizard/"
COMPONENT Devel
)
-
-
-target_sources(KPim6ImportWizard PRIVATE
- abstractimporter.cpp
- abstractsettings.cpp
- abstractaddressbook.cpp
- abstractcalendar.cpp
- abstractbase.cpp
- abstractdisplayinfo.cpp
- importwizardutil.cpp
- importwizardsavepasswordjob.cpp
- abstractsettings.h
- abstractbase.h
- importwizardutil.h
- abstractaddressbook.h
- importwizardsavepasswordjob.h
- abstractimporter.h
- abstractdisplayinfo.h
- abstractcalendar.h
+target_sources(
+ KPim6ImportWizard
+ PRIVATE
+ abstractimporter.cpp
+ abstractsettings.cpp
+ abstractaddressbook.cpp
+ abstractcalendar.cpp
+ abstractbase.cpp
+ 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(KPim6ImportWizard HEADER libimportwizard_debug.h IDENTIFIER LIBIMPORTWIZARD_LOG CATEGORY_NAME org.kde.pim.importwizard.lib
@@ -65,36 +67,39 @@ if(COMPILE_WITH_UNITY_CMAKE_SUPPORT)
set_target_properties(KPim6ImportWizard PROPERTIES UNITY_BUILD ON)
endif()
-
-target_include_directories(KPim6ImportWizard INTERFACE
- "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim6/ImportWizard;${KDE_INSTALL_INCLUDEDIR}/KPim6/>")
-
+target_include_directories(
+ KPim6ImportWizard
+ INTERFACE
+ "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim6/ImportWizard;${KDE_INSTALL_INCLUDEDIR}/KPim6/>"
+)
generate_export_header(KPim6ImportWizard BASE_NAME libimportwizard)
-target_link_libraries(KPim6ImportWizard
- PUBLIC
- KPim6::MailTransport
+target_link_libraries(
+ KPim6ImportWizard
+ PUBLIC KPim6::MailTransport
PRIVATE
- KF6::Archive
- KPim6::PimCommon
- KPim6::MailCommon
- KPim6::MailImporter
- KPim6::MailImporterAkonadi
- KF6::I18n
+ KF6::Archive
+ KPim6::PimCommon
+ KPim6::MailCommon
+ KPim6::MailImporter
+ KPim6::MailImporterAkonadi
+ KF6::I18n
)
target_link_libraries(KPim6ImportWizard PRIVATE qt6keychain)
-set_target_properties(KPim6ImportWizard PROPERTIES
- VERSION ${IMPORTWIZARD_VERSION}
- SOVERSION ${IMPORTWIZARD_SOVERSION}
- EXPORT_NAME ImportWizard
-)
-
-install(TARGETS
+set_target_properties(
KPim6ImportWizard
- EXPORT KPim6ImportWizardTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
+ PROPERTIES
+ VERSION ${IMPORTWIZARD_VERSION}
+ SOVERSION ${IMPORTWIZARD_SOVERSION}
+ EXPORT_NAME ImportWizard
)
+install(
+ TARGETS KPim6ImportWizard
+ EXPORT KPim6ImportWizardTargets
+ ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
+)
install(TARGETS KPim6ImportWizard ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
@@ -111,16 +116,16 @@ ecm_generate_headers(ImportWizard_CamelCase_HEADERS
REQUIRED_HEADERS ImportWizard_HEADERS
)
-install(FILES
- ${ImportWizard_CamelCase_HEADERS}
+install(
+ FILES ${ImportWizard_CamelCase_HEADERS}
DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim6/ImportWizard/ImportWizard/
COMPONENT Devel
)
-install(FILES
- ${CMAKE_CURRENT_BINARY_DIR}/libimportwizard_export.h
- ${ImportWizard_HEADERS}
+install(
+ FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/libimportwizard_export.h
+ ${ImportWizard_HEADERS}
DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim6/ImportWizard/importwizard/
COMPONENT Devel
)
-
diff --git a/src/libimportwizard/KPimImportWizardConfig.cmake.in b/src/libimportwizard/KPimImportWizardConfig.cmake.in
index f4c500cc..1c957398 100644
--- a/src/libimportwizard/KPimImportWizardConfig.cmake.in
+++ b/src/libimportwizard/KPimImportWizardConfig.cmake.in
@@ -4,4 +4,3 @@ include(CMakeFindDependencyMacro)
find_dependency(KPim6MailTransport "@KMAILTRANSPORT_LIB_VERSION@")
include("${CMAKE_CURRENT_LIST_DIR}/KPim6ImportWizardTargets.cmake")
-
diff --git a/src/main.cpp b/src/main.cpp
index ab6f6804..2aef778c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -26,7 +26,7 @@ int main(int argc, char *argv[])
KStyleManager::initStyle();
KLocalizedString::setApplicationDomain(QByteArrayLiteral("akonadiimportwizard"));
- // FIXME: "wizards" are "assistents" in new KDE slang
+ // FIXME: "wizards" are "assistants" in new KDE slang
KAboutData aboutData(QStringLiteral("importwizard"),
i18n("PIM Import Tool"),
diff --git a/src/manual/pics/CMakeLists.txt b/src/manual/pics/CMakeLists.txt
index 78889c0d..281fc5a9 100644
--- a/src/manual/pics/CMakeLists.txt
+++ b/src/manual/pics/CMakeLists.txt
@@ -1 +1 @@
-install(FILES step1.png DESTINATION ${KDE_INSTALL_DATADIR}/importwizard/pics)
+install(FILES step1.png DESTINATION ${KDE_INSTALL_DATADIR}/importwizard/pics)
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 9a6d2adb..24d29ee0 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -6,4 +6,3 @@ add_subdirectory(claws-mail)
add_subdirectory(thunderbird)
add_subdirectory(icedove)
add_subdirectory(seamonkey)
-
diff --git a/src/plugins/balsa/CMakeLists.txt b/src/plugins/balsa/CMakeLists.txt
index 7be803ef..bda362b6 100644
--- a/src/plugins/balsa/CMakeLists.txt
+++ b/src/plugins/balsa/CMakeLists.txt
@@ -5,7 +5,6 @@ set(balsaimporter_SRCS
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
@@ -13,15 +12,17 @@ ecm_qt_declare_logging_category(balsaimporter_SRCS HEADER balsaplugin_debug.h
EXPORT IMPORTWIZARD
)
-
-
kcoreaddons_add_plugin(balsaimporterplugin SOURCES ${balsaimporter_SRCS} INSTALL_NAMESPACE pim6/importwizard)
if(COMPILE_WITH_UNITY_CMAKE_SUPPORT)
set_target_properties(balsaimporterplugin PROPERTIES UNITY_BUILD ON)
endif()
-set_target_properties(balsaimporterplugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/importwizard/")
+set_target_properties(
+ balsaimporterplugin
+ PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/importwizard/"
+)
-target_link_libraries(balsaimporterplugin
+target_link_libraries(
+ balsaimporterplugin
KPim6::ImportWizard
KF6::XmlGui
KF6::I18n
diff --git a/src/plugins/claws-mail/CMakeLists.txt b/src/plugins/claws-mail/CMakeLists.txt
index ec3a218c..adb552cc 100644
--- a/src/plugins/claws-mail/CMakeLists.txt
+++ b/src/plugins/claws-mail/CMakeLists.txt
@@ -8,7 +8,6 @@ set(clawsmailimporter_SRCS
clawsmailimportdata.h
clawsmailaddressbook.h
clawsmailsettings.h
-
)
ecm_qt_declare_logging_category(clawsmailimporter_SRCS HEADER sylpheedplugin_debug.h
@@ -23,15 +22,17 @@ ecm_qt_declare_logging_category(clawsmailimporter_SRCS HEADER clawsmailplugin_de
EXPORT IMPORTWIZARD
)
-
-
kcoreaddons_add_plugin(clawsmailimporterplugin SOURCES ${clawsmailimporter_SRCS} INSTALL_NAMESPACE pim6/importwizard)
-set_target_properties(clawsmailimporterplugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/importwizard/")
+set_target_properties(
+ clawsmailimporterplugin
+ PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/importwizard/"
+)
if(COMPILE_WITH_UNITY_CMAKE_SUPPORT)
set_target_properties(clawsmailimporterplugin PROPERTIES UNITY_BUILD ON)
endif()
-target_link_libraries(clawsmailimporterplugin
+target_link_libraries(
+ clawsmailimporterplugin
KPim6::ImportWizard
KF6::XmlGui
KF6::I18n
diff --git a/src/plugins/evolutionv3/CMakeLists.txt b/src/plugins/evolutionv3/CMakeLists.txt
index 35180fdc..ae754f8b 100644
--- a/src/plugins/evolutionv3/CMakeLists.txt
+++ b/src/plugins/evolutionv3/CMakeLists.txt
@@ -16,15 +16,18 @@ ecm_qt_declare_logging_category(evolutionv3importer_SRCS HEADER evolutionv3plugi
EXPORT IMPORTWIZARD
)
-
kcoreaddons_add_plugin(evolutionv3importerplugin SOURCES ${evolutionv3importer_SRCS} INSTALL_NAMESPACE pim6/importwizard)
if(COMPILE_WITH_UNITY_CMAKE_SUPPORT)
set_target_properties(evolutionv3importerplugin PROPERTIES UNITY_BUILD ON)
endif()
-set_target_properties(evolutionv3importerplugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/importwizard/")
+set_target_properties(
+ evolutionv3importerplugin
+ PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/importwizard/"
+)
-target_link_libraries(evolutionv3importerplugin
+target_link_libraries(
+ evolutionv3importerplugin
KPim6::ImportWizard
KF6::XmlGui
KF6::I18n
diff --git a/src/plugins/icedove/CMakeLists.txt b/src/plugins/icedove/CMakeLists.txt
index 5df45a25..55d10eec 100644
--- a/src/plugins/icedove/CMakeLists.txt
+++ b/src/plugins/icedove/CMakeLists.txt
@@ -13,12 +13,16 @@ ecm_qt_declare_logging_category(icedoveimporter_SRCS HEADER thunderbirdplugin_de
)
kcoreaddons_add_plugin(icedoveimporterplugin SOURCES ${icedoveimporter_SRCS} INSTALL_NAMESPACE pim6/importwizard)
-set_target_properties(icedoveimporterplugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/importwizard/")
+set_target_properties(
+ icedoveimporterplugin
+ PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/importwizard/"
+)
if(COMPILE_WITH_UNITY_CMAKE_SUPPORT)
set_target_properties(icedoveimporterplugin PROPERTIES UNITY_BUILD ON)
endif()
-target_link_libraries(icedoveimporterplugin
+target_link_libraries(
+ icedoveimporterplugin
KPim6::ImportWizard
KF6::XmlGui
KF6::I18n
diff --git a/src/plugins/seamonkey/CMakeLists.txt b/src/plugins/seamonkey/CMakeLists.txt
index 9e0c989e..1c74d081 100644
--- a/src/plugins/seamonkey/CMakeLists.txt
+++ b/src/plugins/seamonkey/CMakeLists.txt
@@ -13,12 +13,16 @@ ecm_qt_declare_logging_category(seamonkeyimporter_SRCS HEADER thunderbirdplugin_
)
kcoreaddons_add_plugin(seamonkeyimporterplugin SOURCES ${seamonkeyimporter_SRCS} INSTALL_NAMESPACE pim6/importwizard)
-set_target_properties(seamonkeyimporterplugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/importwizard/")
+set_target_properties(
+ seamonkeyimporterplugin
+ PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/importwizard/"
+)
if(COMPILE_WITH_UNITY_CMAKE_SUPPORT)
set_target_properties(seamonkeyimporterplugin PROPERTIES UNITY_BUILD ON)
endif()
-target_link_libraries(seamonkeyimporterplugin
+target_link_libraries(
+ seamonkeyimporterplugin
KPim6::ImportWizard
KF6::XmlGui
KF6::I18n
diff --git a/src/plugins/sylpheed/CMakeLists.txt b/src/plugins/sylpheed/CMakeLists.txt
index d678c1ab..6ff71ccd 100644
--- a/src/plugins/sylpheed/CMakeLists.txt
+++ b/src/plugins/sylpheed/CMakeLists.txt
@@ -7,7 +7,6 @@ set(sylpheedimporter_SRCS
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
@@ -16,12 +15,16 @@ ecm_qt_declare_logging_category(sylpheedimporter_SRCS HEADER sylpheedplugin_debu
)
kcoreaddons_add_plugin(sylpheedimporterplugin SOURCES ${sylpheedimporter_SRCS} INSTALL_NAMESPACE pim6/importwizard)
-set_target_properties(sylpheedimporterplugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/importwizard/")
+set_target_properties(
+ sylpheedimporterplugin
+ PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/importwizard/"
+)
if(COMPILE_WITH_UNITY_CMAKE_SUPPORT)
set_target_properties(sylpheedimporterplugin PROPERTIES UNITY_BUILD ON)
endif()
-target_link_libraries(sylpheedimporterplugin
+target_link_libraries(
+ sylpheedimporterplugin
KPim6::ImportWizard
KF6::XmlGui
KF6::I18n
diff --git a/src/plugins/thunderbird/CMakeLists.txt b/src/plugins/thunderbird/CMakeLists.txt
index a99b9cb3..606ef40d 100644
--- a/src/plugins/thunderbird/CMakeLists.txt
+++ b/src/plugins/thunderbird/CMakeLists.txt
@@ -15,12 +15,16 @@ ecm_qt_declare_logging_category(thunderbirdimporter_SRCS HEADER thunderbirdplugi
)
kcoreaddons_add_plugin(thunderbirdimporterplugin SOURCES ${thunderbirdimporter_SRCS} INSTALL_NAMESPACE pim6/importwizard)
-set_target_properties(thunderbirdimporterplugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/importwizard/")
+set_target_properties(
+ thunderbirdimporterplugin
+ PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/importwizard/"
+)
if(COMPILE_WITH_UNITY_CMAKE_SUPPORT)
set_target_properties(thunderbirdimporterplugin PROPERTIES UNITY_BUILD ON)
endif()
-target_link_libraries(thunderbirdimporterplugin
+target_link_libraries(
+ thunderbirdimporterplugin
KPim6::ImportWizard
KF6::XmlGui
KF6::I18n
diff --git a/src/plugins/thunderbird/addressbook/MorkParser.h b/src/plugins/thunderbird/addressbook/MorkParser.h
index 055f5042..f0187dbc 100644
--- a/src/plugins/thunderbird/addressbook/MorkParser.h
+++ b/src/plugins/thunderbird/addressbook/MorkParser.h
@@ -122,7 +122,7 @@ protected: // Data
int mNextAddValueId;
int mDefaultScope;
- // Indicates intity is being parsed
+ // Indicates entity is being parsed
enum {
NPColumns,
NPValues,
diff --git a/src/plugins/thunderbird/thunderbirdaddressbook.cpp b/src/plugins/thunderbird/thunderbirdaddressbook.cpp
index c3329f7f..17dfebae 100644
--- a/src/plugins/thunderbird/thunderbirdaddressbook.cpp
+++ b/src/plugins/thunderbird/thunderbirdaddressbook.cpp
@@ -221,7 +221,7 @@ void ThunderBirdAddressBook::readAddressBook(const QString &filename)
} else if (column == QLatin1StringView("Notes")) {
contact.setNote(value);
} else {
- qCDebug(THUNDERBIRDPLUGIN_LOG) << " Columnn not implemented " << column;
+ qCDebug(THUNDERBIRDPLUGIN_LOG) << " Column not implemented " << column;
}
// qCDebug(THUNDERBIRDPLUGIN_LOG)<<" value :"<<value<<" column"<<column;
}
diff --git a/src/plugins/thunderbird/thunderbirdsettings.cpp b/src/plugins/thunderbird/thunderbirdsettings.cpp
index 71aacfab..f9def30e 100644
--- a/src/plugins/thunderbird/thunderbirdsettings.cpp
+++ b/src/plugins/thunderbird/thunderbirdsettings.cpp
@@ -784,7 +784,7 @@ void ThunderbirdSettings::readTransport()
case 3: // Unencrypted password
mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::CLEAR); //???
break;
- case 4: // crypted password
+ case 4: // encrypted password
mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::LOGIN); //???
break;
case 5: // GSSAPI
diff --git a/src/plugins/trojita/CMakeLists.txt b/src/plugins/trojita/CMakeLists.txt
index 07939f81..7aef8fe8 100644
--- a/src/plugins/trojita/CMakeLists.txt
+++ b/src/plugins/trojita/CMakeLists.txt
@@ -14,13 +14,16 @@ ecm_qt_declare_logging_category(trojitaimporter_SRCS HEADER trojitaplugin_debug.
)
kcoreaddons_add_plugin(trojitaimporterplugin SOURCES ${trojitaimporter_SRCS} INSTALL_NAMESPACE pim6/importwizard)
-set_target_properties(trojitaimporterplugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/importwizard/")
+set_target_properties(
+ trojitaimporterplugin
+ PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/importwizard/"
+)
if(COMPILE_WITH_UNITY_CMAKE_SUPPORT)
set_target_properties(trojitaimporterplugin PROPERTIES UNITY_BUILD ON)
endif()
-
-target_link_libraries(trojitaimporterplugin
+target_link_libraries(
+ trojitaimporterplugin
KPim6::ImportWizard
KF6::XmlGui
KF6::I18n
More information about the kde-doc-english
mailing list