[pim/incidenceeditor] src: Use KCalendarCore 6.30 API when available

Git commit 8ff4bef613b6a2d65ac3518d09c37039490b6d25 by Volker Krause.
Committed on 15/08/2026 at 14:03.
Pushed by vkrause into branch 'master'.

Use KCalendarCore 6.30 API when available

M  +9    -0    src/attendeeline.cpp
M  +26   -0    src/incidenceattendee.cpp
M  +6    -0    src/incidencesecrecy.cpp
M  +9    -0    src/schedulingdialog.cpp

https://invent.kde.org/pim/incidenceeditor/-/commit/8ff4bef613b6a2d65ac3518d09c37039490b6d25

diff --git a/src/attendeeline.cpp b/src/attendeeline.cpp
index e905f585..3f8dbd55 100644
--- a/src/attendeeline.cpp
+++ b/src/attendeeline.cpp
@@ -8,7 +8,9 @@
 #include "attendeeline.h"
 #include "attendeedata.h"
 
+#if KCALENDARCORE_VERSION < QT_VERSION_CHECK(6, 30, 0)
 #include <KCalUtils/Stringify>
+#endif
 
 #include <KEmailAddress>
 
@@ -136,10 +138,17 @@ AttendeeLine::AttendeeLine(QWidget *parent)
 
     QBoxLayout *topLayout = new QHBoxLayout(this);
     topLayout->setContentsMargins(0, 0, 0, 0);
+#if KCALENDARCORE_VERSION < QT_VERSION_CHECK(6, 30, 0)
     mRoleCombo->addItem(QIcon::fromTheme(u"meeting-participant"_s), KCalUtils::Stringify::attendeeRole(KCalendarCore::Attendee::ReqParticipant));
     mRoleCombo->addItem(QIcon::fromTheme(u"meeting-participant-optional"_s), KCalUtils::Stringify::attendeeRole(KCalendarCore::Attendee::OptParticipant));
     mRoleCombo->addItem(QIcon::fromTheme(u"meeting-observer"_s), KCalUtils::Stringify::attendeeRole(KCalendarCore::Attendee::NonParticipant));
     mRoleCombo->addItem(QIcon::fromTheme(u"meeting-chair"_s), KCalUtils::Stringify::attendeeRole(KCalendarCore::Attendee::Chair));
+#else
+    mRoleCombo->addItem(QIcon::fromTheme(u"meeting-participant"_s), KCalendarCore::Attendee::roleName(KCalendarCore::Attendee::ReqParticipant));
+    mRoleCombo->addItem(QIcon::fromTheme(u"meeting-participant-optional"_s), KCalendarCore::Attendee::roleName(KCalendarCore::Attendee::OptParticipant));
+    mRoleCombo->addItem(QIcon::fromTheme(u"meeting-observer"_s), KCalendarCore::Attendee::roleName(KCalendarCore::Attendee::NonParticipant));
+    mRoleCombo->addItem(QIcon::fromTheme(u"meeting-chair"_s), KCalendarCore::Attendee::roleName(KCalendarCore::Attendee::Chair));
+#endif
 
     mResponseCombo->addItem(QIcon::fromTheme(u"meeting-participant-request-response"_s), i18nc("@item:inlistbox", "Request Response"));
     mResponseCombo->addItem(QIcon::fromTheme(u"meeting-participant-no-response"_s), i18nc("@item:inlistbox", "Request No Response"));
diff --git a/src/incidenceattendee.cpp b/src/incidenceattendee.cpp
index 377d33fd..0d4dc303 100644
--- a/src/incidenceattendee.cpp
+++ b/src/incidenceattendee.cpp
@@ -29,7 +29,9 @@ using namespace Qt::Literals::StringLiterals;
 #include <Akonadi/ContactGroupSearchJob>
 #include <Akonadi/EmailAddressSelectionDialog>
 
+#if KCALENDARCORE_VERSION < QT_VERSION_CHECK(6, 30, 0)
 #include <KCalUtils/Stringify>
+#endif
 #include <KEmailAddress>
 #include <KPluginFactory>
 
