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

projectexplorer/editormanager: fix uses of Core::Id

Browse Source 
Change-Id: Iba0c42511c43b306a5cecebf15dcb03b0c2cb0e2
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
hjk
2011-11-08 11:26:07 +01:00
committed by Eike Ziller
parent cc2433f79e
commit 5c750f869a
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/editormanager/editormanager.cpp
View File

@@ -1009,7 +1009,7 @@ void EditorManager::activateEditorForIndex(Internal::EditorView *view, const QMo
} }
QString fileName = index.data(Qt::UserRole + 1).toString(); QString fileName = index.data(Qt::UserRole + 1).toString();
QString id = index.data(Qt::UserRole + 2).toString(); Core::Id id = index.data(Qt::UserRole + 2).value<Core::Id>();
if (!openEditor(view, fileName, id, flags)) if (!openEditor(view, fileName, id, flags))
d->m_editorModel->removeEditor(index); d->m_editorModel->removeEditor(index);
} }

2
src/plugins/coreplugin/editormanager/openeditorsmodel.cpp
View File

@@ -321,7 +321,7 @@ QVariant OpenEditorsModel::data(const QModelIndex &index, int role) const
case Qt::UserRole + 1: case Qt::UserRole + 1:
return e.fileName(); return e.fileName();
case Qt::UserRole + 2: case Qt::UserRole + 2:
return QVariant::fromValue(e.editor ? e.editor->id() : e.id()); return QVariant::fromValue(e.editor ? Core::Id(e.editor->id()) : e.id());
default: default:
return QVariant(); return QVariant();
} }

2
src/plugins/projectexplorer/projecttreewidget.cpp
View File

@@ -362,7 +362,7 @@ void ProjectTreeWidget::openItem(const QModelIndex &mainIndex)
Node *node = m_model->nodeForIndex(mainIndex); Node *node = m_model->nodeForIndex(mainIndex);
if (node->nodeType() == FileNodeType) { if (node->nodeType() == FileNodeType) {
Core::EditorManager *editorManager = Core::EditorManager::instance(); Core::EditorManager *editorManager = Core::EditorManager::instance();
editorManager->openEditor(node->path(), QString(), Core::EditorManager::ModeSwitch); editorManager->openEditor(node->path(), Core::Id(), Core::EditorManager::ModeSwitch);
} }
} }