Use new akonadi calendar install include

CMakeLists.txt

@@ -57,7 +57,7 @@ set(LIBKDEPIM_LIB_VERSION "5.19.40")
 set(LIBGRANTLEETHEME_LIB_VERSION "5.19.40")
 set(PIMCOMMON_LIB_VERSION "5.19.40")
 set(AKONADI_SEARCH_VERSION "5.19.40")
-set(AKONADI_CONTACT_VERSION "5.19.40")
+set(AKONADI_CONTACT_VERSION "5.19.41")
 
 # Find KF5 package
 find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)

src/globalcontactmodel.cpp

@@ -9,7 +9,7 @@
 #include "globalcontactmodel.h"
 
 #include <Akonadi/ChangeRecorder>
-#include <Akonadi/Contact/ContactsTreeModel>
+#include <Akonadi/ContactsTreeModel>
 #include <Akonadi/EntityDisplayAttribute>
 #include <Akonadi/ItemFetchScope>
 #include <Akonadi/Session>

src/mainwidget.cpp

@@ -27,8 +27,8 @@
 #include "importexport/plugininterface.h"
 #include "importexport/pluginmanager.h"
 
-#include <Akonadi/Contact/GrantleeContactFormatter>
-#include <Akonadi/Contact/GrantleeContactGroupFormatter>
+#include <Akonadi/GrantleeContactFormatter>
+#include <Akonadi/GrantleeContactGroupFormatter>
 #include <GrantleeTheme/GrantleeThemeManager>
 
 #include "uistatesaver.h"
@@ -51,13 +51,13 @@
 #include <PimCommonAkonadi/ManageServerSideSubscriptionJob>
 #include <QPointer>
 
-#include <Akonadi/Contact/ContactDefaultActions>
-#include <Akonadi/Contact/ContactGroupEditorDialog>
-#include <Akonadi/Contact/ContactGroupViewer>
-#include <Akonadi/Contact/ContactViewer>
-#include <Akonadi/Contact/ContactsFilterProxyModel>
-#include <Akonadi/Contact/ContactsTreeModel>
-#include <Akonadi/Contact/StandardContactActionManager>
+#include <Akonadi/ContactDefaultActions>
+#include <Akonadi/ContactGroupEditorDialog>
+#include <Akonadi/ContactGroupViewer>
+#include <Akonadi/ContactViewer>
+#include <Akonadi/ContactsFilterProxyModel>
+#include <Akonadi/ContactsTreeModel>
+#include <Akonadi/StandardContactActionManager>
 
 #include "kaddressbook_debug.h"
 #include <KActionCollection>

src/modelcolumnmanager.h

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <Akonadi/Contact/ContactsTreeModel>
+#include <Akonadi/ContactsTreeModel>
 
 #include <QObject>
 

src/printing/grantlee/grantleeprintstyle.cpp

@@ -8,7 +8,7 @@
 #include "importexport/contactfields.h"
 #include "printingwizard.h"
 #include "printprogress.h"
-#include <Akonadi/Contact/GrantleePrint>
+#include <Akonadi/GrantleePrint>
 
 #include <KContacts/Addressee>
 

src/stylecontactlistdelegate.cpp

@@ -9,7 +9,7 @@
 #include "stylecontactlistdelegate.h"
 #include "contactinfoproxymodel.h"
 
-#include <Akonadi/Contact/ContactsTreeModel>
+#include <Akonadi/ContactsTreeModel>
 
 #include <QApplication>
 #include <QImage>