TextEditor: Fix failure in cpptools autotest

The issue only appeared in the test due to the different
editor construction there. Now use the same factory access.

Change-Id: I3a8534fbe683bb88f04ad68850cecdfe32b11433
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
hjk
2014-08-27 11:19:04 +02:00
parent 59f1ffd9d2
commit 7b67701dea
7 changed files with 38 additions and 37 deletions

View File

@@ -41,10 +41,10 @@
#include <utils/qtcassert.h>
#include <QCoreApplication>
#include <QDebug>
namespace TextEditor {
namespace Internal {
static PlainTextEditorFactory *m_instance = 0;
class PlainTextEditorWidget : public BaseTextEditorWidget
{
@@ -55,6 +55,8 @@ public:
PlainTextEditorFactory::PlainTextEditorFactory()
{
QTC_CHECK(!m_instance);
m_instance = this;
setId(Core::Constants::K_DEFAULT_TEXT_EDITOR_ID);
setDisplayName(qApp->translate("OpenWith::Editors", Core::Constants::K_DEFAULT_TEXT_EDITOR_DISPLAY_NAME));
addMimeType(QLatin1String(TextEditor::Constants::C_TEXTEDITOR_MIMETYPE_TEXT));
@@ -69,5 +71,14 @@ PlainTextEditorFactory::PlainTextEditorFactory()
TextEditorActionHandler::UnCollapseAll);
}
} // namespace Internal
PlainTextEditorFactory *PlainTextEditorFactory::instance()
{
return m_instance;
}
BaseTextEditor *PlainTextEditorFactory::createPlainTextEditor()
{
return qobject_cast<BaseTextEditor *>(m_instance->createEditor());
}
} // namespace TextEditor