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

Move displayName from IEditor to IDocument

Browse Source 
The display name is not editor instance specific, but belongs to the
document.

Change-Id: I3c936f04a86e10e6ca30063d85036d85b4b5880e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Eike Ziller
2013-07-04 22:25:15 +02:00
parent 81eba6f984
commit 113c5600c9
57 changed files with 177 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/coreplugin/editortoolbar.cpp
View File

@@ -207,7 +207,7 @@ EditorToolBar::~EditorToolBar()
void EditorToolBar::removeToolbarForEditor(IEditor *editor)
{
QTC_ASSERT(editor, return);
disconnect(editor, SIGNAL(changed()), this, SLOT(checkEditorStatus()));
disconnect(editor->document(), SIGNAL(changed()), this, SLOT(checkEditorStatus()));
QWidget *toolBar = editor->toolBar();
if (toolBar != 0) {
@@ -245,7 +245,7 @@ void EditorToolBar::closeEditor()
void EditorToolBar::addEditor(IEditor *editor)
{
QTC_ASSERT(editor, return);
connect(editor, SIGNAL(changed()), this, SLOT(checkEditorStatus()));
connect(editor->document(), SIGNAL(changed()), this, SLOT(checkEditorStatus()));
QWidget *toolBar = editor->toolBar();
if (toolBar && !d->m_isStandalone)
@@ -394,7 +394,7 @@ void EditorToolBar::updateEditorStatus(IEditor *editor)
if (editor == current)
d->m_editorList->setToolTip(
current->document()->filePath().isEmpty()
? current->displayName()
? current->document()->displayName()
: QDir::toNativeSeparators(editor->document()->filePath())
);
}