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

QmlDesigner: Simplify notifier

Browse Source 
Change-Id: I6542596729e025210447ab93aaef44ed103d9982
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Marco Bubke
2020-10-22 14:47:08 +02:00
parent 48ebaecb52
commit bed1c073db
3 changed files with 356 additions and 877 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmldesigner/designercore/include/model.h
View File

@@ -94,9 +94,9 @@ public:
// Editing sub-components: // Editing sub-components:
// Imports: // Imports:
QList<Import> imports() const; const QList<Import> &imports() const;
QList<Import> possibleImports() const; const QList<Import> &possibleImports() const;
QList<Import> usedImports() const; const QList<Import> &usedImports() const;
void changeImports(const QList<Import> &importsToBeAdded, const QList<Import> &importsToBeRemoved); void changeImports(const QList<Import> &importsToBeAdded, const QList<Import> &importsToBeRemoved);
void setPossibleImports(const QList<Import> &possibleImports); void setPossibleImports(const QList<Import> &possibleImports);
void setUsedImports(const QList<Import> &usedImports); void setUsedImports(const QList<Import> &usedImports);

1210
src/plugins/qmldesigner/designercore/model/model.cpp
View File

File diff suppressed because it is too large Load Diff

17
src/plugins/qmldesigner/designercore/model/model_p.h
View File

@@ -122,9 +122,15 @@ public:
void detachView(AbstractView *view, bool notifyView); void detachView(AbstractView *view, bool notifyView);
void detachAllViews(); void detachAllViews();
Model *model() const { return m_model; }
void setModel(Model *model) { m_model = model; }
Model *model() const { return m_q; } template<typename Callable>
void setModel(Model *q) { m_q = q; } void notifyNodeInstanceViewLast(Callable call);
template<typename Callable>
void notifyNormalViewsLast(Callable call);
template<typename Callable>
void notifyInstanceChanges(Callable call);
void notifyNodeCreated(const InternalNodePointer &newInternalNodePointer); void notifyNodeCreated(const InternalNodePointer &newInternalNodePointer);
void notifyNodeAboutToBeReparent(const InternalNodePointer &internalNodePointer, const InternalNodeAbstractPropertyPointer &newPropertyParent, const InternalNodePointer &oldParent, const PropertyName &oldPropertyName, AbstractView::PropertyChangeFlags propertyChange); void notifyNodeAboutToBeReparent(const InternalNodePointer &internalNodePointer, const InternalNodeAbstractPropertyPointer &newPropertyParent, const InternalNodePointer &oldParent, const PropertyName &oldPropertyName, AbstractView::PropertyChangeFlags propertyChange);
@@ -179,11 +185,10 @@ public:
void setAuxiliaryData(const InternalNodePointer& node, const PropertyName &name, const QVariant &data); void setAuxiliaryData(const InternalNodePointer& node, const PropertyName &name, const QVariant &data);
void removeAuxiliaryData(const InternalNodePointer& node, const PropertyName &name); void removeAuxiliaryData(const InternalNodePointer& node, const PropertyName &name);
void resetModelByRewriter(const QString &description); [[noreturn]] void resetModelByRewriter(const QString &description);
// Imports: // Imports:
QList<Import> imports() const { return m_imports; } const QList<Import> &imports() const { return m_imports; }
void addImport(const Import &import); void addImport(const Import &import);
void removeImport(const Import &import); void removeImport(const Import &import);
void changeImports(const QList<Import> &importsToBeAdded, const QList<Import> &importToBeRemoved); void changeImports(const QList<Import> &importsToBeAdded, const QList<Import> &importToBeRemoved);
@@ -250,7 +255,7 @@ private: //functions
const QList<QPointer<AbstractView>> enabledViews() const; const QList<QPointer<AbstractView>> enabledViews() const;
private: private:
Model *m_q; Model *m_model;
MetaInfo m_metaInfo; MetaInfo m_metaInfo;
QList<Import> m_imports; QList<Import> m_imports;
QList<Import> m_possibleImportList; QList<Import> m_possibleImportList;