cleaned up includes

fancontrol-gui/src/main.cpp

@@ -17,13 +17,13 @@
  *
  */
 
-#include <QApplication>
-#include <QQmlApplicationEngine>
-#include <QQmlContext>
+#include <QtWidgets/QApplication>
+#include <QtQml/QQmlApplicationEngine>
+#include <QtQml/QQmlContext>
 #include <KDeclarative/KDeclarative>
 #include <KI18n/KLocalizedString>
 #include <KPackage/PackageLoader>
-#include <KAboutData>
+#include <KCoreAddons/KAboutData>
 
 #include "../lib/src/guibase.h"
 

helper/src/helper.cpp

@@ -19,12 +19,13 @@
 
 #include "helper.h"
 
-#include <QFile>
-#include <QTextStream>
-#include <QProcess>
+#include <QtCore/QFile>
+#include <QtCore/QTextStream>
+#include <QtCore/QProcess>
+#include <KAuth/KAuthHelperSupport>
 
 #ifndef NO_SYSTEMD
-#include <QtDBus>
+#include <QtDBus/QDBusInterface>
 #endif
 
 ActionReply Helper::action(const QVariantMap &arguments)

helper/src/helper.h

@@ -17,7 +17,7 @@
  *
  */
 
-#include <KAuth>
+#include <KAuth/KAuthActionReply>
 
 using namespace KAuth;
 

kcm/src/fancontrolkcm.cpp

@@ -22,10 +22,10 @@
 
 #include "fancontrolkcm.h"
 
-#include <QtQml>
-#include <KAboutData>
-#include <KLocalizedString>
-#include <KPluginFactory>
+#include <QtQml/qqml.h>
+#include <KCoreAddons/KAboutData>
+#include <KCoreAddons/KPluginFactory>
+#include <KI18n/KLocalizedString>
 
 
 K_PLUGIN_FACTORY_WITH_JSON(FancontrolKCMFactory, "kcm_fancontrol.json", registerPlugin<FancontrolKCM>();)

kcm/src/fancontrolkcm.h

@@ -23,7 +23,7 @@
 #ifndef FANCONTROLKCM_H
 #define FANCONTROLKCM_H
 
-#include <KQuickAddons/ConfigModule>
+#include <KDeclarative/KQuickAddons/ConfigModule>
 
 #include "../lib/src/guibase.h"
 

lib/src/fan.cpp

@@ -22,13 +22,13 @@
 
 #include "hwmon.h"
 
-#include <QTextStream>
-#include <QDir>
-#include <QFile>
-#include <QDebug>
+#include <QtCore/QTextStream>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QDebug>
 
-#include <KSharedConfig>
-#include <KConfigGroup>
+#include <KConfigCore/KSharedConfig>
+#include <KConfigCore/KConfigGroup>
 
 
 Fan::Fan(Hwmon *parent, uint index) : 

lib/src/guibase.cpp

@@ -26,8 +26,8 @@
 #include "config.h"
 #include "hwmon.h"
 
-#include <QtQml>
-#include <QLocale>
+#include <QtQml/qqml.h>
+#include <QtCore/QLocale>
 
 
 GUIBase::GUIBase(QObject *parent) : QObject(parent),    

lib/src/guibase.h

@@ -24,7 +24,7 @@
 #ifndef GUIBASE_H
 #define GUIBASE_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include "loader.h"
 

lib/src/hwmon.cpp

@@ -20,10 +20,9 @@
 
 #include "hwmon.h"
 
-#include <QDir>
-#include <QTextStream>
-#include <QtQml>
-#include <QDebug>
+#include <QtCore/QDir>
+#include <QtCore/QTextStream>
+#include <QtCore/QDebug>
 
 Hwmon::Hwmon(const QString &path, QObject *parent) : QObject(parent),
     m_path(path),

lib/src/hwmon.h

@@ -21,9 +21,9 @@
 #ifndef HWMON_H
 #define HWMON_H
 
-#include <QObject>
-#include <QString>
-#include <QList>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QList>
 
 #include "temp.h"
 #include "fan.h"

lib/src/sensor.h

@@ -21,8 +21,8 @@
 #ifndef SENSOR_H
 #define SENSOR_H
 
-#include <QObject>
-#include <QString>
+#include <QtCore/QObject>
+#include <QtCore/QString>
 
 
 class Hwmon;

lib/src/systemdcommunicator.cpp

@@ -20,9 +20,9 @@
 
 #include "systemdcommunicator.h"
 
-#include <KF5/KAuth/kauthexecutejob.h>
-#include <QDebug>
-#include <QVariant>
+#include <KAuth/kauthexecutejob.h>
+#include <QtCore/QDebug>
+#include <QtCore/QVariant>
 #include <QtDBus/QDBusArgument>
 #include <QtDBus/QDBusInterface>
 

lib/src/systemdcommunicator.h

@@ -21,7 +21,7 @@
 #ifndef SYSTEMDCOMMUNICATOR_H
 #define SYSTEMDCOMMUNICATOR_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include "fancontrol_gui_lib_export.h"
 

lib/src/temp.cpp

@@ -25,13 +25,13 @@
 
 #include "hwmon.h"
 
-#include <QTextStream>
-#include <QFile>
-#include <QDir>
-#include <QDebug>
+#include <QtCore/QTextStream>
+#include <QtCore/QFile>
+#include <QtCore/QDir>
+#include <QtCore/QDebug>
 
-#include <KSharedConfig>
-#include <KConfigGroup>
+#include <KConfigCore/KSharedConfig>
+#include <KConfigCore/KConfigGroup>
 
 
 Temp::Temp(Hwmon *parent, uint index) :