minor include cleanups

fancontrol-gui/src/main.cpp

@@ -20,10 +20,11 @@
 #include <QApplication>
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
+
 #include <KDeclarative/KDeclarative>
 #include <KI18n/KLocalizedString>
 #include <KPackage/PackageLoader>
-#include <KAboutData>
+#include <KCoreAddons/KAboutData>
 
 #include "../lib/src/guibase.h"
 

kcm/src/fancontrolkcm.cpp

@@ -23,9 +23,10 @@
 #include "fancontrolkcm.h"
 
 #include <QtQml>
-#include <KAboutData>
-#include <KLocalizedString>
-#include <KPluginFactory>
+
+#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/config.h

@@ -24,7 +24,7 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#include <KF5/KConfigCore/KCoreConfigSkeleton>
+#include <KConfigCore/KCoreConfigSkeleton>
 
 
 class Config : public KCoreConfigSkeleton

lib/src/fan.cpp

@@ -27,8 +27,8 @@
 #include <QFile>
 #include <QDebug>
 
-#include <KSharedConfig>
-#include <KConfigGroup>
+#include <KConfigCore/KSharedConfig>
+#include <KConfigCore/KConfigGroup>
 
 
 Fan::Fan(Hwmon *parent, uint index) : 

lib/src/loader.cpp

@@ -21,9 +21,6 @@
 #include "loader.h"
 
 #include "hwmon.h"
-#include "fan.h"
-#include "pwmfan.h"
-#include "temp.h"
 
 #include <QFile>
 #include <QDir>
@@ -31,10 +28,12 @@
 #include <QTimer>
 #include <QDebug>
 
-#include <KF5/KAuth/KAuthExecuteJob>
+#include <KAuth/KAuthExecuteJob>
+
 
 #define HWMON_PATH "/sys/class/hwmon"
 
+
 Loader::Loader(QObject *parent) : QObject(parent),
     m_interval(10),
     m_configUrl(QUrl::fromLocalFile("/etc/fancontrol")),
@@ -111,6 +110,7 @@ bool Loader::load(const QUrl &url)
     }
     else if (url.isLocalFile())
         fileName = url.toLocalFile();
+    
     else
     {
         setError("Url is not a local file");

lib/src/loader.h

@@ -61,7 +61,7 @@ public:
     void setInterval(int interval, bool writeNewConfig = true);
     QString error() const { return m_error; }
     
-    static int getHwmonNumber(const QString &str); 
+    static int getHwmonNumber(const QString &str);
     static int getSensorNumber(const QString &str);
 
     

lib/src/pwmfan.cpp

@@ -31,9 +31,9 @@
 #include <QFile>
 #include <QDebug>
 
-#include <KConfigGroup>
-#include <KSharedConfig>
-#include <KF5/KAuth/KAuthExecuteJob>
+#include <KConfigCore/KConfigGroup>
+#include <KConfigCore/KSharedConfig>
+#include <KAuth/KAuthExecuteJob>
 
 
 #define MAX_ERRORS_FOR_RPM_ZERO 10

lib/src/systemdcommunicator.cpp

@@ -20,12 +20,13 @@
 
 #include "systemdcommunicator.h"
 
-#include <KF5/KAuth/kauthexecutejob.h>
 #include <QDebug>
 #include <QVariant>
 #include <QtDBus/QDBusArgument>
 #include <QtDBus/QDBusInterface>
 
+#include <KAuth/KAuthExecuteJob>
+
 
 using namespace KAuth;
 

lib/src/temp.cpp

@@ -30,8 +30,8 @@
 #include <QDir>
 #include <QDebug>
 
-#include <KSharedConfig>
-#include <KConfigGroup>
+#include <KConfigCore/KSharedConfig>
+#include <KConfigCore/KConfigGroup>
 
 
 Temp::Temp(Hwmon *parent, uint index) :