We depend against kf5.98

src/koglobals.cpp

@@ -9,7 +9,6 @@
 #include "koglobals.h"
 #include "prefs/koprefs.h"
 #include <KHolidays/HolidayRegion>
-#include <kholidays_version.h>
 
 #include <QApplication>
 
@@ -48,11 +47,7 @@ QMap<QDate, QStringList> KOGlobals::holiday(const QDate &start, const QDate &end
 
     for (const KHolidays::HolidayRegion *region : std::as_const(mHolidayRegions)) {
         if (region && region->isValid()) {
-#if KHOLIDAYS_VERSION < QT_VERSION_CHECK(5, 95, 0)
-            const KHolidays::Holiday::List list = region->holidays(start, end);
-#else
             const KHolidays::Holiday::List list = region->rawHolidaysWithAstroSeasons(start, end);
-#endif
             const int listCount(list.count());
             for (int i = 0; i < listCount; ++i) {
                 const KHolidays::Holiday &h = list.at(i);

src/kontactplugin/korganizer/todosummarywidget.cpp

@@ -11,7 +11,6 @@
 #include "korganizerinterface.h"
 #include "todoplugin.h"
 #include <CalendarSupport/CalendarSingleton>
-#include <kcalendarcore_version.h>
 
 #include <Akonadi/CalendarUtils>
 #include <Akonadi/Collection>
@@ -126,18 +125,12 @@ void TodoSummaryWidget::updateView()
         prList.append(todo);
     }
     if (!prList.isEmpty()) {
-#if KCALENDARCORE_VERSION < QT_VERSION_CHECK(5, 95, 0)
-        prList = Akonadi::ETMCalendar::sortTodos(prList, KCalendarCore::TodoSortSummary, KCalendarCore::SortDirectionAscending);
-        prList = Akonadi::ETMCalendar::sortTodos(prList, KCalendarCore::TodoSortPriority, KCalendarCore::SortDirectionAscending);
-        prList = Akonadi::ETMCalendar::sortTodos(prList, KCalendarCore::TodoSortDueDate, KCalendarCore::SortDirectionAscending);
-#else
         KCalendarCore::Todo::List todoListSorted1(prList);
         KCalendarCore::Todo::List todoListSorted2(prList);
         KCalendarCore::Todo::List todoListSorted3(prList);
         prList = Akonadi::ETMCalendar::sortTodos(std::move(todoListSorted1), KCalendarCore::TodoSortSummary, KCalendarCore::SortDirectionAscending);
         prList = Akonadi::ETMCalendar::sortTodos(std::move(todoListSorted2), KCalendarCore::TodoSortPriority, KCalendarCore::SortDirectionAscending);
         prList = Akonadi::ETMCalendar::sortTodos(std::move(todoListSorted3), KCalendarCore::TodoSortDueDate, KCalendarCore::SortDirectionAscending);
-#endif
     }
 
     // The to-do print consists of the following fields:

src/kontactplugin/specialdates/sdsummarywidget.cpp

@@ -11,7 +11,6 @@
 #include "korganizer_kontactplugins_specialdates_debug.h"
 #include <KontactInterface/Core>
 #include <KontactInterface/Plugin>
-#include <kholidays_version.h>
 
 #include <Akonadi/ContactSearchJob>
 #include <Akonadi/ContactViewerDialog>
@@ -357,11 +356,7 @@ void SDSummaryWidget::createLabels()
     if (mShowHolidays) {
         if (initHolidays()) {
             for (dt = QDate::currentDate(); dt <= QDate::currentDate().addDays(mDaysAhead - 1); dt = dt.addDays(1)) {
-#if KHOLIDAYS_VERSION < QT_VERSION_CHECK(5, 95, 0)
-                QList<Holiday> holidays = mHolidays->holidays(dt);
-#else
                 QList<Holiday> holidays = mHolidays->rawHolidaysWithAstroSeasons(dt);
-#endif
                 QList<Holiday>::ConstIterator it = holidays.constBegin();
                 for (; it != holidays.constEnd(); ++it) {
                     SDEntry entry;