TextEditor: Fix typo in a TextDocumentLayout function

Change-Id: I17153d9bfe9820f3ccc88f54bce1d494a522be33
Reviewed-by: David Schulz <david.schulz@qt.io>

11 files changed, 31 insertions, 31 deletions

diff --git a/src/plugins/cppeditor/cpphighlighter.cpp b/src/plugins/cppeditor/cpphighlighter.cpp
index 681ba51ce3..5abfe71a26 100644
--- a/src/plugins/cppeditor/cpphighlighter.cpp
+++ b/src/plugins/cppeditor/cpphighlighter.cpp
@@ -65,7 +65,7 @@ void CppHighlighter::highlightBlock(const QString &text)
 
     initialLexerState &= ~0x80; // discard newline expected bit
     int foldingIndent = initialBraceDepth;
-    if (TextBlockUserData *userData = TextDocumentLayout::testUserData(currentBlock())) {
+    if (TextBlockUserData *userData = TextDocumentLayout::textUserData(currentBlock())) {
         userData->setFoldingIndent(0);
         userData->setFoldingStartIncluded(false);
         userData->setFoldingEndIncluded(false);
diff --git a/src/plugins/cpptools/cppcodeformatter.cpp b/src/plugins/cpptools/cppcodeformatter.cpp
index 413a5fde7b..170bf4c61c 100644
--- a/src/plugins/cpptools/cppcodeformatter.cpp
+++ b/src/plugins/cpptools/cppcodeformatter.cpp
@@ -1132,7 +1132,7 @@ void QtStyleCodeFormatter::saveBlockData(QTextBlock *block, const BlockData &dat
 
 bool QtStyleCodeFormatter::loadBlockData(const QTextBlock &block, BlockData *data) const
 {
-    TextBlockUserData *userData = TextDocumentLayout::testUserData(block);
+    TextBlockUserData *userData = TextDocumentLayout::textUserData(block);
     if (!userData)
         return false;
     auto cppData = static_cast<const CppCodeFormatterData *>(userData->codeFormatterData());
diff --git a/src/plugins/glsleditor/glslhighlighter.cpp b/src/plugins/glsleditor/glslhighlighter.cpp
index 417525dac6..c21e2ab1dc 100644
--- a/src/plugins/glsleditor/glslhighlighter.cpp
+++ b/src/plugins/glsleditor/glslhighlighter.cpp
@@ -77,7 +77,7 @@ void GlslHighlighter::highlightBlock(const QString &text)
     state = lex.state(); // refresh the state
 
     int foldingIndent = initialBraceDepth;
-    if (TextBlockUserData *userData = TextDocumentLayout::testUserData(currentBlock())) {
+    if (TextBlockUserData *userData = TextDocumentLayout::textUserData(currentBlock())) {
         userData->setFoldingIndent(0);
         userData->setFoldingStartIncluded(false);
         userData->setFoldingEndIncluded(false);
diff --git a/src/plugins/qmljseditor/qmljshighlighter.cpp b/src/plugins/qmljseditor/qmljshighlighter.cpp
index 6d81ea8d1d..afab8ab3c7 100644
--- a/src/plugins/qmljseditor/qmljshighlighter.cpp
+++ b/src/plugins/qmljseditor/qmljshighlighter.cpp
@@ -287,7 +287,7 @@ int QmlJSHighlighter::onBlockStart()
     m_braceDepth = 0;
     m_foldingIndent = 0;
     m_inMultilineComment = false;
-    if (TextBlockUserData *userData = TextDocumentLayout::testUserData(currentBlock())) {
+    if (TextBlockUserData *userData = TextDocumentLayout::textUserData(currentBlock())) {
         userData->setFoldingIndent(0);
         userData->setFoldingStartIncluded(false);
         userData->setFoldingEndIncluded(false);
diff --git a/src/plugins/qmljstools/qmljsqtstylecodeformatter.cpp b/src/plugins/qmljstools/qmljsqtstylecodeformatter.cpp
index ece0d5fa1b..87e668eb05 100644
--- a/src/plugins/qmljstools/qmljsqtstylecodeformatter.cpp
+++ b/src/plugins/qmljstools/qmljsqtstylecodeformatter.cpp
@@ -52,7 +52,7 @@ void CreatorCodeFormatter::saveBlockData(QTextBlock *block, const BlockData &dat
 
 bool CreatorCodeFormatter::loadBlockData(const QTextBlock &block, BlockData *data) const
 {
-    TextBlockUserData *userData = TextDocumentLayout::testUserData(block);
+    TextBlockUserData *userData = TextDocumentLayout::textUserData(block);
     if (!userData)
         return false;
     auto cppData = static_cast<const QmlJSCodeFormatterData *>(userData->codeFormatterData());
diff --git a/src/plugins/texteditor/highlighter.cpp b/src/plugins/texteditor/highlighter.cpp
index dc7d492592..29bc705be9 100644
--- a/src/plugins/texteditor/highlighter.cpp
+++ b/src/plugins/texteditor/highlighter.cpp
@@ -306,7 +306,7 @@ void Highlighter::highlightBlock(const QString &text)
     QTextBlock block = currentBlock();
     KSyntaxHighlighting::State state;
     TextDocumentLayout::setBraceDepth(block, TextDocumentLayout::braceDepth(block.previous()));
-    if (TextBlockUserData *data = TextDocumentLayout::testUserData(block)) {
+    if (TextBlockUserData *data = TextDocumentLayout::textUserData(block)) {
         state = data->syntaxState();
         data->setFoldingStartIncluded(false);
         data->setFoldingEndIncluded(false);
diff --git a/src/plugins/texteditor/textdocument.cpp b/src/plugins/texteditor/textdocument.cpp
index 4b2e09caf9..07641e86b8 100644
--- a/src/plugins/texteditor/textdocument.cpp
+++ b/src/plugins/texteditor/textdocument.cpp
@@ -517,7 +517,7 @@ void TextDocument::setIndenter(Indenter *indenter)
 {
     // clear out existing code formatter data
     for (QTextBlock it = document()->begin(); it.isValid(); it = it.next()) {
-        TextBlockUserData *userData = TextDocumentLayout::testUserData(it);
+        TextBlockUserData *userData = TextDocumentLayout::textUserData(it);
         if (userData)
             userData->setCodeFormatterData(nullptr);
     }
@@ -988,7 +988,7 @@ TextMarks TextDocument::marksAt(int line) const
     QTextBlock block = d->m_document.findBlockByNumber(blockNumber);
 
     if (block.isValid()) {
-        if (TextBlockUserData *userData = TextDocumentLayout::testUserData(block))
+        if (TextBlockUserData *userData = TextDocumentLayout::textUserData(block))
             return userData->marks();
     }
     return TextMarks();
@@ -1069,7 +1069,7 @@ void TextDocument::updateMark(TextMark *mark)
 void TextDocument::moveMark(TextMark *mark, int previousLine)
 {
     QTextBlock block = d->m_document.findBlockByNumber(previousLine - 1);
-    if (TextBlockUserData *data = TextDocumentLayout::testUserData(block)) {
+    if (TextBlockUserData *data = TextDocumentLayout::textUserData(block)) {
         if (!data->removeMark(mark))
             qDebug() << "Could not find mark" << mark << "on line" << previousLine;
     }
diff --git a/src/plugins/texteditor/textdocumentlayout.cpp b/src/plugins/texteditor/textdocumentlayout.cpp
index a692c5e81c..a2f292e9c7 100644
--- a/src/plugins/texteditor/textdocumentlayout.cpp
+++ b/src/plugins/texteditor/textdocumentlayout.cpp
@@ -388,7 +388,7 @@ TextDocumentLayout::~TextDocumentLayout()
 void TextDocumentLayout::setParentheses(const QTextBlock &block, const Parentheses &parentheses)
 {
     if (parentheses.isEmpty()) {
-        if (TextBlockUserData *userData = testUserData(block))
+        if (TextBlockUserData *userData = textUserData(block))
             userData->clearParentheses();
     } else {
         userData(block)->setParentheses(parentheses);
@@ -397,14 +397,14 @@ void TextDocumentLayout::setParentheses(const QTextBlock &block, const Parenthes
 
 Parentheses TextDocumentLayout::parentheses(const QTextBlock &block)
 {
-    if (TextBlockUserData *userData = testUserData(block))
+    if (TextBlockUserData *userData = textUserData(block))
         return userData->parentheses();
     return Parentheses();
 }
 
 bool TextDocumentLayout::hasParentheses(const QTextBlock &block)
 {
-    if (TextBlockUserData *userData = testUserData(block))
+    if (TextBlockUserData *userData = textUserData(block))
         return userData->hasParentheses();
     return false;
 }
@@ -416,21 +416,21 @@ bool TextDocumentLayout::setIfdefedOut(const QTextBlock &block)
 
 bool TextDocumentLayout::clearIfdefedOut(const QTextBlock &block)
 {
-    if (TextBlockUserData *userData = testUserData(block))
+    if (TextBlockUserData *userData = textUserData(block))
         return userData->clearIfdefedOut();
     return false;
 }
 
 bool TextDocumentLayout::ifdefedOut(const QTextBlock &block)
 {
-    if (TextBlockUserData *userData = testUserData(block))
+    if (TextBlockUserData *userData = textUserData(block))
         return userData->ifdefedOut();
     return false;
 }
 
 int TextDocumentLayout::braceDepthDelta(const QTextBlock &block)
 {
-    if (TextBlockUserData *userData = testUserData(block))
+    if (TextBlockUserData *userData = textUserData(block))
         return userData->braceDepthDelta();
     return 0;
 }
@@ -461,7 +461,7 @@ void TextDocumentLayout::changeBraceDepth(QTextBlock &block, int delta)
 void TextDocumentLayout::setLexerState(const QTextBlock &block, int state)
 {
     if (state == 0) {
-        if (TextBlockUserData *userData = testUserData(block))
+        if (TextBlockUserData *userData = textUserData(block))
             userData->setLexerState(0);
     } else {
         userData(block)->setLexerState(qMax(0,state));
@@ -470,7 +470,7 @@ void TextDocumentLayout::setLexerState(const QTextBlock &block, int state)
 
 int TextDocumentLayout::lexerState(const QTextBlock &block)
 {
-    if (TextBlockUserData *userData = testUserData(block))
+    if (TextBlockUserData *userData = textUserData(block))
         return userData->lexerState();
     return 0;
 }
@@ -478,7 +478,7 @@ int TextDocumentLayout::lexerState(const QTextBlock &block)
 void TextDocumentLayout::setFoldingIndent(const QTextBlock &block, int indent)
 {
     if (indent == 0) {
-        if (TextBlockUserData *userData = testUserData(block))
+        if (TextBlockUserData *userData = textUserData(block))
             userData->setFoldingIndent(0);
     } else {
         userData(block)->setFoldingIndent(indent);
@@ -487,7 +487,7 @@ void TextDocumentLayout::setFoldingIndent(const QTextBlock &block, int indent)
 
 int TextDocumentLayout::foldingIndent(const QTextBlock &block)
 {
-    if (TextBlockUserData *userData = testUserData(block))
+    if (TextBlockUserData *userData = textUserData(block))
         return userData->foldingIndent();
     return 0;
 }
@@ -505,7 +505,7 @@ bool TextDocumentLayout::canFold(const QTextBlock &block)
 
 bool TextDocumentLayout::isFolded(const QTextBlock &block)
 {
-    if (TextBlockUserData *userData = testUserData(block))
+    if (TextBlockUserData *userData = textUserData(block))
         return userData->folded();
     return false;
 }
@@ -514,7 +514,7 @@ void TextDocumentLayout::setFolded(const QTextBlock &block, bool folded)
 {
     if (folded)
         userData(block)->setFolded(true);
-    else if (TextBlockUserData *userData = testUserData(block))
+    else if (TextBlockUserData *userData = textUserData(block))
         userData->setFolded(false);
     else
         return;
@@ -605,7 +605,7 @@ void TextDocumentLayout::updateMarksLineNumber()
     QTextBlock block = document()->begin();
     int blockNumber = 0;
     while (block.isValid()) {
-        if (const TextBlockUserData *userData = testUserData(block)) {
+        if (const TextBlockUserData *userData = textUserData(block)) {
             for (TextMark *mrk : userData->marks())
                 mrk->updateLineNumber(blockNumber + 1);
         }
@@ -616,7 +616,7 @@ void TextDocumentLayout::updateMarksLineNumber()
 
 void TextDocumentLayout::updateMarksBlock(const QTextBlock &block)
 {
-    if (const TextBlockUserData *userData = testUserData(block)) {
+    if (const TextBlockUserData *userData = textUserData(block)) {
         for (TextMark *mrk : userData->marks())
             mrk->updateBlock(block);
     }
@@ -625,7 +625,7 @@ void TextDocumentLayout::updateMarksBlock(const QTextBlock &block)
 QRectF TextDocumentLayout::blockBoundingRect(const QTextBlock &block) const
 {
     QRectF boundingRect = QPlainTextDocumentLayout::blockBoundingRect(block);
-    if (TextBlockUserData *userData = testUserData(block))
+    if (TextBlockUserData *userData = textUserData(block))
         boundingRect.adjust(0, 0, 0, userData->additionalAnnotationHeight());
     return boundingRect;
 }
diff --git a/src/plugins/texteditor/textdocumentlayout.h b/src/plugins/texteditor/textdocumentlayout.h
index 119dcb7e2c..7097d684c3 100644
--- a/src/plugins/texteditor/textdocumentlayout.h
+++ b/src/plugins/texteditor/textdocumentlayout.h
@@ -196,7 +196,7 @@ public:
         int m_insideFold = 0;
     };
 
-    static TextBlockUserData *testUserData(const QTextBlock &block) {
+    static TextBlockUserData *textUserData(const QTextBlock &block) {
         return static_cast<TextBlockUserData*>(block.userData());
     }
     static TextBlockUserData *userData(const QTextBlock &block) {
diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
index 014cea172a..f47b30b847 100644
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -3445,7 +3445,7 @@ void TextEditorWidgetPrivate::processTooltipRequest(const QTextCursor &c)
 bool TextEditorWidgetPrivate::processAnnotaionTooltipRequest(const QTextBlock &block,
                                                              const QPoint &pos) const
 {
-    TextBlockUserData *blockUserData = TextDocumentLayout::testUserData(block);
+    TextBlockUserData *blockUserData = TextDocumentLayout::textUserData(block);
     if (!blockUserData)
         return false;
 
@@ -4019,7 +4019,7 @@ void TextEditorWidgetPrivate::updateLineAnnotation(const PaintEventData &data,
     if (!m_displaySettings.m_displayAnnotations)
         return;
 
-    TextBlockUserData *blockUserData = TextDocumentLayout::testUserData(data.block);
+    TextBlockUserData *blockUserData = TextDocumentLayout::textUserData(data.block);
     if (!blockUserData)
         return;
 
@@ -4528,7 +4528,7 @@ void TextEditorWidgetPrivate::paintReplacement(PaintEventData &data, QPainter &p
         painter.setRenderHint(QPainter::Antialiasing, false);
         painter.translate(-.5, -.5);
 
-        if (TextBlockUserData *nextBlockUserData = TextDocumentLayout::testUserData(nextBlock)) {
+        if (TextBlockUserData *nextBlockUserData = TextDocumentLayout::textUserData(nextBlock)) {
             if (nextBlockUserData->foldingStartIncluded())
                 replacement.prepend(nextBlock.text().trimmed().at(0));
         }
@@ -4537,7 +4537,7 @@ void TextEditorWidgetPrivate::paintReplacement(PaintEventData &data, QPainter &p
         if (!lastInvisibleBlock.isValid())
             lastInvisibleBlock = data.doc->lastBlock();
 
-        if (TextBlockUserData *blockUserData = TextDocumentLayout::testUserData(lastInvisibleBlock)) {
+        if (TextBlockUserData *blockUserData = TextDocumentLayout::textUserData(lastInvisibleBlock)) {
             if (blockUserData->foldingEndIncluded()) {
                 QString right = lastInvisibleBlock.text().trimmed();
                 if (right.endsWith(QLatin1Char(';'))) {
@@ -5071,7 +5071,7 @@ void TextEditorWidgetPrivate::paintCodeFolding(QPainter &painter,
     }
 
     const QTextBlock &nextBlock = data.block.next();
-    TextBlockUserData *nextBlockUserData = TextDocumentLayout::testUserData(nextBlock);
+    TextBlockUserData *nextBlockUserData = TextDocumentLayout::textUserData(nextBlock);
 
     bool drawBox = nextBlockUserData
             && TextDocumentLayout::foldingIndent(data.block) < nextBlockUserData->foldingIndent();
diff --git a/src/plugins/vcsbase/diffandloghighlighter.cpp b/src/plugins/vcsbase/diffandloghighlighter.cpp
index eeb7ad915b..afdc72cc67 100644
--- a/src/plugins/vcsbase/diffandloghighlighter.cpp
+++ b/src/plugins/vcsbase/diffandloghighlighter.cpp
@@ -193,7 +193,7 @@ void DiffAndLogHighlighter::highlightBlock(const QString &text)
     TextEditor::TextBlockUserData *data =
             TextEditor::TextDocumentLayout::userData(currentBlock());
     QTC_ASSERT(data, return; );
-    if (!TextEditor::TextDocumentLayout::testUserData(currentBlock().previous()))
+    if (!TextEditor::TextDocumentLayout::textUserData(currentBlock().previous()))
         d->m_foldingState = Internal::StartOfFile;
 
     switch (d->m_foldingState) {