@@ -54,11 +56,19 @@ IncidenceAttendee::IncidenceAttendee(QWidget *parent, IncidenceDateTime *dateTim
     mDataModel = new AttendeeTableModel(this);
     mDataModel->setKeepEmpty(true);
     mDataModel->setRemoveEmptyLines(true);
+#if KCALENDARCORE_VERSION < QT_VERSION_CHECK(6, 30, 0)
     mRoleDelegate->addItem(QIcon::fromTheme(u":/meeting-participant.png"_s), KCalUtils::Stringify::attendeeRole(KCalendarCore::Attendee::ReqParticipant));
     mRoleDelegate->addItem(QIcon::fromTheme(u":/meeting-participant-optional.png"_s),
                            KCalUtils::Stringify::attendeeRole(KCalendarCore::Attendee::OptParticipant));
     mRoleDelegate->addItem(QIcon::fromTheme(u":/meeting-observer.png"_s), KCalUtils::Stringify::attendeeRole(KCalendarCore::Attendee::NonParticipant));
     mRoleDelegate->addItem(QIcon::fromTheme(u":/meeting-chair.png"_s), KCalUtils::Stringify::attendeeRole(KCalendarCore::Attendee::Chair));
+#else
+    mRoleDelegate->addItem(QIcon::fromTheme(u":/meeting-participant.png"_s), KCalendarCore::Attendee::roleName(KCalendarCore::Attendee::ReqParticipant));
+    mRoleDelegate->addItem(QIcon::fromTheme(u":/meeting-participant-optional.png"_s),
+                           KCalendarCore::Attendee::roleName(KCalendarCore::Attendee::OptParticipant));
+    mRoleDelegate->addItem(QIcon::fromTheme(u":/meeting-observer.png"_s), KCalendarCore::Attendee::roleName(KCalendarCore::Attendee::NonParticipant));
+    mRoleDelegate->addItem(QIcon::fromTheme(u":/meeting-chair.png"_s), KCalendarCore::Attendee::roleName(KCalendarCore::Attendee::Chair));
+#endif
 
     mResponseDelegate->addItem(QIcon::fromTheme(u"meeting-participant-request-response"_s), i18nc("@item:inlistbox", "Request Response"));
     mResponseDelegate->addItem(QIcon::fromTheme(u"meeting-participant-no-response"_s), i18nc("@item:inlistbox", "Request No Response"));
@@ -886,6 +896,7 @@ void IncidenceAttendee::setActions(KCalendarCore::Incidence::IncidenceType actio
 {
     mStateDelegate->clear();
     if (actions == KCalendarCore::Incidence::TypeEvent) {
+#if KCALENDARCORE_VERSION < QT_VERSION_CHECK(6, 30, 0)
         mStateDelegate->addItem(QIcon::fromTheme(u":/task-attention.png"_s), KCalUtils::Stringify::attendeeStatus(AttendeeData::NeedsAction));
         mStateDelegate->addItem(QIcon::fromTheme(u":/task-accepted.png"_s), KCalUtils::Stringify::attendeeStatus(AttendeeData::Accepted));
         mStateDelegate->addItem(QIcon::fromTheme(u":/task-reject.png"_s), KCalUtils::Stringify::attendeeStatus(AttendeeData::Declined));
@@ -899,6 +910,21 @@ void IncidenceAttendee::setActions(KCalendarCore::Incidence::IncidenceType actio
         mStateDelegate->addItem(QIcon::fromTheme(u":/task-delegate.png"_s), KCalUtils::Stringify::attendeeStatus(AttendeeData::Delegated));
         mStateDelegate->addItem(QIcon::fromTheme(u":/task-complete.png"_s), KCalUtils::Stringify::attendeeStatus(AttendeeData::Completed));
         mStateDelegate->addItem(QIcon::fromTheme(u":/task-ongoing.png"_s), KCalUtils::Stringify::attendeeStatus(AttendeeData::InProcess));
+#else
+        mStateDelegate->addItem(QIcon::fromTheme(u":/task-attention.png"_s), KCalendarCore::Attendee::statusName(AttendeeData::NeedsAction));
+        mStateDelegate->addItem(QIcon::fromTheme(u":/task-accepted.png"_s), KCalendarCore::Attendee::statusName(AttendeeData::Accepted));
+        mStateDelegate->addItem(QIcon::fromTheme(u":/task-reject.png"_s), KCalendarCore::Attendee::statusName(AttendeeData::Declined));
+        mStateDelegate->addItem(QIcon::fromTheme(u":/task-attempt.png"_s), KCalendarCore::Attendee::statusName(AttendeeData::Tentative));
+        mStateDelegate->addItem(QIcon::fromTheme(u":/task-delegate.png"_s), KCalendarCore::Attendee::statusName(AttendeeData::Delegated));
+    } else {
+        mStateDelegate->addItem(QIcon::fromTheme(u":/task-attention.png"_s), KCalendarCore::Attendee::statusName(AttendeeData::NeedsAction));
+        mStateDelegate->addItem(QIcon::fromTheme(u":/task-accepted.png"_s), KCalendarCore::Attendee::statusName(AttendeeData::Accepted));
+        mStateDelegate->addItem(QIcon::fromTheme(u":/task-reject.png"_s), KCalendarCore::Attendee::statusName(AttendeeData::Declined));
+        mStateDelegate->addItem(QIcon::fromTheme(u":/task-attempt.png"_s), KCalendarCore::Attendee::statusName(AttendeeData::Tentative));
+        mStateDelegate->addItem(QIcon::fromTheme(u":/task-delegate.png"_s), KCalendarCore::Attendee::statusName(AttendeeData::Delegated));
+        mStateDelegate->addItem(QIcon::fromTheme(u":/task-complete.png"_s), KCalendarCore::Attendee::statusName(AttendeeData::Completed));
+        mStateDelegate->addItem(QIcon::fromTheme(u":/task-ongoing.png"_s), KCalendarCore::Attendee::statusName(AttendeeData::InProcess));
+#endif
     }
 }
 
diff --git a/src/incidencesecrecy.cpp b/src/incidencesecrecy.cpp
index 12720b99..50a7aafd 100644
--- a/src/incidencesecrecy.cpp
+++ b/src/incidencesecrecy.cpp
@@ -11,7 +11,9 @@ using namespace Qt::Literals::StringLiterals;
 
 #include "ui_dialogdesktop.h"
 
+#if KCALENDARCORE_VERSION < QT_VERSION_CHECK(6, 30, 0)
 #include <KCalUtils/Stringify>
+#endif
 
 using namespace IncidenceEditorNG;
 
@@ -21,7 +23,11 @@ IncidenceSecrecy::IncidenceSecrecy(Ui::EventOrTodoDesktop *ui)
     setObjectName("IncidenceSecrecy"_L1);
     for (const auto secrecy :
          {KCalendarCore::Incidence::SecrecyPublic, KCalendarCore::Incidence::SecrecyPrivate, KCalendarCore::Incidence::SecrecyConfidential}) {
+#if KCALENDARCORE_VERSION < QT_VERSION_CHECK(6, 30, 0)
         mUi->mSecrecyCombo->addItem(KCalUtils::Stringify::incidenceSecrecy(secrecy), secrecy);
+#else
+        mUi->mSecrecyCombo->addItem(KCalendarCore::Incidence::secrecyName(secrecy), secrecy);
+#endif
     }
     connect(mUi->mSecrecyCombo, &QComboBox::currentIndexChanged, this, &IncidenceSecrecy::checkDirtyStatus);
 }
diff --git a/src/schedulingdialog.cpp b/src/schedulingdialog.cpp
index 27c23ff9..699f33c0 100644
--- a/src/schedulingdialog.cpp
+++ b/src/schedulingdialog.cpp
@@ -11,7 +11,9 @@ using namespace Qt::Literals::StringLiterals;
 #include "conflictresolver.h"
 #include "visualfreebusywidget.h"
 #include <CalendarSupport/FreePeriodModel>
+#if KCALENDARCORE_VERSION < QT_VERSION_CHECK(6, 30, 0)
 #include <KCalUtils/Stringify>
+#endif
 
 #include <KLocalizedString>
 
@@ -90,10 +92,17 @@ void SchedulingDialog::slotUpdateIncidenceStartEnd(const QDateTime &startDateTim
 void SchedulingDialog::fillCombos()
 {
     // Note: we depend on the following order
+#if KCALENDARCORE_VERSION < QT_VERSION_CHECK(6, 30, 0)
     mRolesCombo->addItem(QIcon::fromTheme(u"meeting-participant"_s), KCalUtils::Stringify::attendeeRole(KCalendarCore::Attendee::ReqParticipant));
     mRolesCombo->addItem(QIcon::fromTheme(u"meeting-participant-optional"_s), KCalUtils::Stringify::attendeeRole(KCalendarCore::Attendee::OptParticipant));
     mRolesCombo->addItem(QIcon::fromTheme(u"meeting-observer"_s), KCalUtils::Stringify::attendeeRole(KCalendarCore::Attendee::NonParticipant));
     mRolesCombo->addItem(QIcon::fromTheme(u"meeting-chair"_s), KCalUtils::Stringify::attendeeRole(KCalendarCore::Attendee::Chair));
+#else
+    mRolesCombo->addItem(QIcon::fromTheme(u"meeting-participant"_s), KCalendarCore::Attendee::roleName(KCalendarCore::Attendee::ReqParticipant));
+    mRolesCombo->addItem(QIcon::fromTheme(u"meeting-participant-optional"_s), KCalendarCore::Attendee::roleName(KCalendarCore::Attendee::OptParticipant));
+    mRolesCombo->addItem(QIcon::fromTheme(u"meeting-observer"_s), KCalendarCore::Attendee::roleName(KCalendarCore::Attendee::NonParticipant));
+    mRolesCombo->addItem(QIcon::fromTheme(u"meeting-chair"_s), KCalendarCore::Attendee::roleName(KCalendarCore::Attendee::Chair));
+#endif
 
     mRolesCombo->setWhatsThis(i18nc("@info:whatsthis", "Edits the role of the attendee."));