feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TextEditor: Fix build with Qt6

Browse Source 
Adapt to QStringRef and QAbstractItemView::viewOptions() removal

Task-number: QTCREATORBUG-24098
Change-Id: Ia2d446312f68bd60143796284d31f5bba56aa0ed
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Eike Ziller
2020-09-07 14:44:41 +02:00
parent 6b9cad8b05
commit 7aa0b1ea6b
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/texteditor/codeassist/codeassistant.cpp
View File

@@ -400,8 +400,8 @@ void CodeAssistantPrivate::handlePrefixExpansion(const QString &newPrefix)
if (!textAfterCursor.startsWith(newPrefix)) {
if (newPrefix.indexOf(textAfterCursor, currentPosition - m_proposal->basePosition()) >= 0)
currentPosition = cursor.position();
const QStringRef prefixAddition =
newPrefix.midRef(currentPosition - m_proposal->basePosition());
const QStringView prefixAddition = QStringView(newPrefix).mid(currentPosition
- m_proposal->basePosition());
// If remaining string starts with the prefix addition
if (textAfterCursor.startsWith(prefixAddition))
currentPosition += prefixAddition.size();

2
src/plugins/texteditor/codeassist/genericproposalmodel.cpp
View File

@@ -176,7 +176,7 @@ static bool textStartsWith(CaseSensitivity cs, const QString &text, const QStrin
return text.startsWith(prefix, Qt::CaseSensitive);
case TextEditor::FirstLetterCaseSensitive:
return prefix.at(0) == text.at(0)
&& prefix.midRef(1).startsWith(text.midRef(1), Qt::CaseInsensitive);
&& QStringView(prefix).mid(1).startsWith(QStringView(text).mid(1), Qt::CaseInsensitive);
}
return false;

5
src/plugins/texteditor/codeassist/genericproposalwidget.cpp
View File

@@ -95,7 +95,7 @@ QVariant ModelAdapter::data(const QModelIndex &index, int role) const
const int lineBreakPos = text.indexOf('\n');
if (lineBreakPos < 0)
return text;
return QString(text.leftRef(lineBreakPos) + QLatin1String(" (...)"));
return QString(text.left(lineBreakPos) + QLatin1String(" (...)"));
} else if (role == Qt::DecorationRole) {
return m_completionModel->icon(index.row());
} else if (role == Qt::WhatsThisRole) {
@@ -232,10 +232,9 @@ QSize GenericProposalListView::calculateSize() const
const int visibleItems = qMin(model()->rowCount(), maxVisibleItems);
const int firstVisibleRow = verticalScrollBar()->value();
const QStyleOptionViewItem &option = viewOptions();
QSize shint;
for (int i = 0; i < visibleItems; ++i) {
QSize tmp = itemDelegate()->sizeHint(option, model()->index(i + firstVisibleRow, 0));
QSize tmp = sizeHintForIndex(model()->index(i + firstVisibleRow, 0));
if (shint.width() < tmp.width())
shint = tmp;
}

2
src/plugins/texteditor/linenumberfilter.cpp
View File

@@ -62,7 +62,7 @@ void LineNumberFilter::prepareSearch(const QString &entry)
QList<LocatorFilterEntry> LineNumberFilter::matchesFor(QFutureInterface<LocatorFilterEntry> &, const QString &entry)
{
QList<LocatorFilterEntry> value;
const QVector<QStringRef> lineAndColumn = entry.splitRef(':');
const QStringList lineAndColumn = entry.split(':');
int sectionCount = lineAndColumn.size();
int line = 0;
int column = 0;

6
src/plugins/texteditor/texteditor.cpp
View File

@@ -3745,7 +3745,7 @@ QString TextEditorWidgetPrivate::copyBlockSelection()
selection += QString(-startOffset, QLatin1Char(' '));
if (endOffset < 0)
--endPos;
selection += text.midRef(startPos, endPos - startPos);
selection += text.mid(startPos, endPos - startPos);
if (endOffset < 0)
selection += QString(ts.m_tabSize + endOffset, QLatin1Char(' '));
else if (endOffset > 0)
@@ -4622,10 +4622,10 @@ void TextEditorWidgetPrivate::paintReplacement(PaintEventData &data, QPainter &p
if (right.endsWith(QLatin1Char(';'))) {
right.chop(1);
right = right.trimmed();
replacement.append(right.rightRef(right.endsWith('/') ? 2 : 1));
replacement.append(right.right(right.endsWith('/') ? 2 : 1));
replacement.append(QLatin1Char(';'));
} else {
replacement.append(right.rightRef(right.endsWith('/') ? 2 : 1));
replacement.append(right.right(right.endsWith('/') ? 2 : 1));
}
}
}