GIT_SILENT: migrate more include to new akonadi api

autotests/dummykernel.cpp

@@ -3,7 +3,7 @@
 #include <Akonadi/ChangeRecorder>
 #include <Akonadi/EntityMimeTypeFilterModel>
 #include <Akonadi/EntityTreeModel>
-#include <AkonadiCore/session.h>
+#include <Akonadi/Session>
 #include <KIdentityManagement/kidentitymanagement/identitymanager.h>
 #include <KSharedConfig>
 #include <MailCommon/FolderCollectionMonitor>

autotests/favoritestest.cpp

@@ -11,9 +11,9 @@
 #include <KSharedConfig>
 
 #include <Akonadi/ChangeRecorder>
+#include <Akonadi/Control>
 #include <Akonadi/EntityTreeModel>
 #include <akonadi/qtest_akonadi.h>
-#include <control.h>
 #include <favoritecollectionorderproxymodel.h>
 #include <favoritecollectionsmodel.h>
 

src/collectionpage/collectionexpirypage.h

@@ -10,7 +10,7 @@
 #include "mailcommon_export.h"
 
 #include <Akonadi/Collection>
-#include <CollectionPropertiesPage>
+#include <Akonadi/CollectionPropertiesPage>
 
 namespace MailCommon
 {

src/collectionpage/collectionexpirywidget.cpp

@@ -13,7 +13,7 @@
 #include "mailcommon_debug.h"
 #include "util/mailutil.h"
 
-#include <CollectionModifyJob>
+#include <Akonadi/CollectionModifyJob>
 
 #include <KMessageBox>
 #include <KPluralHandlingSpinBox>

src/collectionpage/collectiongeneralpage.cpp

@@ -16,10 +16,10 @@
 #include <PimCommonAkonadi/ContentTypeWidget>
 
 #include <Akonadi/AgentManager>
+#include <Akonadi/AttributeFactory>
 #include <Akonadi/Collection>
+#include <Akonadi/CollectionModifyJob>
 #include <Akonadi/EntityDisplayAttribute>
-#include <AttributeFactory>
-#include <CollectionModifyJob>
 #include <PimCommon/PimUtil>
 
 #include <KIdentityManagement/IdentityCombo>

src/collectionpage/collectiongeneralpage.h

@@ -8,7 +8,7 @@
 
 #include "mailcommon_export.h"
 
-#include <CollectionPropertiesPage>
+#include <Akonadi/CollectionPropertiesPage>
 
 class QLineEdit;
 

src/filter/autotests/filteractionaddtoaddressbooktest.cpp

@@ -12,7 +12,7 @@
 #include <QWidget>
 
 #include <Akonadi/CollectionComboBox>
-#include <AkonadiWidgets/TagWidget>
+#include <Akonadi/TagWidget>
 
 FilterActionAddToAddressBookTest::FilterActionAddToAddressBookTest(QObject *parent)
     : QObject(parent)

src/filter/filterimporter/autotests/filtertestkernel.cpp

@@ -9,7 +9,7 @@
 #include <Akonadi/ChangeRecorder>
 #include <Akonadi/EntityMimeTypeFilterModel>
 #include <Akonadi/EntityTreeModel>
-#include <AkonadiCore/session.h>
+#include <Akonadi/Session>
 #include <KIdentityManagement/kidentitymanagement/identitymanager.h>
 #include <KSharedConfig>
 #include <MessageComposer/AkonadiSender>

src/filter/filtermanager.cpp

@@ -12,11 +12,11 @@
 #include "filterimporterexporter.h"
 #include "mailfilteragentinterface.h"
 #include <Akonadi/Monitor>
+#include <Akonadi/Tag>
+#include <Akonadi/TagAttribute>
+#include <Akonadi/TagFetchJob>
 #include <Akonadi/TagFetchScope>
 #include <KConfigGroup>
-#include <Tag>
-#include <TagAttribute>
-#include <TagFetchJob>
 
 #include <QTimer>
 

src/folder/foldersettings.cpp

@@ -10,10 +10,10 @@
 #include "mailcommon_debug.h"
 #include "util/mailutil.h"
 #include "util/resourcereadconfigfile.h"
+#include <Akonadi/CollectionModifyJob>
 #include <Akonadi/ItemFetchJob>
 #include <Akonadi/ItemFetchScope>
 #include <Akonadi/KMime/NewMailNotifierAttribute>
-#include <CollectionModifyJob>
 #include <PimCommon/PimUtil>
 
 using namespace Akonadi;

src/folder/foldertreeview.cpp

@@ -10,8 +10,8 @@
 #include "util/mailutil_p.h"
 
 #include <Akonadi/CollectionStatistics>
+#include <Akonadi/CollectionStatisticsDelegate>
 #include <Akonadi/EntityTreeModel>
-#include <CollectionStatisticsDelegate>
 
 #include <KConfigGroup>
 #include <KGuiItem>

src/folder/foldertreeview.h

@@ -12,7 +12,7 @@
 #include "mailcommon_export.h"
 
 #include <Akonadi/Collection>
-#include <EntityTreeView>
+#include <Akonadi/EntityTreeView>
 
 class QMouseEvent;
 

src/job/backupjob.cpp

@@ -8,11 +8,11 @@
 #include "backupjob.h"
 
 #include "mailcommon_debug.h"
+#include <Akonadi/CollectionDeleteJob>
 #include <Akonadi/CollectionFetchJob>
 #include <Akonadi/CollectionFetchScope>
 #include <Akonadi/ItemFetchJob>
 #include <Akonadi/ItemFetchScope>
-#include <CollectionDeleteJob>
 #include <PimCommon/BroadcastStatus>
 
 #include <KMime/Message>

src/kernel/mailkernel.cpp

@@ -13,10 +13,10 @@
 
 #include <Akonadi/AgentInstance>
 #include <Akonadi/AgentManager>
+#include <Akonadi/EntityMimeTypeFilterModel>
 #include <Akonadi/KMime/SpecialMailCollectionsDiscoveryJob>
 #include <Akonadi/KMime/SpecialMailCollectionsRequestJob>
 #include <QApplication>
-#include <entitymimetypefiltermodel.h>
 #include <util/resourcereadconfigfile.h>
 
 #include <KIdentityManagement/Identity>

src/mdn/mdnstateattribute.cpp

@@ -9,7 +9,7 @@
 
 #include "mdnstateattribute.h"
 
-#include <attributefactory.h>
+#include <akonadi/attributefactory.h>
 
 #include <QByteArray>
 

src/search/widgethandler/tagrulewidgethandler.cpp

@@ -13,10 +13,10 @@
 #include <KLocalizedString>
 #include <QIcon>
 
+#include <Akonadi/Tag>
+#include <Akonadi/TagAttribute>
+#include <Akonadi/TagFetchJob>
 #include <Akonadi/TagFetchScope>
-#include <Tag>
-#include <TagAttribute>
-#include <TagFetchJob>
 
 #include <QComboBox>
 #include <QLineEdit>

src/tag/tag.cpp

@@ -5,10 +5,10 @@
 */
 #include "tag.h"
 
+#include <Akonadi/Tag>
+#include <Akonadi/TagAttribute>
 #include <QFont>
 #include <QGuiApplication>
-#include <Tag>
-#include <TagAttribute>
 
 #include <QUuid>
 using namespace MailCommon;

src/util/mailutil.cpp

@@ -31,13 +31,13 @@
 #include <MessageComposer/MessageHelper>
 
 #include <Akonadi/AgentManager>
+#include <Akonadi/EntityMimeTypeFilterModel>
 #include <Akonadi/EntityTreeModel>
 #include <Akonadi/ItemFetchJob>
 #include <Akonadi/ItemFetchScope>
 #include <Akonadi/KMime/MessageParts>
 #include <Akonadi/KMime/NewMailNotifierAttribute>
 #include <Akonadi/ServerManager>
-#include <entitymimetypefiltermodel.h>
 
 #include <KMime/KMimeMessage>
 

src/widgets/favoritecollectionwidget.h

@@ -9,7 +9,7 @@
 
 #include "mailcommon_export.h"
 
-#include <EntityListView>
+#include <Akonadi/EntityListView>
 
 class KXMLGUIClient;
 class KActionCollection;