From c76161e802026c902684841ea81d353b597875b4 Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@qt.io>
Date: Wed, 12 Jun 2019 14:12:11 +0200
Subject: [PATCH] TextEditor: make it obvious that formats are consumed by
 setExtraFormats

... 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>
---
 src/plugins/texteditor/semantichighlighter.cpp | 2 +-
 src/plugins/texteditor/syntaxhighlighter.cpp   | 4 ++--
 src/plugins/texteditor/syntaxhighlighter.h     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/texteditor/semantichighlighter.cpp b/src/plugins/texteditor/semantichighlighter.cpp
index 9dded606ba5..17cfc1374bd 100644
--- a/src/plugins/texteditor/semantichighlighter.cpp
+++ b/src/plugins/texteditor/semantichighlighter.cpp
@@ -112,7 +112,7 @@ void SemanticHighlighter::incrementalApplyExtraAdditionalFormats(
             if (nextBlockNumber != blockNumber)
                 break;
         }
-        highlighter->setExtraFormats(b, formats);
+        highlighter->setExtraFormats(b, std::move(formats));
         b = b.next();
         ++currentBlockNumber;
     }
diff --git a/src/plugins/texteditor/syntaxhighlighter.cpp b/src/plugins/texteditor/syntaxhighlighter.cpp
index 06802461350..8f7f1f153e6 100644
--- a/src/plugins/texteditor/syntaxhighlighter.cpp
+++ b/src/plugins/texteditor/syntaxhighlighter.cpp
@@ -662,10 +662,10 @@ static bool byStartOfRange(const QTextLayout::FormatRange &range, const QTextLay
     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!
 void SyntaxHighlighter::setExtraFormats(const QTextBlock &block,
-                                        QVector<QTextLayout::FormatRange> &formats)
+                                        QVector<QTextLayout::FormatRange> &&formats)
 {
     Q_D(SyntaxHighlighter);
 
diff --git a/src/plugins/texteditor/syntaxhighlighter.h b/src/plugins/texteditor/syntaxhighlighter.h
index f55b9f9f004..bbd23a77d41 100644
--- a/src/plugins/texteditor/syntaxhighlighter.h
+++ b/src/plugins/texteditor/syntaxhighlighter.h
@@ -63,7 +63,7 @@ public:
     void setDocument(QTextDocument *doc);
     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);
 
     static QList<QColor> generateColors(int n, const QColor &background);