diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2016-09-30 10:35:49 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-09-30 10:42:28 +0200 |
| commit | bf3a7979a41b166b8dc178a3cc6a22f15a4e6ea5 (patch) | |
| tree | ef02290769e610427f052a53a0e24e71b4adc9e1 /src/lib/corelib/tools/commandechomode.cpp | |
| parent | d17105376102c4cd846757c7f091b9f3cd90e4d7 (diff) | |
| parent | ed69ed958d6ca25cb97dc81b21322f8ab398b7df (diff) | |
| download | qbs-bf3a7979a41b166b8dc178a3cc6a22f15a4e6ea5.tar.gz | |
Merge 1.6 into master
Change-Id: I5a0de1ab1c38080d6061045d28fa9220a88ef4ba
Diffstat (limited to 'src/lib/corelib/tools/commandechomode.cpp')
| -rw-r--r-- | src/lib/corelib/tools/commandechomode.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/corelib/tools/commandechomode.cpp b/src/lib/corelib/tools/commandechomode.cpp index be0a70d8b..fc6a3386a 100644 --- a/src/lib/corelib/tools/commandechomode.cpp +++ b/src/lib/corelib/tools/commandechomode.cpp @@ -77,7 +77,7 @@ QString commandEchoModeName(CommandEchoMode mode) CommandEchoMode commandEchoModeFromName(const QString &name) { CommandEchoMode mode = defaultCommandEchoMode(); - for (int i = 0; i <= static_cast<int>(CommandEchoModeLast); ++i) { + for (int i = 0; i < CommandEchoModeInvalid; ++i) { if (commandEchoModeName(static_cast<CommandEchoMode>(i)) == name) { mode = static_cast<CommandEchoMode>(i); break; @@ -90,7 +90,7 @@ CommandEchoMode commandEchoModeFromName(const QString &name) QStringList allCommandEchoModeStrings() { QStringList result; - for (int i = 0; i <= static_cast<int>(CommandEchoModeLast); ++i) + for (int i = 0; i < CommandEchoModeInvalid; ++i) result << commandEchoModeName(static_cast<CommandEchoMode>(i)); return result; } |