diff options
| author | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-06-16 10:23:19 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-06-16 22:46:16 +0200 |
| commit | 1b10ce6a08edbc2ac7e8fd7e97e3fc691f2081df (patch) | |
| tree | 34ab485d1dd9435369709b5e77c11af6dec78c22 /src/qml/qmldirparser | |
| parent | b65eee039092fa664e781cdd98a4bb5e66815218 (diff) | |
Port QtDeclarative from QStringRef to QStringView
Task-number: QTBUG-84319
Change-Id: I2dcfb8a2db98282c7a1acdad1e6f4f949f26df15
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/qml/qmldirparser')
| -rw-r--r-- | src/qml/qmldirparser/qqmldirparser.cpp | 6 | ||||
| -rw-r--r-- | src/qml/qmldirparser/qqmlimportresolver.cpp | 6 | ||||
| -rw-r--r-- | src/qml/qmldirparser/qqmlimportresolver_p.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/qml/qmldirparser/qqmldirparser.cpp b/src/qml/qmldirparser/qqmldirparser.cpp index a8a450d2ca..e4d916a10f 100644 --- a/src/qml/qmldirparser/qqmldirparser.cpp +++ b/src/qml/qmldirparser/qqmldirparser.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -static int parseInt(const QStringRef &str, bool *ok) +static int parseInt(QStringView str, bool *ok) { int pos = 0; int number = 0; @@ -65,9 +65,9 @@ static QTypeRevision parseVersion(const QString &str) const int dotIndex = str.indexOf(QLatin1Char('.')); if (dotIndex != -1 && str.indexOf(QLatin1Char('.'), dotIndex + 1) == -1) { bool ok = false; - const int major = parseInt(QStringRef(&str, 0, dotIndex), &ok); + const int major = parseInt(QStringView(str).left(dotIndex), &ok); if (!ok) return QTypeRevision(); - const int minor = parseInt(QStringRef(&str, dotIndex + 1, str.length() - dotIndex - 1), &ok); + const int minor = parseInt(QStringView(str).mid(dotIndex + 1, str.length() - dotIndex - 1), &ok); return ok ? QTypeRevision::fromVersion(major, minor) : QTypeRevision(); } return QTypeRevision(); diff --git a/src/qml/qmldirparser/qqmlimportresolver.cpp b/src/qml/qmldirparser/qqmlimportresolver.cpp index d427706140..25b366556d 100644 --- a/src/qml/qmldirparser/qqmlimportresolver.cpp +++ b/src/qml/qmldirparser/qqmlimportresolver.cpp @@ -54,13 +54,13 @@ enum ImportVersion { FullyVersioned, PartiallyVersioned, Unversioned }; - base/QtQml.2/Models - base/QtQml/Models */ -QStringList qQmlResolveImportPaths(const QString &uri, const QStringList &basePaths, +QStringList qQmlResolveImportPaths(QStringView uri, const QStringList &basePaths, QTypeRevision version) { static const QLatin1Char Slash('/'); static const QLatin1Char Backslash('\\'); - const QVector<QStringRef> parts = uri.splitRef(QLatin1Char('.'), Qt::SkipEmptyParts); + const QVector<QStringView> parts = uri.split(u'.', Qt::SkipEmptyParts); QStringList importPaths; // fully & partially versioned parts + 1 unversioned for each base path @@ -81,7 +81,7 @@ QStringList qQmlResolveImportPaths(const QString &uri, const QStringList &basePa return QString(); }; - auto joinStringRefs = [](const QVector<QStringRef> &refs, const QChar &sep) { + auto joinStringRefs = [](const QVector<QStringView> &refs, const QChar &sep) { QString str; for (auto it = refs.cbegin(); it != refs.cend(); ++it) { if (it != refs.cbegin()) diff --git a/src/qml/qmldirparser/qqmlimportresolver_p.h b/src/qml/qmldirparser/qqmlimportresolver_p.h index bfc0592bf8..c2f49ee4ec 100644 --- a/src/qml/qmldirparser/qqmlimportresolver_p.h +++ b/src/qml/qmldirparser/qqmlimportresolver_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE -QStringList qQmlResolveImportPaths(const QString &uri, const QStringList &basePaths, +QStringList qQmlResolveImportPaths(QStringView uri, const QStringList &basePaths, QTypeRevision version); QT_END_NAMESPACE |