summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2023-09-01 13:51:22 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-09-05 20:41:53 +0000
commit9478aa74ee0af8a902d2fc603710db06f749048e (patch)
tree9c0f1cb54d98d28332d92796c0fa0faf959c6fd9 /examples
parenta1045b2b0f117dc514bcefb870e737576875a70b (diff)
Exploit C++17 init-statements in if to simplify a loop
The serialization converter example's text converter's loadFile() can be made tidier by making the conditions within its loop into a chain. Task-number: QTBUG-111228 Change-Id: Ic82355eab7380a0c671b3805ca140958bb1c5af5 Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Øystein Heskestad <oystein.heskestad@qt.io> (cherry picked from commit d631f888042e3f3f5d4d0284c6bad8eb91e2c9a3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples')
-rw-r--r--examples/corelib/serialization/convert/textconverter.cpp17
1 files changed, 5 insertions, 12 deletions
diff --git a/examples/corelib/serialization/convert/textconverter.cpp b/examples/corelib/serialization/convert/textconverter.cpp
index 6c27e48323..48f32615ab 100644
--- a/examples/corelib/serialization/convert/textconverter.cpp
+++ b/examples/corelib/serialization/convert/textconverter.cpp
@@ -79,21 +79,14 @@ QVariant TextConverter::loadFile(QIODevice *f, Converter *&outputConverter)
QString line;
while (!in.atEnd()) {
in.readLineInto(&line);
-
bool ok;
- qint64 v = line.toLongLong(&ok);
- if (ok) {
- list.append(v);
- continue;
- }
- double d = line.toDouble(&ok);
- if (ok) {
+ if (qint64 v = line.toLongLong(&ok); ok)
+ list.append(v);
+ else if (double d = line.toDouble(&ok); ok)
list.append(d);
- continue;
- }
-
- list.append(line);
+ else
+ list.append(line);
}
return list;