Use new akonadi calendar install include

CMakeLists.txt

@@ -49,7 +49,7 @@ set(IDENTITYMANAGEMENT_LIB_VERSION "5.19.40")
 set(KLDAP_LIB_VERSION "5.19.40")
 set(KMAILTRANSPORT_LIB_VERSION "5.19.40")
 set(CALENDARUTILS_LIB_VERSION "5.19.40")
-set(AKONADICALENDAR_LIB_VERSION "5.19.41")
+set(AKONADICALENDAR_LIB_VERSION "5.19.42")
 set(KONTACTINTERFACE_LIB_VERSION "5.19.40")
 set(KMIME_LIB_VERSION "5.19.40")
 set(KPIMTEXTEDIT_LIB_VERSION "5.19.40")

korgac/alarmdialog.h

@@ -7,7 +7,7 @@
 */
 #pragma once
 
-#include <Akonadi/Calendar/ETMCalendar>
+#include <Akonadi/ETMCalendar>
 
 #include <QDialog>
 #include <QTimer>

korgac/koalarmclient.h

@@ -7,7 +7,7 @@
 */
 #pragma once
 
-#include <Akonadi/Calendar/ETMCalendar>
+#include <Akonadi/ETMCalendar>
 
 #include <QDateTime>
 #include <QSessionManager>

src/actionmanager.cpp

@@ -34,12 +34,12 @@
 
 #include <IncidenceEditor/IncidenceEditorSettings>
 
-#include <Akonadi/Calendar/History>
-#include <Akonadi/Calendar/ICalImporter>
 #include <Akonadi/ETMViewStateSaver>
 #include <Akonadi/EntityDisplayAttribute>
 #include <Akonadi/EntityTreeModel>
 #include <Akonadi/EntityTreeView>
+#include <Akonadi/History>
+#include <Akonadi/ICalImporter>
 
 #include <KCalendarCore/FileStorage>
 #include <KCalendarCore/ICalFormat>

src/actionmanager.h

@@ -15,7 +15,7 @@
 #include "korganizerprivate_export.h"
 #include "part.h"
 
-#include <Akonadi/Calendar/ETMCalendar>
+#include <Akonadi/ETMCalendar>
 #include <Akonadi/Item>
 
 #include <KViewStateMaintainer>

src/akonadicollectionview.cpp

@@ -26,7 +26,6 @@
 #include <Akonadi/AgentInstanceCreateJob>
 #include <Akonadi/AgentManager>
 #include <Akonadi/AgentTypeDialog>
-#include <Akonadi/Calendar/StandardCalendarActionManager>
 #include <Akonadi/CollectionDeleteJob>
 #include <Akonadi/CollectionFilterProxyModel>
 #include <Akonadi/CollectionIdentificationAttribute>
@@ -34,6 +33,7 @@
 #include <Akonadi/EntityDisplayAttribute>
 #include <Akonadi/EntityTreeModel>
 #include <Akonadi/EntityTreeView>
+#include <Akonadi/StandardCalendarActionManager>
 #include <PimCommonAkonadi/MailUtil>
 #include <PimCommonAkonadi/ManageServerSideSubscriptionJob>
 

src/calendarview.cpp

@@ -35,11 +35,11 @@
 #include <Akonadi/AttributeFactory>
 #include <Akonadi/CollectionIdentificationAttribute>
 
-#include <Akonadi/Calendar/CalendarClipboard>
-#include <Akonadi/Calendar/FreeBusyManager>
-#include <Akonadi/Calendar/IncidenceChanger>
-#include <Akonadi/Calendar/TodoPurger>
-#include <akonadi/calendar/calendarsettings.h> //krazy:exclude=camelcase this is a generated file
+#include <Akonadi/CalendarClipboard>
+#include <Akonadi/FreeBusyManager>
+#include <Akonadi/IncidenceChanger>
+#include <Akonadi/TodoPurger>
+#include <akonadi/calendarsettings.h> //krazy:exclude=camelcase this is a generated file
 
 #include <Akonadi/CollectionMaintenancePage>
 #include <Akonadi/CollectionPropertiesDialog>

src/calendarview.h

