Replace manual parsing with QVersionNumber::fromString()

Instead of splitting the version string into tokens separated by dots
(.) and then parsing each token into an int, building a QList from
them with which to eventually construct a QVersionNumber, just use
QVersionNumber::fromString(), which is both simpler and more
efficient.

Amends f467e29f74fd121b62ad66cb70da9a4b7f6e3248.

Gets rid of Q_FOREACH loops that have crept back in after the cmake
port dropped the QT_NO_FOREACH protection originally added in
61342a9e915f77501b2e5ab72fe40bc40818c4f5.

As a drive-by, to maintain line-length limits, port affected lines to
_L1 UDLs.

Change-Id: If22da8eb1a33f1e967ae2f6d152f0b4c401d722d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>

12 files changed, 36 insertions, 60 deletions

diff --git a/src/imports/lottieanimation.cpp b/src/imports/lottieanimation.cpp
index 4d60ed6..20c2ee8 100644
--- a/src/imports/lottieanimation.cpp
+++ b/src/imports/lottieanimation.cpp
@@ -26,6 +26,8 @@
 #include "rasterrenderer/batchrenderer.h"
 #include "rasterrenderer/lottierasterrenderer.h"
 
+using namespace Qt::StringLiterals;
+
 QT_BEGIN_NAMESPACE
 
 Q_LOGGING_CATEGORY(lcLottieQtBodymovinRender, "qt.lottieqt.bodymovin.render");
@@ -660,11 +662,7 @@ int LottieAnimation::parse(QByteArray jsonSource)
     if (Q_UNLIKELY(rootObj.empty()))
         return -1;
 
-    QStringList versionString = rootObj.value(QLatin1String("v")).toString().split(u'.');
-    QList<int> version;
-    foreach (QString v, versionString)
-        version.append(v.toInt());
-    m_version = QVersionNumber(version);
+    m_version = QVersionNumber::fromString(rootObj.value("v"_L1).toString());
 
     int startFrame = rootObj.value(QLatin1String("ip")).toVariant().toInt();
     int endFrame = rootObj.value(QLatin1String("op")).toVariant().toInt();
diff --git a/tests/auto/bodymovin/shape/ellipse/tst_bmellipse.cpp b/tests/auto/bodymovin/shape/ellipse/tst_bmellipse.cpp
index 86985c3..8b834e0 100644
--- a/tests/auto/bodymovin/shape/ellipse/tst_bmellipse.cpp
+++ b/tests/auto/bodymovin/shape/ellipse/tst_bmellipse.cpp
@@ -11,6 +11,8 @@
 #include "private/bmlayer_p.h"
 #include "private/bmellipse_p.h"
 
