Commit 3d01b6af authored by Thomas Hartmann's avatar Thomas Hartmann
Browse files

QmlDesigner.propertyEditor: remove ambigous typedef

Reviewed-by: Kai Koehne
parent 7f660195
......@@ -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();
}
......
......@@ -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;
......
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