From 610fe76bac95b7eb9f1fa44d05e4b4040707304f Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Sun, 11 Mar 2018 13:36:48 +0100
Subject: Remove not necessary QtCore and co

---
 src/core/conversioncheck.h                | 12 ++++++------
 src/core/kauthorized.cpp                  |  4 ++--
 src/core/kconfig.cpp                      |  8 ++++----
 src/core/kconfig.h                        |  8 ++++----
 src/core/kconfig_p.h                      |  8 ++++----
 src/core/kconfigbackend.cpp               | 12 ++++++------
 src/core/kconfigbackend_p.h               |  4 ++--
 src/core/kconfigbase.cpp                  |  2 +-
 src/core/kconfigbase.h                    |  2 +-
 src/core/kconfigbase_p.h                  |  2 +-
 src/core/kconfigdata.h                    |  8 ++++----
 src/core/kconfiggroup.cpp                 | 20 ++++++++++----------
 src/core/kconfiggroup.h                   |  6 +++---
 src/core/kconfiggroup_p.h                 |  2 +-
 src/core/kcoreconfigskeleton.h            | 12 ++++++------
 src/core/kdesktopfile.cpp                 |  4 ++--
 src/core/kemailsettings.h                 |  4 ++--
 src/gui/kconfiggroupgui.cpp               |  2 +-
 src/gui/kstandardshortcut.h               |  2 +-
 src/kconf_update/kconf_update.cpp         | 10 +++++-----
 src/kconfig_compiler/kconfig_compiler.cpp | 18 +++++++++---------
 21 files changed, 75 insertions(+), 75 deletions(-)

(limited to 'src')

diff --git a/src/core/conversioncheck.h b/src/core/conversioncheck.h
index 55bd8826..4ba0c111 100644
--- a/src/core/conversioncheck.h
+++ b/src/core/conversioncheck.h
@@ -21,12 +21,12 @@
 #ifndef CONVERSION_CHECK_H
 #define CONVERSION_CHECK_H
 
-#include <QtCore/QString>
-#include <QtCore/QDate>
-#include <QtCore/QPoint>
-#include <QtCore/QSize>
-#include <QtCore/QRect>
-#include <QtCore/QVariant>
+#include <QString>
+#include <QDate>
+#include <QPoint>
+#include <QSize>
+#include <QRect>
+#include <QVariant>
 
 class QColor;
 class QFont;
diff --git a/src/core/kauthorized.cpp b/src/core/kauthorized.cpp
index 9c8b1175..b6054d76 100644
--- a/src/core/kauthorized.cpp
+++ b/src/core/kauthorized.cpp
@@ -20,8 +20,8 @@
 
 #include "kauthorized.h"
 
-#include <QtCore/QDir>
-#include <QtCore/QRegExp>
+#include <QDir>
+#include <QRegExp>
 #include <QList>
 #include <QUrl>
 
diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp
index c8eb90af..6b498746 100644
--- a/src/core/kconfig.cpp
+++ b/src/core/kconfig.cpp
@@ -49,10 +49,10 @@ static inline int pclose(FILE *stream)
 #include <qfile.h>
 #include <qlocale.h>
 #include <qdir.h>
-#include <QtCore/QProcess>
-#include <QtCore/QSet>
-#include <QtCore/QBasicMutex>
-#include <QtCore/QMutexLocker>
+#include <QProcess>
+#include <QSet>
+#include <QBasicMutex>
+#include <QMutexLocker>
 
 bool KConfigPrivate::mappingsRegistered = false;
 
diff --git a/src/core/kconfig.h b/src/core/kconfig.h
index ab148b3e..9601a1e9 100644
--- a/src/core/kconfig.h
+++ b/src/core/kconfig.h
@@ -28,10 +28,10 @@
 
 #include <kconfigcore_export.h>
 
