diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-10-31 15:56:20 +0100 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-11-01 09:10:31 +0000 |
| commit | 16e61cdf82317805ba5449bbb4c05f94df35e64d (patch) | |
| tree | f9129ebe7f366bca551346cd58319d2bd36eaa7f /src/libs/utils/json.cpp | |
| parent | eabc5e2bddd1a6e42d0bff323a7f4dea86610bb4 (diff) | |
| download | qt-creator-16e61cdf82317805ba5449bbb4c05f94df35e64d.tar.gz | |
Utils: Simplify
bugprone-branch-clone
readability-simplify-boolean-expr
Change-Id: I75ad6118275ad9231f21b578567c3c042414263b
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/libs/utils/json.cpp')
| -rw-r--r-- | src/libs/utils/json.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/libs/utils/json.cpp b/src/libs/utils/json.cpp index 104cf571b9..b195e134d4 100644 --- a/src/libs/utils/json.cpp +++ b/src/libs/utils/json.cpp @@ -225,17 +225,13 @@ bool JsonSchema::typeMatches(const QString &expected, const QString &actual) bool JsonSchema::isCheckableType(const QString &s) { - if (s == QLatin1String("string") - || s == QLatin1String("number") - || s == QLatin1String("integer") - || s == QLatin1String("boolean") - || s == QLatin1String("object") - || s == QLatin1String("array") - || s == QLatin1String("null")) { - return true; - } - - return false; + return s == QLatin1String("string") + || s == QLatin1String("number") + || s == QLatin1String("integer") + || s == QLatin1String("boolean") + || s == QLatin1String("object") + || s == QLatin1String("array") + || s == QLatin1String("null"); } QStringList JsonSchema::validTypes() const |