From e2c16864c83c635f6129fec3580ccff8689570e7 Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Fri, 23 Oct 2020 08:39:01 +0200
Subject: [PATCH] If include is define in .h remove it if it's defined in .cpp
 too (scripted)

---
 autotests/dialogqmltest.cpp                                | 2 --
 autotests/dynamictreemodel.cpp                             | 2 --
 src/declarativeimports/core/iconitem.cpp                   | 1 -
 src/declarativeimports/core/tooltip.cpp                    | 1 -
 src/declarativeimports/core/units.cpp                      | 1 -
 src/plasma/applet.cpp                                      | 1 -
 src/plasma/dataengine.cpp                                  | 2 --
 src/plasma/dataengineconsumer.cpp                          | 1 -
 src/plasma/private/containment_p.cpp                       | 3 ---
 src/plasma/private/timetracker.cpp                         | 1 -
 src/plasma/theme.cpp                                       | 2 --
 src/plasmaquick/appletquickitem.cpp                        | 2 --
 src/plasmaquick/dialog.cpp                                 | 1 -
 src/plasmaquick/packageurlinterceptor.cpp                  | 1 -
 src/scriptengines/qml/plasmoid/appletinterface.cpp         | 1 -
 src/scriptengines/qml/plasmoid/declarativeappletscript.cpp | 1 -
 src/scriptengines/qml/plasmoid/dropmenu.cpp                | 1 -
 17 files changed, 24 deletions(-)

diff --git a/autotests/dialogqmltest.cpp b/autotests/dialogqmltest.cpp
index bb81ab5d3..b40d97533 100644
--- a/autotests/dialogqmltest.cpp
+++ b/autotests/dialogqmltest.cpp
@@ -6,13 +6,11 @@
 
 #include "dialogqmltest.h"
 
-#include "plasmaquick/dialog.h"
 #include <plasma.h>
 
 #include <QQmlEngine>
 #include <QQmlContext>
 
-#include <QTest>
 #include <QSignalSpy>
 
 
diff --git a/autotests/dynamictreemodel.cpp b/autotests/dynamictreemodel.cpp
index 6151f7735..be1c8acb6 100644
--- a/autotests/dynamictreemodel.cpp
+++ b/autotests/dynamictreemodel.cpp
@@ -9,8 +9,6 @@
 
 #include "dynamictreemodel.h"
 
-#include <QHash>
-#include <QList>
 #include <QTimer>
 
 DynamicTreeModel::DynamicTreeModel(QObject *parent)
diff --git a/src/declarativeimports/core/iconitem.cpp b/src/declarativeimports/core/iconitem.cpp
index 262d236f8..4d2b435b6 100644
--- a/src/declarativeimports/core/iconitem.cpp
+++ b/src/declarativeimports/core/iconitem.cpp
@@ -11,7 +11,6 @@
 #include <QPainter>
 #include <QPalette>
 #include <QPropertyAnimation>
-#include <QPixmap>
 #include <QSGSimpleTextureNode>
 #include <QQuickWindow>
 
diff --git a/src/declarativeimports/core/tooltip.cpp b/src/declarativeimports/core/tooltip.cpp
index f48ed5de6..9e02a9e6d 100644
--- a/src/declarativeimports/core/tooltip.cpp
+++ b/src/declarativeimports/core/tooltip.cpp
@@ -10,7 +10,6 @@
 #include "tooltipdialog.h"
 
 #include <QQmlEngine>
-#include <QQuickItem>
 #include <QDebug>
 
 #include "framesvgitem.h"
diff --git a/src/declarativeimports/core/units.cpp b/src/declarativeimports/core/units.cpp
index 30ebe4153..9a041bf7e 100644
--- a/src/declarativeimports/core/units.cpp
+++ b/src/declarativeimports/core/units.cpp
@@ -17,7 +17,6 @@
 #include <QFontMetrics>
 #include <cmath>
 
-#include <KConfigWatcher>
 #include <KIconLoader>
 
 const int defaultLongDuration = 250;
diff --git a/src/plasma/applet.cpp b/src/plasma/applet.cpp
index 89eaa1443..8751750c0 100644
--- a/src/plasma/applet.cpp
+++ b/src/plasma/applet.cpp
@@ -27,7 +27,6 @@
 #include <KDesktopFile>
 #include <QDebug>
 #include <KGlobalAccel>
-#include <KPluginInfo>
 #include <KLocalizedString>
 #include <KService>
 #include <KConfigLoader>
diff --git a/src/plasma/dataengine.cpp b/src/plasma/dataengine.cpp
index 83fc3eaef..54b103cf4 100644
--- a/src/plasma/dataengine.cpp
+++ b/src/plasma/dataengine.cpp
@@ -18,8 +18,6 @@
 #include <QDebug>
 #include <QStandardPaths>
 
-#include <KPluginInfo>
-#include <KService>
 #include <KLocalizedString>
 
 #include "datacontainer.h"
diff --git a/src/plasma/dataengineconsumer.cpp b/src/plasma/dataengineconsumer.cpp
index bae84de23..043ff0ed6 100644
--- a/src/plasma/dataengineconsumer.cpp
+++ b/src/plasma/dataengineconsumer.cpp
@@ -10,7 +10,6 @@
 #include "private/dataengineconsumer_p.h"
 
 #include <QSet>
