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

Initialize ITextMark with a lineNumber

Browse Source 
Ensure that it is updated as the lines are moved. That can be later used
to quickly find and remove the marks again.

Change-Id: I2285111996d5c8ef12f792fd73ff00ce186addc1
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Daniel Teske
2012-02-21 16:27:04 +01:00
committed by hjk
parent b112c277da
commit 2df2c0655c
7 changed files with 44 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/texteditor/basetextmark.cpp
View File

@@ -57,7 +57,7 @@ void BaseTextMarkRegistry::add(BaseTextMark *mark)
if (ITextEditor *textEditor = qobject_cast<ITextEditor *>(editor)) {
if (mark->m_markableInterface == 0) { // We aren't added to something
ITextMarkable *markableInterface = textEditor->markableInterface();
if (markableInterface->addMark(mark, mark->m_line)) {
if (markableInterface->addMark(mark)) {
mark->m_markableInterface = markableInterface;
// Handle reload of text documents, readding the mark as necessary
connect(textEditor->document(), SIGNAL(reloaded()),
@@ -89,7 +89,7 @@ void BaseTextMarkRegistry::editorOpened(Core::IEditor *editor)
foreach (BaseTextMark *mark, m_marks.value(Utils::FileName::fromString(editor->document()->fileName()))) {
if (mark->m_markableInterface == 0) { // We aren't added to something
ITextMarkable *markableInterface = textEditor->markableInterface();
if (markableInterface->addMark(mark, mark->m_line))
if (markableInterface->addMark(mark))
mark->m_markableInterface = markableInterface;
}
}
@@ -108,13 +108,13 @@ void BaseTextMarkRegistry::documentReloaded()
if (mark->m_markableInterface)
return;
ITextMarkable *markableInterface = doc->documentMarker();
if (markableInterface->addMark(mark, mark->m_line))
if (markableInterface->addMark(mark))
mark->m_markableInterface = markableInterface;
}
}
BaseTextMark::BaseTextMark(const QString &fileName, int lineNumber)
: m_fileName(fileName), m_line(lineNumber)
: ITextMark(lineNumber), m_fileName(fileName)
{
Internal::TextEditorPlugin::instance()->baseTextMarkRegistry()->add(this);
}
@@ -128,11 +128,6 @@ BaseTextMark::~BaseTextMark()
Internal::TextEditorPlugin::instance()->baseTextMarkRegistry()->remove(this);
}
void BaseTextMark::updateLineNumber(int lineNumber)
{
m_line = lineNumber;
}
void BaseTextMark::updateMarker()
{
if (m_markableInterface)