[pim/merkuro] /: Remove (direct) dependency on kcalutils

Git commit f0899d30cb440e0009b19db67f96e1236630cbc0 by Volker Krause.
Committed on 29/07/2026 at 18:59.
Pushed by vkrause into branch 'master'.

Remove (direct) dependency on kcalutils

This was only used here to copy values from an enum we duplicate here
already anyway.

M  +0    -1    .kde-ci.yml
M  +0    -2    CMakeLists.txt
M  +0    -1    src/calendar/CMakeLists.txt
M  +4    -4    src/calendar/calendarmanager.cpp
M  +3    -4    src/calendar/incidencewrapper.h

https://invent.kde.org/pim/merkuro/-/commit/f0899d30cb440e0009b19db67f96e1236630cbc0

diff --git a/.kde-ci.yml b/.kde-ci.yml
index 052c62108..feab1af08 100644
--- a/.kde-ci.yml
+++ b/.kde-ci.yml
@@ -14,7 +14,6 @@ Dependencies:
     'frameworks/kcontacts': '@latest-kf6'
     'pim/akonadi': '@same'
     'pim/akonadi-calendar': '@same'
-    'pim/kcalutils': '@same'
     'frameworks/kmime': '@latest-kf6'
     'pim/kdepim-runtime': '@same'
     'pim/mailcommon': '@same'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d91c7bb68..91a56838c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,6 @@ set(KF_MIN_VERSION "6.26.0")
 set(AKONADI_CONTACT_VERSION "6.7.40")
 set(IDENTITYMANAGEMENT_LIB_VERSION "6.7.40")
 set(MAILTRANSPORT_LIB_VERSION "6.7.40")
-set(CALENDARUTILS_LIB_VERSION "6.7.40")
 set(AKONADICALENDAR_LIB_VERSION "6.7.42")
 set(AKONADISEARCH_LIB_VERSION "6.7.40")
 set(AKONADI_LIB_VERSION "6.7.40")
@@ -127,7 +126,6 @@ find_package(KPim6AkonadiCalendar ${AKONADICALENDAR_LIB_VERSION} REQUIRED)
 find_package(KPim6AkonadiContactCore ${AKONADI_CONTACT_VERSION} REQUIRED)
 find_package(KPim6AkonadiMime ${AKONADIMIME_LIB_VERSION} REQUIRED)
 find_package(KPim6AkonadiSearch ${AKONADISEARCH_LIB_VERSION} REQUIRED)
-find_package(KPim6CalendarUtils ${CALENDARUTILS_LIB_VERSION} REQUIRED)
 find_package(KPim6IdentityManagementCore ${IDENTITYMANAGEMENT_LIB_VERSION} REQUIRED)
 find_package(KPim6IdentityManagementQuick ${IDENTITYMANAGEMENT_LIB_VERSION} REQUIRED)
 find_package(KPim6MailCommon ${MAILCOMMON_LIB_VERSION} REQUIRED)
diff --git a/src/calendar/CMakeLists.txt b/src/calendar/CMakeLists.txt
index 5d02632fd..f5641319a 100644
--- a/src/calendar/CMakeLists.txt
+++ b/src/calendar/CMakeLists.txt
@@ -75,7 +75,6 @@ target_link_libraries(merkuro_calendar_static PUBLIC
     KPim6::AkonadiCalendar
     KPim6::AkonadiContactCore
     KPim6::AkonadiWidgets
-    KPim6::CalendarUtils
     MerkuroComponents
     PRIVATE KF6::I18nQml
 )
diff --git a/src/calendar/calendarmanager.cpp b/src/calendar/calendarmanager.cpp
index 241d79f04..4824d7c18 100644
--- a/src/calendar/calendarmanager.cpp
+++ b/src/calendar/calendarmanager.cpp
@@ -516,7 +516,7 @@ void CalendarManager::updateIncidenceDates(IncidenceWrapper *incidenceWrapper, i
 
     if (incidenceWrapper->incidencePtr()->recurs()) {
         switch (occurrences) {
-        case KCalUtils::RecurrenceActions::AllOccurrences: {
+        case IncidenceWrapper::AllOccurrences: {
             // All occurrences
             KCalendarCore::Incidence::Ptr oldIncidence(incidenceWrapper->incidencePtr()->clone());
             setNewDates(incidenceWrapper->incidencePtr());
@@ -524,9 +524,9 @@ void CalendarManager::updateIncidenceDates(IncidenceWrapper *incidenceWrapper, i
             m_changer->modifyIncidence(item, oldIncidence);
             break;
         }
-        case KCalUtils::RecurrenceActions::SelectedOccurrence: // Just this occurrence
-        case KCalUtils::RecurrenceActions::FutureOccurrences: { // All future occurrences
-            const bool thisAndFuture = (occurrences == KCalUtils::RecurrenceActions::FutureOccurrences);
+        case IncidenceWrapper::SelectedOccurrence: // Just this occurrence
+        case IncidenceWrapper::FutureOccurrences: { // All future occurrences
+            const bool thisAndFuture = (occurrences == IncidenceWrapper::FutureOccurrences);
             auto tzedOccurrenceDate = occurrenceDate.toTimeZone(incidenceWrapper->incidenceStart().timeZone());
             KCalendarCore::Incidence::Ptr newIncidence(
                 KCalendarCore::Calendar::createException(incidenceWrapper->incidencePtr(), tzedOccurrenceDate, thisAndFuture));
diff --git a/src/calendar/incidencewrapper.h b/src/calendar/incidencewrapper.h
index 548f2f652..3b9f6b130 100644
--- a/src/calendar/incidencewrapper.h
+++ b/src/calendar/incidencewrapper.h
@@ -13,7 +13,6 @@
 #include <Akonadi/ItemFetchJob>
 #include <Akonadi/ItemFetchScope>
 #include <Akonadi/ItemMonitor>
-#include <KCalUtils/RecurrenceActions>
 #include <KFormat>
 #include <QByteArray>
 #include <QObject>
@@ -158,9 +157,9 @@ public:
     Q_ENUM(IncidenceTypes)
 
     enum RecurrenceActions {
-        AllOccurrences = KCalUtils::RecurrenceActions::AllOccurrences,
-        SelectedOccurrence = KCalUtils::RecurrenceActions::SelectedOccurrence,
-        FutureOccurrences = KCalUtils::RecurrenceActions::FutureOccurrences,
+        AllOccurrences,
+        SelectedOccurrence,
+        FutureOccurrences,
     };
     Q_ENUM(RecurrenceActions)