summaryrefslogtreecommitdiffstats
path: root/src/plugins/geometryloaders/default/objgeometryloader.cpp
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-02-25 15:52:27 +0100
committerEdward Welbourne <edward.welbourne@qt.io>2020-02-27 10:02:27 +0100
commite9291b11947a6fa7a652c8808c7d3aca82c11536 (patch)
treebc29814ec497f5cc481ba640decc1c8e4594164b /src/plugins/geometryloaders/default/objgeometryloader.cpp
parent0920fab4a5a59dad619c72176517b8192d509c9b (diff)
Use Qt::SplitBehavior in preference to QString::SplitBehavior
The Qt version was added in 5.14 "for use as eventual replacement for QString::SplitBehavior." Move another step closer to that goal. Change-Id: I685be5c4f16e7acfb38deafe3b92cfadb3a42188 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/plugins/geometryloaders/default/objgeometryloader.cpp')
-rw-r--r--src/plugins/geometryloaders/default/objgeometryloader.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/geometryloaders/default/objgeometryloader.cpp b/src/plugins/geometryloaders/default/objgeometryloader.cpp
index 54b7bc710..c0bd18563 100644
--- a/src/plugins/geometryloaders/default/objgeometryloader.cpp
+++ b/src/plugins/geometryloaders/default/objgeometryloader.cpp
@@ -105,7 +105,7 @@ bool ObjGeometryLoader::doLoad(QIODevice *ioDev, const QString &subMesh)
while (line[lineSize - 1] == ' ' || line[lineSize - 1] == '\t')
--lineSize; // chop trailing spaces
- const ByteArraySplitter tokens(line, line + lineSize, ' ', QString::SkipEmptyParts);
+ const ByteArraySplitter tokens(line, line + lineSize, ' ', Qt::SkipEmptyParts);
if (qstrncmp(tokens.charPtrAt(0), "v ", 2) == 0) {
if (tokens.size() < 4) {
@@ -155,7 +155,7 @@ bool ObjGeometryLoader::doLoad(QIODevice *ioDev, const QString &subMesh)
for (int i = 0; i < faceVertices; i++) {
FaceIndices faceIndices;
- const ByteArraySplitter indices = tokens.splitterAt(i + 1, '/', QString::KeepEmptyParts);
+ const ByteArraySplitter indices = tokens.splitterAt(i + 1, '/', Qt::KeepEmptyParts);
switch (indices.size()) {
case 3:
faceIndices.normalIndex = indices.intAt(2) - 1 - normalsOffset; // fall through