From e9291b11947a6fa7a652c8808c7d3aca82c11536 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Tue, 25 Feb 2020 15:52:27 +0100 Subject: 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 --- src/plugins/geometryloaders/default/basegeometryloader_p.h | 6 +++--- src/plugins/geometryloaders/default/objgeometryloader.cpp | 4 ++-- src/plugins/geometryloaders/default/stlgeometryloader.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/plugins/geometryloaders/default/basegeometryloader_p.h b/src/plugins/geometryloaders/default/basegeometryloader_p.h index 0fe1e2763..a5a450525 100644 --- a/src/plugins/geometryloaders/default/basegeometryloader_p.h +++ b/src/plugins/geometryloaders/default/basegeometryloader_p.h @@ -168,14 +168,14 @@ QT3D_DECLARE_TYPEINFO(Qt3DRender, ByteArraySplitterEntry, Q_PRIMITIVE_TYPE) class ByteArraySplitter { public: - explicit ByteArraySplitter(const char *begin, const char *end, char delimiter, QString::SplitBehavior splitBehavior) + explicit ByteArraySplitter(const char *begin, const char *end, char delimiter, Qt::SplitBehavior splitBehavior) : m_input(begin) { int position = 0; int lastPosition = 0; for (auto it = begin; it != end; ++it) { if (*it == delimiter) { - if (position > lastPosition || splitBehavior == QString::KeepEmptyParts) { // skip multiple consecutive delimiters + if (position > lastPosition || splitBehavior == Qt::KeepEmptyParts) { // skip multiple consecutive delimiters const ByteArraySplitterEntry entry = { lastPosition, position - lastPosition }; m_entries.append(entry); } @@ -214,7 +214,7 @@ public: return QString::fromLatin1(m_input + m_entries[index].start, m_entries[index].size); } - ByteArraySplitter splitterAt(int index, char delimiter, QString::SplitBehavior splitBehavior) const + ByteArraySplitter splitterAt(int index, char delimiter, Qt::SplitBehavior splitBehavior) const { return ByteArraySplitter(m_input + m_entries[index].start, m_input + m_entries[index].start + m_entries[index].size, delimiter, splitBehavior); } 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 diff --git a/src/plugins/geometryloaders/default/stlgeometryloader.cpp b/src/plugins/geometryloaders/default/stlgeometryloader.cpp index 4af3d23b6..a40cbb8a3 100644 --- a/src/plugins/geometryloaders/default/stlgeometryloader.cpp +++ b/src/plugins/geometryloaders/default/stlgeometryloader.cpp @@ -79,7 +79,7 @@ bool StlGeometryLoader::loadAscii(QIODevice *ioDev) const char *begin = lineBuffer.constData(); const char *end = begin + lineBuffer.size(); - const ByteArraySplitter tokens(begin, end, ' ', QString::SkipEmptyParts); + const ByteArraySplitter tokens(begin, end, ' ', Qt::SkipEmptyParts); if (qstrncmp(tokens.charPtrAt(0), "vertex ", 7) == 0) { if (tokens.size() < 4) { -- cgit v1.2.3