Take over the last used methods from {KD}Application.

Change-Id: I9aaac261bef7aaa48cf0beaee83e15cc5bccd437
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>

1 files changed, 19 insertions, 0 deletions

diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index b349bd00a..e2e52a6db 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -335,6 +335,8 @@ static bool sNoForceInstallation = false;
 static bool sVirtualComponentsVisible = false;
 static bool sCreateLocalRepositoryFromBinary = false;
 
+PackageManagerCore *PackageManagerCore::m_instance = 0;
+
 static bool componentMatches(const Component *component, const QString &name,
     const QString &version = QString())
 {
@@ -718,6 +720,9 @@ bool PackageManagerCore::fileExists(const QString &filePath) const
 PackageManagerCore::PackageManagerCore()
     : d(new PackageManagerCorePrivate(this))
 {
+    Q_ASSERT_X(m_instance == 0, Q_FUNC_INFO, "PackageManagerCore called more then once.");
+    m_instance = this;
+
     Repository::registerMetaType(); // register, cause we stream the type as QVariant
     qRegisterMetaType<QInstaller::PackageManagerCore::Status>("QInstaller::PackageManagerCore::Status");
     qRegisterMetaType<QInstaller::PackageManagerCore::WizardPage>("QInstaller::PackageManagerCore::WizardPage");
@@ -727,6 +732,9 @@ PackageManagerCore::PackageManagerCore(qint64 magicmaker, const QList<OperationB
         const QString &socketName, const QString &key, Protocol::Mode mode)
     : d(new PackageManagerCorePrivate(this, magicmaker, operations))
 {
+    Q_ASSERT_X(m_instance == 0, Q_FUNC_INFO, "PackageManagerCore called more then once.");
+    m_instance = this;
+
     Repository::registerMetaType(); // register, cause we stream the type as QVariant
     qRegisterMetaType<QInstaller::PackageManagerCore::Status>("QInstaller::PackageManagerCore::Status");
     qRegisterMetaType<QInstaller::PackageManagerCore::WizardPage>("QInstaller::PackageManagerCore::WizardPage");
@@ -775,6 +783,7 @@ PackageManagerCore::~PackageManagerCore()
         QInstaller::VerboseWriter::instance()->setFileName(logFileName);
     }
     delete d;
+    m_instance = 0;
 
     RemoteClient::instance().setActive(false);
     RemoteClient::instance().shutdown();
@@ -2524,3 +2533,13 @@ ComponentModel *PackageManagerCore::componentModel(PackageManagerCore *core, con
 
     return model;
 }
+
+QStringList PackageManagerCore::filesForDelayedDeletion() const
+{
+    return d->m_filesForDelayedDeletion;
+}
+
+void PackageManagerCore::addFilesForDelayedDeletion(const QStringList &files)
+{
+    d->m_filesForDelayedDeletion.append(files);
+}