From f47c101b8b03776ac874732684f9f7d1af4176e3 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Tue, 8 Oct 2013 13:02:52 +0300
Subject: Revert "EditorManager: Fix crash when closing an editor upon
 activation"

Deleting an editor while currentEditorChanged is apparently not a good
idea.
Use a queued connection instead.

This reverts commits 243a6259618e69b8da9ac2438480c449754f7f77,
447c4ed37f8904ca733d6e6253ad19bb0388f209,
d9602ca550c53e60a5229bfec9539e41fa5a694c and
31034870389a512e3450e32ed990e1622bd6e679.

Change-Id: Iccbee25fb77714963faa6f7184d1f5f53ed348a6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
 src/plugins/cpptools/cppmodelmanager_test.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/plugins/cpptools/cppmodelmanager_test.cpp')

diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp
index bf17c90cd3..3d1383b469 100644
--- a/src/plugins/cpptools/cppmodelmanager_test.cpp
+++ b/src/plugins/cpptools/cppmodelmanager_test.cpp
@@ -33,7 +33,7 @@
 #include "modelmanagertesthelper.h"
 
 #include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/plugintestutils.h>
+#include <coreplugin/testdatadir.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/session.h>
 #include <utils/hostosinfo.h>
@@ -62,7 +62,7 @@ namespace {
 
 inline QString _(const QByteArray &ba) { return QString::fromLatin1(ba, ba.size()); }
 
-class MyTestDataDir : public Core::Tests::TestDataDir
+class MyTestDataDir : public Core::Internal::Tests::TestDataDir
 {
 public:
     MyTestDataDir(const QString &dir)
@@ -723,7 +723,7 @@ void CppToolsPlugin::test_modelmanager_gc_if_last_cppeditor_closed()
     helper.waitForRefreshedSourceFiles();
 
     // Close file/editor
-    Core::Tests::closeAndDeleteEditor(editor);
+    Core::EditorManager::closeEditor(editor, /*askAboutModifiedEditors=*/ false);
     helper.waitForFinishedGc();
 
     // Check: File is removed from the snapshpt
@@ -760,7 +760,7 @@ void CppToolsPlugin::test_modelmanager_dont_gc_opened_files()
     QVERIFY(mm->snapshot().contains(file));
 
     // Close editor
-    Core::Tests::closeAndDeleteEditor(editor);
+    Core::EditorManager::closeEditor(editor);
     helper.waitForFinishedGc();
     QVERIFY(mm->snapshot().isEmpty());
 }
@@ -772,7 +772,7 @@ struct EditorCloser {
     ~EditorCloser()
     {
         if (editor)
-            Core::Tests::closeAndDeleteEditor(editor);
+            Core::EditorManager::closeEditor(editor);
     }
 };
 
-- 
cgit v1.2.1