+using namespace Qt::StringLiterals;
+
 class tst_BMEllipse: public QObject
 {
     Q_OBJECT
@@ -257,11 +259,7 @@ void tst_BMEllipse::loadTestData(const QByteArray &filename)
     if (rootObj.empty())
         QFAIL("Cannot parse test file");
 
-    QStringList vs = rootObj.value(QLatin1String("v")).toString().split(u'.');
-    QList<int> vi;
-    foreach (QString v, vs)
-        vi.append(v.toInt());
-    QVersionNumber version = QVersionNumber(vi);
+    const auto version = QVersionNumber::fromString(rootObj.value("v"_L1).toString());
 
     QJsonArray layers = rootObj.value(QLatin1String("layers")).toArray();
     QJsonObject layerObj = layers[0].toObject();
diff --git a/tests/auto/bodymovin/shape/fill/tst_bmfill.cpp b/tests/auto/bodymovin/shape/fill/tst_bmfill.cpp
index 88a8e76..7a3c380 100644
--- a/tests/auto/bodymovin/shape/fill/tst_bmfill.cpp
+++ b/tests/auto/bodymovin/shape/fill/tst_bmfill.cpp
@@ -11,6 +11,8 @@
 #include "private/bmlayer_p.h"
 #include "private/bmfill_p.h"
 
+using namespace Qt::StringLiterals;
+
 class tst_BMFill: public QObject
 {
     Q_OBJECT
@@ -178,11 +180,7 @@ void tst_BMFill::loadTestData(const QByteArray &filename)
     if (rootObj.empty())
         QFAIL("Cannot parse test file");
 
-    QStringList vs = rootObj.value(QLatin1String("v")).toString().split(u'.');
-    QList<int> vi;
-    foreach (QString v, vs)
-        vi.append(v.toInt());
-    QVersionNumber version = QVersionNumber(vi);
+    const auto version = QVersionNumber::fromString(rootObj.value("v"_L1).toString());
 
     QJsonArray layers = rootObj.value(QLatin1String("layers")).toArray();
     QJsonObject layerObj = layers[0].toObject();
diff --git a/tests/auto/bodymovin/shape/path/tst_bmpath.cpp b/tests/auto/bodymovin/shape/path/tst_bmpath.cpp
index bff038b..7b8db48 100644
--- a/tests/auto/bodymovin/shape/path/tst_bmpath.cpp
+++ b/tests/auto/bodymovin/shape/path/tst_bmpath.cpp
@@ -11,6 +11,8 @@
 #include "private/bmlayer_p.h"
 #include "private/bmfreeformshape_p.h"
 
+using namespace Qt::StringLiterals;
+
 class tst_BMPath: public QObject
 {
     Q_OBJECT
@@ -1106,11 +1108,7 @@ void tst_BMPath::loadTestData(const QByteArray &filename)
     if (rootObj.empty())
         QFAIL("Cannot parse test file");
 
-    QStringList vs = rootObj.value(QLatin1String("v")).toString().split(u'.');
-    QList<int> vi;
-    foreach (QString v, vs)
-        vi.append(v.toInt());
-    QVersionNumber version = QVersionNumber(vi);
+    const auto version = QVersionNumber::fromString(rootObj.value("v"_L1).toString());
 
     QJsonArray layers = rootObj.value(QLatin1String("layers")).toArray();
     QJsonObject layerObj = layers[0].toObject();
diff --git a/tests/auto/bodymovin/shape/rect/tst_bmrect.cpp b/tests/auto/bodymovin/shape/rect/tst_bmrect.cpp
index bdcc58f..e80bde4 100644
--- a/tests/auto/bodymovin/shape/rect/tst_bmrect.cpp
+++ b/tests/auto/bodymovin/shape/rect/tst_bmrect.cpp
@@ -11,6 +11,8 @@
 #include "private/bmlayer_p.h"
 #include "private/bmrect_p.h"
 
+using namespace Qt::StringLiterals;
+
 class tst_BMRect: public QObject
 {
     Q_OBJECT
@@ -291,11 +293,7 @@ void tst_BMRect::loadTestData(const QByteArray &filename)
     if (rootObj.empty())
         QFAIL("Cannot parse test file");
 
-    QStringList vs = rootObj.value(QLatin1String("v")).toString().split(u'.');
-    QList<int> vi;
-    foreach (QString v, vs)
-        vi.append(v.toInt());
-    QVersionNumber version = QVersionNumber(vi);
+    const auto version = QVersionNumber::fromString(rootObj.value("v"_L1).toString());
 
     QJsonArray layers = rootObj.value(QLatin1String("layers")).toArray();
     QJsonObject layerObj = layers[0].toObject();
diff --git a/tests/auto/bodymovin/shape/repeater/tst_bmrepeater.cpp b/tests/auto/bodymovin/shape/repeater/tst_bmrepeater.cpp
index eb8e828..8b23f8b 100644
--- a/tests/auto/bodymovin/shape/repeater/tst_bmrepeater.cpp
+++ b/tests/auto/bodymovin/shape/repeater/tst_bmrepeater.cpp
@@ -11,6 +11,8 @@
 #include "private/bmlayer_p.h"
 #include "private/bmrepeater_p.h"
 
+using namespace Qt::StringLiterals;
+
 class tst_BMRepeater : public QObject
 {
     Q_OBJECT
@@ -173,11 +175,7 @@ void tst_BMRepeater::loadTestData(const QByteArray &filename)
     if (rootObj.empty())
         QFAIL("Cannot parse test file");
 
-    QStringList vs = rootObj.value(QLatin1String("v")).toString().split(u'.');
-    QList<int> vi;
-    foreach (QString v, vs)
-        vi.append(v.toInt());
-    QVersionNumber version = QVersionNumber(vi);
+    const auto version = QVersionNumber::fromString(rootObj.value("v"_L1).toString());
 
     QJsonArray layers = rootObj.value(QLatin1String("layers")).toArray();
     QJsonObject layerObj = layers[0].toObject();
diff --git a/tests/auto/bodymovin/shape/repeatertransform/tst_bmrepeatertransform.cpp b/tests/auto/bodymovin/shape/repeatertransform/tst_bmrepeatertransform.cpp
index ee948f3..98254ec 100644
--- a/tests/auto/bodymovin/shape/repeatertransform/tst_bmrepeatertransform.cpp
+++ b/tests/auto/bodymovin/shape/repeatertransform/tst_bmrepeatertransform.cpp
@@ -12,6 +12,8 @@
 #include "private/bmrepeater_p.h"
 #include "private/bmrepeatertransform_p.h"
 
+using namespace Qt::StringLiterals;
+
 class tst_BMRepeaterTransform: public QObject
 {
     Q_OBJECT
@@ -402,11 +404,7 @@ void tst_BMRepeaterTransform::loadTestData(const QByteArray &filename)
     if (rootObj.empty())
         QFAIL("Cannot parse test file");
 
-    QStringList vs = rootObj.value(QLatin1String("v")).toString().split(u'.');
-    QList<int> vi;
-    foreach (QString v, vs)
-        vi.append(v.toInt());
-    QVersionNumber version = QVersionNumber(vi);
+    const auto version = QVersionNumber::fromString(rootObj.value("v"_L1).toString());
 
     QJsonArray layers = rootObj.value(QLatin1String("layers")).toArray();
     QJsonObject layerObj = layers[0].toObject();
diff --git a/tests/auto/bodymovin/shape/shapelayer/tst_bmshapelayer.cpp b/tests/auto/bodymovin/shape/shapelayer/tst_bmshapelayer.cpp
index b8045a0..c07f753 100644
--- a/tests/auto/bodymovin/shape/shapelayer/tst_bmshapelayer.cpp
+++ b/tests/auto/bodymovin/shape/shapelayer/tst_bmshapelayer.cpp
@@ -11,6 +11,8 @@
 #include "private/bmlayer_p.h"
 #include "private/bmshapelayer_p.h"
 
+using namespace Qt::StringLiterals;
+
 class tst_BMShapeLayer: public QObject
 {
     Q_OBJECT
@@ -146,11 +148,7 @@ void tst_BMShapeLayer::loadTestData(const QByteArray &filename)
     if (rootObj.empty())
         QFAIL("Cannot parse test file");
 
-    QStringList vs = rootObj.value(QLatin1String("v")).toString().split(u'.');
-    QList<int> vi;
-    foreach (QString v, vs)
-        vi.append(v.toInt());
-    QVersionNumber version = QVersionNumber(vi);
+    const auto version = QVersionNumber::fromString(rootObj.value("v"_L1).toString());
 
     m_width = rootObj.value(QLatin1String("w")).toVariant().toReal();
     m_height = rootObj.value(QLatin1String("h")).toVariant().toReal();
diff --git a/tests/auto/bodymovin/shape/shapetransform/tst_bmshapetransform.cpp b/tests/auto/bodymovin/shape/shapetransform/tst_bmshapetransform.cpp
index c76220b..c9de5b1 100644
--- a/tests/auto/bodymovin/shape/shapetransform/tst_bmshapetransform.cpp
+++ b/tests/auto/bodymovin/shape/shapetransform/tst_bmshapetransform.cpp
@@ -12,6 +12,8 @@
 #include "private/bmgroup_p.h"
 #include "private/bmshapetransform_p.h"
 
+using namespace Qt::StringLiterals;
+
 class tst_BMShapeTransform: public QObject
 {
     Q_OBJECT
@@ -458,11 +460,7 @@ void tst_BMShapeTransform::loadTestData(const QByteArray &filename)
     if (type != 4)
         QFAIL("It's not shape layer");
 
-    QStringList vs = rootObj.value(QLatin1String("v")).toString().split(u'.');
-    QList<int> vi;
-    foreach (QString v, vs)
-        vi.append(v.toInt());
-    QVersionNumber version = QVersionNumber(vi);
+    const auto version = QVersionNumber::fromString(rootObj.value("v"_L1).toString());
 
     QJsonArray shapes = layerObj.value(QLatin1String("shapes")).toArray();
     QJsonArray::const_iterator shapesIt = shapes.constBegin();
diff --git a/tests/auto/bodymovin/shape/stroke/tst_bmstroke.cpp b/tests/auto/bodymovin/shape/stroke/tst_bmstroke.cpp
index 8b57693..8d6b19c 100644
--- a/tests/auto/bodymovin/shape/stroke/tst_bmstroke.cpp
+++ b/tests/auto/bodymovin/shape/stroke/tst_bmstroke.cpp
@@ -11,6 +11,8 @@
 #include "private/bmlayer_p.h"
 #include "private/bmstroke_p.h"
 
+using namespace Qt::StringLiterals;
+
 class tst_BMStroke: public QObject
 {
     Q_OBJECT
@@ -291,11 +293,7 @@ void tst_BMStroke::loadTestData(const QByteArray &filename)
     if (rootObj.empty())
         QFAIL("Cannot parse test file");
 
-    QStringList vs = rootObj.value(QLatin1String("v")).toString().split(u'.');
-    QList<int> vi;
-    foreach (QString v, vs)
-        vi.append(v.toInt());
-    QVersionNumber version = QVersionNumber(vi);
+    const auto version = QVersionNumber::fromString(rootObj.value("v"_L1).toString());
 
     QJsonArray layers = rootObj.value(QLatin1String("layers")).toArray();
     QJsonObject layerObj = layers[0].toObject();
diff --git a/tests/auto/bodymovin/shape/transform/tst_bmbasictransform.cpp b/tests/auto/bodymovin/shape/transform/tst_bmbasictransform.cpp
index f3c9104..382c6fb 100644
--- a/tests/auto/bodymovin/shape/transform/tst_bmbasictransform.cpp
+++ b/tests/auto/bodymovin/shape/transform/tst_bmbasictransform.cpp
@@ -11,6 +11,8 @@
 #include "private/bmlayer_p.h"
 #include "private/bmbasictransform_p.h"
 
+using namespace Qt::StringLiterals;
+
 class tst_BMBasicTransform: public QObject
 {
     Q_OBJECT
@@ -366,11 +368,7 @@ void tst_BMBasicTransform::loadTestData(const QByteArray &filename)
     if (rootObj.empty())
         QFAIL("Cannot parse test file");
 
-    QStringList vs = rootObj.value(QLatin1String("v")).toString().split(u'.');
-    QList<int> vi;
-    foreach (QString v, vs)
-        vi.append(v.toInt());
-    QVersionNumber version = QVersionNumber(vi);
+    const auto version = QVersionNumber::fromString(rootObj.value("v"_L1).toString());
 
     QJsonArray layers = rootObj.value(QLatin1String("layers")).toArray();
     QJsonObject layerObj = layers[0].toObject();
diff --git a/tests/auto/bodymovin/shape/trimpath/tst_bmtrimpath.cpp b/tests/auto/bodymovin/shape/trimpath/tst_bmtrimpath.cpp
index 5006601..c0b6652 100644
--- a/tests/auto/bodymovin/shape/trimpath/tst_bmtrimpath.cpp
+++ b/tests/auto/bodymovin/shape/trimpath/tst_bmtrimpath.cpp
@@ -11,6 +11,8 @@
 #include "private/bmlayer_p.h"
 #include "private/bmtrimpath_p.h"
 
+using namespace Qt::StringLiterals;
+
 class tst_BMTrimPath: public QObject
 {
     Q_OBJECT
@@ -253,11 +255,7 @@ void tst_BMTrimPath::loadTestData(const QByteArray &filename)
     if (rootObj.empty())
         QFAIL("Cannot parse test file");
 
-    QStringList vs = rootObj.value(QLatin1String("v")).toString().split(u'.');
-    QList<int> vi;
-    foreach (QString v, vs)
-        vi.append(v.toInt());
-    QVersionNumber version = QVersionNumber(vi);
+    const auto version = QVersionNumber::fromString(rootObj.value("v"_L1).toString());
 
     QJsonArray layers = rootObj.value(QLatin1String("layers")).toArray();
     QJsonObject layerObj = layers[0].toObject();