diff options
| -rw-r--r-- | src/imports/platform/qquickplatformfiledialog.cpp | 14 | ||||
| -rw-r--r-- | tests/auto/sanity/tst_sanity.cpp | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/imports/platform/qquickplatformfiledialog.cpp b/src/imports/platform/qquickplatformfiledialog.cpp index 128e9429..c15625e6 100644 --- a/src/imports/platform/qquickplatformfiledialog.cpp +++ b/src/imports/platform/qquickplatformfiledialog.cpp @@ -610,21 +610,21 @@ static QString extractName(const QString &filter) return filter.left(filter.indexOf(QLatin1Char('(')) - 1); } -static QString extractExtension(const QString &filter) +static QString extractExtension(QStringView filter) { - return filter.mid(filter.indexOf(QLatin1Char('.')) + 1); + return filter.mid(filter.indexOf(QLatin1Char('.')) + 1).toString(); } -static QStringList extractExtensions(const QString &filter) +static QStringList extractExtensions(QStringView filter) { QStringList extensions; const int from = filter.indexOf(QLatin1Char('(')); const int to = filter.lastIndexOf(QLatin1Char(')')) - 1; if (from >= 0 && from < to) { - const QStringRef ref = filter.midRef(from + 1, to - from); - const QList<QStringRef> exts = ref.split(QLatin1Char(' '), Qt::SkipEmptyParts); - for (const QStringRef &ref : exts) - extensions += extractExtension(ref.toString()); + const QStringView ref = filter.mid(from + 1, to - from); + const QVector<QStringView> exts = ref.split(QLatin1Char(' '), Qt::SkipEmptyParts); + for (const QStringView &ref : exts) + extensions += extractExtension(ref); } return extensions; diff --git a/tests/auto/sanity/tst_sanity.cpp b/tests/auto/sanity/tst_sanity.cpp index b5d0054b..35c48970 100644 --- a/tests/auto/sanity/tst_sanity.cpp +++ b/tests/auto/sanity/tst_sanity.cpp @@ -211,9 +211,9 @@ void tst_Sanity::functions_data() class SignalHandlerValidator : public BaseValidator { protected: - static bool isSignalHandler(const QStringRef &name) + static bool isSignalHandler(QStringView name) { - return name.length() > 2 && name.startsWith("on") && name.at(2).isUpper(); + return name.length() > 2 && name.startsWith(QLatin1String("on")) && name.at(2).isUpper(); } virtual bool visit(QQmlJS::AST::UiScriptBinding *node) |