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) ...@@ -188,12 +188,12 @@ void PropertyEditorValue::setIsValid(bool valid)
m_isValid = valid; m_isValid = valid;
} }
ModelNode PropertyEditorValue::modelNode() const QmlDesigner::ModelNode PropertyEditorValue::modelNode() const
{ {
return m_modelNode; return m_modelNode;
} }
void PropertyEditorValue::setModelNode(const ModelNode &modelNode) void PropertyEditorValue::setModelNode(const QmlDesigner::ModelNode &modelNode)
{ {
if (modelNode != m_modelNode) { if (modelNode != m_modelNode) {
m_modelNode = modelNode; m_modelNode = modelNode;
...@@ -250,7 +250,7 @@ QString PropertyEditorNodeWrapper::type() ...@@ -250,7 +250,7 @@ QString PropertyEditorNodeWrapper::type()
} }
ModelNode PropertyEditorNodeWrapper::parentModelNode() const QmlDesigner::ModelNode PropertyEditorNodeWrapper::parentModelNode() const
{ {
return m_editorValue->modelNode(); return m_editorValue->modelNode();
} }
......
...@@ -39,9 +39,6 @@ ...@@ -39,9 +39,6 @@
class PropertyEditorValue; class PropertyEditorValue;
typedef QmlDesigner::ModelNode ModelNode;
class PropertyEditorNodeWrapper : public QObject { class PropertyEditorNodeWrapper : public QObject {
Q_OBJECT Q_OBJECT
...@@ -55,7 +52,7 @@ public: ...@@ -55,7 +52,7 @@ public:
bool exists(); bool exists();
QString type(); QString type();
QDeclarativePropertyMap* properties(); QDeclarativePropertyMap* properties();
ModelNode parentModelNode() const; QmlDesigner::ModelNode parentModelNode() const;
QString propertyName() const; QString propertyName() const;
public slots: public slots:
...@@ -112,8 +109,8 @@ public: ...@@ -112,8 +109,8 @@ public:
QString name() const; QString name() const;
void setName(const QString &name); void setName(const QString &name);
ModelNode modelNode() const; QmlDesigner::ModelNode modelNode() const;
void setModelNode(const ModelNode &modelNode); void setModelNode(const QmlDesigner::ModelNode &modelNode);
PropertyEditorNodeWrapper* complexNode(); PropertyEditorNodeWrapper* complexNode();
...@@ -135,7 +132,7 @@ signals: ...@@ -135,7 +132,7 @@ signals:
void isValidChanged(); void isValidChanged();
private: //variables private: //variables
ModelNode m_modelNode; QmlDesigner::ModelNode m_modelNode;
QVariant m_value; QVariant m_value;
QString m_expression; QString m_expression;
QString m_name; 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