-#include <QtCore/QString>
-#include <QtCore/QVariant>
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
+#include <QString>
+#include <QVariant>
+#include <QByteArray>
+#include <QList>
 #include <qstandardpaths.h>
 
 class KConfigGroup;
diff --git a/src/core/kconfig_p.h b/src/core/kconfig_p.h
index 080adadb..dfb3875a 100644
--- a/src/core/kconfig_p.h
+++ b/src/core/kconfig_p.h
@@ -28,10 +28,10 @@
 #include "kconfigbackend_p.h"
 #include "kconfiggroup.h"
 
-#include <QtCore/QStringList>
-#include <QtCore/QStack>
-#include <QtCore/QFile>
-#include <QtCore/QDir>
+#include <QStringList>
+#include <QStack>
+#include <QFile>
+#include <QDir>
 
 class KConfigPrivate
 {
diff --git a/src/core/kconfigbackend.cpp b/src/core/kconfigbackend.cpp
index 0c18f2c8..5d274583 100644
--- a/src/core/kconfigbackend.cpp
+++ b/src/core/kconfigbackend.cpp
@@ -22,12 +22,12 @@
 
 #include "kconfigbackend_p.h"
 
-#include <QtCore/QDateTime>
-#include <QtCore/QStringList>
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QHash>
-#include <QtCore/QDebug>
+#include <QDateTime>
+#include <QStringList>
+#include <QDir>
+#include <QFileInfo>
+#include <QHash>
+#include <QDebug>
 
 #include "kconfig.h"
 #include "kconfigini_p.h"
diff --git a/src/core/kconfigbackend_p.h b/src/core/kconfigbackend_p.h
index d2e3de4e..31e728bf 100644
--- a/src/core/kconfigbackend_p.h
+++ b/src/core/kconfigbackend_p.h
@@ -23,8 +23,8 @@
 #ifndef KCONFIGBACKEND_H
 #define KCONFIGBACKEND_H
 
-#include <QtCore/QObject>
-#include <QtCore/QString>
+#include <QObject>
+#include <QString>
 #include <QExplicitlySharedDataPointer>
 
 #include <kconfigcore_export.h>
diff --git a/src/core/kconfigbase.cpp b/src/core/kconfigbase.cpp
index 8cda588f..d22cc20a 100644
--- a/src/core/kconfigbase.cpp
+++ b/src/core/kconfigbase.cpp
@@ -24,7 +24,7 @@
 
 #include "kconfiggroup.h"
 
-#include <QtCore/QString>
+#include <QString>
 
 bool KConfigBase::hasGroup(const QString &group) const
 {
diff --git a/src/core/kconfigbase.h b/src/core/kconfigbase.h
index 998c3570..b7403de1 100644
--- a/src/core/kconfigbase.h
+++ b/src/core/kconfigbase.h
@@ -26,7 +26,7 @@
 
 #include <kconfigcore_export.h>
 
-#include <QtCore/QtGlobal>
+#include <QtGlobal>
 
 class QStringList;
 class KConfigGroup;
diff --git a/src/core/kconfigbase_p.h b/src/core/kconfigbase_p.h
index c1066267..fe1c193e 100644
--- a/src/core/kconfigbase_p.h
+++ b/src/core/kconfigbase_p.h
@@ -22,7 +22,7 @@
 #ifndef KCONFIGBASE_P_H
 #define KCONFIGBASE_P_H
 
-#include <QtCore/QSharedData>
+#include <QSharedData>
 
 class KConfigBasePrivate : public QSharedData
 {
diff --git a/src/core/kconfigdata.h b/src/core/kconfigdata.h
index e33cfd27..f84e51e3 100644
--- a/src/core/kconfigdata.h
+++ b/src/core/kconfigdata.h
@@ -23,10 +23,10 @@
 #ifndef KCONFIGDATA_H
 #define KCONFIGDATA_H
 
-#include <QtCore/QByteArray>
-#include <QtCore/QString>
-#include <QtCore/QMap>
-#include <QtCore/QDebug>
+#include <QByteArray>
+#include <QString>
+#include <QMap>
+#include <QDebug>
 
 /**
  * map/dict/list config node entry.
diff --git a/src/core/kconfiggroup.cpp b/src/core/kconfiggroup.cpp
index c81fcbef..88bc6402 100644
--- a/src/core/kconfiggroup.cpp
+++ b/src/core/kconfiggroup.cpp
@@ -28,15 +28,15 @@
 #include "ksharedconfig.h"
 #include "kconfigdata.h"
 
-#include <QtCore/QDate>
-#include <QtCore/QSharedData>
-#include <QtCore/QFile>
-#include <QtCore/QPoint>
-#include <QtCore/QRect>
-#include <QtCore/QString>
-#include <QtCore/QTextStream>
-#include <QtCore/QDir>
-#include <QtCore/QUrl>
+#include <QDate>
+#include <QSharedData>
+#include <QFile>
+#include <QPoint>
+#include <QRect>
+#include <QString>
+#include <QTextStream>
+#include <QDir>
+#include <QUrl>
 
 #include <stdlib.h>
 
@@ -388,7 +388,7 @@ QVariant KConfigGroup::convertToQVariant(const char *pKey, const QByteArray &val
 }
 
 #ifdef Q_OS_WIN
-# include <QtCore/QDir>
+# include <QDir>
 #endif
 
 static bool cleanHomeDirPath(QString &path, const QString &homeDir)
diff --git a/src/core/kconfiggroup.h b/src/core/kconfiggroup.h
index ed350566..5b8c4075 100644
--- a/src/core/kconfiggroup.h
+++ b/src/core/kconfiggroup.h
@@ -28,9 +28,9 @@
 
 #include <kconfigcore_export.h>
 
-#include <QtCore/QExplicitlySharedDataPointer>
-#include <QtCore/QVariant>
-#include <QtCore/QStringList>
+#include <QExplicitlySharedDataPointer>
+#include <QVariant>
+#include <QStringList>
 
 class KConfig;
 class KConfigGroupPrivate;
diff --git a/src/core/kconfiggroup_p.h b/src/core/kconfiggroup_p.h
index edc59cc8..8e33ce05 100644
--- a/src/core/kconfiggroup_p.h
+++ b/src/core/kconfiggroup_p.h
@@ -21,7 +21,7 @@
 #ifndef KCONFIGGROUP_P_H
 #define KCONFIGGROUP_P_H
 
-#include <QtCore/QVariant>
+#include <QVariant>
 #include "kconfiggroup.h"
 
 class KConfigGroup;
diff --git a/src/core/kcoreconfigskeleton.h b/src/core/kcoreconfigskeleton.h
index 729f5acf..fa1d8827 100644
--- a/src/core/kcoreconfigskeleton.h
+++ b/src/core/kcoreconfigskeleton.h
@@ -28,12 +28,12 @@
 #include <ksharedconfig.h>
 #include <kconfiggroup.h>
 
-#include <QtCore/QDate>
-#include <QtCore/QHash>
-#include <QtCore/QRect>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-#include <QtCore/QUrl>
+#include <QDate>
+#include <QHash>
+#include <QRect>
+#include <QStringList>
+#include <QVariant>
+#include <QUrl>
 class KCoreConfigSkeletonPrivate;
 
 class KConfigSkeletonItemPrivate;
diff --git a/src/core/kdesktopfile.cpp b/src/core/kdesktopfile.cpp
index b0b6a878..96d7b118 100644
--- a/src/core/kdesktopfile.cpp
+++ b/src/core/kdesktopfile.cpp
@@ -25,8 +25,8 @@
 #include <unistd.h>
 #endif
 
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
+#include <QDir>
+#include <QFileInfo>
 #include <QUrl>
 #include <qstandardpaths.h>
 
diff --git a/src/core/kemailsettings.h b/src/core/kemailsettings.h
index 505b0b6d..4d2f0d50 100644
--- a/src/core/kemailsettings.h
+++ b/src/core/kemailsettings.h
@@ -28,8 +28,8 @@
 #ifndef _KEMAILSETTINGS_H
 #define _KEMAILSETTINGS_H
 
-#include <QtCore/QCoreApplication> // Q_DECLARE_TR_FUNCTIONS
-#include <QtCore/QStringList>
+#include <QCoreApplication> // Q_DECLARE_TR_FUNCTIONS
+#include <QStringList>
 
 #include <kconfigcore_export.h>
 
diff --git a/src/gui/kconfiggroupgui.cpp b/src/gui/kconfiggroupgui.cpp
index c399a65b..8031458e 100644
--- a/src/gui/kconfiggroupgui.cpp
+++ b/src/gui/kconfiggroupgui.cpp
@@ -20,7 +20,7 @@
 
 #include <kconfiggroup.h>
 
-#include <QtCore/QMutableStringListIterator>
+#include <QMutableStringListIterator>
 #include <QColor>
 #include <QDebug>
 #include <QFont>
diff --git a/src/gui/kstandardshortcut.h b/src/gui/kstandardshortcut.h
index 0b3b6589..aabe6b3c 100644
--- a/src/gui/kstandardshortcut.h
+++ b/src/gui/kstandardshortcut.h
@@ -20,7 +20,7 @@
 #ifndef KSTANDARDSHORTCUT_H
 #define KSTANDARDSHORTCUT_H
 
-#include <QtCore/QString>
+#include <QString>
 #include <QKeySequence>
 
 #include <kconfiggui_export.h>
diff --git a/src/kconf_update/kconf_update.cpp b/src/kconf_update/kconf_update.cpp
index ab7d9469..928f3a0b 100644
--- a/src/kconf_update/kconf_update.cpp
+++ b/src/kconf_update/kconf_update.cpp
@@ -20,14 +20,14 @@
 
 #include <config-kconf.h> // CMAKE_INSTALL_PREFIX
 
-#include <QtCore/QDate>
-#include <QtCore/QFile>
-#include <QtCore/QTextStream>
-#include <QtCore/QTextCodec>
+#include <QDate>
+#include <QFile>
+#include <QTextStream>
+#include <QTextCodec>
 #include <QUrl>
 #include <QTemporaryFile>
 #include <QCoreApplication>
-#include <QtCore/QDir>
+#include <QDir>
 #include <QProcess>
 #include <QDebug>
 
diff --git a/src/kconfig_compiler/kconfig_compiler.cpp b/src/kconfig_compiler/kconfig_compiler.cpp
index 8346de2b..95d23dd4 100644
--- a/src/kconfig_compiler/kconfig_compiler.cpp
+++ b/src/kconfig_compiler/kconfig_compiler.cpp
@@ -26,14 +26,14 @@
 // Compiling this file with this flag is just crazy
 #undef QT_NO_CAST_FROM_ASCII
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QSettings>
-#include <QtCore/QTextStream>
-#include <QtXml/QDomAttr>
-#include <QtCore/QRegExp>
-#include <QtCore/QStringList>
+#include <QCoreApplication>
+#include <QFile>
+#include <QFileInfo>
+#include <QSettings>
+#include <QTextStream>
+#include <QDomAttr>
+#include <QRegExp>
+#include <QStringList>
 
 #include <qcommandlineparser.h>
 #include <qcommandlineoption.h>
@@ -2244,7 +2244,7 @@ int main(int argc, char **argv)
 
     // Header required by singleton implementation
     if (cfg.singleton) {
-        cpp << "#include <qglobal.h>" << endl << "#include <QtCore/QFile>" << endl << endl;
+        cpp << "#include <qglobal.h>" << endl << "#include <QFile>" << endl << endl;
     }
     if (cfg.singleton && cfgFileNameArg) {
         cpp << "#include <QDebug>" << endl << endl;
-- 
cgit v1.2.1