diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2021-11-20 18:04:35 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2021-11-22 17:56:20 +0000 |
| commit | 7c1f8137257e28299c5ec0fe030d9b9ba9ff55bf (patch) | |
| tree | 0ea2ad91452c92c9ee882d695dbbef90a67281a9 /src/app | |
| parent | 55d0e01789f9b197ecb45413644873aea806e1ae (diff) | |
Fix Clang-Tidy & Clazy 'llvm-else-after-return' warnings
Change-Id: I16649525d797c980c0ba1357b3671b683c4fde25
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/qbs-setup-toolchains/iarewprobe.cpp | 4 | ||||
| -rw-r--r-- | src/app/qbs-setup-toolchains/keilprobe.cpp | 6 | ||||
| -rw-r--r-- | src/app/qbs/parser/commandlineparser.cpp | 3 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/app/qbs-setup-toolchains/iarewprobe.cpp b/src/app/qbs-setup-toolchains/iarewprobe.cpp index 6c1506778..10845e4bc 100644 --- a/src/app/qbs-setup-toolchains/iarewprobe.cpp +++ b/src/app/qbs-setup-toolchains/iarewprobe.cpp @@ -177,9 +177,9 @@ static Version dumpIarCompilerVersion(const QFileInfo &compiler) } const QString arch = guessIarArchitecture(compiler); - if (arch == QLatin1String("arm")) { + if (arch == QLatin1String("arm")) return Version{verCode / 1000000, (verCode / 1000) % 1000, verCode % 1000}; - } else if (arch == QLatin1String("avr") + if (arch == QLatin1String("avr") || arch == QLatin1String("mcs51") || arch == QLatin1String("stm8") || arch == QLatin1String("msp430") diff --git a/src/app/qbs-setup-toolchains/keilprobe.cpp b/src/app/qbs-setup-toolchains/keilprobe.cpp index a4b61397a..9a54a7861 100644 --- a/src/app/qbs-setup-toolchains/keilprobe.cpp +++ b/src/app/qbs-setup-toolchains/keilprobe.cpp @@ -307,11 +307,11 @@ static Version dumpArmClangCompilerVersion(const QFileInfo &compiler) static Version dumpKeilCompilerVersion(const QFileInfo &compiler) { const QString arch = guessKeilArchitecture(compiler); - if (arch == QLatin1String("mcs51") || arch == QLatin1String("mcs251")) { + if (arch == QLatin1String("mcs51") || arch == QLatin1String("mcs251")) return dumpMcsCompilerVersion(compiler); - } else if (arch == QLatin1String("c166")) { + if (arch == QLatin1String("c166")) return dumpC166CompilerVersion(compiler); - } else if (arch == QLatin1String("arm")) { + if (arch == QLatin1String("arm")) { if (isArmClangCompiler(compiler)) return dumpArmClangCompilerVersion(compiler); return dumpArmCCCompilerVersion(compiler); diff --git a/src/app/qbs/parser/commandlineparser.cpp b/src/app/qbs/parser/commandlineparser.cpp index 5d3c14ebb..cc7da79dc 100644 --- a/src/app/qbs/parser/commandlineparser.cpp +++ b/src/app/qbs/parser/commandlineparser.cpp @@ -582,8 +582,7 @@ QString CommandLineParser::CommandLineParserPrivate::propertyName(const QString // Make fully-qualified, ie "platform" -> "qbs.platform" if (aCommandLineName.contains(QLatin1Char('.'))) return aCommandLineName; - else - return QLatin1String("qbs.") + aCommandLineName; + return QLatin1String("qbs.") + aCommandLineName; } bool CommandLineParser::CommandLineParserPrivate::checkForExistingBuildConfiguration( |