Use new akonadi mime install include

CMakeLists.txt

@@ -46,7 +46,7 @@ endif()
 set(KDEPIM_VERSION "${PIM_VERSION}${KDEPIM_DEV_VERSION} (${RELEASE_SERVICE_VERSION})")
 
 
-set(AKONADI_MIMELIB_VERSION "5.19.40")
+set(AKONADI_MIMELIB_VERSION "5.19.41")
 set(AKONADI_CONTACT_VERSION "5.19.40")
 set(CALENDARUTILS_LIB_VERSION "5.19.40")
 set(IDENTITYMANAGEMENT_LIB_VERSION "5.19.42")

agents/followupreminderagent/followupremindermanager.cpp

@@ -12,7 +12,7 @@
 #include "jobs/followupreminderfinishtaskjob.h"
 #include "jobs/followupreminderjob.h"
 
-#include <Akonadi/KMime/SpecialMailCollections>
+#include <Akonadi/SpecialMailCollections>
 
 #include <KConfig>
 #include <KConfigGroup>

agents/followupreminderagent/jobs/followupreminderjob.cpp

@@ -8,7 +8,7 @@
 
 #include <Akonadi/ItemFetchJob>
 #include <Akonadi/ItemFetchScope>
-#include <Akonadi/KMime/MessageParts>
+#include <Akonadi/MessageParts>
 
 #include <KMime/Message>
 

agents/mailfilteragent/filtermanager.cpp

@@ -19,7 +19,7 @@
 #include <Akonadi/ItemFetchScope>
 #include <Akonadi/ItemModifyJob>
 #include <Akonadi/ItemMoveJob>
-#include <Akonadi/KMime/MessageParts>
+#include <Akonadi/MessageParts>
 #include <KLocalizedString>
 #include <KMime/KMimeMessage>
 #include <KNotification>

agents/mailfilteragent/mailfilteragent.cpp

@@ -20,9 +20,9 @@
 #include <Akonadi/CollectionFetchScope>
 #include <Akonadi/ItemFetchJob>
 #include <Akonadi/ItemFetchScope>
-#include <Akonadi/KMime/MessageParts>
-#include <Akonadi/KMime/MessageStatus>
-#include <Akonadi/KMime/Pop3ResourceAttribute>
+#include <Akonadi/MessageParts>
+#include <Akonadi/MessageStatus>
+#include <Akonadi/Pop3ResourceAttribute>
 #include <Akonadi/ServerManager>
 #include <Akonadi/Session>
 #include <KConfigGroup>

agents/mailmergeagent/mailmergeagent.cpp

@@ -16,9 +16,9 @@
 #include <Akonadi/ChangeRecorder>
 #include <Akonadi/CollectionFetchScope>
 #include <Akonadi/ItemFetchScope>
-#include <Akonadi/KMime/SpecialMailCollections>
 #include <Akonadi/ServerManager>
 #include <Akonadi/Session>
+#include <Akonadi/SpecialMailCollections>
 #include <KMime/Message>
 #include <QDBusConnection>
 

agents/sendlateragent/sendlateragent.cpp

@@ -18,9 +18,9 @@
 #include <Akonadi/ChangeRecorder>
 #include <Akonadi/CollectionFetchScope>
 #include <Akonadi/ItemFetchScope>
-#include <Akonadi/KMime/SpecialMailCollections>
 #include <Akonadi/ServerManager>
 #include <Akonadi/Session>
+#include <Akonadi/SpecialMailCollections>
 #include <KMime/Message>
 #include <MessageComposer/SendLaterInfo>
 #include <QDBusConnection>

agents/unifiedmailboxagent/unifiedmailboxagent.h

@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <Akonadi/KMime/SpecialMailCollections>
 #include <Akonadi/ResourceBase>
+#include <Akonadi/SpecialMailCollections>
 
 #include "unifiedmailboxmanager.h"
 

agents/unifiedmailboxagent/unifiedmailboxmanager.cpp

@@ -15,9 +15,9 @@
 #include <Akonadi/CollectionFetchJob>
 #include <Akonadi/CollectionFetchScope>
 #include <Akonadi/ItemFetchScope>
-#include <Akonadi/KMime/SpecialMailCollections>
 #include <Akonadi/LinkJob>
 #include <Akonadi/SpecialCollectionAttribute>
+#include <Akonadi/SpecialMailCollections>
 #include <Akonadi/UnlinkJob>
 
 #include <QTimer>

src/collectionpage/collectionmailinglistpage.cpp

@@ -14,7 +14,7 @@
 
 #include <Akonadi/ItemFetchJob>
 #include <Akonadi/ItemFetchScope>
