1 files changed, 10 insertions, 28 deletions
diff --git a/src/libs/installer/packagemanagercore_p.h b/src/libs/installer/packagemanagercore_p.h
index ca2c43b9a..d78bd3e69 100644
--- a/src/libs/installer/packagemanagercore_p.h
+++ b/src/libs/installer/packagemanagercore_p.h
@@ -38,15 +38,15 @@
 #include "packagemanagercore.h"
 #include "packagemanagercoredata.h"
 #include "packagemanagerproxyfactory.h"
+#include "packagesource.h"
 #include "qinstallerglobal.h"
 
-#include "kdsysinfo.h"
-#include "kdupdaterapplication.h"
-#include "kdupdaterupdatefinder.h"
+#include "sysinfo.h"
+#include "updatefinder.h"
 
 #include <QObject>
 
-class KDJob;
+class Job;
 
 QT_FORWARD_DECLARE_CLASS(QFile)
 QT_FORWARD_DECLARE_CLASS(QFileDevice)
@@ -65,27 +65,6 @@ class InstallerCalculator;
 class UninstallerCalculator;
 class RemoteFileEngineHandler;
 
-/*
-    The default configuration interface implementation does call QSettings to save files for later deletion,
-    though according to QSettings there should nothing be written if QSettings is not setup properly (which
-    we do not in our case). Still, caused by a broken QSettings implementation at least on Linux we write an
-    empty config file which resulted in QTIFW-196. To workaround the issue we now use this empty dummy class.
-*/
-class DummyConfigurationInterface : public KDUpdater::ConfigurationInterface
-{
-public:
-    QVariant value(const QString &key) const
-    {
-        Q_UNUSED(key)
-        return QVariant();
-    }
-    void setValue(const QString &key, const QVariant &value)
-    {
-        if (value.isNull())
-            qDebug() << "DummyConfigurationInterface called with key:" << key << "and value:" << value;
-    }
-};
-
 class PackageManagerCorePrivate : public QObject
 {
     Q_OBJECT
@@ -196,7 +175,9 @@ signals:
 
 public:
     UpdateFinder *m_updateFinder;
-    Application m_updaterApplication;
+    QSet<PackageSource> m_packageSources;
+    std::shared_ptr<LocalPackageHub> m_localPackageHub;
+    QStringList m_filesForDelayedDeletion;
 
     int m_status;
     QString m_error;
@@ -224,10 +205,10 @@ public:
     bool m_dependsOnLocalInstallerBinary;
 
 private slots:
-    void infoMessage(KDJob *, const QString &message) {
+    void infoMessage(Job *, const QString &message) {
         emit m_core->metaJobInfoMessage(message);
     }
-    void infoProgress(KDJob *, quint64 progress, quint64) {
+    void infoProgress(Job *, quint64 progress, quint64) {
         emit m_core->metaJobProgress(progress);
     }
 
@@ -249,6 +230,7 @@ private:
     LocalPackagesHash localInstalledPackages();
     bool fetchMetaInformationFromRepositories();
     bool addUpdateResourcesFromRepositories(bool parseChecksum);
+    void processFilesForDelayedDeletion();
 
 private:
     PackageManagerCore *m_core;