Improve documentation for QMesh

Also use QRegularExpression instead of the older QRegEx
in the obj loader

Change-Id: I031f98a718d81e9baeba7aeb6e3482bb22d5643f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/src/plugins/geometryloaders/default/objgeometryloader.cpp b/src/plugins/geometryloaders/default/objgeometryloader.cpp
index ad1bde7d4..ab2f17712 100644
--- a/src/plugins/geometryloaders/default/objgeometryloader.cpp
+++ b/src/plugins/geometryloaders/default/objgeometryloader.cpp
@@ -40,6 +40,7 @@
 #include "objgeometryloader.h"
 
 #include <QtCore/QLoggingCategory>
+#include <QtCore/QRegularExpression>
 
 QT_BEGIN_NAMESPACE
 
@@ -77,7 +78,7 @@ bool ObjGeometryLoader::doLoad(QIODevice *ioDev, const QString &subMesh)
     int normalsOffset = 0;
     int texCoordsOffset = 0;
 
-    QRegExp subMeshMatch(subMesh);
+    QRegularExpression subMeshMatch(subMesh);
     if (!subMeshMatch.isValid())
         subMeshMatch.setPattern(QLatin1String("^(") + subMesh + QLatin1String(")$"));
     Q_ASSERT(subMeshMatch.isValid());
@@ -196,7 +197,8 @@ bool ObjGeometryLoader::doLoad(QIODevice *ioDev, const QString &subMesh)
                 } else {
                     if (!subMesh.isEmpty() ) {
                         const QString objName = tokens.stringAt(1);
-                        skipping = subMeshMatch.indexIn(objName) < 0;
+                        QRegularExpressionMatch match = subMeshMatch.match(objName);
+                        skipping = !match.hasMatch();
                     }
                 }
             }