From a5063549d7abf0e7ef0032b5827da4319a50f8dd Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Thu, 22 Oct 2020 22:02:56 +0200
Subject: [PATCH] If include is define in .h remove it if it's defined in .cpp
 too (scripted)

---
 src/collectionpage/collectionexpiryjob.cpp            | 1 -
 src/filter/filteractions/filteractionaddtag.cpp       | 1 -
 src/filter/filteractions/filteractionstatus.cpp       | 1 -
 src/filter/filteractions/filteractionwidget.cpp       | 1 -
 src/filter/kmfilterdialog.cpp                         | 1 -
 src/filter/tests/filterimporterexportergui.cpp        | 1 -
 src/folder/folderselectiondialog.cpp                  | 1 -
 src/folder/foldertreewidget.cpp                       | 1 -
 src/folder/foldertreewidgetproxymodel.cpp             | 1 -
 src/mdn/mdnadvicehelper.cpp                           | 1 -
 src/search/searchpattern.cpp                          | 1 -
 src/search/searchpatternedit.cpp                      | 1 -
 src/search/widgethandler/rulewidgethandlermanager.cpp | 1 -
 src/snippets/snippetdialog.cpp                        | 1 -
 src/snippets/snippetselectattachmentwidget.cpp        | 1 -
 15 files changed, 15 deletions(-)

diff --git a/src/collectionpage/collectionexpiryjob.cpp b/src/collectionpage/collectionexpiryjob.cpp
index c24dbae..457978b 100644
--- a/src/collectionpage/collectionexpiryjob.cpp
+++ b/src/collectionpage/collectionexpiryjob.cpp
@@ -8,7 +8,6 @@
 #include "util/mailutil.h"
 #include "mailcommon_debug.h"
 
-#include <AkonadiCore/Collection>
 #include <AkonadiCore/CollectionModifyJob>
 
 using namespace MailCommon;
diff --git a/src/filter/filteractions/filteractionaddtag.cpp b/src/filter/filteractions/filteractionaddtag.cpp
index e19c503..9788949 100644
--- a/src/filter/filteractions/filteractionaddtag.cpp
+++ b/src/filter/filteractions/filteractionaddtag.cpp
@@ -9,7 +9,6 @@
 #include "filter/filtermanager.h"
 #include "filter/dialog/filteractionmissingtagdialog.h"
 
-#include <QPointer>
 #include <QComboBox>
 
 #include <AkonadiCore/Tag>
diff --git a/src/filter/filteractions/filteractionstatus.cpp b/src/filter/filteractions/filteractionstatus.cpp
index 5a26fc1..1ceeb7f 100644
--- a/src/filter/filteractions/filteractionstatus.cpp
+++ b/src/filter/filteractions/filteractionstatus.cpp
@@ -6,7 +6,6 @@
 */
 
 #include "filteractionstatus.h"
-#include <Akonadi/KMime/MessageStatus>
 #include <KLocalizedString>
 using namespace MailCommon;
 
diff --git a/src/filter/filteractions/filteractionwidget.cpp b/src/filter/filteractions/filteractionwidget.cpp
index d1ce320..96d856c 100644
--- a/src/filter/filteractions/filteractionwidget.cpp
+++ b/src/filter/filteractions/filteractionwidget.cpp
@@ -16,7 +16,6 @@
 #include <QPushButton>
 #include <QIcon>
 #include <QComboBox>
-#include <QVector>
 
 #include <QGridLayout>
 #include <QLabel>
diff --git a/src/filter/kmfilterdialog.cpp b/src/filter/kmfilterdialog.cpp
index 60cbeee..5d02f82 100644
--- a/src/filter/kmfilterdialog.cpp
+++ b/src/filter/kmfilterdialog.cpp
@@ -16,7 +16,6 @@
 #include "filterimporterpathcache.h"
 #include "filteractions/filteractiondict.h"
 #include "filteractions/filteractionwidget.h"
-#include "filterimporterexporter.h"
 #include "filterselectiondialog.h"
 #include "kmfilteraccountlist.h"
 using MailCommon::FilterImporterExporter;
diff --git a/src/filter/tests/filterimporterexportergui.cpp b/src/filter/tests/filterimporterexportergui.cpp
index b15dca9..434d1e6 100644
--- a/src/filter/tests/filterimporterexportergui.cpp
+++ b/src/filter/tests/filterimporterexportergui.cpp
@@ -5,7 +5,6 @@
 */
 
 #include "filterimporterexportergui.h"
-#include "filter/filterimporterexporter.h"
 #include "filter/mailfilter.h"
 
 #include <QApplication>
diff --git a/src/folder/folderselectiondialog.cpp b/src/folder/folderselectiondialog.cpp
index cb46aa6..a6cf36b 100644
--- a/src/folder/folderselectiondialog.cpp
+++ b/src/folder/folderselectiondialog.cpp
@@ -13,7 +13,6 @@
 #include "foldertreewidgetproxymodel.h"
 #include "kernel/mailkernel.h"
 
