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

Remove ITextMarkable

Browse Source 
There was only a single user (TextEditor::DocumentMarker) which
in turn was only used in a single place (BaseTextDocument), so
merge the ITextMarkable into BaseTextDocument.

Change-Id: I1ca8675f9fc22cb56097b843dc5a0fe76875d3e7
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
hjk
2014-07-18 15:29:04 +02:00
parent 19a44fd769
commit cd7df865ad
12 changed files with 186 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/debugger/disassembleragent.cpp
View File

@@ -192,7 +192,7 @@ void DisassemblerAgent::resetLocation()
return;
if (d->resetLocationScheduled) {
d->resetLocationScheduled = false;
d->document->markableInterface()->removeMark(&d->locationMark);
d->document->removeMark(&d->locationMark);
}
}
@@ -331,9 +331,9 @@ void DisassemblerAgent::updateLocationMarker()
const DisassemblerLines contents = d->contentsAtCurrentLocation();
int lineNumber = contents.lineForAddress(d->location.address());
if (d->location.needsMarker()) {
d->document->markableInterface()->removeMark(&d->locationMark);
d->document->removeMark(&d->locationMark);
d->locationMark.updateLineNumber(lineNumber);
d->document->markableInterface()->addMark(&d->locationMark);
d->document->addMark(&d->locationMark);
}
// Center cursor.
@@ -354,7 +354,7 @@ void DisassemblerAgent::updateBreakpointMarkers()
const DisassemblerLines contents = d->contentsAtCurrentLocation();
foreach (TextEditor::ITextMark *marker, d->breakpointMarks)
d->document->markableInterface()->removeMark(marker);
d->document->removeMark(marker);
qDeleteAll(d->breakpointMarks);
d->breakpointMarks.clear();
foreach (BreakpointModelId id, ids) {
@@ -368,7 +368,7 @@ void DisassemblerAgent::updateBreakpointMarkers()
marker->setIcon(handler->icon(id));
marker->setPriority(ITextMark::NormalPriority);
d->breakpointMarks.append(marker);
d->document->markableInterface()->addMark(marker);
d->document->addMark(marker);
}
}