Verified Commit 3f0ce5ee authored by Carl Schwan's avatar Carl Schwan 🚴
Browse files

Drop support for KDE PIM libs < 21.12

And use new headers locations
parent 0fec66a1
Pipeline #123878 passed with stage
in 6 minutes and 44 seconds
......@@ -8,13 +8,8 @@
#include <QTimer>
#include <akonadi_version.h>
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/EntityTreeModel>
#include <Akonadi/ServerManager>
#else
#include <AkonadiCore/EntityTreeModel>
#include <AkonadiCore/ServerManager>
#endif
#include <Akonadi/Calendar/ETMCalendar>
class AlarmNotification;
......
......@@ -2,19 +2,13 @@
// SPDX-License-Identifier: LGPL-2.0-or-later
#include "agentconfiguration.h"
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/AgentConfigurationDialog>
#include <Akonadi/AgentInstanceCreateJob>
#include <Akonadi/AgentInstanceModel>
#include <Akonadi/AgentManager>
#include <Akonadi/AgentTypeModel>
#else
#include <AgentConfigurationDialog>
#include <AkonadiCore/AgentInstanceCreateJob>
#include <AkonadiCore/AgentInstanceModel>
#include <AkonadiCore/AgentManager>
#include <AkonadiCore/AgentTypeModel>
#endif
#include <KWindowSystem>
#include <QPointer>
......
......@@ -5,11 +5,8 @@
#include <QObject>
#include <akonadi_version.h>
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/AgentFilterProxyModel>
#else
#include <AkonadiCore/AgentFilterProxyModel>
#endif
class AgentConfiguration : public QObject
{
Q_OBJECT
......
......@@ -6,6 +6,7 @@
#include <KCalendarCore/Calendar>
#include <QAbstractListModel>
#include <QMimeDatabase>
class AttachmentsModel : public QAbstractListModel
{
Q_OBJECT
......
......@@ -11,7 +11,6 @@
#include "calendarmanager.h"
// Akonadi
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/AgentInstanceModel>
#include <Akonadi/AgentManager>
#include <Akonadi/AttributeFactory>
......@@ -27,24 +26,6 @@
#include <Akonadi/ItemModifyJob>
#include <Akonadi/ItemMoveJob>
#include <Akonadi/Monitor>
#else
#include <AkonadiCore/AgentInstanceModel>
#include <AkonadiCore/AgentManager>
#include <AkonadiCore/AttributeFactory>
#include <AkonadiCore/CollectionColorAttribute>
#include <AkonadiCore/CollectionDeleteJob>
#include <AkonadiCore/CollectionIdentificationAttribute>
#include <AkonadiCore/CollectionModifyJob>
#include <AkonadiCore/CollectionUtils>
#include <AkonadiCore/EntityDisplayAttribute>
#include <AkonadiCore/ItemModifyJob>
#include <AkonadiCore/ItemMoveJob>
#include <AkonadiWidgets/CollectionPropertiesDialog>
#include <CollectionFilterProxyModel>
#include <EntityTreeModel>
#include <Monitor>
#include <control.h>
#endif
#include "kalendar_debug.h"
#include <Akonadi/Calendar/History>
#include <EventViews/Prefs>
......
......@@ -6,17 +6,10 @@
#include <QObject>
#include <akonadi_version.h>
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/AgentFilterProxyModel>
#include <Akonadi/CollectionFilterProxyModel>
#include <Akonadi/ETMViewStateSaver>
#include <Akonadi/EntityRightsFilterModel>
#else
#include <AkonadiCore/AgentFilterProxyModel>
#include <AkonadiCore/CollectionFilterProxyModel>
#include <AkonadiCore/EntityRightsFilterModel>
#include <ETMViewStateSaver>
#endif
#include <Akonadi/Calendar/IncidenceChanger>
#include <CalendarSupport/KCalPrefs>
#include <CalendarSupport/Utils>
......
......@@ -2,17 +2,10 @@
// SPDX-License-Identifier: LGPL-2.1-or-later
#include <QObject>
#include <akonadi_version.h>
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/Item>
#include <Akonadi/ItemFetchJob>
#include <Akonadi/ItemFetchScope>
#include <Akonadi/Monitor>
#else
#include <AkonadiCore/Item>
#include <AkonadiCore/ItemFetchJob>
#include <AkonadiCore/ItemFetchScope>
#include <AkonadiCore/Monitor>
#endif
#include "contactsmanager.h"
#include <Akonadi/Contact/EmailAddressSelectionModel>
#include <KContacts/Addressee>
......
......@@ -8,11 +8,7 @@
#include <QObject>
#include <QSortFilterProxyModel>
#include <akonadi_version.h>
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/EntityMimeTypeFilterModel>
#else
#include <AkonadiCore/EntityMimeTypeFilterModel>
#endif
class QSortFilterProxyModel;
......
......@@ -2,6 +2,7 @@
// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
#include <CalendarSupport/KCalPrefs>
#include <CalendarSupport/Utils>
#include <EventViews/IncidenceTreeModel>
......
......@@ -10,11 +10,7 @@
#include <QMetaEnum>
#include <akonadi_version.h>
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/EntityTreeModel>
#else
#include <AkonadiCore/EntityTreeModel>
#endif
#include <KCalendarCore/MemoryCalendar>
#include <KCalendarCore/OccurrenceIterator>
#include <KConfigGroup>
......
......@@ -9,19 +9,11 @@
#include <QByteArray>
#include <QObject>
#include <akonadi_version.h>
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/CollectionIdentificationAttribute>
#include <Akonadi/Item>
#include <Akonadi/ItemFetchJob>
#include <Akonadi/ItemFetchScope>
#include <Akonadi/ItemMonitor>
#else
#include <AkonadiCore/CollectionIdentificationAttribute>
#include <AkonadiCore/Item>
#include <AkonadiCore/ItemFetchJob>
#include <AkonadiCore/ItemFetchScope>
#include <AkonadiCore/ItemMonitor>
#endif
#include "attachmentsmodel.h"
#include "attendeesmodel.h"
#include "recurrenceexceptionsmodel.h"
......
......@@ -8,11 +8,7 @@
#include <akonadi_version.h>
#include <cmath>
#include <infinitecalendarviewmodel.h>
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/EntityTreeModel>
#else
#include <AkonadiCore/EntityTreeModel>
#endif
InfiniteCalendarViewModel::InfiniteCalendarViewModel(QObject *parent)
: QAbstractListModel(parent)
......
......@@ -4,13 +4,8 @@
#include "kalendar_debug.h"
#include <QMetaEnum>
#include <akonadi_version.h>
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/ItemFetchJob>
#include <Akonadi/ItemFetchScope>
#else
#include <AkonadiCore/ItemFetchJob>
#include <AkonadiCore/ItemFetchScope>
#endif
#include <KCalendarCore/Incidence>
#include <itemtagsmodel.h>
......
......@@ -4,11 +4,7 @@
#pragma once
#include <QObject>
#include <akonadi_version.h>
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/Item>
#else
#include <AkonadiCore/Item>
#endif
#include <QAbstractListModel>
class ItemTagsModel : public QAbstractListModel
......
......@@ -21,11 +21,7 @@
#include <QQuickWindow>
#include <QUrl>
#include <akonadi_version.h>
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/AgentFilterProxyModel>
#else
#include <AkonadiCore/AgentFilterProxyModel>
#endif
#include "about.h"
#include "agentconfiguration.h"
#include "calendarmanager.h"
......
// SPDX-FileCopyrightText: 2021 Claudio Cambra <claudio.cambra@gmail.com>
// SPDX-License-Identifier: LGPL-2.1-or-later
#include "tagmanager.h"
#include "kalendar_debug.h"
#include <QObject>
#include <akonadi_version.h>
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/TagCreateJob>
#include <Akonadi/TagDeleteJob>
#include <Akonadi/TagModifyJob>
#else
#include <AkonadiCore/TagCreateJob>
#include <AkonadiCore/TagDeleteJob>
#include <AkonadiCore/TagModifyJob>
#endif
#include <KDescendantsProxyModel>
#include <tagmanager.h>
class FlatTagModel : public QSortFilterProxyModel
{
......
......@@ -2,15 +2,11 @@
// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
#include <QObject>
#include <akonadi_version.h>
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/Monitor>
#include <Akonadi/TagModel>
#else
#include <AkonadiCore/Monitor>
#include <AkonadiCore/TagModel>
#endif
#include <QSortFilterProxyModel>
class TagManager : public QObject
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment