diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-05-22 10:55:41 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-06-10 07:08:57 +0000 |
| commit | 6c108ee0c489dbc9c67b3ff1064f08d30c60d0ea (patch) | |
| tree | 3dd751a5533bfb2819ee931531e14565f982c818 /src/widgets/dialogs | |
| parent | be61790a9ec7366aaddaaf8531dfe5e590c0f23c (diff) | |
Port QtWidgets from QStringRef to QStringView
Change-Id: Ibe348e7aea838ab8c2d628bb43709c867a506637
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/widgets/dialogs')
| -rw-r--r-- | src/widgets/dialogs/qfiledialog.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index 28153baceb..acc59c40dc 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -1151,12 +1151,12 @@ Q_AUTOTEST_EXPORT QString qt_tildeExpansion(const QString &path) if (separatorPosition < 0) separatorPosition = path.size(); if (separatorPosition == 1) { - return QDir::homePath() + path.midRef(1); + return QDir::homePath() + QStringView{path}.mid(1); } else { #if defined(Q_OS_VXWORKS) || defined(Q_OS_INTEGRITY) const QString homePath = QDir::homePath(); #else - const QByteArray userName = path.midRef(1, separatorPosition - 1).toLocal8Bit(); + const QByteArray userName = QStringView{path}.mid(1, separatorPosition - 1).toLocal8Bit(); # if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_WASM) passwd pw; passwd *tmpPw; @@ -1178,7 +1178,7 @@ Q_AUTOTEST_EXPORT QString qt_tildeExpansion(const QString &path) const QString homePath = QString::fromLocal8Bit(pw->pw_dir); # endif #endif - return homePath + path.midRef(separatorPosition); + return homePath + QStringView{path}.mid(separatorPosition); } } #endif @@ -4051,11 +4051,11 @@ QString QFileDialogPrivate::getEnvironmentVariable(const QString &string) { #ifdef Q_OS_UNIX if (string.size() > 1 && string.startsWith(QLatin1Char('$'))) { - return QString::fromLocal8Bit(qgetenv(string.midRef(1).toLatin1().constData())); + return QString::fromLocal8Bit(qgetenv(QStringView{string}.mid(1).toLatin1().constData())); } #else if (string.size() > 2 && string.startsWith(QLatin1Char('%')) && string.endsWith(QLatin1Char('%'))) { - return QString::fromLocal8Bit(qgetenv(string.midRef(1, string.size() - 2).toLatin1().constData())); + return QString::fromLocal8Bit(qgetenv(QStringView{string}.mid(1, string.size() - 2).toLatin1().constData())); } #endif return string; |