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

TextEditor: Fix typo in a TextDocumentLayout function

Browse Source 
Change-Id: I17153d9bfe9820f3ccc88f54bce1d494a522be33
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-12-04 08:19:53 +01:00
parent 0bd85b00a7
commit 548e798885
11 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/texteditor/textdocumentlayout.cpp
View File

@@ -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;
}