1 files changed, 10 insertions, 14 deletions
diff --git a/src/libs/installer/selfrestartoperation.cpp b/src/libs/installer/selfrestartoperation.cpp
index 54b970074..df1fec2c4 100644
--- a/src/libs/installer/selfrestartoperation.cpp
+++ b/src/libs/installer/selfrestartoperation.cpp
@@ -34,30 +34,31 @@
 #include "selfrestartoperation.h"
 #include "packagemanagercore.h"
 
-#include <kdselfrestarter.h>
+#include "selfrestarter.h"
 
 using namespace QInstaller;
 
-SelfRestartOperation::SelfRestartOperation()
+SelfRestartOperation::SelfRestartOperation(PackageManagerCore *core)
+    : UpdateOperation(core)
 {
     setName(QLatin1String("SelfRestart"));
 }
 
 void SelfRestartOperation::backup()
 {
-    setValue(QLatin1String("PreviousSelfRestart"), KDSelfRestarter::restartOnQuit());
+    setValue(QLatin1String("PreviousSelfRestart"), SelfRestarter::restartOnQuit());
 }
 
 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 '%1' operation is empty.").arg(name()));
+        setErrorString(tr("Installer object needed in operation %1 is empty.").arg(name()));
         return false;
     }
 
-    if (!core->isUpdater() && !core->isPackageManager()) {
+    if (!core->isMaintainer()) {
         setError(UserDefinedError);
         setErrorString(tr("Self Restart: Only valid within updater or packagemanager mode."));
         return false;
@@ -68,13 +69,13 @@ bool SelfRestartOperation::performOperation()
         setErrorString(tr("Self Restart: Invalid arguments"));
         return false;
     }
-    KDSelfRestarter::setRestartOnQuit(true);
-    return KDSelfRestarter::restartOnQuit();
+    SelfRestarter::setRestartOnQuit(true);
+    return SelfRestarter::restartOnQuit();
 }
 
 bool SelfRestartOperation::undoOperation()
 {
-    KDSelfRestarter::setRestartOnQuit(value(QLatin1String("PreviousSelfRestart")).toBool());
+    SelfRestarter::setRestartOnQuit(value(QLatin1String("PreviousSelfRestart")).toBool());
     return true;
 }
 
@@ -82,8 +83,3 @@ bool SelfRestartOperation::testOperation()
 {
     return true;
 }
-
-Operation *SelfRestartOperation::clone() const
-{
-    return new SelfRestartOperation();
-}