-#include <QUrl>
 
 #include <QDebug>
 
diff --git a/src/plasma/private/containment_p.cpp b/src/plasma/private/containment_p.cpp
index 8b76b78a3..13ab3260c 100644
--- a/src/plasma/private/containment_p.cpp
+++ b/src/plasma/private/containment_p.cpp
@@ -9,15 +9,12 @@
 
 #include "private/containment_p.h"
 
-#include <KActionCollection>
 #include <QDebug>
 #include <KLocalizedString>
 #include <KWindowSystem>
 
 #include "config-plasma.h"
 
-#include "containmentactions.h"
-#include "corona.h"
 #include "pluginloader.h"
 
 #include "private/applet_p.h"
diff --git a/src/plasma/private/timetracker.cpp b/src/plasma/private/timetracker.cpp
index 00e6b2a7a..5dd219bba 100644
--- a/src/plasma/private/timetracker.cpp
+++ b/src/plasma/private/timetracker.cpp
@@ -6,7 +6,6 @@
 
 #include "timetracker.h"
 #include <containment.h>
-#include <QDateTime>
 #include <QMetaObject>
 #include <QFile>
 #include <QDebug>
diff --git a/src/plasma/theme.cpp b/src/plasma/theme.cpp
index 3895006bd..944038f6f 100644
--- a/src/plasma/theme.cpp
+++ b/src/plasma/theme.cpp
@@ -8,7 +8,6 @@
 #include "private/theme_p.h"
 
 #include <QFile>
-#include <QFont>
 #include <QFontDatabase>
 #include <QFileInfo>
 #include <QMutableListIterator>
@@ -25,7 +24,6 @@
 #include <QDebug>
 #include <KDirWatch>
 #include <KImageCache>
-#include <KSharedConfig>
 #include <KWindowEffects>
 #include <KWindowSystem>
 #include <QStandardPaths>
diff --git a/src/plasmaquick/appletquickitem.cpp b/src/plasmaquick/appletquickitem.cpp
index 595707f33..5f758422e 100644
--- a/src/plasmaquick/appletquickitem.cpp
+++ b/src/plasmaquick/appletquickitem.cpp
@@ -8,9 +8,7 @@
 #include "private/appletquickitem_p.h"
 #include "debug_p.h"
 
-#include <QQmlComponent>
 #include <QQmlExpression>
-#include <QQmlEngine>
 #include <QQmlProperty>
 #include <QQmlContext>
 #include <QQuickWindow>
diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
index a939102ff..a129173eb 100644
--- a/src/plasmaquick/dialog.cpp
+++ b/src/plasmaquick/dialog.cpp
@@ -29,7 +29,6 @@
 #include <kquickaddons/quickviewsharedengine.h>
 
 #include <KWindowEffects>
-#include <Plasma/Plasma>
 #include <Plasma/Corona>
 
 #include <QDebug>
diff --git a/src/plasmaquick/packageurlinterceptor.cpp b/src/plasmaquick/packageurlinterceptor.cpp
index b7eb5ab24..0fd43c826 100644
--- a/src/plasmaquick/packageurlinterceptor.cpp
+++ b/src/plasmaquick/packageurlinterceptor.cpp
@@ -15,7 +15,6 @@
 
 #include <Plasma/PluginLoader>
 #include <Plasma/Package>
-#include <KPackage/Package>
 
 #include <kdeclarative/kdeclarative.h>
 
diff --git a/src/scriptengines/qml/plasmoid/appletinterface.cpp b/src/scriptengines/qml/plasmoid/appletinterface.cpp
index fc5a3dfcd..45541b0ec 100644
--- a/src/scriptengines/qml/plasmoid/appletinterface.cpp
+++ b/src/scriptengines/qml/plasmoid/appletinterface.cpp
@@ -20,7 +20,6 @@
 #include <KConfigLoader>
 
 #include <Plasma/Plasma>
-#include <Plasma/Applet>
 #include <Plasma/Corona>
 #include <Plasma/Package>
 #include <Plasma/PluginLoader>
diff --git a/src/scriptengines/qml/plasmoid/declarativeappletscript.cpp b/src/scriptengines/qml/plasmoid/declarativeappletscript.cpp
index 2da2addf5..4cece7b34 100644
--- a/src/scriptengines/qml/plasmoid/declarativeappletscript.cpp
+++ b/src/scriptengines/qml/plasmoid/declarativeappletscript.cpp
@@ -7,7 +7,6 @@
 
 #include <QQmlComponent>
 #include <QQmlContext>
-#include <QQmlEngine>
 #include <QQmlExpression>
 #include <QQmlProperty>
 #include <QFile>
diff --git a/src/scriptengines/qml/plasmoid/dropmenu.cpp b/src/scriptengines/qml/plasmoid/dropmenu.cpp
index 5c35523c8..8e5eef070 100644
--- a/src/scriptengines/qml/plasmoid/dropmenu.cpp
+++ b/src/scriptengines/qml/plasmoid/dropmenu.cpp
@@ -11,7 +11,6 @@
 
 #include <QApplication>
 #include <QUrl>
-#include <QPoint>
 #include <QMenu>
 #include <QJSValue>
 #include <QAction>