Commit d0b610b5 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Make it compile with new akonadi includes

parent 02e66442
......@@ -2,12 +2,20 @@
// SPDX-License-Identifier: LGPL-2.0-or-later
#include "agentconfiguration.h"
#include <akonadi_version.h>
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/AgentManager>
#include <Akonadi/AgentInstanceCreateJob>
#include <Akonadi/AgentInstanceModel>
#include <Akonadi/AgentTypeModel>
#include <Akonadi/AgentConfigurationDialog>
#else
#include <AkonadiCore/AgentManager>
#include <AkonadiCore/AgentInstanceCreateJob>
#include <AkonadiCore/AgentInstanceModel>
#include <AkonadiCore/AgentTypeModel>
#include <AgentConfigurationDialog>
#endif
#include <KWindowSystem>
#include <QPointer>
......
......@@ -4,8 +4,12 @@
#pragma once
#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,10 +6,19 @@
#include <KLocalizedString>
#include "attendeesmodel.h"
#include <KContacts/Addressee>
#include <akonadi_version.h>
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/Item>
#include <Akonadi/ItemFetchJob>
#include <Akonadi/ItemFetchScope>
#include <Akonadi/SearchQuery>
#else
#include <AkonadiCore/Item>
#include <AkonadiCore/ItemFetchJob>
#include <AkonadiCore/ItemFetchScope>
#include <AkonadiCore/SearchQuery>
#endif
#include <Akonadi/Contact/ContactSearchJob>
AttendeeStatusModel::AttendeeStatusModel(QObject *parent)
......
......@@ -12,20 +12,30 @@
#include "calendarmanager.h"
// Akonadi
#include <akonadi_version.h>
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/Control>
#include <Akonadi/CollectionFilterProxyModel>
#include <Akonadi/Monitor>
#include <Akonadi/EntityTreeModel>
#include <Akonadi/EntityDisplayAttribute>
#include <Akonadi/AgentManager>
#include <Akonadi/AgentInstanceModel>
#include <Akonadi/CollectionIdentificationAttribute>
#include <Akonadi/ItemMoveJob>
#include <Akonadi/ItemModifyJob>
#include <Akonadi/CollectionModifyJob>
#include <Akonadi/AttributeFactory>
#include <Akonadi/CollectionColorAttribute>
#include <Akonadi/CollectionUtils>
#else
#include <control.h>
#include <etmcalendar.h>
#include <CollectionFilterProxyModel>
#include <Monitor>
#include <KLocalizedString>
#include <EntityTreeModel>
#include <QApplication>
#include <CalendarSupport/KCalPrefs>
#include <CalendarSupport/Utils>
#include <AkonadiCore/EntityDisplayAttribute>
#include <AkonadiCore/AgentManager>
#include <AkonadiCore/AgentInstanceModel>
#include <Akonadi/Calendar/IncidenceChanger>
#include <Akonadi/Calendar/History>
#include <AkonadiCore/CollectionIdentificationAttribute>
#include <AkonadiCore/ItemMoveJob>
#include <AkonadiCore/ItemModifyJob>
......@@ -33,6 +43,14 @@
#include <AkonadiCore/AttributeFactory>
#include <AkonadiCore/CollectionColorAttribute>
#include <AkonadiCore/CollectionUtils>
#endif
#include <etmcalendar.h>
#include <KLocalizedString>
#include <QApplication>
#include <CalendarSupport/KCalPrefs>
#include <CalendarSupport/Utils>
#include <Akonadi/Calendar/IncidenceChanger>
#include <Akonadi/Calendar/History>
#include <QRandomGenerator>
#include <EventViews/Prefs>
#include <KCheckableProxyModel>
......
......@@ -5,12 +5,20 @@
#pragma once
#include <QObject>
#include <ETMViewStateSaver>
#include <KDescendantsProxyModel>
#include <akonadi_version.h>
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/ETMViewStateSaver>
#include <Akonadi/AgentFilterProxyModel>
#include <Akonadi/CollectionFilterProxyModel>
#include <Akonadi/EntityRightsFilterModel>
#else
#include <AkonadiCore/AgentFilterProxyModel>
#include <AkonadiCore/CollectionFilterProxyModel>
#include <AkonadiCore/EntityRightsFilterModel>
#include <ETMViewStateSaver>
#endif
#include <Akonadi/Calendar/IncidenceChanger>
#include <KDescendantsProxyModel>
#include <CalendarSupport/KCalPrefs>
#include <CalendarSupport/Utils>
#include <incidencewrapper.h>
......
// SPDX-FileCopyrightText: 2021 Claudio Cambra <claudio.cambra@gmail.com>
// 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 <Akonadi/Contact/EmailAddressSelectionModel>
#include <KContacts/Addressee>
#include <KContacts/ContactGroup>
......
......@@ -7,7 +7,12 @@
#include <QSortFilterProxyModel>
#include <Akonadi/Contact/ContactsTreeModel>
#include <Akonadi/Contact/ContactsFilterProxyModel>
#include <akonadi_version.h>
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/EntityMimeTypeFilterModel>
#else
#include <AkonadiCore/EntityMimeTypeFilterModel>
#endif
#include <KItemModels/KDescendantsProxyModel>
class QSortFilterProxyModel;
......
......@@ -8,8 +8,12 @@
#include "incidenceoccurrencemodel.h"
#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/OccurrenceIterator>
#include <KCalendarCore/MemoryCalendar>
#include <KFormat>
......
......@@ -6,8 +6,12 @@
//#include "calendarview_debug.h"
#include "incidencetreemodel_p.h"
#include <akonadi_version.h>
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/EntityTreeModel>
#else
#include <AkonadiCore/EntityTreeModel>
#endif
using namespace Akonadi;
QDebug operator<<(QDebug s, const Node::Ptr &node);
......
......@@ -7,7 +7,13 @@
#pragma once
#include "eventviews_export.h"
#include <QObject>
#include <akonadi_version.h>
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/Item>
#else
#include <AkonadiCore/Item>
#endif
#include <QAbstractProxyModel>
......
......@@ -7,9 +7,12 @@
#pragma once
#include "incidencetreemodel.h"
#include <akonadi_version.h>
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/Item>
#else
#include <AkonadiCore/Item>
#endif
#include <KCalendarCore/Incidence>
#include <QHash>
#include <QModelIndex>
......
......@@ -6,7 +6,12 @@
#include <QObject>
#include <CalendarSupport/KCalPrefs>
#include <CalendarSupport/Utils>
#include <akonadi_version.h>
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/CollectionIdentificationAttribute>
#else
#include <AkonadiCore/CollectionIdentificationAttribute>
#endif
#include "remindersmodel.h"
#include "attendeesmodel.h"
#include "recurrenceexceptionsmodel.h"
......
......@@ -2,8 +2,15 @@
// SPDX-License-Identifier: LGPL-2.1-or-later
#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>
......
......@@ -2,8 +2,13 @@
// 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/Item>
#else
#include <AkonadiCore/Item>
#endif
#include <QAbstractListModel>
class ItemTagsModel : public QAbstractListModel
......
......@@ -10,7 +10,12 @@
#include <KLocalizedString>
#include <KCalendarCore/VCalFormat>
#include <KCalendarCore/MemoryCalendar>
#include <akonadi_version.h>
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/AgentFilterProxyModel>
#else
#include <AkonadiCore/AgentFilterProxyModel>
#endif
#include "multidayincidencemodel.h"
#include "incidenceoccurrencemodel.h"
#include "monthviewmodel.h"
......
// SPDX-FileCopyrightText: 2021 Claudio Cambra <claudio.cambra@gmail.com>
// 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/TagCreateJob>
#include <Akonadi/TagDeleteJob>
#include <Akonadi/TagModifyJob>
#else
#include <AkonadiCore/TagCreateJob>
#include <AkonadiCore/TagDeleteJob>
#include <AkonadiCore/TagModifyJob>
#endif
#include <tagmanager.h>
class FlatTagModel : public QSortFilterProxyModel
......
......@@ -2,9 +2,15 @@
// 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/TagModel>
#include <Akonadi/Monitor>
#else
#include <AkonadiCore/TagModel>
#include <AkonadiCore/Monitor>
#endif
#include <QSortFilterProxyModel>
#include <KDescendantsProxyModel>
......
......@@ -11,9 +11,15 @@
#include <Akonadi/Calendar/ETMCalendar>
#include <Akonadi/Calendar/IncidenceChanger>
#include <akonadi_version.h>
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/Item>
#include <Akonadi/EntityTreeModel>
#else
#include <Item>
#include <EntityTreeModel>
#endif
#include <KCalendarCore/Todo>
#include <QAbstractItemModel>
#include <QAbstractProxyModel>
......
......@@ -10,7 +10,12 @@
#include "todomodel.h"
#include <Akonadi/Calendar/ETMCalendar>
#include <akonadi_version.h>
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/Item>
#else
#include <Item>
#endif
#include <QModelIndex>
#include <QString>
......
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