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

BaseTextMark: Remove checks for linenumber after updateLineNumber

Browse Source 
The breakpoints are deleted in some cases on updateLineNumber, thus we
can't call anything on the mark after calling updateLineNumber

Change-Id: Ib6c7bddc980fc72e9d4f4b9ec9e2eeb8292c1e15
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Daniel Teske
2012-03-13 16:05:16 +01:00
committed by hjk
parent e4aa2b581e
commit 9bf9474e8d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/texteditor/basetextdocumentlayout.cpp
View File

@@ -84,7 +84,7 @@ bool DocumentMarker::addMark(TextEditor::ITextMark *mark)
userData->addMark(mark); userData->addMark(mark);
m_marksCache.append(mark); m_marksCache.append(mark);
mark->updateLineNumber(blockNumber + 1); mark->updateLineNumber(blockNumber + 1);
QTC_CHECK(mark->lineNumber() == blockNumber + 1); QTC_CHECK(mark->lineNumber() == blockNumber + 1); // Checks that the base class is called
mark->updateBlock(block); mark->updateBlock(block);
documentLayout->hasMarks = true; documentLayout->hasMarks = true;
documentLayout->maxMarkWidthFactor = qMax(mark->widthFactor(), documentLayout->maxMarkWidthFactor = qMax(mark->widthFactor(),
@@ -716,14 +716,14 @@ void BaseTextDocumentLayout::documentClosing()
void BaseTextDocumentLayout::updateMarksLineNumber() void BaseTextDocumentLayout::updateMarksLineNumber()
{ {
// Note: the breakpointmanger deletes breakpoint marks and readds them
// if it doesn't agree with our updating
QTextBlock block = document()->begin(); QTextBlock block = document()->begin();
int blockNumber = 0; int blockNumber = 0;
while (block.isValid()) { while (block.isValid()) {
if (const TextBlockUserData *userData = testUserData(block)) if (const TextBlockUserData *userData = testUserData(block))
foreach (ITextMark *mrk, userData->marks()) { foreach (ITextMark *mrk, userData->marks())
mrk->updateLineNumber(blockNumber + 1); mrk->updateLineNumber(blockNumber + 1);
QTC_CHECK(mrk->lineNumber() == blockNumber +1);
}
block = block.next(); block = block.next();
++blockNumber; ++blockNumber;
} }