Compile.

Change-Id: I118bdfd3fb9843e7522cec304a0d7da879651b30
Reviewed-on: http://codereview.qt.nokia.com/2750
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index 110cdd5..55ba512 100644 (file)
--- 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 92b298d..48df792 100644 (file)
--- 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);