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/cppeditor/cppdoxygen_test.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/plugins/cppeditor/cppdoxygen_test.cpp')

diff --git a/src/plugins/cppeditor/cppdoxygen_test.cpp b/src/plugins/cppeditor/cppdoxygen_test.cpp
index 5ee9989f60..8feffc6579 100644
--- a/src/plugins/cppeditor/cppdoxygen_test.cpp
+++ b/src/plugins/cppeditor/cppdoxygen_test.cpp
@@ -30,7 +30,6 @@
 #include "cppeditor.h"
 
 #include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/plugintestutils.h>
 #include <cplusplus/CppDocument.h>
 #include <cppeditor/cppeditor.h>
 #include <cppeditor/cppeditorplugin.h>
@@ -116,7 +115,8 @@ TestCase::TestCase(const QByteArray &input)
 
 TestCase::~TestCase()
 {
-    Core::Tests::closeAndDeleteEditor(editor);
+    EditorManager::closeEditor(editor, false);
+    QCoreApplication::processEvents(); // process any pending events
 
     // Remove the test file from the code-model
     CppTools::CppModelManagerInterface *mmi = CppTools::CppModelManagerInterface::instance();
-- 
cgit v1.2.1