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

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

Use KCalendarCore 6.30 API when available

M  +31   -0    src/printing/calprintdefaultplugins.cpp

https://invent.kde.org/pim/calendarsupport/-/commit/bf8f29d32b29291bd394e3c42d6866eb57739f61

diff --git a/src/printing/calprintdefaultplugins.cpp b/src/printing/calprintdefaultplugins.cpp
index fa8d56b2..d6e6d12b 100644
--- a/src/printing/calprintdefaultplugins.cpp
+++ b/src/printing/calprintdefaultplugins.cpp
@@ -23,7 +23,9 @@ using namespace Qt::Literals::StringLiterals;
 #include <KCalendarCore/Visitor>
 
 #include <KCalUtils/IncidenceFormatter>
+#if KCALENDARCORE_VERSION < QT_VERSION_CHECK(6, 30, 0)
 #include <KCalUtils/Stringify>
+#endif
 
 #include <KConfigGroup>
 
@@ -483,7 +485,11 @@ void CalPrintIncidence::print(QPainter &p, int width, int height)
                         continue;
                     }
                     // format the status
+#if KCALENDARCORE_VERSION < QT_VERSION_CHECK(6, 30, 0)
                     statusString = KCalUtils::Stringify::incidenceStatus(todo->status());
+#else
+                    statusString = KCalendarCore::Incidence::statusName(todo->status());
+#endif
                     if (statusString.isEmpty()) {
                         if (todo->status() == KCalendarCore::Incidence::StatusNone) {
                             statusString = i18nc("no status", "none");
@@ -524,7 +530,11 @@ void CalPrintIncidence::print(QPainter &p, int width, int height)
                     subitemString += i18nc("subitem Status: statusString", "Status: %1\n", statusString);
                     subitemString += KCalUtils::IncidenceFormatter::recurrenceString(todo) + u'\n';
                     subitemString += i18nc("subitem Priority: N", "Priority: %1\n", QString::number(todo->priority()));
+#if KCALENDARCORE_VERSION < QT_VERSION_CHECK(6, 30, 0)
                     subitemString += i18nc("subitem Secrecy: secrecyString", "Secrecy: %1\n", KCalUtils::Stringify::incidenceSecrecy(todo->secrecy()));
+#else
+                    subitemString += i18nc("subitem Secrecy: secrecyString", "Secrecy: %1\n", KCalendarCore::Incidence::secrecyName(todo->secrecy()));
+#endif
                     subitemString += u'\n';
                 }
                 drawBoxWithCaption(p,
@@ -578,6 +588,7 @@ void CalPrintIncidence::print(QPainter &p, int width, int height)
                 if (!attendeeString.isEmpty()) {
                     attendeeString += u'\n';
                 }
+#if KCALENDARCORE_VERSION < QT_VERSION_CHECK(6, 30, 0)
                 attendeeString += i18nc(
                     "Formatting of an attendee: "
                     "'Name (Role): Status', e.g. 'Reinhold Kainhofer "
@@ -586,6 +597,16 @@ void CalPrintIncidence::print(QPainter &p, int width, int height)
                     (*ait).fullName(),
                     KCalUtils::Stringify::attendeeRole((*ait).role()),
                     KCalUtils::Stringify::attendeeStatus((*ait).status()));
+#else
+                attendeeString += i18nc(
+                    "Formatting of an attendee: "
+                    "'Name (Role): Status', e.g. 'Reinhold Kainhofer "
+                    "<[email protected]> (Participant): Awaiting Response'",
+                    "%1 (%2): %3",
+                    (*ait).fullName(),
+                    KCalendarCore::Attendee::roleName((*ait).role()),
+                    KCalendarCore::Attendee::statusName((*ait).status()));
+#endif
             }
             drawBoxWithCaption(p,
                                attendeesBox,
@@ -599,12 +620,22 @@ void CalPrintIncidence::print(QPainter &p, int width, int height)
 
         if (mShowOptions) {
             QString optionsString;
+#if KCALENDARCORE_VERSION < QT_VERSION_CHECK(6, 30, 0)
             if (!KCalUtils::Stringify::incidenceStatus((*it)->status()).isEmpty()) {
                 optionsString += i18n("Status: %1", KCalUtils::Stringify::incidenceStatus((*it)->status()));
+#else
+            if (!KCalendarCore::Incidence::statusName((*it)->status()).isEmpty()) {
+                optionsString += i18n("Status: %1", KCalendarCore::Incidence::statusName((*it)->status()));
+#endif
                 optionsString += u'\n';
             }
+#if KCALENDARCORE_VERSION < QT_VERSION_CHECK(6, 30, 0)
             if (!KCalUtils::Stringify::incidenceSecrecy((*it)->secrecy()).isEmpty()) {
                 optionsString += i18n("Secrecy: %1", KCalUtils::Stringify::incidenceSecrecy((*it)->secrecy()));
+#else
+            if (!KCalendarCore::Incidence::secrecyName((*it)->secrecy()).isEmpty()) {
+                optionsString += i18n("Secrecy: %1", KCalendarCore::Incidence::secrecyName((*it)->secrecy()));
+#endif
                 optionsString += u'\n';
             }
             if ((*it)->type() == KCalendarCore::Incidence::TypeEvent) {