Commit e0ba5006 authored by Friedemann Kleint's avatar Friedemann Kleint

Compile.

Change-Id: I118bdfd3fb9843e7522cec304a0d7da879651b30
Reviewed-on: http://codereview.qt.nokia.com/2750Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@nokia.com>
parent 9592eb53
......@@ -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);
}
......
......@@ -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);
......
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