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

TextEditor: Fix failure in cpptools autotest

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/texteditor/texteditorplugin.cpp
View File

@@ -70,7 +70,6 @@ static TextEditorPlugin *m_instance = 0;
TextEditorPlugin::TextEditorPlugin()
: m_settings(0),
m_editorFactory(0),
m_lineNumberFilter(0),
m_searchResultWindow(0)
{
@@ -154,8 +153,7 @@ bool TextEditorPlugin::initialize(const QStringList &arguments, QString *errorMe
m_settings = new TextEditorSettings(this);
// Add plain text editor factory
m_editorFactory = new PlainTextEditorFactory;
addAutoReleasedObject(m_editorFactory);
addAutoReleasedObject(new PlainTextEditorFactory);
// Goto line functionality for quick open
m_lineNumberFilter = new LineNumberFilter;
@@ -261,11 +259,6 @@ void TextEditorPlugin::extensionsInitialized()
this, SLOT(updateCurrentSelection(QString)));
}
PlainTextEditorFactory *TextEditorPlugin::editorFactory()
{
return m_instance->m_editorFactory;
}
LineNumberFilter *TextEditorPlugin::lineNumberFilter()
{
return m_instance->m_lineNumberFilter;