diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-13 12:55:17 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-29 20:43:26 +0200 |
| commit | 111df3b5e04ffc6467be08bb84990aba48bf6b5a (patch) | |
| tree | 2a425b325d752b488ed671ac2881c0a1d05fce04 /src/testlib/qxmltestlogger.cpp | |
| parent | afb8ba3fd22ca86ec3438a04c08353c9ddcaca1a (diff) | |
QTestLib: Fix various clang warnings
- Fix else after return/break
- Fix use of int as boolean literal
- Use range-based for in some cases
- Avoid copies by using const-ref
- Remove unnecessary null-check before delete
Task-number: QTBUG-69413
Change-Id: I69f46e6deaa55ef70a8b3a61e6539c79a64aaa23
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/testlib/qxmltestlogger.cpp')
| -rw-r--r-- | src/testlib/qxmltestlogger.cpp | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/src/testlib/qxmltestlogger.cpp b/src/testlib/qxmltestlogger.cpp index 84126c10eb..763cea327b 100644 --- a/src/testlib/qxmltestlogger.cpp +++ b/src/testlib/qxmltestlogger.cpp @@ -180,23 +180,20 @@ inline static bool isEmpty(const char *str) static const char *incidentFormatString(bool noDescription, bool noTag) { if (noDescription) { - if (noTag) - return "<Incident type=\"%s\" file=\"%s\" line=\"%d\" />\n"; - else - return "<Incident type=\"%s\" file=\"%s\" line=\"%d\">\n" + return noTag + ? "<Incident type=\"%s\" file=\"%s\" line=\"%d\" />\n" + : "<Incident type=\"%s\" file=\"%s\" line=\"%d\">\n" " <DataTag><![CDATA[%s%s%s%s]]></DataTag>\n" "</Incident>\n"; - } else { - if (noTag) - return "<Incident type=\"%s\" file=\"%s\" line=\"%d\">\n" - " <Description><![CDATA[%s%s%s%s]]></Description>\n" - "</Incident>\n"; - else - return "<Incident type=\"%s\" file=\"%s\" line=\"%d\">\n" - " <DataTag><![CDATA[%s%s%s]]></DataTag>\n" - " <Description><![CDATA[%s]]></Description>\n" - "</Incident>\n"; } + return noTag + ? "<Incident type=\"%s\" file=\"%s\" line=\"%d\">\n" + " <Description><![CDATA[%s%s%s%s]]></Description>\n" + "</Incident>\n" + : "<Incident type=\"%s\" file=\"%s\" line=\"%d\">\n" + " <DataTag><![CDATA[%s%s%s]]></DataTag>\n" + " <Description><![CDATA[%s]]></Description>\n" + "</Incident>\n"; } static const char *benchmarkResultFormatString() |