-#include <Collection>
 #include <CollectionCreateJob>
 #include <EntityMimeTypeFilterModel>
 #include <EntityTreeModel>
diff --git a/src/folder/foldertreewidget.cpp b/src/folder/foldertreewidget.cpp
index 6fa6e89..b6a190a 100644
--- a/src/folder/foldertreewidget.cpp
+++ b/src/folder/foldertreewidget.cpp
@@ -8,7 +8,6 @@
 #include "foldertreewidget.h"
 #include "entitycollectionorderproxymodel.h"
 #include "foldertreeview.h"
-#include "foldertreewidgetproxymodel.h"
 #include "kernel/mailkernel.h"
 #include "util/mailutil.h"
 
diff --git a/src/folder/foldertreewidgetproxymodel.cpp b/src/folder/foldertreewidgetproxymodel.cpp
index 6dcf73e..5cb7445 100644
--- a/src/folder/foldertreewidgetproxymodel.cpp
+++ b/src/folder/foldertreewidgetproxymodel.cpp
@@ -13,7 +13,6 @@
 
 #include <AgentInstance>
 #include <AgentManager>
-#include <Collection>
 #include <EntityTreeModel>
 #include <MimeTypeChecker>
 
diff --git a/src/mdn/mdnadvicehelper.cpp b/src/mdn/mdnadvicehelper.cpp
index 7952a26..e0e1eea 100644
--- a/src/mdn/mdnadvicehelper.cpp
+++ b/src/mdn/mdnadvicehelper.cpp
@@ -9,7 +9,6 @@
 #include "mailcommon_debug.h"
 #include <MessageViewer/MessageViewerSettings>
 #include "filter/mdnadvicedialog.h"
-#include <MessageComposer/MessageFactoryNG>
 #include <MessageComposer/Util>
 #include <AkonadiCore/ItemModifyJob>
 #include <QPointer>
diff --git a/src/search/searchpattern.cpp b/src/search/searchpattern.cpp
index f3b816e..0efb10a 100644
--- a/src/search/searchpattern.cpp
+++ b/src/search/searchpattern.cpp
@@ -21,7 +21,6 @@ using MailCommon::FilterLog;
 #include <KMime/KMimeMessage>
 
 #include <KConfigGroup>
-#include <KLocalizedString>
 
 #include <QDataStream>
 
diff --git a/src/search/searchpatternedit.cpp b/src/search/searchpatternedit.cpp
index eb34a10..4f51493 100644
--- a/src/search/searchpatternedit.cpp
+++ b/src/search/searchpatternedit.cpp
@@ -17,7 +17,6 @@ using MailCommon::RuleWidgetHandlerManager;
 #include <QIcon>
 #include <KComboBox>
 #include <QButtonGroup>
-#include <QByteArray>
 #include <QHBoxLayout>
 #include <QRadioButton>
 #include <QStackedWidget>
diff --git a/src/search/widgethandler/rulewidgethandlermanager.cpp b/src/search/widgethandler/rulewidgethandlermanager.cpp
index a7a72ef..2d01e56 100644
--- a/src/search/widgethandler/rulewidgethandlermanager.cpp
+++ b/src/search/widgethandler/rulewidgethandlermanager.cpp
@@ -22,7 +22,6 @@
 #include <QObject>
 #include <QStackedWidget>
 
-#include "search/searchpattern.h"
 
 #include <algorithm>
 using std::for_each;
diff --git a/src/snippets/snippetdialog.cpp b/src/snippets/snippetdialog.cpp
index 6894202..37f4550 100644
--- a/src/snippets/snippetdialog.cpp
+++ b/src/snippets/snippetdialog.cpp
@@ -13,7 +13,6 @@
 #include <MessageComposer/ConvertSnippetVariableMenu>
 #include <KPIMTextEdit/PlainTextEditor>
 #include <KActionCollection>
-#include <QDialog>
 #include <QVBoxLayout>
 #include <QPushButton>
 #include <QDialogButtonBox>
diff --git a/src/snippets/snippetselectattachmentwidget.cpp b/src/snippets/snippetselectattachmentwidget.cpp
index c741f91..e6e8358 100644
--- a/src/snippets/snippetselectattachmentwidget.cpp
+++ b/src/snippets/snippetselectattachmentwidget.cpp
@@ -6,7 +6,6 @@
 
 #include "snippetselectattachmentwidget.h"
 #include "snippetcustomfileattachmentnamedialog.h"
-#include <PimCommon/SimpleStringListEditor>
 #include <QVBoxLayout>
 #include <QFileDialog>
 #include <KLocalizedString>
-- 
GitLab