Use new akonadi calendar install include

CMakeLists.txt

@@ -47,7 +47,7 @@ set(KDEPIM_VERSION "${PIM_VERSION}${KDEPIM_DEV_VERSION} (${RELEASE_SERVICE_VERSI
 
 
 set(AKONADI_MIMELIB_VERSION "5.19.41")
-set(AKONADI_CONTACT_VERSION "5.19.40")
+set(AKONADI_CONTACT_VERSION "5.19.41")
 set(CALENDARUTILS_LIB_VERSION "5.19.40")
 set(IDENTITYMANAGEMENT_LIB_VERSION "5.19.42")
 set(KLDAP_LIB_VERSION "5.19.40")

src/dialog/addemailtoexistingcontactdialog.cpp

@@ -8,8 +8,8 @@
 #include "kmkernel.h"
 
 #include <Akonadi/ChangeRecorder>
-#include <Akonadi/Contact/ContactsTreeModel>
-#include <Akonadi/Contact/EmailAddressSelectionWidget>
+#include <Akonadi/ContactsTreeModel>
+#include <Akonadi/EmailAddressSelectionWidget>
 #include <Akonadi/EntityDisplayAttribute>
 #include <Akonadi/ItemFetchScope>
 #include <Akonadi/Session>

src/editor/kmcomposerwin.cpp

@@ -51,7 +51,7 @@
 #include <templateparser/templatesconfiguration_kfg.h>
 
 #include <Akonadi/ChangeRecorder>
-#include <Akonadi/Contact/ContactGroupExpandJob>
+#include <Akonadi/ContactGroupExpandJob>
 #include <Akonadi/ItemFetchJob>
 #include <Akonadi/MessageFlags>
 #include <Akonadi/MessageStatus>

src/identity/encodedimagepicker.cpp

@@ -11,7 +11,7 @@
 #include "encodedimagepicker.h"
 #include "ui_encodedimagepicker.h"
 
-#include <Akonadi/Contact/ContactSearchJob>
+#include <Akonadi/ContactSearchJob>
 #include <KIdentityManagement/Identity>
 #include <KIdentityManagement/IdentityManager>
 #include <KPIMTextEdit/PlainTextEditor>

src/identity/identityeditvcarddialog.cpp

@@ -7,7 +7,7 @@
 #include "identityeditvcarddialog.h"
 
 #include "kmail_debug.h"
-#include <Akonadi/Contact/ContactEditor>
+#include <Akonadi/ContactEditor>
 #include <KContacts/VCardConverter>
 #include <KLocalizedString>
 #include <KMessageBox>

src/job/createnewcontactjob.cpp

@@ -18,7 +18,7 @@
 #include <Akonadi/AgentTypeDialog>
 #include <Akonadi/CollectionFetchJob>
 #include <Akonadi/CollectionFetchScope>
-#include <Akonadi/Contact/ContactEditorDialog>
+#include <Akonadi/ContactEditorDialog>
 
 #include <KLocalizedString>
 #include <KMessageBox>

src/kmmainwidget.cpp

@@ -106,7 +106,7 @@
 #include <Akonadi/CollectionFetchScope>
 #include <Akonadi/CollectionPropertiesDialog>
 #include <Akonadi/CollectionStatistics>
-#include <Akonadi/Contact/ContactSearchJob>
+#include <Akonadi/ContactSearchJob>
 #include <Akonadi/ControlGui>
 #include <Akonadi/ETMViewStateSaver>
 #include <Akonadi/EntityDisplayAttribute>

src/kmreadermainwin.cpp

@@ -42,7 +42,7 @@
 #include <QStatusBar>
 #include <TemplateParser/CustomTemplatesMenu>
 
-#include <Akonadi/Contact/ContactSearchJob>
+#include <Akonadi/ContactSearchJob>
 #include <KActionCollection>
 #include <KEmailAddress>
 #include <KMime/KMimeMessage>

src/kmreaderwin.cpp

@@ -19,9 +19,9 @@
 
 #include "kmail-version.h"
 #include "kmcommands.h"
-#include <Akonadi/Contact/AddEmailAddressJob>
-#include <Akonadi/Contact/AddEmailDisplayJob>
-#include <Akonadi/Contact/OpenEmailAddressJob>
+#include <Akonadi/AddEmailAddressJob>
+#include <Akonadi/AddEmailDisplayJob>
+#include <Akonadi/OpenEmailAddressJob>
 #include <KEmailAddress>
 #include <MailCommon/MailUtil>
 #include <MailCommon/SendMdnHandler>
@@ -49,7 +49,7 @@ using namespace MessageViewer;
 
 #include <KIO/JobUiDelegate>
 
-#include <Akonadi/Contact/ContactEditorDialog>
+#include <Akonadi/ContactEditorDialog>
 
 #include "kmail_debug.h"
 #include <KActionCollection>