diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 110cdd5fe066db2e27a5b486719c00ff03b8d282..55ba5123f65b40ec806e2d63725aa5308ba9c6c1 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -1270,13 +1270,13 @@ QStringList TextToModelMerger::syncGroupedProperties(ModelNode &modelNode, return props; } -void ModelValidator::modelMissesImport(const Import &import) +void ModelValidator::modelMissesImport(const QmlDesigner::Import &import) { Q_UNUSED(import) Q_ASSERT(m_merger->view()->model()->imports().contains(import)); } -void ModelValidator::importAbsentInQMl(const Import &import) +void ModelValidator::importAbsentInQMl(const QmlDesigner::Import &import) { Q_UNUSED(import) Q_ASSERT(! m_merger->view()->model()->imports().contains(import)); @@ -1394,17 +1394,18 @@ void ModelValidator::propertyAbsentFromQml(AbstractProperty &modelProperty) void ModelValidator::idsDiffer(ModelNode &modelNode, const QString &qmlId) { Q_UNUSED(modelNode) + Q_UNUSED(qmlId) Q_ASSERT(modelNode.id() == qmlId); Q_ASSERT(0); } -void ModelAmender::modelMissesImport(const Import &import) +void ModelAmender::modelMissesImport(const QmlDesigner::Import &import) { - m_merger->view()->model()->changeImports(QList<Import>() << import, QList<Import>()); + m_merger->view()->model()->changeImports(QList<QmlDesigner::Import>() << import, QList<QmlDesigner::Import>()); } -void ModelAmender::importAbsentInQMl(const Import &import) +void ModelAmender::importAbsentInQMl(const QmlDesigner::Import &import) { m_merger->view()->model()->changeImports(QList<Import>(), QList<Import>() << import); } diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h index 92b298dfd599a5a8f011c15abbe0c977c8dc6c76..48df79258aa99b05a46b72f883684fc76b7e9bde 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h @@ -156,8 +156,8 @@ public: virtual ~DifferenceHandler() {} - virtual void modelMissesImport(const Import &import) = 0; - virtual void importAbsentInQMl(const Import &import) = 0; + virtual void modelMissesImport(const QmlDesigner::Import &import) = 0; + virtual void importAbsentInQMl(const QmlDesigner::Import &import) = 0; virtual void bindingExpressionsDiffer(BindingProperty &modelProperty, const QString &javascript, const QString &astType) = 0; @@ -203,8 +203,8 @@ public: ~ModelValidator() {} - virtual void modelMissesImport(const Import &import); - virtual void importAbsentInQMl(const Import &import); + virtual void modelMissesImport(const QmlDesigner::Import &import); + virtual void importAbsentInQMl(const QmlDesigner::Import &import); virtual void bindingExpressionsDiffer(BindingProperty &modelProperty, const QString &javascript, const QString &astType); @@ -247,8 +247,8 @@ public: ~ModelAmender() {} - virtual void modelMissesImport(const Import &import); - virtual void importAbsentInQMl(const Import &import); + virtual void modelMissesImport(const QmlDesigner::Import &import); + virtual void importAbsentInQMl(const QmlDesigner::Import &import); virtual void bindingExpressionsDiffer(BindingProperty &modelProperty, const QString &javascript, const QString &astType);