Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pimcommon for openSUSE:Factory checked in at 2023-05-12 20:34:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pimcommon (Old) and /work/SRC/openSUSE:Factory/.pimcommon.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pimcommon" Fri May 12 20:34:10 2023 rev:90 rq:1086460 version:23.04.1 Changes: -------- --- /work/SRC/openSUSE:Factory/pimcommon/pimcommon.changes 2023-04-23 22:47:13.526630728 +0200 +++ /work/SRC/openSUSE:Factory/.pimcommon.new.1533/pimcommon.changes 2023-05-12 20:35:04.577138362 +0200 @@ -1,0 +2,13 @@ +Tue May 9 10:47:53 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.04.1 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/gear/23.04.1/ +- Changes since 23.04.0: + * Fix typo + * install config-pimcommon.h + * Adapt to new autocorrection lib (split core/widgets) + * Use correct INSTALL_TARGETS_DEFAULT_ARGS + +------------------------------------------------------------------- Old: ---- pimcommon-23.04.0.tar.xz pimcommon-23.04.0.tar.xz.sig New: ---- pimcommon-23.04.1.tar.xz pimcommon-23.04.1.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pimcommon.spec ++++++ --- /var/tmp/diff_new_pack.QV2UKg/_old 2023-05-12 20:35:05.565143792 +0200 +++ /var/tmp/diff_new_pack.QV2UKg/_new 2023-05-12 20:35:05.569143814 +0200 @@ -19,7 +19,7 @@ %define kf5_version 5.99.0 %bcond_without released Name: pimcommon -Version: 23.04.0 +Version: 23.04.1 Release: 0 Summary: Base package of KDE PIM PimCommon library License: GPL-2.0-only AND LGPL-2.1-or-later ++++++ pimcommon-23.04.0.tar.xz -> pimcommon-23.04.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pimcommon-23.04.0/CMakeLists.txt new/pimcommon-23.04.1/CMakeLists.txt --- old/pimcommon-23.04.0/CMakeLists.txt 2023-04-11 06:39:43.000000000 +0200 +++ new/pimcommon-23.04.1/CMakeLists.txt 2023-05-03 21:32:41.000000000 +0200 @@ -1,7 +1,7 @@ # SPDX-License-Identifier: CC0-1.0 # SPDX-FileCopyrightText: none cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "5.23.0") +set(PIM_VERSION "5.23.1") project(pimcommon VERSION ${PIM_VERSION}) @@ -37,7 +37,7 @@ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") set(PIMCOMMON_LIB_VERSION ${PIM_VERSION}) -set(LIBKDEPIM_LIB_VERSION "5.23.0") +set(LIBKDEPIM_LIB_VERSION "5.23.1") set(QT_REQUIRED_VERSION "5.15.2") if (QT_MAJOR_VERSION STREQUAL "6") set(QT_REQUIRED_VERSION "6.4.0") @@ -48,12 +48,12 @@ set(KF_MAJOR_VERSION "5") set(KTEXTADDONS_MIN_VERSION "1.0.0") endif() -set(KIMAP_LIB_VERSION "5.23.0") -set(KPIMTEXTEDIT_LIB_VERSION "5.23.0") -set(KLDAP_LIB_VERSION "5.23.0") +set(KIMAP_LIB_VERSION "5.23.1") +set(KPIMTEXTEDIT_LIB_VERSION "5.23.1") +set(KLDAP_LIB_VERSION "5.23.1") -set(AKONADICONTACT_LIB_VERSION "5.23.0") -set(AKONADI_VERSION "5.23.0") +set(AKONADICONTACT_LIB_VERSION "5.23.1") +set(AKONADI_VERSION "5.23.1") find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Network Test Xml) @@ -120,7 +120,24 @@ ecm_set_disabled_deprecation_versions(QT 5.15.2 KF 5.104.0) -find_package(KF${KF_MAJOR_VERSION}TextAutoCorrection ${KTEXTADDONS_MIN_VERSION} CONFIG REQUIRED) +find_package(KF${KF_MAJOR_VERSION}TextAutoCorrectionWidgets ${KTEXTADDONS_MIN_VERSION} CONFIG) +set_package_properties(KF${KF_MAJOR_VERSION}TextAutoCorrectionWidgets PROPERTIES DESCRIPTION + "Add support for text auto correction" + TYPE OPTIONAL +) +if (TARGET KF${KF_MAJOR_VERSION}::TextAutoCorrectionWidgets) + set(HAVE_TEXT_AUTOCORRECTION_WIDGETS TRUE) +else() + find_package(KF${KF_MAJOR_VERSION}TextAutoCorrection ${KTEXTADDONS_MIN_VERSION} CONFIG REQUIRED) +endif() + +configure_file(config-pimcommon.h.in ${CMAKE_CURRENT_BINARY_DIR}/src/config-pimcommon.h) + +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/src/config-pimcommon.h + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/PimCommon/pimcommon COMPONENT Devel + ) + add_subdirectory(src) ecm_qt_install_logging_categories( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pimcommon-23.04.0/config-pimcommon.h.in new/pimcommon-23.04.1/config-pimcommon.h.in --- old/pimcommon-23.04.0/config-pimcommon.h.in 1970-01-01 01:00:00.000000000 +0100 +++ new/pimcommon-23.04.1/config-pimcommon.h.in 2023-05-03 21:32:41.000000000 +0200 @@ -0,0 +1,7 @@ +/* +SPDX-License-Identifier: CC0-1.0 +SPDX-FileCopyrightText: none +*/ +#pragma once + +#cmakedefine01 HAVE_TEXT_AUTOCORRECTION_WIDGETS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pimcommon-23.04.0/po/de/libpimcommon.po new/pimcommon-23.04.1/po/de/libpimcommon.po --- old/pimcommon-23.04.0/po/de/libpimcommon.po 2023-04-11 06:39:43.000000000 +0200 +++ new/pimcommon-23.04.1/po/de/libpimcommon.po 2023-05-03 21:32:41.000000000 +0200 @@ -12,7 +12,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 22.12.3\n" #: pimcommon/configureplugins/configurepluginslistwidget.cpp:145 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pimcommon-23.04.0/po/ko/libpimcommon.po new/pimcommon-23.04.1/po/ko/libpimcommon.po --- old/pimcommon-23.04.0/po/ko/libpimcommon.po 2023-04-11 06:39:43.000000000 +0200 +++ new/pimcommon-23.04.1/po/ko/libpimcommon.po 2023-05-03 21:32:41.000000000 +0200 @@ -15,7 +15,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 21.12.3\n" +"X-Generator: Lokalize 22.12.3\n" #: pimcommon/configureplugins/configurepluginslistwidget.cpp:145 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pimcommon-23.04.0/po/zh_CN/libpimcommon.po new/pimcommon-23.04.1/po/zh_CN/libpimcommon.po --- old/pimcommon-23.04.0/po/zh_CN/libpimcommon.po 2023-04-11 06:39:43.000000000 +0200 +++ new/pimcommon-23.04.1/po/zh_CN/libpimcommon.po 2023-05-03 21:32:41.000000000 +0200 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2023-03-21 03:07+0000\n" -"PO-Revision-Date: 2023-04-10 14:13\n" +"PO-Revision-Date: 2023-04-29 08:36\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pimcommon-23.04.0/src/pimcommon/CMakeLists.txt new/pimcommon-23.04.1/src/pimcommon/CMakeLists.txt --- old/pimcommon-23.04.0/src/pimcommon/CMakeLists.txt 2023-04-11 06:39:43.000000000 +0200 +++ new/pimcommon-23.04.1/src/pimcommon/CMakeLists.txt 2023-05-03 21:32:41.000000000 +0200 @@ -147,7 +147,6 @@ KF${KF_MAJOR_VERSION}::KIOCore KF${KF_MAJOR_VERSION}::ConfigWidgets KPim${KF_MAJOR_VERSION}::PimTextEdit - KF${KF_MAJOR_VERSION}::TextAutoCorrection PRIVATE Qt::Network KF${KF_MAJOR_VERSION}::I18n @@ -161,6 +160,17 @@ KF${KF_MAJOR_VERSION}::PurposeWidgets KF${KF_MAJOR_VERSION}::Codecs ) +if (TARGET KF${KF_MAJOR_VERSION}::TextAutoCorrectionWidgets) + target_link_libraries(KF5PimCommon + PUBLIC + KF${KF_MAJOR_VERSION}::TextAutoCorrectionWidgets + ) +else() + target_link_libraries(KF5PimCommon + PUBLIC + KF${KF_MAJOR_VERSION}::TextAutoCorrection + ) +endif() target_include_directories(KF5PimCommon INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/PimCommon/>") @@ -174,7 +184,7 @@ install(TARGETS KF5PimCommon - EXPORT KF5PimCommonTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT KF5PimCommonTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) if (BUILD_TESTING) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pimcommon-23.04.0/src/pimcommon/KF5PimCommonConfig.cmake.in new/pimcommon-23.04.1/src/pimcommon/KF5PimCommonConfig.cmake.in --- old/pimcommon-23.04.0/src/pimcommon/KF5PimCommonConfig.cmake.in 2023-04-11 06:39:43.000000000 +0200 +++ new/pimcommon-23.04.1/src/pimcommon/KF5PimCommonConfig.cmake.in 2023-05-03 21:32:41.000000000 +0200 @@ -9,6 +9,10 @@ find_dependency(Qt@QT_MAJOR_VERSION@Widgets "@QT_REQUIRED_VERSION@") find_dependency(Qt@QT_MAJOR_VERSION@DBus "@QT_REQUIRED_VERSION@") find_dependency(Qt@QT_MAJOR_VERSION@Gui "@QT_REQUIRED_VERSION@") +if (@HAVE_TEXT_AUTOCORRECTION_WIDGETS@) +find_dependency(KF@KF_MAJOR_VERSION@TextAutoCorrectionWidgets "@KTEXTADDONS_MIN_VERSION@") +else() find_dependency(KF@KF_MAJOR_VERSION@TextAutoCorrection "@KTEXTADDONS_MIN_VERSION@") +endif() include("${CMAKE_CURRENT_LIST_DIR}/KF5PimCommonTargets.cmake") @PACKAGE_INCLUDE_QCHTARGETS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pimcommon-23.04.0/src/pimcommon/autocorrection/autotests/CMakeLists.txt new/pimcommon-23.04.1/src/pimcommon/autocorrection/autotests/CMakeLists.txt --- old/pimcommon-23.04.0/src/pimcommon/autocorrection/autotests/CMakeLists.txt 2023-04-11 06:39:43.000000000 +0200 +++ new/pimcommon-23.04.1/src/pimcommon/autocorrection/autotests/CMakeLists.txt 2023-05-03 21:32:41.000000000 +0200 @@ -6,7 +6,16 @@ add_executable( ${_name} ${_test} ${_name}.h) add_test(NAME ${_name} COMMAND ${_name} ) ecm_mark_as_test(pimcommon-autocorrection-${_name}) - target_link_libraries(${_name} Qt::Test KF5::PimCommon KF${KF_MAJOR_VERSION}::TextAutoCorrection) + target_link_libraries(${_name} Qt::Test KF5::PimCommon) + if (TARGET KF${KF_MAJOR_VERSION}::TextAutoCorrectionWidgets) + target_link_libraries(${_name} + KF${KF_MAJOR_VERSION}::TextAutoCorrectionWidgets + ) +else() + target_link_libraries(${_name} + KF${KF_MAJOR_VERSION}::TextAutoCorrection + ) +endif() endmacro() add_pimcommon_autocorrect_unittest(lineeditwithautocorrectiontest.cpp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pimcommon-23.04.0/src/pimcommon/autocorrection/autotests/lineeditwithautocorrectiontest.cpp new/pimcommon-23.04.1/src/pimcommon/autocorrection/autotests/lineeditwithautocorrectiontest.cpp --- old/pimcommon-23.04.0/src/pimcommon/autocorrection/autotests/lineeditwithautocorrectiontest.cpp 2023-04-11 06:39:43.000000000 +0200 +++ new/pimcommon-23.04.1/src/pimcommon/autocorrection/autotests/lineeditwithautocorrectiontest.cpp 2023-05-03 21:32:41.000000000 +0200 @@ -5,9 +5,14 @@ */ #include "lineeditwithautocorrectiontest.h" +#include "config-pimcommon.h" #include <PimCommon/LineEditWithAutoCorrection> #include <QTest> +#if HAVE_TEXT_AUTOCORRECTION_WIDGETS +#include <TextAutoCorrectionCore/AutoCorrection> +#else #include <TextAutoCorrection/AutoCorrection> +#endif #include <qtestkeyboard.h> LineEditWithAutocorrectionTest::LineEditWithAutocorrectionTest() = default; @@ -19,7 +24,11 @@ const QString originalWord = QStringLiteral("FOOFOO"); const QString replaceWord = QStringLiteral("BLABLA"); entries.insert(originalWord, replaceWord); +#if HAVE_TEXT_AUTOCORRECTION_WIDGETS + auto settings = new TextAutoCorrectionCore::AutoCorrectionSettings; +#else auto settings = new TextAutoCorrection::AutoCorrectionSettings; +#endif settings->setAutocorrectEntries(entries); lineedit.autocorrection()->setAutoCorrectionSettings(settings); lineedit.show(); @@ -36,7 +45,11 @@ const QString replaceWord = QStringLiteral("BLABLA"); QHash<QString, QString> entries; entries.insert(originalWord, replaceWord); +#if HAVE_TEXT_AUTOCORRECTION_WIDGETS + auto settings = new TextAutoCorrectionCore::AutoCorrectionSettings; +#else auto settings = new TextAutoCorrection::AutoCorrectionSettings; +#endif settings->setAutocorrectEntries(entries); settings->setEnabledAutoCorrection(true); settings->setAdvancedAutocorrect(true); @@ -55,7 +68,11 @@ const QString replaceWord = QStringLiteral("BLABLA"); QHash<QString, QString> entries; entries.insert(originalWord, replaceWord); +#if HAVE_TEXT_AUTOCORRECTION_WIDGETS + auto settings = new TextAutoCorrectionCore::AutoCorrectionSettings; +#else auto settings = new TextAutoCorrection::AutoCorrectionSettings; +#endif settings->setAutocorrectEntries(entries); settings->setEnabledAutoCorrection(true); settings->setAdvancedAutocorrect(true); @@ -72,7 +89,11 @@ { PimCommon::LineEditWithAutoCorrection lineedit(nullptr, QStringLiteral("lineeditwithautocorrecttestrc")); const QString originalWord = QStringLiteral("FOOFOO "); +#if HAVE_TEXT_AUTOCORRECTION_WIDGETS + auto settings = new TextAutoCorrectionCore::AutoCorrectionSettings; +#else auto settings = new TextAutoCorrection::AutoCorrectionSettings; +#endif settings->setSingleSpaces(true); settings->setEnabledAutoCorrection(true); lineedit.autocorrection()->setAutoCorrectionSettings(settings); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pimcommon-23.04.0/src/pimcommon/autocorrection/tests/CMakeLists.txt new/pimcommon-23.04.1/src/pimcommon/autocorrection/tests/CMakeLists.txt --- old/pimcommon-23.04.0/src/pimcommon/autocorrection/tests/CMakeLists.txt 2023-04-11 06:39:43.000000000 +0200 +++ new/pimcommon-23.04.1/src/pimcommon/autocorrection/tests/CMakeLists.txt 2023-05-03 21:32:41.000000000 +0200 @@ -4,5 +4,14 @@ target_link_libraries(autocorrection_gui KF5::PimCommon KF${KF_MAJOR_VERSION}::I18n - KF${KF_MAJOR_VERSION}::TextAutoCorrection ) + +if (TARGET KF${KF_MAJOR_VERSION}::TextAutoCorrectionWidgets) + target_link_libraries(autocorrection_gui + KF${KF_MAJOR_VERSION}::TextAutoCorrectionWidgets + ) +else() + target_link_libraries(autocorrection_gui + KF${KF_MAJOR_VERSION}::TextAutoCorrection + ) +endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pimcommon-23.04.0/src/pimcommon/autocorrection/tests/autocorrection_gui.cpp new/pimcommon-23.04.1/src/pimcommon/autocorrection/tests/autocorrection_gui.cpp --- old/pimcommon-23.04.0/src/pimcommon/autocorrection/tests/autocorrection_gui.cpp 2023-04-11 06:39:43.000000000 +0200 +++ new/pimcommon-23.04.1/src/pimcommon/autocorrection/tests/autocorrection_gui.cpp 2023-05-03 21:32:41.000000000 +0200 @@ -6,9 +6,15 @@ #include "autocorrection_gui.h" #include <PimCommon/LineEditWithAutoCorrection> +#if HAVE_TEXT_AUTOCORRECTION_WIDGETS +#include <TextAutoCorrectionCore/AutoCorrection> +#include <TextAutoCorrectionWidgets/AutoCorrectionWidget> +#include <textautocorrectioncore/textautocorrectionsettings.h> +#else #include <TextAutoCorrection/AutoCorrection> #include <TextAutoCorrection/AutoCorrectionWidget> #include <textautocorrection/textautocorrectionsettings.h> +#endif #include <QAction> #include <QApplication> @@ -19,8 +25,11 @@ #include <QPushButton> #include <QToolBar> #include <QVBoxLayout> - +#if HAVE_TEXT_AUTOCORRECTION_WIDGETS +ConfigureTestDialog::ConfigureTestDialog(TextAutoCorrectionCore::AutoCorrection *autoCorrection, QWidget *parent) +#else ConfigureTestDialog::ConfigureTestDialog(TextAutoCorrection::AutoCorrection *autoCorrection, QWidget *parent) +#endif : QDialog(parent) { setWindowTitle(QStringLiteral("Configure Autocorrection")); @@ -33,8 +42,11 @@ connect(buttonBox, &QDialogButtonBox::rejected, this, &ConfigureTestDialog::reject); buttonBox->button(QDialogButtonBox::Ok)->setDefault(true); - +#if HAVE_TEXT_AUTOCORRECTION_WIDGETS + mWidget = new TextAutoCorrectionWidgets::AutoCorrectionWidget(this); +#else mWidget = new TextAutoCorrection::AutoCorrectionWidget(this); +#endif mainLayout->addWidget(mWidget); mainLayout->addWidget(buttonBox); @@ -50,7 +62,11 @@ mWidget->writeConfig(); } +#if HAVE_TEXT_AUTOCORRECTION_WIDGETS +TextEditAutoCorrectionWidget::TextEditAutoCorrectionWidget(TextAutoCorrectionCore::AutoCorrection *autoCorrection, QWidget *parent) +#else TextEditAutoCorrectionWidget::TextEditAutoCorrectionWidget(TextAutoCorrection::AutoCorrection *autoCorrection, QWidget *parent) +#endif : QTextEdit(parent) , mAutoCorrection(autoCorrection) { @@ -82,9 +98,15 @@ : QWidget(parent) , mConfig(KSharedConfig::openConfig(QStringLiteral("autocorrectionguirc"))) { +#if HAVE_TEXT_AUTOCORRECTION_WIDGETS + TextAutoCorrectionCore::TextAutoCorrectionSettings::self()->setSharedConfig(mConfig); + TextAutoCorrectionCore::TextAutoCorrectionSettings::self()->load(); + mAutoCorrection = new TextAutoCorrectionCore::AutoCorrection; +#else TextAutoCorrection::TextAutoCorrectionSettings::self()->setSharedConfig(mConfig); TextAutoCorrection::TextAutoCorrectionSettings::self()->load(); mAutoCorrection = new TextAutoCorrection::AutoCorrection; +#endif auto lay = new QVBoxLayout(this); auto bar = new QToolBar; @@ -118,7 +140,11 @@ { QPointer<ConfigureTestDialog> dlg = new ConfigureTestDialog(mAutoCorrection, this); if (dlg->exec()) { +#if HAVE_TEXT_AUTOCORRECTION_WIDGETS + TextAutoCorrectionCore::TextAutoCorrectionSettings::self()->save(); +#else TextAutoCorrection::TextAutoCorrectionSettings::self()->save(); +#endif } delete dlg; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pimcommon-23.04.0/src/pimcommon/autocorrection/tests/autocorrection_gui.h new/pimcommon-23.04.1/src/pimcommon/autocorrection/tests/autocorrection_gui.h --- old/pimcommon-23.04.0/src/pimcommon/autocorrection/tests/autocorrection_gui.h 2023-04-11 06:39:43.000000000 +0200 +++ new/pimcommon-23.04.1/src/pimcommon/autocorrection/tests/autocorrection_gui.h 2023-05-03 21:32:41.000000000 +0200 @@ -10,12 +10,24 @@ #include <QDialog> #include <QWidget> +#include "config-pimcommon.h" #include <QTextEdit> +#if HAVE_TEXT_AUTOCORRECTION_WIDGETS +namespace TextAutoCorrectionCore +{ +class AutoCorrection; +} +namespace TextAutoCorrectionWidgets +{ +class AutoCorrectionWidget; +} +#else namespace TextAutoCorrection { class AutoCorrection; class AutoCorrectionWidget; } +#endif namespace PimCommon { class LineEditWithAutoCorrection; @@ -24,28 +36,44 @@ { Q_OBJECT public: +#if HAVE_TEXT_AUTOCORRECTION_WIDGETS + explicit ConfigureTestDialog(TextAutoCorrectionCore::AutoCorrection *autoCorrection, QWidget *parent = nullptr); +#else explicit ConfigureTestDialog(TextAutoCorrection::AutoCorrection *autoCorrection, QWidget *parent = nullptr); +#endif ~ConfigureTestDialog() override; private Q_SLOTS: void slotSaveSettings(); private: +#if HAVE_TEXT_AUTOCORRECTION_WIDGETS + TextAutoCorrectionWidgets::AutoCorrectionWidget *mWidget = nullptr; +#else TextAutoCorrection::AutoCorrectionWidget *mWidget = nullptr; +#endif }; class TextEditAutoCorrectionWidget : public QTextEdit { Q_OBJECT public: +#if HAVE_TEXT_AUTOCORRECTION_WIDGETS + explicit TextEditAutoCorrectionWidget(TextAutoCorrectionCore::AutoCorrection *autoCorrection, QWidget *parent = nullptr); +#else explicit TextEditAutoCorrectionWidget(TextAutoCorrection::AutoCorrection *autoCorrection, QWidget *parent = nullptr); +#endif ~TextEditAutoCorrectionWidget() override; protected: void keyPressEvent(QKeyEvent *e) override; private: +#if HAVE_TEXT_AUTOCORRECTION_WIDGETS + TextAutoCorrectionCore::AutoCorrection *mAutoCorrection = nullptr; +#else TextAutoCorrection::AutoCorrection *mAutoCorrection = nullptr; +#endif }; class AutocorrectionTestWidget : public QWidget @@ -62,6 +90,10 @@ private: TextEditAutoCorrectionWidget *mEdit = nullptr; PimCommon::LineEditWithAutoCorrection *mSubject = nullptr; +#if HAVE_TEXT_AUTOCORRECTION_WIDGETS + TextAutoCorrectionCore::AutoCorrection *mAutoCorrection = nullptr; +#else TextAutoCorrection::AutoCorrection *mAutoCorrection = nullptr; +#endif KSharedConfig::Ptr mConfig; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pimcommon-23.04.0/src/pimcommon/autocorrection/widgets/lineeditwithautocorrection.cpp new/pimcommon-23.04.1/src/pimcommon/autocorrection/widgets/lineeditwithautocorrection.cpp --- old/pimcommon-23.04.0/src/pimcommon/autocorrection/widgets/lineeditwithautocorrection.cpp 2023-04-11 06:39:43.000000000 +0200 +++ new/pimcommon-23.04.1/src/pimcommon/autocorrection/widgets/lineeditwithautocorrection.cpp 2023-05-03 21:32:41.000000000 +0200 @@ -5,8 +5,12 @@ */ #include "autocorrection/widgets/lineeditwithautocorrection.h" +#include "config-pimcommon.h" +#if HAVE_TEXT_AUTOCORRECTION_WIDGETS +#include <TextAutoCorrectionCore/AutoCorrection> +#else #include <TextAutoCorrection/AutoCorrection> - +#endif #include <QKeyEvent> using namespace PimCommon; @@ -14,7 +18,11 @@ { public: LineEditWithAutoCorrectionPrivate() +#if HAVE_TEXT_AUTOCORRECTION_WIDGETS + : mAutoCorrection(new TextAutoCorrectionCore::AutoCorrection()) +#else : mAutoCorrection(new TextAutoCorrection::AutoCorrection()) +#endif { } @@ -24,7 +32,11 @@ delete mAutoCorrection; } } +#if HAVE_TEXT_AUTOCORRECTION_WIDGETS + TextAutoCorrectionCore::AutoCorrection *mAutoCorrection = nullptr; +#else TextAutoCorrection::AutoCorrection *mAutoCorrection = nullptr; +#endif bool mNeedToDeleteAutoCorrection = true; }; @@ -36,6 +48,19 @@ LineEditWithAutoCorrection::~LineEditWithAutoCorrection() = default; +#if HAVE_TEXT_AUTOCORRECTION_WIDGETS +TextAutoCorrectionCore::AutoCorrection *LineEditWithAutoCorrection::autocorrection() const +{ + return d->mAutoCorrection; +} + +void LineEditWithAutoCorrection::setAutocorrection(TextAutoCorrectionCore::AutoCorrection *autocorrect) +{ + d->mNeedToDeleteAutoCorrection = false; + delete d->mAutoCorrection; + d->mAutoCorrection = autocorrect; +} +#else TextAutoCorrection::AutoCorrection *LineEditWithAutoCorrection::autocorrection() const { return d->mAutoCorrection; @@ -47,10 +72,15 @@ delete d->mAutoCorrection; d->mAutoCorrection = autocorrect; } +#endif void LineEditWithAutoCorrection::setAutocorrectionLanguage(const QString &language) { +#if HAVE_TEXT_AUTOCORRECTION_WIDGETS + TextAutoCorrectionCore::AutoCorrectionSettings *settings = d->mAutoCorrection->autoCorrectionSettings(); +#else TextAutoCorrection::AutoCorrectionSettings *settings = d->mAutoCorrection->autoCorrectionSettings(); +#endif settings->setLanguage(language); d->mAutoCorrection->setAutoCorrectionSettings(settings); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pimcommon-23.04.0/src/pimcommon/autocorrection/widgets/lineeditwithautocorrection.h new/pimcommon-23.04.1/src/pimcommon/autocorrection/widgets/lineeditwithautocorrection.h --- old/pimcommon-23.04.0/src/pimcommon/autocorrection/widgets/lineeditwithautocorrection.h 2023-04-11 06:39:43.000000000 +0200 +++ new/pimcommon-23.04.1/src/pimcommon/autocorrection/widgets/lineeditwithautocorrection.h 2023-05-03 21:32:41.000000000 +0200 @@ -8,11 +8,19 @@ #include "pimcommon_export.h" +#include "config-pimcommon.h" #include <PimCommon/SpellCheckLineEdit> +#if HAVE_TEXT_AUTOCORRECTION_WIDGETS +namespace TextAutoCorrectionCore +{ +class AutoCorrection; +} +#else namespace TextAutoCorrection { class AutoCorrection; } +#endif namespace PimCommon { @@ -28,9 +36,13 @@ explicit LineEditWithAutoCorrection(QWidget *parent, const QString &configFile); ~LineEditWithAutoCorrection() override; +#if HAVE_TEXT_AUTOCORRECTION_WIDGETS + Q_REQUIRED_RESULT TextAutoCorrectionCore::AutoCorrection *autocorrection() const; + void setAutocorrection(TextAutoCorrectionCore::AutoCorrection *autocorrect); +#else Q_REQUIRED_RESULT TextAutoCorrection::AutoCorrection *autocorrection() const; void setAutocorrection(TextAutoCorrection::AutoCorrection *autocorrect); - +#endif void setAutocorrectionLanguage(const QString &language); protected: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pimcommon-23.04.0/src/pimcommonakonadi/CMakeLists.txt new/pimcommon-23.04.1/src/pimcommonakonadi/CMakeLists.txt --- old/pimcommon-23.04.0/src/pimcommonakonadi/CMakeLists.txt 2023-04-11 06:39:43.000000000 +0200 +++ new/pimcommon-23.04.1/src/pimcommonakonadi/CMakeLists.txt 2023-05-03 21:32:41.000000000 +0200 @@ -189,7 +189,7 @@ install(TARGETS KF5PimCommonAkonadi - EXPORT KF5PimCommonAkonadiTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT KF5PimCommonAkonadiTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) if (BUILD_TESTING)
