diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp index 68a2589bd0da1d99560c000b68ec179cbd725a60..4d3661216c6b2b5314be0bc555053cb9de039dff 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp @@ -188,12 +188,12 @@ void PropertyEditorValue::setIsValid(bool valid) m_isValid = valid; } -ModelNode PropertyEditorValue::modelNode() const +QmlDesigner::ModelNode PropertyEditorValue::modelNode() const { return m_modelNode; } -void PropertyEditorValue::setModelNode(const ModelNode &modelNode) +void PropertyEditorValue::setModelNode(const QmlDesigner::ModelNode &modelNode) { if (modelNode != m_modelNode) { m_modelNode = modelNode; @@ -250,7 +250,7 @@ QString PropertyEditorNodeWrapper::type() } -ModelNode PropertyEditorNodeWrapper::parentModelNode() const +QmlDesigner::ModelNode PropertyEditorNodeWrapper::parentModelNode() const { return m_editorValue->modelNode(); } diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h index 1a6c42e872cdc275c2b66e523a5e618c1057e596..ff3912475fb02dba12bc80977898ccc8e33bf684 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h @@ -39,9 +39,6 @@ class PropertyEditorValue; -typedef QmlDesigner::ModelNode ModelNode; - - class PropertyEditorNodeWrapper : public QObject { Q_OBJECT @@ -55,7 +52,7 @@ public: bool exists(); QString type(); QDeclarativePropertyMap* properties(); - ModelNode parentModelNode() const; + QmlDesigner::ModelNode parentModelNode() const; QString propertyName() const; public slots: @@ -112,8 +109,8 @@ public: QString name() const; void setName(const QString &name); - ModelNode modelNode() const; - void setModelNode(const ModelNode &modelNode); + QmlDesigner::ModelNode modelNode() const; + void setModelNode(const QmlDesigner::ModelNode &modelNode); PropertyEditorNodeWrapper* complexNode(); @@ -135,7 +132,7 @@ signals: void isValidChanged(); private: //variables - ModelNode m_modelNode; + QmlDesigner::ModelNode m_modelNode; QVariant m_value; QString m_expression; QString m_name;