From 6c108ee0c489dbc9c67b3ff1064f08d30c60d0ea Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 22 May 2020 10:55:41 +0200 Subject: Port QtWidgets from QStringRef to QStringView Change-Id: Ibe348e7aea838ab8c2d628bb43709c867a506637 Reviewed-by: Volker Hilsheimer --- src/widgets/dialogs/qfiledialog.cpp | 10 +++++----- src/widgets/styles/qfusionstyle.cpp | 2 +- src/widgets/styles/qstylesheetstyle.cpp | 2 +- src/widgets/styles/qwindowsstyle.cpp | 2 +- src/widgets/util/qcompleter.cpp | 2 +- src/widgets/widgets/qabstractspinbox.cpp | 2 +- src/widgets/widgets/qcalendarwidget.cpp | 4 ++-- src/widgets/widgets/qlineedit_p.cpp | 2 +- src/widgets/widgets/qtabbar.cpp | 6 +++--- src/widgets/widgets/qtextbrowser.cpp | 2 +- src/widgets/widgets/qwidgetlinecontrol.cpp | 4 ++-- src/widgets/widgets/qwidgettextcontrol.cpp | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src') 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; diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp index dfd979cf7d..3d6c86d20b 100644 --- a/src/widgets/styles/qfusionstyle.cpp +++ b/src/widgets/styles/qfusionstyle.cpp @@ -1697,7 +1697,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio QRect textRect(xpos, y + windowsItemVMargin, w - xm - windowsRightBorder - tab + 1, h - 2 * windowsItemVMargin); QRect vTextRect = visualRect(opt->direction, menuitem->rect, textRect); - QStringRef s(&menuitem->text); + QStringView s(menuitem->text); if (!s.isEmpty()) { // draw text p->save(); int t = s.indexOf(QLatin1Char('\t')); diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index 92fb035b68..a9989dcd3e 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -3781,7 +3781,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q textRect.setWidth(textRect.width() - mi.tabWidth); const QRect vTextRect = visualRect(opt->direction, m->rect, textRect); - QStringRef s(&mi.text); + QStringView s(mi.text); p->setPen(mi.palette.buttonText().color()); if (!s.isEmpty()) { int text_flags = Qt::AlignLeft | Qt::AlignVCenter | Qt::TextShowMnemonic | Qt::TextDontClip | Qt::TextSingleLine; diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp index ae238c8951..c442636e06 100644 --- a/src/widgets/styles/qwindowsstyle.cpp +++ b/src/widgets/styles/qwindowsstyle.cpp @@ -1190,7 +1190,7 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai QRect textRect(xpos, y + QWindowsStylePrivate::windowsItemVMargin, w - xm - QWindowsStylePrivate::windowsRightBorder - tab + 1, h - 2 * QWindowsStylePrivate::windowsItemVMargin); QRect vTextRect = visualRect(opt->direction, menuitem->rect, textRect); - QStringRef s(&menuitem->text); + QStringView s(menuitem->text); if (!s.isEmpty()) { // draw text p->save(); int t = s.indexOf(QLatin1Char('\t')); diff --git a/src/widgets/util/qcompleter.cpp b/src/widgets/util/qcompleter.cpp index 72084ebd8f..7853398a70 100644 --- a/src/widgets/util/qcompleter.cpp +++ b/src/widgets/util/qcompleter.cpp @@ -984,7 +984,7 @@ static bool completeOnLoaded(const QFileSystemModel *model, // The user is typing something within that directory and is not in a subdirectory yet. const auto separator = QLatin1Char('/'); return prefix.startsWith(path, caseSensitivity) && prefix.at(pathSize) == separator - && !prefix.rightRef(prefixSize - pathSize - 1).contains(separator); + && !QStringView{prefix}.right(prefixSize - pathSize - 1).contains(separator); } void QCompleterPrivate::_q_fileSystemModelDirectoryLoaded(const QString &path) diff --git a/src/widgets/widgets/qabstractspinbox.cpp b/src/widgets/widgets/qabstractspinbox.cpp index 2a51bafa01..f7e19ae7c8 100644 --- a/src/widgets/widgets/qabstractspinbox.cpp +++ b/src/widgets/widgets/qabstractspinbox.cpp @@ -1482,7 +1482,7 @@ QStyle::SubControl QAbstractSpinBoxPrivate::newHoverControl(const QPoint &pos) QString QAbstractSpinBoxPrivate::stripped(const QString &t, int *pos) const { - QStringRef text(&t); + QStringView text(t); if (specialValueText.size() == 0 || text != specialValueText) { int from = 0; int size = text.size(); diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp index 9cb107fb8f..331f1bc979 100644 --- a/src/widgets/widgets/qcalendarwidget.cpp +++ b/src/widgets/widgets/qcalendarwidget.cpp @@ -107,7 +107,7 @@ QString QCalendarDateSectionValidator::highlightString(const QString &str, int p if (pos == 0) return QLatin1String("") + str + QLatin1String(""); int startPos = str.length() - pos; - return str.midRef(0, startPos) + QLatin1String("") + str.midRef(startPos, pos) + QLatin1String(""); + return QStringView{str}.mid(0, startPos) + QLatin1String("") + QStringView{str}.mid(startPos, pos) + QLatin1String(""); } @@ -548,7 +548,7 @@ void QCalendarDateValidator::setFormat(const QString &format) bool quoting = false; QString separator; while (pos < format.size()) { - const QStringRef mid = format.midRef(pos); + const QStringView mid = QStringView{format}.mid(pos); int offset = 1; if (mid.startsWith(quote)) { diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp index bd700e09f3..6424c1452c 100644 --- a/src/widgets/widgets/qlineedit_p.cpp +++ b/src/widgets/widgets/qlineedit_p.cpp @@ -106,7 +106,7 @@ void QLineEditPrivate::_q_completionHighlighted(const QString &newText) } else { int c = control->cursor(); QString text = control->text(); - q->setText(text.leftRef(c) + newText.midRef(c)); + q->setText(QStringView{text}.left(c) + QStringView{newText}.mid(c)); control->moveCursor(control->end(), false); #ifndef Q_OS_ANDROID const bool mark = true; diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp index f70cf77fb3..777ff688e2 100644 --- a/src/widgets/widgets/qtabbar.cpp +++ b/src/widgets/widgets/qtabbar.cpp @@ -1539,13 +1539,13 @@ static QString computeElidedText(Qt::TextElideMode mode, const QString &text) QString ret; switch (mode) { case Qt::ElideRight: - ret = text.leftRef(2) + Ellipses; + ret = QStringView{text}.left(2) + Ellipses; break; case Qt::ElideMiddle: - ret = text.leftRef(1) + Ellipses + text.rightRef(1); + ret = QStringView{text}.left(1) + Ellipses + QStringView{text}.right(1); break; case Qt::ElideLeft: - ret = Ellipses + text.rightRef(2); + ret = Ellipses + QStringView{text}.right(2); break; case Qt::ElideNone: ret = text; diff --git a/src/widgets/widgets/qtextbrowser.cpp b/src/widgets/widgets/qtextbrowser.cpp index a7fe0ad2d5..a7a5deec0d 100644 --- a/src/widgets/widgets/qtextbrowser.cpp +++ b/src/widgets/widgets/qtextbrowser.cpp @@ -326,7 +326,7 @@ void QTextBrowserPrivate::setSource(const QUrl &url, QTextDocument::ResourceType qWarning("QTextBrowser: No document for %s", url.toString().toLatin1().constData()); if (q->isVisible()) { - const QStringRef firstTag = txt.leftRef(txt.indexOf(QLatin1Char('>')) + 1); + const QStringView firstTag = QStringView{txt}.left(txt.indexOf(QLatin1Char('>')) + 1); if (firstTag.startsWith(QLatin1String(" 0 && (!m_maskData[i-1].separator || m_maskData[i-1].maskChar != str[(int)strIndex]))) { - s += fill.midRef(i, n - i + 1); + s += QStringView{fill}.mid(i, n - i + 1); i = n + 1; // update i to find + 1 } } else { // search for valid m_blank if not n = findInMask(i, true, false, str[(int)strIndex]); if (n != -1) { - s += fill.midRef(i, n - i); + s += QStringView{fill}.mid(i, n - i); switch (m_maskData[n].caseMode) { case MaskInputData::Upper: s += str[(int)strIndex].toUpper(); diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp index a4823ca8dd..bfcbd6cd18 100644 --- a/src/widgets/widgets/qwidgettextcontrol.cpp +++ b/src/widgets/widgets/qwidgettextcontrol.cpp @@ -2208,7 +2208,7 @@ QVariant QWidgetTextControl::inputMethodQuery(Qt::InputMethodQuery property, QVa tmpCursor.movePosition(QTextCursor::NextBlock); --numBlocks; } - result += block.text().midRef(0, localPos); + result += QStringView{block.text()}.mid(0, localPos); return QVariant(result); } default: -- cgit v1.2.3