From f8ae0518164071c1c9c2b15780faf5761c630798 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 18 Sep 2020 13:16:55 +0200 Subject: [PATCH] VCS: Fix build with Qt6 QStringRef is gone. Task-number: QTCREATORBUG-24098 Change-Id: I38dd1602294fcabf5cf7c1553bcfd93f3c47b601 Reviewed-by: hjk Reviewed-by: Orgad Shaneh --- src/plugins/clearcase/clearcaseplugin.cpp | 2 +- src/plugins/clearcase/clearcasesync.cpp | 2 +- src/plugins/cvs/cvsutils.cpp | 2 +- src/plugins/git/branchmodel.cpp | 2 +- src/plugins/git/gerrit/gerritpushdialog.cpp | 2 +- src/plugins/git/giteditor.cpp | 4 ++-- src/plugins/git/gitgrep.cpp | 6 +++--- src/plugins/git/stashdialog.cpp | 2 +- src/plugins/vcsbase/vcsbaseeditor.cpp | 13 +++++++------ 9 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index 799aec9acf5..c8b03dea0db 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -1304,7 +1304,7 @@ void ClearCasePluginPrivate::diffActivity() // pre-first version. only for the first occurrence if (filever[file].first.isEmpty()) { int verpos = shortver.lastIndexOf(QRegularExpression("[^0-9]")) + 1; - int vernum = shortver.midRef(verpos).toInt(); + int vernum = shortver.mid(verpos).toInt(); if (vernum) --vernum; shortver.replace(verpos, shortver.length() - verpos, QString::number(vernum)); diff --git a/src/plugins/clearcase/clearcasesync.cpp b/src/plugins/clearcase/clearcasesync.cpp index a5f81b06c75..e6eaca528a0 100644 --- a/src/plugins/clearcase/clearcasesync.cpp +++ b/src/plugins/clearcase/clearcasesync.cpp @@ -93,7 +93,7 @@ void ClearCaseSync::processCleartoolLsLine(const QDir &viewRootDir, const QStrin QTC_CHECK(!absFile.isEmpty()); const QRegularExpression reState("^\\s*\\[[^\\]]*\\]"); // [hijacked]; [loaded but missing] - const QRegularExpressionMatch match = reState.match(buffer.midRef(wspos + 1)); + const QRegularExpressionMatch match = reState.match(buffer.mid(wspos + 1)); if (match.hasMatch()) { const QString ccState = match.captured(); if (ccState.indexOf("hijacked") != -1) diff --git a/src/plugins/cvs/cvsutils.cpp b/src/plugins/cvs/cvsutils.cpp index c005141cec0..bba1e508b31 100644 --- a/src/plugins/cvs/cvsutils.cpp +++ b/src/plugins/cvs/cvsutils.cpp @@ -222,7 +222,7 @@ QString previousRevision(const QString &rev) const int dotPos = rev.lastIndexOf(QLatin1Char('.')); if (dotPos == -1) return rev; - const int minor = rev.midRef(dotPos + 1).toInt(); + const int minor = rev.mid(dotPos + 1).toInt(); return rev.left(dotPos + 1) + QString::number(minor - 1); } diff --git a/src/plugins/git/branchmodel.cpp b/src/plugins/git/branchmodel.cpp index 6efe47f1a9b..61607903840 100644 --- a/src/plugins/git/branchmodel.cpp +++ b/src/plugins/git/branchmodel.cpp @@ -784,7 +784,7 @@ void BranchModel::Private::parseOutputLine(const QString &line, bool force) if (strDateTime.isEmpty()) strDateTime = lineParts.at(4); if (!strDateTime.isEmpty()) { - const qint64 timeT = strDateTime.leftRef(strDateTime.indexOf(' ')).toLongLong(); + const qint64 timeT = strDateTime.left(strDateTime.indexOf(' ')).toLongLong(); dateTime = QDateTime::fromSecsSinceEpoch(timeT); } diff --git a/src/plugins/git/gerrit/gerritpushdialog.cpp b/src/plugins/git/gerrit/gerritpushdialog.cpp index 8330288b6b7..8c56dbcae67 100644 --- a/src/plugins/git/gerrit/gerritpushdialog.cpp +++ b/src/plugins/git/gerrit/gerritpushdialog.cpp @@ -117,7 +117,7 @@ void GerritPushDialog::initRemoteBranches() continue; const QString ref = entries.at(0).mid(remotesPrefix.size()); int refBranchIndex = ref.indexOf('/'); - qint64 timeT = entries.at(1).leftRef(entries.at(1).indexOf(' ')).toLongLong(); + qint64 timeT = entries.at(1).left(entries.at(1).indexOf(' ')).toLongLong(); BranchDate bd(ref.mid(refBranchIndex + 1), QDateTime::fromSecsSinceEpoch(timeT).date()); m_remoteBranches.insertMulti(ref.left(refBranchIndex), bd); } diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp index 404dd28d506..6b25e3afaa6 100644 --- a/src/plugins/git/giteditor.cpp +++ b/src/plugins/git/giteditor.cpp @@ -186,8 +186,8 @@ static QString sanitizeBlameOutput(const QString &b) forever { QTC_CHECK(prevPos < pos); int afterParen = prevPos + parenPos; - result.append(b.midRef(prevPos, stripPos)); - result.append(b.midRef(afterParen, pos - afterParen)); + result.append(b.mid(prevPos, stripPos)); + result.append(b.mid(afterParen, pos - afterParen)); prevPos = pos; QTC_CHECK(prevPos != 0); if (pos == b.size()) diff --git a/src/plugins/git/gitgrep.cpp b/src/plugins/git/gitgrep.cpp index 4d3d2256501..4a47d808993 100644 --- a/src/plugins/git/gitgrep.cpp +++ b/src/plugins/git/gitgrep.cpp @@ -108,7 +108,7 @@ public: filePath.remove(0, m_ref.length()); single.fileName = m_directory + '/' + filePath; const int textSeparator = line.indexOf(QChar::Null, lineSeparator + 1); - single.lineNumber = line.midRef(lineSeparator + 1, textSeparator - lineSeparator - 1).toInt(); + single.lineNumber = line.mid(lineSeparator + 1, textSeparator - lineSeparator - 1).toInt(); QString text = line.mid(textSeparator + 1); QRegularExpression regexp; QVector matches; @@ -128,11 +128,11 @@ public: QTC_ASSERT(matchEnd != -1, break); const int matchLength = matchEnd - matchTextStart; Match match(matchStart, matchLength); - const QStringRef matchText = text.midRef(matchTextStart, matchLength); + const QString matchText = text.mid(matchTextStart, matchLength); if (m_parameters.flags & FindRegularExpression) match.regexpCapturedTexts = regexp.match(matchText).capturedTexts(); matches.append(match); - text = text.leftRef(matchStart) + matchText + text.midRef(matchEnd + resetColor.size()); + text = text.left(matchStart) + matchText + text.mid(matchEnd + resetColor.size()); } single.matchingLine = text; diff --git a/src/plugins/git/stashdialog.cpp b/src/plugins/git/stashdialog.cpp index f33791549e8..fcef1a945b0 100644 --- a/src/plugins/git/stashdialog.cpp +++ b/src/plugins/git/stashdialog.cpp @@ -229,7 +229,7 @@ static inline QString nextStash(const QString &stash) if (closingBracePos == -1) return QString(); bool ok; - const int n = stash.midRef(openingBracePos + 1, closingBracePos - openingBracePos - 1).toInt(&ok); + const int n = stash.mid(openingBracePos + 1, closingBracePos - openingBracePos - 1).toInt(&ok); if (!ok) return QString(); QString rc = stash.left(openingBracePos + 1); diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp index 752be68db26..8b62ddb0850 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.cpp +++ b/src/plugins/vcsbase/vcsbaseeditor.cpp @@ -31,19 +31,20 @@ #include "vcsbaseeditorconfig.h" #include "vcscommand.h" -#include -#include -#include #include #include +#include +#include +#include #include #include #include -#include #include +#include #include #include #include +#include #include #include @@ -1564,8 +1565,8 @@ void VcsBaseEditorWidget::addChangeActions(QMenu *, const QString &) QSet VcsBaseEditorWidget::annotationChanges() const { QSet changes; - QString text = toPlainText(); - QStringRef txt(&text); + const QString text = toPlainText(); + StringView txt = make_stringview(text); if (txt.isEmpty()) return changes; if (!d->m_annotationSeparatorPattern.pattern().isEmpty()) {