QmlJSEditor: General editor related code consolidation

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

View File

@@ -43,23 +43,17 @@ namespace Utils { class JsonSchemaManager; }
namespace Core {
class Command;
class ActionContainer;
class ActionManager;
class IEditor;
}
namespace TextEditor { class BaseTextEditor; }
namespace QmlJS { class ModelManagerInterface; }
namespace QmlJSEditor {
class QmlFileWizard;
class QmlJSEditorDocument;
namespace Internal {
class QmlJSEditorFactory;
class QmlJSPreviewRunner;
class QmlJSQuickFixAssistProvider;
class QmlTaskManager;
@@ -102,7 +96,6 @@ private:
static QmlJSEditorPlugin *m_instance;
QmlJS::ModelManagerInterface *m_modelManager;
QmlJSEditorFactory *m_editor;
QmlJSQuickFixAssistProvider *m_quickFixAssistProvider;
QmlTaskManager *m_qmlTaskManager;