-#include <Akonadi/KMime/MessageParts>
+#include <Akonadi/MessageParts>
 
 #include <QCheckBox>
 #include <QFormLayout>

src/collectionpage/collectionviewpage.cpp

@@ -8,7 +8,7 @@
 #include <MailCommon/MailKernel>
 
 #include <Akonadi/EntityDisplayAttribute>
-#include <Akonadi/KMime/MessageFolderAttribute>
+#include <Akonadi/MessageFolderAttribute>
 
 #include "kmail_debug.h"
 #include <KIconButton>

src/editor/kmcomposerwin.cpp

@@ -53,8 +53,8 @@
 #include <Akonadi/ChangeRecorder>
 #include <Akonadi/Contact/ContactGroupExpandJob>
 #include <Akonadi/ItemFetchJob>
-#include <Akonadi/KMime/MessageFlags>
-#include <Akonadi/KMime/MessageStatus>
+#include <Akonadi/MessageFlags>
+#include <Akonadi/MessageStatus>
 #include <Akonadi/Monitor>
 
 #include <KContacts/VCardConverter>

src/identity/identitydialog.cpp

@@ -89,7 +89,7 @@ using MailTransport::TransportManager;
 #include <Akonadi/CollectionFetchJob>
 #include <Akonadi/CollectionModifyJob>
 #include <Akonadi/EntityDisplayAttribute>
-#include <Akonadi/KMime/SpecialMailCollections>
+#include <Akonadi/SpecialMailCollections>
 #include <QDialogButtonBox>
 #include <QStandardPaths>
 

src/job/createtaskjob.cpp

@@ -7,7 +7,7 @@
 
 #include "createtaskjob.h"
 #include "attributes/taskattribute.h"
-#include <Akonadi/KMime/MessageStatus>
+#include <Akonadi/MessageStatus>
 
 #include <Akonadi/ItemFetchJob>
 #include <Akonadi/ItemFetchScope>

src/job/markallmessagesasreadinfolderandsubfolderjob.h

@@ -10,7 +10,7 @@
 #include <QObject>
 
 #include <Akonadi/Collection>
-#include <Akonadi/KMime/MarkAsCommand>
+#include <Akonadi/MarkAsCommand>
 
 class MarkAllMessagesAsReadInFolderAndSubFolderJob : public QObject
 {

src/job/removeduplicatemailjob.cpp

@@ -8,10 +8,10 @@
 
 #include <Akonadi/Collection>
 #include <Akonadi/EntityTreeModel>
+#include <Akonadi/RemoveDuplicatesJob>
 #include <KLocalizedString>
 #include <KMessageBox>
 #include <Libkdepim/ProgressManager>
-#include <akonadi/kmime/removeduplicatesjob.h>
 
 #include <QItemSelectionModel>
 Q_DECLARE_METATYPE(KPIM::ProgressItem *)

src/job/removeduplicatemessageinfolderandsubfolderjob.cpp

@@ -9,7 +9,7 @@
 #include "kmail_debug.h"
 #include <Akonadi/CollectionFetchJob>
 #include <Akonadi/CollectionFetchScope>
-#include <Akonadi/KMime/RemoveDuplicatesJob>
+#include <Akonadi/RemoveDuplicatesJob>
 #include <KLocalizedString>
 #include <KMessageBox>
 #include <Libkdepim/ProgressManager>

src/job/savedraftjob.cpp

@@ -9,8 +9,8 @@
 #include "kmail_debug.h"
 #include <Akonadi/Item>
 #include <Akonadi/ItemCreateJob>
-#include <Akonadi/KMime/MessageFlags>
-#include <Akonadi/KMime/MessageStatus>
+#include <Akonadi/MessageFlags>
+#include <Akonadi/MessageStatus>
 
 SaveDraftJob::SaveDraftJob(const KMime::Message::Ptr &msg, const Akonadi::Collection &col, QObject *parent)
     : KJob(parent)

src/kmcommands.h

@@ -9,7 +9,7 @@
 #include <MessageList/View>
 #include <MessageViewer/Viewer>
 
-#include <Akonadi/KMime/MessageStatus>
+#include <Akonadi/MessageStatus>
 #include <KIO/Job>
 #include <KMime/KMimeMessage>
 

src/kmmainwidget.cpp

@@ -117,7 +117,7 @@
 #include <Akonadi/ItemFetchJob>
 #include <Akonadi/ItemFetchScope>
 #include <Akonadi/ItemModifyJob>
-#include <Akonadi/KMime/MessageFlags>
+#include <Akonadi/MessageFlags>
 #include <Akonadi/Session>
 #include <Akonadi/StandardActionManager>