@@ -19,7 +19,7 @@
 #include <KCalendarCore/ScheduleMessage>
 #include <KCalendarCore/Visitor>
 
-#include <Akonadi/Calendar/ITIPHandler>
+#include <Akonadi/ITIPHandler>
 
 #include <CalendarSupport/MessageWidget>
 

src/collectiongeneralpage.cpp

@@ -6,7 +6,7 @@
 */
 
 #include "collectiongeneralpage.h"
-#include <Akonadi/Calendar/BlockAlarmsAttribute>
+#include <Akonadi/BlockAlarmsAttribute>
 #include <Akonadi/Collection>
 #include <Akonadi/EntityDisplayAttribute>
 #include <PimCommon/PimUtil>

src/datenavigatorcontainer.h

@@ -12,7 +12,7 @@
 
 #pragma once
 
-#include <Akonadi/Calendar/ETMCalendar>
+#include <Akonadi/ETMCalendar>
 
 #include <QDate>
 #include <QFrame>

src/dialog/koeventviewerdialog.cpp

@@ -11,7 +11,7 @@
 #include "korganizer_debug.h"
 #include "korganizerinterface.h"
 
-#include <Akonadi/Calendar/ETMCalendar>
+#include <Akonadi/ETMCalendar>
 #include <CalendarSupport/IncidenceViewer>
 #include <CalendarSupport/Utils>
 

src/interfaces/korganizer/baseview.h

@@ -14,8 +14,8 @@
 #include <CalendarSupport/PrintPlugin>
 #include <EventViews/EventView>
 
-#include <Akonadi/Calendar/ETMCalendar>
-#include <Akonadi/Calendar/IncidenceChanger>
+#include <Akonadi/ETMCalendar>
+#include <Akonadi/IncidenceChanger>
 
 #include <Akonadi/Collection>
 #include <Akonadi/Item>

src/interfaces/korganizer/calendarviewbase.h

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

src/kodaymatrix.h

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include <Akonadi/Calendar/ETMCalendar>
+#include <Akonadi/ETMCalendar>
 
 #include <KCalendarCore/IncidenceBase> //for KCalendarCore::DateList typedef
 

src/koeventpopupmenu.h

@@ -12,7 +12,7 @@
 #include <QDate>
 #include <QMenu>
 
-#include <Akonadi/Calendar/ETMCalendar>
+#include <Akonadi/ETMCalendar>
 #include <Akonadi/Item>
 
 /**

src/koeventview.cpp

@@ -11,7 +11,7 @@
 #include "kocore.h"
 #include "koeventpopupmenu.h"
 
-#include <Akonadi/Calendar/ETMCalendar>
+#include <Akonadi/ETMCalendar>
 #include <CalendarSupport/KCalPrefs>
 #include <CalendarSupport/Utils>
 

src/kontactplugin/korganizer/apptsummarywidget.cpp

@@ -15,8 +15,8 @@
 #include <CalendarSupport/CalendarSingleton>
 #include <CalendarSupport/Utils>
 
-#include <Akonadi/Calendar/IncidenceChanger>
 #include <Akonadi/Collection>
+#include <Akonadi/IncidenceChanger>
 
 #include <KCalendarCore/Calendar>
 #include <KCalendarCore/Event>

src/kontactplugin/korganizer/apptsummarywidget.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <Akonadi/Calendar/ETMCalendar>
+#include <Akonadi/ETMCalendar>
 #include <KontactInterface/Summary>
 
 class KOrganizerPlugin;

src/kontactplugin/korganizer/summaryeventinfo.h

@@ -9,7 +9,7 @@
 */
 #pragma once
 
-#include <Akonadi/Calendar/ETMCalendar>
+#include <Akonadi/ETMCalendar>
 
 class QDate;
 

src/kontactplugin/korganizer/todosummarywidget.cpp

@@ -13,8 +13,8 @@
 #include <CalendarSupport/CalendarSingleton>
 #include <CalendarSupport/Utils>
 
-#include <Akonadi/Calendar/IncidenceChanger>
 #include <Akonadi/Collection>
+#include <Akonadi/IncidenceChanger>
 #include <Akonadi/ItemFetchScope>
 
 #include <KCalUtils/IncidenceFormatter>