From 73b886fcce38feb3fdc04caee028fd48ce2231b4 Mon Sep 17 00:00:00 2001
From: mae <qtc-committer@nokia.com>
Date: Tue, 10 Mar 2009 15:16:27 +0100
Subject: [PATCH] make "close all" work with fake-restored editors
---
.../coreplugin/editormanager/editormanager.cpp | 1 +
src/plugins/coreplugin/editormanager/editorview.cpp | 11 +++++++++++
src/plugins/coreplugin/editormanager/editorview.h | 1 +
3 files changed, 13 insertions(+)
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 96cf69c6d3e..6cfec71e0f6 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -628,6 +628,7 @@ QList<IFile *> EditorManager::filesForEditors(QList<IEditor *> editors) const
bool EditorManager::closeAllEditors(bool askAboutModifiedEditors)
{
+ m_d->m_editorModel->removeAllRestoredEditors();
return closeEditors(openedEditors(), askAboutModifiedEditors);
}
diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp
index b166ecd76e5..a201e5c9bae 100644
--- a/src/plugins/coreplugin/editormanager/editorview.cpp
+++ b/src/plugins/coreplugin/editormanager/editorview.cpp
@@ -181,6 +181,17 @@ void EditorModel::removeEditor(IEditor *editor)
disconnect(editor, SIGNAL(changed()), this, SLOT(itemChanged()));
}
+void EditorModel::removeAllRestoredEditors()
+{
+ for (int i = m_editors.count()-1; i >= 0; --i) {
+ if (!m_editors.at(i).editor) {
+ beginRemoveRows(QModelIndex(), i, i);
+ m_editors.removeAt(i);
+ endRemoveRows();
+ }
+ }
+}
+
bool EditorModel::isDuplicate(IEditor *editor) const
{
return m_duplicateEditors.contains(editor);
diff --git a/src/plugins/coreplugin/editormanager/editorview.h b/src/plugins/coreplugin/editormanager/editorview.h
index 5754530736d..364be827f94 100644
--- a/src/plugins/coreplugin/editormanager/editorview.h
+++ b/src/plugins/coreplugin/editormanager/editorview.h
@@ -86,6 +86,7 @@ public:
QList<Entry> entries() const { return m_editors; }
void removeEditor(IEditor *editor);
+ void removeAllRestoredEditors();
void emitDataChanged(IEditor *editor);
QList<IEditor *> editors() const;
--
GitLab