From f489d52b0a5c8cc037575d0496a513a3a7d94e9a Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 8 Sep 2021 19:23:23 +0200 Subject: [PATCH] GIT_SILENT: migrate more include to new akonadi api --- autotests/dummykernel.cpp | 2 +- autotests/favoritestest.cpp | 2 +- src/collectionpage/collectionexpirypage.h | 2 +- src/collectionpage/collectionexpirywidget.cpp | 2 +- src/collectionpage/collectiongeneralpage.cpp | 4 ++-- src/collectionpage/collectiongeneralpage.h | 2 +- src/filter/autotests/filteractionaddtoaddressbooktest.cpp | 2 +- src/filter/filterimporter/autotests/filtertestkernel.cpp | 2 +- src/filter/filtermanager.cpp | 6 +++--- src/folder/foldersettings.cpp | 2 +- src/folder/foldertreeview.cpp | 2 +- src/folder/foldertreeview.h | 2 +- src/job/backupjob.cpp | 2 +- src/kernel/mailkernel.cpp | 2 +- src/mdn/mdnstateattribute.cpp | 2 +- src/search/widgethandler/tagrulewidgethandler.cpp | 6 +++--- src/tag/tag.cpp | 4 ++-- src/util/mailutil.cpp | 2 +- src/widgets/favoritecollectionwidget.h | 2 +- 19 files changed, 25 insertions(+), 25 deletions(-) diff --git a/autotests/dummykernel.cpp b/autotests/dummykernel.cpp index 8910be5..e148d5d 100644 --- a/autotests/dummykernel.cpp +++ b/autotests/dummykernel.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/autotests/favoritestest.cpp b/autotests/favoritestest.cpp index 781750e..f3e2a41 100644 --- a/autotests/favoritestest.cpp +++ b/autotests/favoritestest.cpp @@ -11,9 +11,9 @@ #include #include +#include #include #include -#include #include #include diff --git a/src/collectionpage/collectionexpirypage.h b/src/collectionpage/collectionexpirypage.h index ae9d3a9..a45a72d 100644 --- a/src/collectionpage/collectionexpirypage.h +++ b/src/collectionpage/collectionexpirypage.h @@ -10,7 +10,7 @@ #include "mailcommon_export.h" #include -#include +#include namespace MailCommon { diff --git a/src/collectionpage/collectionexpirywidget.cpp b/src/collectionpage/collectionexpirywidget.cpp index 6341241..21de64d 100644 --- a/src/collectionpage/collectionexpirywidget.cpp +++ b/src/collectionpage/collectionexpirywidget.cpp @@ -13,7 +13,7 @@ #include "mailcommon_debug.h" #include "util/mailutil.h" -#include +#include #include #include diff --git a/src/collectionpage/collectiongeneralpage.cpp b/src/collectionpage/collectiongeneralpage.cpp index b1efb39..3ff7625 100644 --- a/src/collectionpage/collectiongeneralpage.cpp +++ b/src/collectionpage/collectiongeneralpage.cpp @@ -16,10 +16,10 @@ #include #include +#include #include +#include #include -#include -#include #include #include diff --git a/src/collectionpage/collectiongeneralpage.h b/src/collectionpage/collectiongeneralpage.h index d07b035..261dd8d 100644 --- a/src/collectionpage/collectiongeneralpage.h +++ b/src/collectionpage/collectiongeneralpage.h @@ -8,7 +8,7 @@ #include "mailcommon_export.h" -#include +#include class QLineEdit; diff --git a/src/filter/autotests/filteractionaddtoaddressbooktest.cpp b/src/filter/autotests/filteractionaddtoaddressbooktest.cpp index acffa7f..3acd15a 100644 --- a/src/filter/autotests/filteractionaddtoaddressbooktest.cpp +++ b/src/filter/autotests/filteractionaddtoaddressbooktest.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include FilterActionAddToAddressBookTest::FilterActionAddToAddressBookTest(QObject *parent) : QObject(parent) diff --git a/src/filter/filterimporter/autotests/filtertestkernel.cpp b/src/filter/filterimporter/autotests/filtertestkernel.cpp index d2b20d6..f130e81 100644 --- a/src/filter/filterimporter/autotests/filtertestkernel.cpp +++ b/src/filter/filterimporter/autotests/filtertestkernel.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/filter/filtermanager.cpp b/src/filter/filtermanager.cpp index 47388ab..4463be9 100644 --- a/src/filter/filtermanager.cpp +++ b/src/filter/filtermanager.cpp @@ -12,11 +12,11 @@ #include "filterimporterexporter.h" #include "mailfilteragentinterface.h" #include +#include +#include +#include #include #include -#include -#include -#include #include diff --git a/src/folder/foldersettings.cpp b/src/folder/foldersettings.cpp index fd8a994..d5e3ad4 100644 --- a/src/folder/foldersettings.cpp +++ b/src/folder/foldersettings.cpp @@ -10,10 +10,10 @@ #include "mailcommon_debug.h" #include "util/mailutil.h" #include "util/resourcereadconfigfile.h" +#include #include #include #include -#include #include using namespace Akonadi; diff --git a/src/folder/foldertreeview.cpp b/src/folder/foldertreeview.cpp index 596283a..510e874 100644 --- a/src/folder/foldertreeview.cpp +++ b/src/folder/foldertreeview.cpp @@ -10,8 +10,8 @@ #include "util/mailutil_p.h" #include +#include #include -#include #include #include diff --git a/src/folder/foldertreeview.h b/src/folder/foldertreeview.h index 79be684..778afee 100644 --- a/src/folder/foldertreeview.h +++ b/src/folder/foldertreeview.h @@ -12,7 +12,7 @@ #include "mailcommon_export.h" #include -#include +#include class QMouseEvent; diff --git a/src/job/backupjob.cpp b/src/job/backupjob.cpp index fb52569..7e03ae8 100644 --- a/src/job/backupjob.cpp +++ b/src/job/backupjob.cpp @@ -8,11 +8,11 @@ #include "backupjob.h" #include "mailcommon_debug.h" +#include #include #include #include #include -#include #include #include diff --git a/src/kernel/mailkernel.cpp b/src/kernel/mailkernel.cpp index d9c7444..d53ae18 100644 --- a/src/kernel/mailkernel.cpp +++ b/src/kernel/mailkernel.cpp @@ -13,10 +13,10 @@ #include #include +#include #include #include #include -#include #include #include diff --git a/src/mdn/mdnstateattribute.cpp b/src/mdn/mdnstateattribute.cpp index e6b8e5f..5505031 100644 --- a/src/mdn/mdnstateattribute.cpp +++ b/src/mdn/mdnstateattribute.cpp @@ -9,7 +9,7 @@ #include "mdnstateattribute.h" -#include +#include #include diff --git a/src/search/widgethandler/tagrulewidgethandler.cpp b/src/search/widgethandler/tagrulewidgethandler.cpp index 2600a5d..0c21107 100644 --- a/src/search/widgethandler/tagrulewidgethandler.cpp +++ b/src/search/widgethandler/tagrulewidgethandler.cpp @@ -13,10 +13,10 @@ #include #include +#include +#include +#include #include -#include -#include -#include #include #include diff --git a/src/tag/tag.cpp b/src/tag/tag.cpp index ea8b12d..60ef326 100644 --- a/src/tag/tag.cpp +++ b/src/tag/tag.cpp @@ -5,10 +5,10 @@ */ #include "tag.h" +#include +#include #include #include -#include -#include #include using namespace MailCommon; diff --git a/src/util/mailutil.cpp b/src/util/mailutil.cpp index 488059a..e119074 100644 --- a/src/util/mailutil.cpp +++ b/src/util/mailutil.cpp @@ -31,13 +31,13 @@ #include #include +#include #include #include #include #include #include #include -#include #include diff --git a/src/widgets/favoritecollectionwidget.h b/src/widgets/favoritecollectionwidget.h index 6531609..4737a62 100644 --- a/src/widgets/favoritecollectionwidget.h +++ b/src/widgets/favoritecollectionwidget.h @@ -9,7 +9,7 @@ #include "mailcommon_export.h" -#include +#include class KXMLGUIClient; class KActionCollection;