forked from qt-creator/qt-creator
Rename IFile->IDocument and FileManager->DocumentManager
And adapt the other API respectively. Change-Id: I1e04e555409be09242db6890f9e013396f83aeed Reviewed-by: Bill King <bill.king@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
@@ -60,7 +60,7 @@ void BaseTextMarkRegistry::add(BaseTextMark *mark)
|
||||
if (markableInterface->addMark(mark, mark->m_line)) {
|
||||
mark->m_markableInterface = markableInterface;
|
||||
// Handle reload of text documents, readding the mark as necessary
|
||||
connect(textEditor->file(), SIGNAL(reloaded()),
|
||||
connect(textEditor->document(), SIGNAL(reloaded()),
|
||||
this, SLOT(documentReloaded()), Qt::UniqueConnection);
|
||||
break;
|
||||
}
|
||||
@@ -79,14 +79,14 @@ void BaseTextMarkRegistry::editorOpened(Core::IEditor *editor)
|
||||
ITextEditor *textEditor = qobject_cast<ITextEditor *>(editor);
|
||||
if (!textEditor)
|
||||
return;
|
||||
if (!m_marks.contains(Utils::FileName::fromString(editor->file()->fileName())))
|
||||
if (!m_marks.contains(Utils::FileName::fromString(editor->document()->fileName())))
|
||||
return;
|
||||
|
||||
// Handle reload of text documents, readding the mark as necessary
|
||||
connect(textEditor->file(), SIGNAL(reloaded()),
|
||||
connect(textEditor->document(), SIGNAL(reloaded()),
|
||||
this, SLOT(documentReloaded()), Qt::UniqueConnection);
|
||||
|
||||
foreach (BaseTextMark *mark, m_marks.value(Utils::FileName::fromString(editor->file()->fileName()))) {
|
||||
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))
|
||||
|
||||
Reference in New Issue
Block a user