Use new akonadi calendar install include

CMakeLists.txt

@@ -42,7 +42,7 @@ set(QT_REQUIRED_VERSION "5.15.2")
 set(KMIME_LIB_VERSION "5.19.40")
 set(CALENDARUTILS_LIB_VERSION "5.19.40")
 set(IDENTITYMANAGEMENT_LIB_VERSION "5.19.40")
-set(AKONADICALENDAR_LIB_VERSION "5.19.40")
+set(AKONADICALENDAR_LIB_VERSION "5.19.42")
 set(PIMCOMMON_LIB_VERSION "5.19.40")
 set(AKONADI_VERSION "5.19.40")
 set(AKONADI_NOTES_VERSION "5.19.41")

src/archivedialog.cpp

@@ -11,7 +11,7 @@
 #include "eventarchiver.h"
 #include "kcalprefs.h"
 
-#include <Akonadi/Calendar/IncidenceChanger>
+#include <Akonadi/IncidenceChanger>
 
 #include <KDateComboBox>
 #include <KLineEdit>

src/archivedialog.h

@@ -8,7 +8,7 @@
 
 #include "calendarsupport_export.h"
 
-#include <Akonadi/Calendar/ETMCalendar>
+#include <Akonadi/ETMCalendar>
 #include <QDialog>
 
 class QComboBox;

src/calendarsingleton.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include "calendarsupport_export.h"
-#include <Akonadi/Calendar/ETMCalendar>
+#include <Akonadi/ETMCalendar>
 
 namespace CalendarSupport
 {

src/calendarutils.cpp

@@ -12,7 +12,7 @@
 #include "calendarutils.h"
 #include "utils.h"
 
-#include <Akonadi/Calendar/IncidenceChanger>
+#include <Akonadi/IncidenceChanger>
 #include <KCalendarCore/Incidence>
 
 #include "calendarsupport_debug.h"

src/calendarutils.h

@@ -5,8 +5,8 @@
 */
 #pragma once
 
-#include <Akonadi/Calendar/ETMCalendar>
 #include <Akonadi/Collection>
+#include <Akonadi/ETMCalendar>
 
 #include <QObject>
 

src/eventarchiver.cpp

@@ -10,7 +10,7 @@
 
 #include "kcalprefs.h"
 #include "utils.h"
-#include <Akonadi/Calendar/IncidenceChanger>
+#include <Akonadi/IncidenceChanger>
 
 #include <KCalendarCore/FileStorage>
 #include <KCalendarCore/ICalFormat>

src/eventarchiver.h

@@ -10,7 +10,7 @@
 
 #include "calendarsupport_export.h"
 
-#include <Akonadi/Calendar/ETMCalendar>
+#include <Akonadi/ETMCalendar>
 #include <Akonadi/Item>
 #include <KCalendarCore/Event>
 #include <KCalendarCore/Todo>

src/freebusymodel/freebusyitem.cpp

@@ -9,7 +9,7 @@
 
 #include "freebusyitem.h"
 
-#include <Akonadi/Calendar/FreeBusyManager>
+#include <Akonadi/FreeBusyManager>
 
 using namespace CalendarSupport;
 

src/freebusymodel/freebusyitemmodel.cpp

@@ -7,7 +7,7 @@
 
 #include "freebusyitemmodel.h"
 
-#include <Akonadi/Calendar/FreeBusyManager>
+#include <Akonadi/FreeBusyManager>
 
 #include <KLocalizedString>
 

src/next/incidenceviewer.cpp

@@ -13,7 +13,7 @@
 
 #include "incidenceattachmentmodel.h"
 
-#include <Akonadi/Calendar/CalendarBase>
+#include <Akonadi/CalendarBase>
 #include <Akonadi/CollectionFetchJob>
 #include <Akonadi/ItemFetchScope>
 

src/printing/calprintpluginbase.h

@@ -12,7 +12,7 @@
 #include "calendarsupport_export.h"
 #include "printplugin.h"
 
-#include <Akonadi/Calendar/ETMCalendar>
+#include <Akonadi/ETMCalendar>
 
 #include <KCalendarCore/Event>
 #include <KCalendarCore/Journal>

src/printing/printplugin.h

@@ -8,7 +8,7 @@
 
 #include "plugin.h"
 
-#include <Akonadi/Calendar/ETMCalendar>
+#include <Akonadi/ETMCalendar>
 
 #include <KCalendarCore/Incidence>
 #include <KConfig>

src/utils.cpp

@@ -17,8 +17,8 @@
 
 #include <Akonadi/CollectionDialog>
 
-#include <Akonadi/Calendar/BlockAlarmsAttribute>
-#include <Akonadi/Calendar/ETMCalendar>
+#include <Akonadi/BlockAlarmsAttribute>
+#include <Akonadi/ETMCalendar>
 
 #include <KHolidays/HolidayRegion>