Remove (KDUpdater}Application, functionality has been merge.

Task-number: QTIFW-215
Change-Id: I7a9215c8c5d5eae0d66d57650f5b8b82dd4d40b4
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>

2 files changed, 1 insertions, 25 deletions

diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index 7d465cb0a..612b40879 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -62,6 +62,7 @@
 
 #include <productkeycheck.h>
 
+#include <QSettings>
 #include <QtConcurrentRun>
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDir>
@@ -186,7 +187,6 @@ static void deferredRename(const QString &oldName, const QString &newName, bool
 
 PackageManagerCorePrivate::PackageManagerCorePrivate(PackageManagerCore *core)
     : m_updateFinder(0)
-    , m_updaterApplication(new DummyConfigurationInterface)
     , m_packagesInfo(std::make_shared<PackagesInfo>())
     , m_core(core)
     , m_updates(false)
@@ -208,7 +208,6 @@ PackageManagerCorePrivate::PackageManagerCorePrivate(PackageManagerCore *core)
 PackageManagerCorePrivate::PackageManagerCorePrivate(PackageManagerCore *core, qint64 magicInstallerMaker,
         const QList<OperationBlob> &performedOperations)
     : m_updateFinder(0)
-    , m_updaterApplication(new DummyConfigurationInterface)
     , m_packagesInfo(std::make_shared<PackagesInfo>())
     , m_status(PackageManagerCore::Unfinished)
     , m_needsHardRestart(false)
diff --git a/src/libs/installer/packagemanagercore_p.h b/src/libs/installer/packagemanagercore_p.h
index 3bcbf8ffa..6dbebd94c 100644
--- a/src/libs/installer/packagemanagercore_p.h
+++ b/src/libs/installer/packagemanagercore_p.h
@@ -42,7 +42,6 @@
 #include "qinstallerglobal.h"
 
 #include "kdsysinfo.h"
-#include "kdupdaterapplication.h"
 #include "kdupdaterupdatefinder.h"
 #include "kdupdaterupdatesourcesinfo.h"
 
@@ -67,27 +66,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
@@ -198,7 +176,6 @@ signals:
 
 public:
     UpdateFinder *m_updateFinder;
-    Application m_updaterApplication;
     UpdateSourcesInfo m_updateSourcesInfo;
     std::shared_ptr<PackagesInfo> m_packagesInfo;
     QStringList m_filesForDelayedDeletion;