Commit 41b03629 authored by Marco Bubke's avatar Marco Bubke Committed by Alessandro Portale

QmlDesigner: Remove DesignDocumentControllerPrivate

Change-Id: I760c79eddc2e8abfe9edcda270d3e81df337d51d
Reviewed-by: default avatarAlessandro Portale <alessandro.portale@nokia.com>
parent d3f05601
......@@ -33,9 +33,24 @@
#include "rewriterview.h"
#include <model.h>
#include <rewriterview.h>
#include <itemlibraryview.h>
#include <navigatorview.h>
#include <stateseditorview.h>
#include <formeditorview.h>
#include <propertyeditor.h>
#include <componentview.h>
#include <basetexteditmodifier.h>
#include <componenttextmodifier.h>
#include <subcomponentmanager.h>
#include <model/viewlogger.h>
#include <QObject>
#include <QString>
#include <QStackedWidget>
QT_BEGIN_NAMESPACE
class QUndoStack;
class QWidget;
......@@ -47,23 +62,14 @@ QT_END_NAMESPACE
namespace QmlDesigner {
class Model;
class ModelNode;
class TextModifier;
class QmlObjectNode;
class RewriterView;
class ItemLibraryView;
class NavigatorView;
class ComponentView;
class PropertyEditor;
class StatesEditorView;
class FormEditorView;
struct CrumbleBarInfo;
class DesignDocumentController: public QObject
{
Q_OBJECT
public:
DesignDocumentController(QObject *parent);
~DesignDocumentController();
......@@ -72,7 +78,7 @@ public:
QString simplfiedDisplayName() const;
QString fileName() const;
void setFileName(const QString &fileName);
void setFileName(const QString &m_fileName);
QList<RewriterView::Error> loadMaster(QPlainTextEdit *edit);
QList<RewriterView::Error> loadMaster(const QByteArray &qml);
......@@ -94,13 +100,13 @@ public:
QString contextHelpId() const;
QList<RewriterView::Error> qmlErrors() const;
void setItemLibraryView(ItemLibraryView* itemLibraryView);
void setItemLibraryView(ItemLibraryView* m_itemLibraryView);
void setNavigator(NavigatorView* navigatorView);
void setPropertyEditorView(PropertyEditor *propertyEditor);
void setStatesEditorView(StatesEditorView* statesEditorView);
void setFormEditorView(FormEditorView *formEditorView);
void setNodeInstanceView(NodeInstanceView *nodeInstanceView);
void setComponentView(ComponentView *componentView);
void setStatesEditorView(StatesEditorView* m_statesEditorView);
void setFormEditorView(FormEditorView *m_formEditorView);
void setNodeInstanceView(NodeInstanceView *m_nodeInstanceView);
void setComponentView(ComponentView *m_componentView);
void setCrumbleBarInfo(const CrumbleBarInfo &crumbleBarInfo);
static void setBlockCrumbleBar(bool);
......@@ -129,7 +135,7 @@ public slots:
void activeQtVersionChanged();
void changeCurrentModelTo(const ModelNode &node);
void changeToSubComponent(const ModelNode &node);
void changeToExternalSubComponent(const QString &fileName);
void changeToExternalSubComponent(const QString &m_fileName);
void goIntoComponent();
#ifdef ENABLE_TEXT_VIEW
......@@ -138,9 +144,9 @@ public slots:
#endif // ENABLE_TEXT_VIEW
private slots:
void doRealSaveAs(const QString &fileName);
void doRealSaveAs(const QString &m_fileName);
private:
private: // functions
void detachNodeInstanceView();
void attachNodeInstanceView();
void changeToMasterModel();
......@@ -149,8 +155,35 @@ private:
QWidget *centralWidget() const;
QString pathToQt() const;
class DesignDocumentControllerPrivate *d;
private: // variables
QWeakPointer<FormEditorView> m_formEditorView;
QWeakPointer<ItemLibraryView> m_itemLibraryView;
QWeakPointer<NavigatorView> m_navigator;
QWeakPointer<PropertyEditor> m_propertyEditorView;
QWeakPointer<StatesEditorView> m_statesEditorView;
QWeakPointer<QStackedWidget> m_stackedWidget;
QWeakPointer<NodeInstanceView> m_nodeInstanceView;
QWeakPointer<ComponentView> m_componentView;
QWeakPointer<Model> m_model;
QWeakPointer<Model> m_subComponentModel;
QWeakPointer<Model> m_masterModel;
QWeakPointer<QPlainTextEdit> m_textEdit;
QWeakPointer<RewriterView> m_rewriterView;
BaseTextEditModifier *m_textModifier;
ComponentTextModifier *m_componentTextModifier;
QWeakPointer<SubComponentManager> m_subComponentManager;
QWeakPointer<Internal::ViewLogger> m_viewLogger;
ModelNode m_componentNode;
QString m_fileName;
QUrl m_searchPath;
bool m_documentLoaded;
bool m_syncBlocked;
int m_qt_versionId;
static bool s_clearCrumblePath;
static bool s_pushCrumblePath;
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment