Use new akonadi mime install include

CMakeLists.txt

@@ -79,7 +79,7 @@ set(AKONADICALENDAR_LIB_VERSION "5.19.40")
 set(KONTACTINTERFACE_LIB_VERSION "5.19.40")
 set(AKONADIKALARM_LIB_VERSION "5.19.40")
 set(KMIME_LIB_VERSION "5.19.40")
-set(AKONADIMIME_LIB_VERSION "5.19.40")
+set(AKONADIMIME_LIB_VERSION "5.19.41")
 set(AKONADICONTACT_LIB_VERSION "5.19.40")
 set(AKONADINOTE_LIB_VERSION "5.19.40")
 set(KGAPI_LIB_VERSION "5.19.40")

agents/maildispatcher/outboxqueue.cpp

@@ -11,14 +11,14 @@
 #include "maildispatcher_debug.h"
 #include <KLocalizedString>
 
+#include <Akonadi/AddressAttribute>
 #include <Akonadi/Attribute>
 #include <Akonadi/ItemFetchJob>
 #include <Akonadi/ItemFetchScope>
-#include <Akonadi/KMime/AddressAttribute>
-#include <Akonadi/KMime/MessageFlags>
-#include <Akonadi/KMime/SpecialMailCollections>
-#include <Akonadi/KMime/SpecialMailCollectionsRequestJob>
+#include <Akonadi/MessageFlags>
 #include <Akonadi/Monitor>
+#include <Akonadi/SpecialMailCollections>
+#include <Akonadi/SpecialMailCollectionsRequestJob>
 
 #include <KMime/Message>
 

agents/maildispatcher/sendjob.cpp

@@ -9,6 +9,7 @@
 #include "storeresultjob.h"
 
 #include "maildispatcher_debug.h"
+#include <Akonadi/AddressAttribute>
 #include <Akonadi/AgentInstance>
 #include <Akonadi/AgentManager>
 #include <Akonadi/Collection>
@@ -16,10 +17,9 @@
 #include <Akonadi/ItemDeleteJob>
 #include <Akonadi/ItemModifyJob>
 #include <Akonadi/ItemMoveJob>
-#include <Akonadi/KMime/AddressAttribute>
-#include <Akonadi/KMime/MessageParts>
-#include <Akonadi/KMime/SpecialMailCollections>
+#include <Akonadi/MessageParts>
 #include <Akonadi/ServerManager>
+#include <Akonadi/SpecialMailCollections>
 #include <Akonadi/TransportResourceBase>
 #include <KLocalizedString>
 #include <MailTransport/Transport>

agents/maildispatcher/sentactionhandler.cpp

@@ -10,7 +10,7 @@
 #include "maildispatcher_debug.h"
 #include <Akonadi/ItemFetchJob>
 #include <Akonadi/ItemModifyJob>
-#include <Akonadi/KMime/MessageFlags>
+#include <Akonadi/MessageFlags>
 
 using namespace MailTransport;
 

agents/maildispatcher/storeresultjob.cpp

@@ -9,7 +9,7 @@
 #include "maildispatcher_debug.h"
 #include <Akonadi/ItemFetchJob>
 #include <Akonadi/ItemModifyJob>
-#include <Akonadi/KMime/MessageFlags>
+#include <Akonadi/MessageFlags>
 #include <KLocalizedString>
 #include <MailTransportAkonadi/DispatchModeAttribute>
 #include <MailTransportAkonadi/ErrorAttribute>

agents/newmailnotifier/newmailnotifieragent.cpp

@@ -24,11 +24,11 @@
 #include <Akonadi/EntityDisplayAttribute>
 #include <Akonadi/EntityHiddenAttribute>
 #include <Akonadi/ItemFetchScope>
-#include <Akonadi/KMime/MessageStatus>
-#include <Akonadi/KMime/NewMailNotifierAttribute>
-#include <Akonadi/KMime/SpecialMailCollections>
+#include <Akonadi/MessageStatus>
+#include <Akonadi/NewMailNotifierAttribute>
 #include <Akonadi/ServerManager>
 #include <Akonadi/Session>
+#include <Akonadi/SpecialMailCollections>
 #include <KLocalizedString>
 #include <KMime/Message>
 #include <KNotification>

agents/newmailnotifier/newmailnotifierselectcollectionwidget.cpp

@@ -9,7 +9,7 @@
 #include <Akonadi/AttributeFactory>
 #include <Akonadi/CollectionFilterProxyModel>
 #include <Akonadi/CollectionModifyJob>
-#include <Akonadi/KMime/NewMailNotifierAttribute>
+#include <Akonadi/NewMailNotifierAttribute>
 #include <QSortFilterProxyModel>
 
 #include <Akonadi/ChangeRecorder>

