We depend against kf5.98

src/printing/calprintpluginbase.cpp

@@ -19,7 +19,6 @@
 #include <KConfig>
 #include <KConfigGroup>
 #include <KWordWrap>
-#include <kcalendarcore_version.h>
 
 #include <KLocalizedString>
 #include <QAbstractTextDocumentLayout>
@@ -1779,11 +1778,7 @@ void CalPrintPluginBase::drawTodo(int &count,
     for (const KCalendarCore::Todo::Ptr &todo : std::as_const(t)) {
         tl.append(todo);
     }
-#if KCALENDARCORE_VERSION < QT_VERSION_CHECK(5, 95, 0)
-    KCalendarCore::Todo::List sl = mCalendar->sortTodos(tl, sortField, sortDir);
-#else
     KCalendarCore::Todo::List sl = mCalendar->sortTodos(std::move(tl), sortField, sortDir);
-#endif
 #endif
 
     int subcount = 0;

src/utils.cpp

@@ -9,7 +9,6 @@
 #include "utils.h"
 #include "calendarsupport_debug.h"
 #include "kcalprefs.h"
-#include <kholidays_version.h>
 
 #include <Akonadi/AgentInstance>
 #include <Akonadi/AgentManager>
@@ -526,11 +525,7 @@ QList<QDate> CalendarSupport::workDays(QDate startDate, QDate endDate)
         for (const QString &regionStr : holidays) {
             KHolidays::HolidayRegion region(regionStr);
             if (region.isValid()) {
-#if KHOLIDAYS_VERSION < QT_VERSION_CHECK(5, 95, 0)
-                for (auto const &h : region.holidays(startDate, endDate)) {
-#else
                 for (auto const &h : region.rawHolidaysWithAstroSeasons(startDate, endDate)) {
-#endif
                     if (h.dayType() == KHolidays::Holiday::NonWorkday) {
                         for (int i = 0; i < h.duration(); i++) {
                             result.removeOne(h.observedStartDate().addDays(i));
@@ -553,11 +548,7 @@ QStringList CalendarSupport::holiday(QDate date)
     for (const QString &regionStr : holidays) {
         KHolidays::HolidayRegion region(regionStr);
         if (region.isValid()) {
-#if KHOLIDAYS_VERSION < QT_VERSION_CHECK(5, 95, 0)
-            const KHolidays::Holiday::List list = region.holidays(date);
-#else
             const KHolidays::Holiday::List list = region.rawHolidaysWithAstroSeasons(date);
-#endif
             const int listCount = list.count();
             for (int i = 0; i < listCount; ++i) {
                 // don't add duplicates.