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

TextEditor: make it obvious that formats are consumed by setExtraFormats

Browse Source 
... by transforming the parameter to an r value and pass the argument by
std::move.

Change-Id: I6949ee6bbac7d8675fdbbcb62bb4f4c394bb395f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
David Schulz
2019-06-12 14:12:11 +02:00
parent cea75f3ac4
commit c76161e802
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,7 +112,7 @@ void SemanticHighlighter::incrementalApplyExtraAdditionalFormats(
if (nextBlockNumber != blockNumber) if (nextBlockNumber != blockNumber)
break; break;
} }
highlighter->setExtraFormats(b, formats); highlighter->setExtraFormats(b, std::move(formats));
b = b.next(); b = b.next();
++currentBlockNumber; ++currentBlockNumber;
} }

4
src/plugins/texteditor/syntaxhighlighter.cpp
View File

@@ -662,10 +662,10 @@ static bool byStartOfRange(const QTextLayout::FormatRange &range, const QTextLay
return range.start < other.start; return range.start < other.start;
} }
// The formats is passed in by reference in order to prevent unnecessary copying of its items. // The formats is passed in by rvalue reference in order to prevent unnecessary copying of its items.
// After this function returns, the list is modified, and should be considered invalidated! // After this function returns, the list is modified, and should be considered invalidated!
void SyntaxHighlighter::setExtraFormats(const QTextBlock &block, void SyntaxHighlighter::setExtraFormats(const QTextBlock &block,
QVector<QTextLayout::FormatRange> &formats) QVector<QTextLayout::FormatRange> &&formats)
{ {
Q_D(SyntaxHighlighter); Q_D(SyntaxHighlighter);

2
src/plugins/texteditor/syntaxhighlighter.h
View File

@@ -63,7 +63,7 @@ public:
void setDocument(QTextDocument *doc); void setDocument(QTextDocument *doc);
QTextDocument *document() const; QTextDocument *document() const;
void setExtraFormats(const QTextBlock &block, QVector<QTextLayout::FormatRange> &formats); void setExtraFormats(const QTextBlock &block, QVector<QTextLayout::FormatRange> &&formats);
void clearExtraFormats(const QTextBlock &block); void clearExtraFormats(const QTextBlock &block);
static QList<QColor> generateColors(int n, const QColor &background); static QList<QColor> generateColors(int n, const QColor &background);