agents/newmailnotifier/specialnotifierjob.cpp

@@ -13,7 +13,7 @@
 #include <Akonadi/ItemDeleteJob>
 #include <Akonadi/ItemFetchJob>
 #include <Akonadi/ItemFetchScope>
-#include <Akonadi/KMime/MessageParts>
+#include <Akonadi/MessageParts>
 
 #include <KEmailAddress>
 #include <KNotification>

agents/newmailnotifier/specialnotifierjob.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include <Akonadi/Item>
-#include <Akonadi/KMime/MarkAsCommand>
+#include <Akonadi/MarkAsCommand>
 #include <QObject>
 #include <QPixmap>
 #include <QStringList>

resources/ews/ewsresource.cpp

@@ -18,7 +18,7 @@
 #include <Akonadi/ItemDeleteJob>
 #include <Akonadi/ItemFetchScope>
 #include <Akonadi/ItemModifyJob>
-#include <Akonadi/KMime/SpecialMailCollections>
+#include <Akonadi/SpecialMailCollections>
 #include <KMime/Message>
 #include <KNotification>
 #include <KWallet>

resources/ews/mail/ewscreatemailjob.cpp

@@ -11,7 +11,7 @@
 #include <Akonadi/AgentManager>
 #include <Akonadi/Collection>
 #include <Akonadi/Item>
-#include <Akonadi/KMime/SpecialMailCollections>
+#include <Akonadi/SpecialMailCollections>
 #include <KMime/Message>
 
 #include "ewscreateitemrequest.h"

resources/ews/mail/ewsfetchmaildetailjob.cpp

@@ -6,7 +6,7 @@
 
 #include "ewsfetchmaildetailjob.h"
 
-#include <Akonadi/KMime/MessageFlags>
+#include <Akonadi/MessageFlags>
 #include <KMime/HeaderParsing>
 #include <KMime/Message>
 

resources/ews/mail/ewsmailhandler.cpp

@@ -7,7 +7,7 @@
 #include "ewsmailhandler.h"
 
 #include <Akonadi/Item>
-#include <Akonadi/KMime/MessageFlags>
+#include <Akonadi/MessageFlags>
 #include <KMime/Message>
 
 #include "ewscreatemailjob.h"

resources/ews/mail/ewsmodifymailjob.cpp

@@ -6,7 +6,7 @@
 
 #include "ewsmodifymailjob.h"
 
-#include <Akonadi/KMime/MessageFlags>
+#include <Akonadi/MessageFlags>
 
 #include <KLocalizedString>
 

resources/ews/test/CMakeLists.txt

@@ -23,6 +23,7 @@ qt_add_dbus_interface(isolatestestcommon_SRCS ${ewsresourceinterface_xml} ewsres
 add_library(isolatedtestcommon STATIC ${isolatestestcommon_SRCS})
 target_link_libraries(isolatedtestcommon
   KF5::AkonadiCore
+  KF5::AkonadiMime
   Qt${QT_MAJOR_VERSION}::Core
   Qt${QT_MAJOR_VERSION}::Network
   Qt${QT_MAJOR_VERSION}::Test

resources/ews/test/isolatedtestbase.h

@@ -9,7 +9,7 @@
 class QObject;
 #include <QString>
 
-#include <Akonadi/KMime/SpecialMailCollections>
+#include <Akonadi/SpecialMailCollections>
 
 #include "fakeewsserver.h"
 

resources/imap/autotests/testretrievecollectionstask.cpp

@@ -11,7 +11,7 @@
 #include "retrievecollectionstask.h"
 #include <noinferiorsattribute.h>
 
-#include <Akonadi/KMime/MessageParts>
+#include <Akonadi/MessageParts>
 
 #include <Akonadi/CachePolicy>
 #include <Akonadi/EntityDisplayAttribute>

resources/imap/autotests/testretrieveitemstask.cpp

@@ -12,7 +12,7 @@
 #include <highestmodseqattribute.h>
 #include <uidvalidityattribute.h>
 
-#include <Akonadi/KMime/MessageParts>
+#include <Akonadi/MessageParts>
 
 #include <Akonadi/CachePolicy>
 #include <Akonadi/CollectionStatistics>

resources/imap/imapresourcebase.cpp

@@ -20,7 +20,7 @@
 
 #include <kwindowsystem.h>
 
-#include <Akonadi/KMime/MessageParts>
+#include <Akonadi/MessageParts>
 
 #include <Akonadi/AgentManager>
 #include <Akonadi/AttributeFactory>

resources/imap/messagehelper.cpp

@@ -5,7 +5,7 @@
 */
 #include "messagehelper.h"
 
-#include <Akonadi/KMime/MessageFlags>
+#include <Akonadi/MessageFlags>
 
 #include "resourcetask.h"