diff options
author | Jarek Kobus <jaroslaw.kobus@theqtcompany.com> | 2015-02-26 12:43:59 +0100 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@theqtcompany.com> | 2015-02-27 11:36:07 +0000 |
commit | 80439d01e2feb1342dc470627585559c97805be3 (patch) | |
tree | dbfe2c9c8b77d80e0bf33004021b91861db27762 /src/libs/installer/linereplaceoperation.cpp | |
parent | 78a1e54683e80ee4c029816c7308c94ca85712bd (diff) |
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>
Diffstat (limited to 'src/libs/installer/linereplaceoperation.cpp')
-rw-r--r-- | src/libs/installer/linereplaceoperation.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/libs/installer/linereplaceoperation.cpp b/src/libs/installer/linereplaceoperation.cpp index 9063f8848..c84d1922c 100644 --- a/src/libs/installer/linereplaceoperation.cpp +++ b/src/libs/installer/linereplaceoperation.cpp @@ -51,18 +51,14 @@ void LineReplaceOperation::backup() bool LineReplaceOperation::performOperation() { - const QStringList args = arguments(); - // Arguments: // 1. filename // 2. startsWith Search-String // 3. Replace-Line-String - if (args.count() != 3) { - setError(InvalidArguments); - setErrorString(tr("Invalid arguments in %0: %1 arguments given, %2 expected%3.") - .arg(name()).arg(arguments().count()).arg(tr("exactly 3"), QLatin1String(""))); + if (!checkArgumentCount(3)) return false; - } + + const QStringList args = arguments(); const QString fileName = args.at(0); const QString searchString = args.at(1); const QString replaceString = args.at(2); |