From 378d7755d5f1b6e00d4513bc229a5c41e1b8542c Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Fri, 23 Sep 2022 16:59:18 +0300
Subject: [PATCH] generic: remove redundant qglobal header inclusions

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 kdeui/colors/kcolorchoosermode_p.h    |  2 --
 kdeui/colors/kcolorcollection.h       |  7 ++++---
 kdeui/colors/kcolorcombo.h            | 14 +++++++-------
 kdeui/colors/kcolorscheme.cpp         |  2 +-
 kdeui/colors/kcolorutils.h            |  2 +-
 kdeui/dialogs/kpassworddialog.h       |  1 -
 kdeui/fonts/kfontutils.h              |  1 -
 kdeui/util/kcrash.h                   |  1 -
 kdeui/util/kkeyserver.h               |  1 +
 solid/solid/ifaces/deviceinterface.h  |  1 -
 solid/solid/ifaces/genericinterface.h |  1 -
 11 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/kdeui/colors/kcolorchoosermode_p.h b/kdeui/colors/kcolorchoosermode_p.h
index 590ace68..8a2fcd14 100644
--- a/kdeui/colors/kcolorchoosermode_p.h
+++ b/kdeui/colors/kcolorchoosermode_p.h
@@ -22,8 +22,6 @@
 
 #include "kcolorchoosermode.h"
 
-#include <QtCore/qglobal.h>
-
 #include <QColor>
 
 namespace KDEPrivate {
diff --git a/kdeui/colors/kcolorcollection.h b/kdeui/colors/kcolorcollection.h
index a7d26435..69332201 100644
--- a/kdeui/colors/kcolorcollection.h
+++ b/kdeui/colors/kcolorcollection.h
@@ -104,9 +104,10 @@ public:
     * @see editable()
     * @see setEditable()
     */
-   enum Editable { Yes, ///< Collection may be edited
-                  No,  ///< Collection may not be edited
-		   Ask  ///< Ask user before editing
+   enum Editable {
+      Yes, ///< Collection may be edited
+      No,  ///< Collection may not be edited
+      Ask  ///< Ask user before editing
    };
   
    /**
diff --git a/kdeui/colors/kcolorcombo.h b/kdeui/colors/kcolorcombo.h
index 42494c4d..e060e5c4 100644
--- a/kdeui/colors/kcolorcombo.h
+++ b/kdeui/colors/kcolorcombo.h
@@ -99,16 +99,16 @@ Q_SIGNALS:
     void highlighted( const QColor &col );
 
 protected:
-        virtual void paintEvent(QPaintEvent *event);
+    virtual void paintEvent(QPaintEvent *event);
 
 private:
-        friend class KColorComboPrivate;
-        KColorComboPrivate *const d;
-        
-        Q_DISABLE_COPY(KColorCombo)
+    friend class KColorComboPrivate;
+    KColorComboPrivate *const d;
 
-        Q_PRIVATE_SLOT(d, void _k_slotActivated(int))
-        Q_PRIVATE_SLOT(d, void _k_slotHighlighted(int))
+    Q_DISABLE_COPY(KColorCombo)
+
+    Q_PRIVATE_SLOT(d, void _k_slotActivated(int))
+    Q_PRIVATE_SLOT(d, void _k_slotHighlighted(int))
 };
 
 Q_DECLARE_METATYPE(QList<QColor>)
diff --git a/kdeui/colors/kcolorscheme.cpp b/kdeui/colors/kcolorscheme.cpp
index a6650ace..64ffca1e 100644
--- a/kdeui/colors/kcolorscheme.cpp
+++ b/kdeui/colors/kcolorscheme.cpp
@@ -261,7 +261,7 @@ private:
 };
 
 #define DEFAULT(c) QColor( c[0], c[1], c[2] )
-#define  SET_DEFAULT(a) DEFAULT( defaults.a )
+#define SET_DEFAULT(a) DEFAULT( defaults.a )
 #define DECO_DEFAULT(a) DEFAULT( defaultDecorationColors.a )
 
 KColorSchemePrivate::KColorSchemePrivate(const KSharedConfigPtr &config,
diff --git a/kdeui/colors/kcolorutils.h b/kdeui/colors/kcolorutils.h
index 5a8d4158..6fde2def 100644
--- a/kdeui/colors/kcolorutils.h
+++ b/kdeui/colors/kcolorutils.h
@@ -23,8 +23,8 @@
 #define KCOLORUTILS_H
 
 #include <kdeui_export.h>
-#include <QtGui/QPainter>
 
+#include <QPainter>
 #include <QColor>
 
 /**
diff --git a/kdeui/dialogs/kpassworddialog.h b/kdeui/dialogs/kpassworddialog.h
index 628620d5..faaba482 100644
--- a/kdeui/dialogs/kpassworddialog.h
+++ b/kdeui/dialogs/kpassworddialog.h
@@ -22,7 +22,6 @@
 #define KPASSWORDDIALOG_H
 
 #include <kdialog.h>
-#include <QtCore/qglobal.h>
 
 /**
  * A dialog for requesting a password and optionaly a login from the end user.
diff --git a/kdeui/fonts/kfontutils.h b/kdeui/fonts/kfontutils.h
index dbc4e77c..cac9bad9 100644
--- a/kdeui/fonts/kfontutils.h
+++ b/kdeui/fonts/kfontutils.h
@@ -24,7 +24,6 @@
 #define KFONTMETRICS_H
 
 #include "kdeui_export.h"
-#include <qglobal.h>
 
 #include <QPainter>
 #include <QSizeF>
diff --git a/kdeui/util/kcrash.h b/kdeui/util/kcrash.h
index 133b8164..7475d132 100644
--- a/kdeui/util/kcrash.h
+++ b/kdeui/util/kcrash.h
@@ -23,7 +23,6 @@
 #define KCRASH_H
 
 #include <kdeui_export.h>
-#include <qglobal.h>
 
 #include <QString>
 
diff --git a/kdeui/util/kkeyserver.h b/kdeui/util/kkeyserver.h
index e7add880..86ea3485 100644
--- a/kdeui/util/kkeyserver.h
+++ b/kdeui/util/kkeyserver.h
@@ -24,6 +24,7 @@
 #define KKEYSERVER_H
 
 #include <kdeui_export.h>
+
 #include <qglobal.h>
 
 #if defined Q_WS_X11 /*or defined Q_WS_WIN*/
diff --git a/solid/solid/ifaces/deviceinterface.h b/solid/solid/ifaces/deviceinterface.h
index aa71692e..18fd94be 100644
--- a/solid/solid/ifaces/deviceinterface.h
+++ b/solid/solid/ifaces/deviceinterface.h
@@ -22,7 +22,6 @@
 #define SOLID_IFACES_DEVICEINTERFACE_H
 
 #include <QtCore/QObject>
-#include <QtCore/qglobal.h>
 
 namespace Solid
 {
diff --git a/solid/solid/ifaces/genericinterface.h b/solid/solid/ifaces/genericinterface.h
index 4412c880..5be57341 100644
--- a/solid/solid/ifaces/genericinterface.h
+++ b/solid/solid/ifaces/genericinterface.h
@@ -22,7 +22,6 @@
 #define SOLID_IFACES_GENERICINTERFACE_H
 
 #include <QtCore/QObject>
-#include <QtCore/qglobal.h>
 #include <QtCore/QMap>
 #include <QtCore/QVariant>