From b6f1ee5ff8e6bbde3ffa43fe704d67264ad54679 Mon Sep 17 00:00:00 2001
From: Oliver Wolff <oliver.wolff@nokia.com>
Date: Fri, 27 Apr 2012 09:19:03 +0200
Subject: Do not limit parameter count to 10 in add(Elevated)Operation

Instead of adding more and more parameters to the functions
the possibility to use arrays was added.

Change-Id: I8569b162e5676f1a3b7c4f2a5b3bf98cb2f46030
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
---
 src/libs/installer/component.cpp | 59 +++++++++++++++++++++++++++++-----------
 src/libs/installer/component.h   |  3 ++
 2 files changed, 46 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp
index 6443819d9..af71f2278 100644
--- a/src/libs/installer/component.cpp
+++ b/src/libs/installer/component.cpp
@@ -802,21 +802,6 @@ Operation *Component::createOperation(const QString &operation, const QString &p
     const QString &parameter6, const QString &parameter7, const QString &parameter8, const QString &parameter9,
     const QString &parameter10)
 {
-    Operation *op = KDUpdater::UpdateOperationFactory::instance().create(operation);
-    if (op == 0) {
-        const QMessageBox::StandardButton button =
-            MessageBoxHandler::critical(MessageBoxHandler::currentBestSuitParent(),
-            QLatin1String("OperationDoesNotExistError"), tr("Error"), tr("Error: Operation %1 does not exist")
-                .arg(operation), QMessageBox::Abort | QMessageBox::Ignore);
-        if (button == QMessageBox::Abort)
-            d->m_operationsCreatedSuccessfully = false;
-        return op;
-    }
-
-    if (op->name() == QLatin1String("Delete"))
-        op->setValue(QLatin1String("performUndo"), false);
-    op->setValue(QLatin1String("installer"), qVariantFromValue(d->m_core));
-
     QStringList arguments;
     if (!parameter1.isNull())
         arguments.append(parameter1);
@@ -838,10 +823,32 @@ Operation *Component::createOperation(const QString &operation, const QString &p
         arguments.append(parameter9);
     if (!parameter10.isNull())
         arguments.append(parameter10);
-    op->setArguments(d->m_core->replaceVariables(arguments));
+
+    return createOperation(operation, arguments);
+}
+
+Operation *Component::createOperation(const QString &operation, const QStringList &parameters)
+{
+    Operation *op = KDUpdater::UpdateOperationFactory::instance().create(operation);
+    if (op == 0) {
+        const QMessageBox::StandardButton button =
+            MessageBoxHandler::critical(MessageBoxHandler::currentBestSuitParent(),
+            QLatin1String("OperationDoesNotExistError"), tr("Error"), tr("Error: Operation %1 does not exist")
+                .arg(operation), QMessageBox::Abort | QMessageBox::Ignore);
+        if (button == QMessageBox::Abort)
+            d->m_operationsCreatedSuccessfully = false;
+        return op;
+    }
+
+    if (op->name() == QLatin1String("Delete"))
+        op->setValue(QLatin1String("performUndo"), false);
+    op->setValue(QLatin1String("installer"), qVariantFromValue(d->m_core));
+
+    op->setArguments(d->m_core->replaceVariables(parameters));
 
     return op;
 }
+
 /*!
     Creates and adds an installation operation for \a operation. Add any number of \a parameter1,
     \a parameter2, \a parameter3, \a parameter4, \a parameter5 and \a parameter6. The contents of
@@ -861,6 +868,16 @@ bool Component::addOperation(const QString &operation, const QString &parameter1
     return false;
 }
 
+bool Component::addOperation(const QString &operation, const QStringList &parameters)
+{
+    if (Operation *op = createOperation(operation, parameters)) {
+            addOperation(op);
+            return true;
+    }
+
+    return false;
+}
+
 /*!
     Creates and adds an installation operation for \a operation. Add any number of \a parameter1,
     \a parameter2, \a parameter3, \a parameter4, \a parameter5 and \a parameter6. The contents of
@@ -882,6 +899,16 @@ bool Component::addElevatedOperation(const QString &operation, const QString &pa
     return false;
 }
 
+bool Component::addElevatedOperation(const QString &operation, const QStringList &parameters)
+{
+    if (Operation *op = createOperation(operation, parameters)) {
+            addElevatedOperation(op);
+            return true;
+    }
+
+    return false;
+}
+
 /*!
     Specifies whether operations should be automatically created when the installation starts. This
     would be done by calling #createOperations. If you set this to false, it's completely up to the
diff --git a/src/libs/installer/component.h b/src/libs/installer/component.h
index 6ac3056ec..6ea05f397 100644
--- a/src/libs/installer/component.h
+++ b/src/libs/installer/component.h
@@ -132,6 +132,7 @@ public:
         const QString &parameter6 = QString(), const QString &parameter7 = QString(),
         const QString &parameter8 = QString(), const QString &parameter9 = QString(),
         const QString &parameter10 = QString());
+    Q_INVOKABLE bool addOperation(const QString &operation, const QStringList &parameters);
 
     void addElevatedOperation(Operation *operation);
     Q_INVOKABLE bool addElevatedOperation(const QString &operation,
@@ -140,6 +141,7 @@ public:
         const QString &parameter5 = QString(), const QString &parameter6 = QString(),
         const QString &parameter7 = QString(), const QString &parameter8 = QString(),
         const QString &parameter9 = QString(), const QString &parameter10 = QString());
+    Q_INVOKABLE bool addElevatedOperation(const QString &operation, const QStringList &parameters);
 
     QStringList downloadableArchives() const;
     Q_INVOKABLE void addDownloadableArchive(const QString &path);
@@ -222,6 +224,7 @@ private:
         const QString &parameter6 = QString(), const QString &parameter7 = QString(),
         const QString &parameter8 = QString(), const QString &parameter9 = QString(),
         const QString &parameter10 = QString());
+    Operation *createOperation(const QString &operation, const QStringList &parameters);
 
 private:
     QString validatorCallbackName;
-- 
cgit v1.2.3