Use new akonadi calendar install include

CMakeLists.txt

@@ -86,7 +86,7 @@ set(KPIMTEXTEDIT_LIB_VERSION "5.19.40")
 set(KIMAP_LIB_VERSION "5.19.40")
 set(LIBKSIEVE_LIB_VERSION "5.19.40")
 set(KMAILTRANSPORT_LIB_VERSION "5.19.41")
-set(AKONADICONTACT_LIB_VERSION "5.19.40")
+set(AKONADICONTACT_LIB_VERSION "5.19.41")
 set(IMPORTWIZARD_LIB_VERSION "5.19.40")
 set(MAILIMPORTER_LIB_VERSION "5.19.40")
 set(KPIMPKPASS_LIB_VERSION "5.19.40")

kaddressbook/editorpages/cryptopageplugin.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <ContactEditor/ContactEditorPagePlugin>
+#include <Akonadi/ContactEditorPagePlugin>
 
 namespace Kleo
 {

kaddressbook/importexportplugins/vcards/engine/vcardviewerdialog.cpp

@@ -5,7 +5,7 @@
 */
 
 #include "vcardviewerdialog.h"
-#include <Akonadi/Contact/GrantleeContactViewer>
+#include <Akonadi/GrantleeContactViewer>
 #include <KConfigGroup>
 #include <KLocalizedString>
 #include <KSharedConfig>

kaddressbook/plugins/mergelib/autotests/searchduplicateresultwidgettest.cpp

@@ -9,8 +9,8 @@
 #include "../searchduplicate/searchduplicateresultwidget.h"
 #include "../widgets/mergecontactloseinformationwarning.h"
 #include <Akonadi/CollectionComboBox>
-#include <Akonadi/Contact/GrantleeContactViewer>
 #include <Akonadi/EntityTreeModel>
+#include <Akonadi/GrantleeContactViewer>
 #include <KContacts/Addressee>
 #include <QLabel>
 #include <QLayout>

kaddressbook/plugins/mergelib/searchduplicate/searchduplicateresultwidget.cpp

@@ -10,7 +10,7 @@
 
 #include "resultduplicatetreewidget.h"
 #include <Akonadi/CollectionComboBox>
-#include <Akonadi/Contact/GrantleeContactViewer>
+#include <Akonadi/GrantleeContactViewer>
 #include <KLocalizedString>
 #include <QHBoxLayout>
 #include <QLabel>

kaddressbook/plugins/mergelib/widgets/mergecontactinfowidget.cpp

@@ -5,7 +5,7 @@
 */
 #include "mergecontactinfowidget.h"
 
-#include <Akonadi/Contact/GrantleeContactViewer>
+#include <Akonadi/GrantleeContactViewer>
 
 #include <QHBoxLayout>
 #include <QLabel>

kaddressbook/plugins/sendvcards/sendvcardsjob.cpp

@@ -7,7 +7,7 @@
 #include "sendvcardsjob.h"
 
 #include "kaddressbook_sendvcardsplugin_debug.h"
-#include <Akonadi/Contact/ContactGroupExpandJob>
+#include <Akonadi/ContactGroupExpandJob>
 #include <Akonadi/ItemFetchJob>
 #include <Akonadi/ItemFetchScope>
 #include <KEMailClientLauncherJob>

kmail/editorplugins/insertemail/selectmailwidget.cpp

@@ -9,7 +9,7 @@
 #include <QHBoxLayout>
 #include <QTreeView>
 
-#include <Akonadi/Contact/EmailAddressSelectionWidget>
+#include <Akonadi/EmailAddressSelectionWidget>
 
 SelectMailWidget::SelectMailWidget(QWidget *parent)
     : QWidget(parent)

kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsjob.cpp

@@ -11,8 +11,9 @@
 #include <Akonadi/AgentTypeDialog>
 #include <Akonadi/CollectionFetchJob>
 #include <Akonadi/CollectionFetchScope>
-#include <Akonadi/Contact/ContactSearchJob>
+#include <Akonadi/ContactSearchJob>
 #include <Akonadi/ItemCreateJob>
+#include <Akonadi/SelectAddressBookDialog>
 #include <KContacts/Addressee>
 #include <KContacts/ContactGroup>
 #include <KEmailAddress>
@@ -20,7 +21,6 @@
 #include <KMessageBox>
 #include <PimCommon/PimUtil>
 #include <QPointer>
-#include <akonadi/contact/selectaddressbookdialog.h>
 
 AutomaticAddContactsJob::AutomaticAddContactsJob(QObject *parent)
     : QObject(parent)

korganizer/emailaddressselectionldapdialog/emailaddressselectionldapdialog.cpp

@@ -5,7 +5,7 @@
 */
 
 #include "emailaddressselectionldapdialog.h"
-#include <Akonadi/Contact/RecipientsPickerWidget>
+#include <Akonadi/RecipientsPickerWidget>
 #include <KConfigGroup>
 #include <KLocalizedString>
 #include <KPluginFactory>

korganizer/emailaddressselectionldapdialog/emailaddressselectionldapdialog.h

@@ -5,7 +5,7 @@
 */
 #pragma once
 
-#include <Akonadi/Contact/AbstractEmailAddressSelectionDialog>
+#include <Akonadi/AbstractEmailAddressSelectionDialog>
 namespace Akonadi
 {
 class RecipientsPickerWidget;

plugins/messageviewer/bodypartformatter/vcard/text_vcard.cpp

@@ -25,10 +25,10 @@
 #include <MimeTreeParser/NodeHelper>
 using MimeTreeParser::Interface::BodyPart;
 
-#include <Akonadi/Contact/AddContactJob>
+#include <Akonadi/AddContactJob>
 
-#include <Akonadi/Contact/ContactViewer>
-#include <Akonadi/Contact/StandardContactFormatter>
+#include <Akonadi/ContactViewer>
+#include <Akonadi/StandardContactFormatter>
 
 #include <KIO/FileCopyJob>
 #include <KIO/StatJob>

plugins/messageviewer/bodypartformatter/vcard/updatecontactjob.cpp

@@ -5,7 +5,7 @@
 */
 
 #include "updatecontactjob.h"
-#include <Akonadi/Contact/ContactSearchJob>
+#include <Akonadi/ContactSearchJob>
 #include <Akonadi/ItemModifyJob>
 #include <KLocalizedString>
 #include <KMessageBox>

plugins/messageviewer/bodypartformatter/vcard/vcardmemento.cpp

@@ -6,7 +6,7 @@
 
 #include "vcardmemento.h"
 #include "vcard_debug.h"
-#include <Akonadi/Contact/ContactSearchJob>
+#include <Akonadi/ContactSearchJob>
 using namespace MessageViewer;
 
 VcardMemento::VcardMemento(const QStringList &emails)

plugins/templateparser/autotests/templateparseremailaddressrequesterakonaditest.cpp

@@ -6,7 +6,7 @@
 
 #include "templateparseremailaddressrequesterakonaditest.h"
 #include "../templateparseremailaddressrequesterakonadi.h"
-#include <Akonadi/Contact/EmailAddressRequester>
+#include <Akonadi/EmailAddressRequester>
 #include <QHBoxLayout>
 #include <QSignalSpy>
 #include <QTest>

plugins/templateparser/templateparseremailaddressrequesterakonadi.cpp

@@ -5,7 +5,7 @@
 */
 
 #include "templateparseremailaddressrequesterakonadi.h"
-#include <Akonadi/Contact/EmailAddressRequester>
+#include <Akonadi/EmailAddressRequester>
 #include <KPluginFactory>
 #include <QHBoxLayout>
 

sieveeditor/emaillineedit/emaillineedit.cpp

@@ -6,7 +6,7 @@
 
 #include "emaillineedit.h"
 #include "sieveeditoremaillineditplugin_debug.h"
-#include <Akonadi/Contact/EmailAddressSelectionDialog>
+#include <Akonadi/EmailAddressSelectionDialog>
 #include <KPluginFactory>
 
 #include <KColorScheme>