Cleanup

1. Add a checkArgumentCount() helper method.
2. Fix a plural form of the check method.
3. Remove repeating translation for every UpdateOperation subclass.
4. Use always QList.at() for checking arguments,
   instead of random usage of first(), last() and at().
5. Fix const corectness.
6. Move isPersistant into #ifdef Q_OS_WIN inside
   EnvironmentVariableOperation.

Change-Id: Idaa12265f1816871de0a4ea3ae586512859a04e3
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>

1 files changed, 3 insertions, 7 deletions

diff --git a/src/libs/installer/installiconsoperation.cpp b/src/libs/installer/installiconsoperation.cpp
index f957623bb..7d5bf08ce 100644
--- a/src/libs/installer/installiconsoperation.cpp
+++ b/src/libs/installer/installiconsoperation.cpp
@@ -109,16 +109,12 @@ void InstallIconsOperation::backup()
 
 bool InstallIconsOperation::performOperation()
 {
-    const QStringList args = arguments();
-    if ((args.count() != 1) && (args.count() != 2)) {
-        setError(InvalidArguments);
-        setErrorString(tr("Invalid arguments in %0: %1 arguments given, %2 expected%3.")
-            .arg(name()).arg(arguments().count()).arg(tr("1 or 2"), tr(" (Sourcepath, [Vendorprefix])")));
+    if (!checkArgumentCount(1, 2, tr("(Sourcepath, [Vendorprefix])")))
         return false;
-    }
 
+    const QStringList args = arguments();
     const QString source = args.at(0);
-    const QString vendor = args.value(1);
+    const QString vendor = args.value(1); // value() used since it's optional
 
     if (source.isEmpty()) {
         setError(InvalidArguments);