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

QmlJSEditor: General editor related code consolidation

Browse Source 
Merge editor files, sort #includes, namespaces.
This does not yet use the new editor construction scheme.

Change-Id: Idb1171389858c4470d7a4ec9441fb25e6d157400
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
hjk
2014-08-20 01:47:42 +02:00
parent ba51240524
commit 3ac0668d5c
13 changed files with 150 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmljseditor/qmljseditorplugin.cpp
View File

@@ -32,7 +32,6 @@
#include "qmljseditor.h"
#include "qmljseditorconstants.h"
#include "qmljseditordocument.h"
#include "qmljseditorfactory.h"
#include "qmljshoverhandler.h"
#include "qmlfilewizard.h"
#include "jsfilewizard.h"
@@ -93,7 +92,6 @@ QmlJSEditorPlugin *QmlJSEditorPlugin::m_instance = 0;
QmlJSEditorPlugin::QmlJSEditorPlugin() :
m_modelManager(0),
m_editor(0),
m_quickFixAssistProvider(0),
m_reformatFileAction(0),
m_currentDocument(0),
@@ -106,7 +104,6 @@ QmlJSEditorPlugin::QmlJSEditorPlugin() :
QmlJSEditorPlugin::~QmlJSEditorPlugin()
{
removeObject(m_editor);
m_instance = 0;
}
@@ -142,8 +139,7 @@ bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *e
Core::Context context(Constants::C_QMLJSEDITOR_ID);
m_editor = new QmlJSEditorFactory(this);
addObject(m_editor);
addAutoReleasedObject(new QmlJSEditorFactory);
IWizardFactory *wizard = new QmlFileWizard;
wizard->setWizardKind(Core::IWizardFactory::FileWizard);