2 files changed, 21 insertions, 37 deletions
diff --git a/installerbuilder/libinstaller/registerdefaultdebuggeroperation.cpp b/installerbuilder/libinstaller/registerdefaultdebuggeroperation.cpp
index 11af4f2a9..1d3883442 100644
--- a/installerbuilder/libinstaller/registerdefaultdebuggeroperation.cpp
+++ b/installerbuilder/libinstaller/registerdefaultdebuggeroperation.cpp
@@ -32,7 +32,7 @@
 **************************************************************************/
 #include "registerdefaultdebuggeroperation.h"
 #include "persistentsettings.h"
-//#include "qinstaller.h"
+#include "qinstaller.h"
 #include "qtcreator_constants.h"
 #include "qtcreatorpersistentsettings.h"
 
@@ -80,15 +80,14 @@ bool RegisterDefaultDebuggerOperation::performOperation()
 
     QString toolChainsXmlFilePath;
 
-//    const Installer* const installer = qVariantValue<Installer*>(value(QLatin1String("installer")));
-//    if (!installer) {
-//        setError(UserDefinedError);
-//        setErrorString(tr("Needed installer object in \"%1\" operation is empty.").arg(name()));
-//        return false;
-//    }
-//    const QString &rootInstallPath = installer->value(QLatin1String("TargetDir"));
-//    toolChainsXmlFilePath = rootInstallPath + QLatin1String(ToolChainSettingsSuffixPath);
-    toolChainsXmlFilePath = "d:\\toolchains.xml_debugger";
+    const Installer* const installer = qVariantValue<Installer*>(value(QLatin1String("installer")));
+    if (!installer) {
+        setError(UserDefinedError);
+        setErrorString(tr("Needed installer object in \"%1\" operation is empty.").arg(name()));
+        return false;
+    }
+    const QString &rootInstallPath = installer->value(QLatin1String("TargetDir"));
+    toolChainsXmlFilePath = rootInstallPath + QLatin1String(ToolChainSettingsSuffixPath);
 
     int argCounter = 0;
     const QString &abiString = args.at(argCounter++); //for example x86-windows-msys-pe-32bit
@@ -121,15 +120,14 @@ bool RegisterDefaultDebuggerOperation::undoOperation()
 
     QString toolChainsXmlFilePath;
 
-//    const Installer* const installer = qVariantValue<Installer*>(value(QLatin1String("installer")));
-//    if (!installer) {
-//        setError(UserDefinedError);
-//        setErrorString(tr("Needed installer object in \"%1\" operation is empty.").arg(name()));
-//        return false;
-//    }
-//    const QString &rootInstallPath = installer->value(QLatin1String("TargetDir"));
-//    toolChainsXmlFilePath = rootInstallPath + QLatin1String(ToolChainSettingsSuffixPath);
-    toolChainsXmlFilePath = "d:\\toolchains.xml_debugger";
+    const Installer* const installer = qVariantValue<Installer*>(value(QLatin1String("installer")));
+    if (!installer) {
+        setError(UserDefinedError);
+        setErrorString(tr("Needed installer object in \"%1\" operation is empty.").arg(name()));
+        return false;
+    }
+    const QString &rootInstallPath = installer->value(QLatin1String("TargetDir"));
+    toolChainsXmlFilePath = rootInstallPath + QLatin1String(ToolChainSettingsSuffixPath);
 
     int argCounter = 0;
     const QString &abiString = args.at(argCounter++); //for example x86-windows-msys-pe-32bit
@@ -148,7 +146,7 @@ bool RegisterDefaultDebuggerOperation::testOperation()
     return true;
 }
 
-KDUpdaterUpdateOperation* RegisterDefaultDebuggerOperation::clone() const
+KDUpdater::UpdateOperation* RegisterDefaultDebuggerOperation::clone() const
 {
     return new RegisterDefaultDebuggerOperation();
 }
diff --git a/installerbuilder/libinstaller/registerdefaultdebuggeroperation.h b/installerbuilder/libinstaller/registerdefaultdebuggeroperation.h
index 6cf971573..3e7f44ea2 100644
--- a/installerbuilder/libinstaller/registerdefaultdebuggeroperation.h
+++ b/installerbuilder/libinstaller/registerdefaultdebuggeroperation.h
@@ -26,38 +26,24 @@
 #ifndef REGISTERDEFAULTDEBUGGEROPERATION_H
 #define REGISTERDEFAULTDEBUGGEROPERATION_H
 
-//#include <KDUpdater/UpdateOperation>
+#include <KDUpdater/UpdateOperation>
 
 #include <QObject>
 #include <QStringList>
-typedef QObject KDUpdaterUpdateOperation;
 
 namespace QInstaller {
 
-class RegisterDefaultDebuggerOperation : public KDUpdaterUpdateOperation
+class RegisterDefaultDebuggerOperation : public KDUpdater::UpdateOperation
 {
 public:
     RegisterDefaultDebuggerOperation();
     ~RegisterDefaultDebuggerOperation();
-    enum error {
-        UserDefinedError,
-        InvalidArguments
-    };
-
-    void setName(const QString &) {}
-    QString name() {return "something";}
-    void setError(error) {}
-    void setErrorString(const QString &) {}
-
-    void setArguments(const QStringList &arguments) {m_arguments = arguments;}
-    QStringList arguments() {return m_arguments;}
-    QStringList m_arguments;
 
     void backup();
     bool performOperation();
     bool undoOperation();
     bool testOperation();
-    KDUpdaterUpdateOperation* clone() const;
+    KDUpdater::UpdateOperation* clone() const;
 };
 
 } // namespace