9 files changed, 10 insertions, 10 deletions
diff --git a/src/libs/installer/consumeoutputoperation.cpp b/src/libs/installer/consumeoutputoperation.cpp
index f665a4c44..1a0e5f534 100644
--- a/src/libs/installer/consumeoutputoperation.cpp
+++ b/src/libs/installer/consumeoutputoperation.cpp
@@ -64,7 +64,7 @@ bool ConsumeOutputOperation::performOperation()
                                            "<executable> [argument1] [argument2] [...]")))
         return false;
 
-    PackageManagerCore *const core = value(QLatin1String("installer")).value<PackageManagerCore*>();
+    PackageManagerCore *const core = packageManager();
     if (!core) {
         setError(UserDefinedError);
         setErrorString(tr("Needed installer object in %1 operation is empty.").arg(name()));
diff --git a/src/libs/installer/createlocalrepositoryoperation.cpp b/src/libs/installer/createlocalrepositoryoperation.cpp
index a58570917..18947a33c 100644
--- a/src/libs/installer/createlocalrepositoryoperation.cpp
+++ b/src/libs/installer/createlocalrepositoryoperation.cpp
@@ -165,7 +165,7 @@ bool CreateLocalRepositoryOperation::performOperation()
         const QString repoPath = QFileInfo(args.at(1)).absoluteFilePath() + QLatin1Char('/');
 
         // check if this is an offline version, otherwise there will be no binary data
-        PackageManagerCore *const core = value(QLatin1String("installer")).value<PackageManagerCore*>();
+        PackageManagerCore *const core = packageManager();
         if (core && !core->isOfflineOnly()) {
             throw QInstaller::Error(tr("Installer at \"%1\" needs to be an offline one.")
                 .arg(QDir::toNativeSeparators(binaryPath)));
diff --git a/src/libs/installer/extractarchiveoperation.cpp b/src/libs/installer/extractarchiveoperation.cpp
index 3a1be7ad3..1b40c488f 100644
--- a/src/libs/installer/extractarchiveoperation.cpp
+++ b/src/libs/installer/extractarchiveoperation.cpp
@@ -67,7 +67,7 @@ bool ExtractArchiveOperation::performOperation()
     connect(&callback, &Callback::currentFileChanged, this, &ExtractArchiveOperation::fileFinished);
     connect(&callback, &Callback::progressChanged, this, &ExtractArchiveOperation::progressChanged);
 
-    if (PackageManagerCore *core = this->value(QLatin1String("installer")).value<PackageManagerCore*>()) {
+    if (PackageManagerCore *core = packageManager()) {
         connect(core, &PackageManagerCore::statusChanged, &callback, &Callback::statusChanged);
     }
 
diff --git a/src/libs/installer/fakestopprocessforupdateoperation.cpp b/src/libs/installer/fakestopprocessforupdateoperation.cpp
index 5b99641ec..a30308712 100644
--- a/src/libs/installer/fakestopprocessforupdateoperation.cpp
+++ b/src/libs/installer/fakestopprocessforupdateoperation.cpp
@@ -60,7 +60,7 @@ bool FakeStopProcessForUpdateOperation::undoOperation()
     if (!checkArgumentCount(1))
         return false;
 
-    PackageManagerCore *const core = value(QLatin1String("installer")).value<PackageManagerCore*>();
+    PackageManagerCore *const core = packageManager();
     if (!core) {
         setError(KDUpdater::UpdateOperation::UserDefinedError, tr("Cannot get package manager "
             "core."));
diff --git a/src/libs/installer/installiconsoperation.cpp b/src/libs/installer/installiconsoperation.cpp
index b6613cd5d..8c5541012 100644
--- a/src/libs/installer/installiconsoperation.cpp
+++ b/src/libs/installer/installiconsoperation.cpp
@@ -129,7 +129,7 @@ bool InstallIconsOperation::performOperation()
     QStringList backupFiles;
     QStringList createdDirectories;
 
-    PackageManagerCore *const core = value(QLatin1String("installer")).value<PackageManagerCore*>();
+    PackageManagerCore *const core = packageManager();
 
     // iterate a second time to get the actual work done
     QDirIterator it(sourceDir.path(), QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoDotAndDotDot,
diff --git a/src/libs/installer/licenseoperation.cpp b/src/libs/installer/licenseoperation.cpp
index 4721a6108..195c6d777 100644
--- a/src/libs/installer/licenseoperation.cpp
+++ b/src/libs/installer/licenseoperation.cpp
@@ -61,7 +61,7 @@ bool LicenseOperation::performOperation()
         return false;
     }
 
-    PackageManagerCore *const core = value(QLatin1String("installer")).value<PackageManagerCore*>();
+    PackageManagerCore *const core = packageManager();
     if (!core) {
         setError( UserDefinedError );
         setErrorString(tr("Needed installer object in %1 operation is empty.").arg(name()));
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index 84eb057c2..13fa1d7b0 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -244,7 +244,7 @@ PackageManagerCorePrivate::PackageManagerCorePrivate(PackageManagerCore *core, q
             qWarning() << "Failed to load XML for operation:" << operation.name;
             continue;
         }
-        op->setValue(QLatin1String("installer"), QVariant::fromValue(core));
+        op->setPackageManager(core);
         m_performedOperationsOld.append(op.take());
     }
 
diff --git a/src/libs/installer/registerfiletypeoperation.cpp b/src/libs/installer/registerfiletypeoperation.cpp
index 181d4a7f8..3e57cb5b9 100644
--- a/src/libs/installer/registerfiletypeoperation.cpp
+++ b/src/libs/installer/registerfiletypeoperation.cpp
@@ -99,7 +99,7 @@ bool RegisterFileTypeOperation::performOperation()
         return false;
 
     bool allUsers = false;
-    PackageManagerCore *const core = value(QLatin1String("installer")).value<PackageManagerCore*>();
+    PackageManagerCore *const core = packageManager();
     if (core && core->value(scAllUsers) == scTrue)
         allUsers = true;
 
@@ -163,7 +163,7 @@ bool RegisterFileTypeOperation::undoOperation()
     }
 
     bool allUsers = false;
-    PackageManagerCore *const core = value(QLatin1String("installer")).value<PackageManagerCore*>();
+    PackageManagerCore *const core = packageManager();
     if (core && core->value(scAllUsers) == scTrue)
         allUsers = true;
 
diff --git a/src/libs/installer/selfrestartoperation.cpp b/src/libs/installer/selfrestartoperation.cpp
index 54df7aa9e..8d18363d3 100644
--- a/src/libs/installer/selfrestartoperation.cpp
+++ b/src/libs/installer/selfrestartoperation.cpp
@@ -51,7 +51,7 @@ void SelfRestartOperation::backup()
 
 bool SelfRestartOperation::performOperation()
 {
-    PackageManagerCore *const core = value(QLatin1String("installer")).value<PackageManagerCore*>();
+    PackageManagerCore *const core = packageManager();
     if (!core) {
         setError(UserDefinedError);
         setErrorString(tr("Installer object needed in operation %1 is empty.").arg(name()));