From 8aaa032159f7002156619c1a505937af1bb362c8 Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@digia.com>
Date: Thu, 25 Jul 2013 17:39:29 +0200
Subject: rename operation to operationName

Change-Id: I6e8f87b40f0bac3a6e50b923cf260f721abc9e07
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
---
 src/libs/installer/component.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/libs/installer/component.cpp')

diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp
index c2cadafc6..cfa220ab1 100644
--- a/src/libs/installer/component.cpp
+++ b/src/libs/installer/component.cpp
@@ -947,7 +947,7 @@ bool Component::operationsCreatedSuccessfully() const
     return d->m_operationsCreatedSuccessfully;
 }
 
-Operation *Component::createOperation(const QString &operation, const QString &parameter1,
+Operation *Component::createOperation(const QString &operationName, const QString &parameter1,
     const QString &parameter2, const QString &parameter3, const QString &parameter4, const QString &parameter5,
     const QString &parameter6, const QString &parameter7, const QString &parameter8, const QString &parameter9,
     const QString &parameter10)
@@ -974,29 +974,29 @@ Operation *Component::createOperation(const QString &operation, const QString &p
     if (!parameter10.isNull())
         arguments.append(parameter10);
 
-    return createOperation(operation, arguments);
+    return createOperation(operationName, arguments);
 }
 
-Operation *Component::createOperation(const QString &operation, const QStringList &parameters)
+Operation *Component::createOperation(const QString &operationName, const QStringList &parameters)
 {
-    Operation *op = KDUpdater::UpdateOperationFactory::instance().create(operation);
-    if (op == 0) {
+    Operation *operation = KDUpdater::UpdateOperationFactory::instance().create(operationName);
+    if (operation == 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);
+                .arg(operationName), QMessageBox::Abort | QMessageBox::Ignore);
         if (button == QMessageBox::Abort)
             d->m_operationsCreatedSuccessfully = false;
-        return op;
+        return operation;
     }
 
-    if (op->name() == QLatin1String("Delete"))
-        op->setValue(QLatin1String("performUndo"), false);
-    op->setValue(QLatin1String("installer"), qVariantFromValue(d->m_core));
+    if (operation->name() == QLatin1String("Delete"))
+        operation->setValue(QLatin1String("performUndo"), false);
+    operation->setValue(QLatin1String("installer"), qVariantFromValue(d->m_core));
 
-    op->setArguments(d->m_core->replaceVariables(parameters));
+    operation->setArguments(d->m_core->replaceVariables(parameters));
 
-    return op;
+    return operation;
 }
 
 /*!
-- 
cgit v1.2.3