forked from qt-creator/qt-creator
QmlDesigner: Move simplifiedTypeName() to QmlObjectNode
This member function belongs should be in the parent class. Change-Id: Ie1788e939516cef428069268629a0c2b95599416 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
@@ -115,8 +115,6 @@ public:
|
||||
QPixmap instanceRenderPixmap() const;
|
||||
QPixmap instanceBlurredRenderPixmap() const;
|
||||
|
||||
QString simplifiedTypeName() const;
|
||||
|
||||
const QList<QmlItemNode> allDirectSubModelNodes() const;
|
||||
const QList<QmlItemNode> allSubModelNodes() const;
|
||||
bool hasAnySubModelNodes() const;
|
||||
|
@@ -114,6 +114,7 @@ public:
|
||||
static QVariant instanceValue(const ModelNode &modelNode, const PropertyName &name);
|
||||
|
||||
static QString generateTranslatableText(const QString& text);
|
||||
QString simplifiedTypeName() const;
|
||||
|
||||
protected:
|
||||
NodeInstance nodeInstance() const;
|
||||
|
@@ -508,11 +508,6 @@ QList<QmlModelState> QmlModelStateGroup::allStates() const
|
||||
return returnList;
|
||||
}
|
||||
|
||||
QString QmlItemNode::simplifiedTypeName() const
|
||||
{
|
||||
return modelNode().simplifiedTypeName();
|
||||
}
|
||||
|
||||
uint qHash(const QmlItemNode &node)
|
||||
{
|
||||
return qHash(node.modelNode());
|
||||
|
@@ -693,4 +693,10 @@ uint qHash(const QmlObjectNode &node)
|
||||
{
|
||||
return qHash(node.modelNode());
|
||||
}
|
||||
|
||||
QString QmlObjectNode::simplifiedTypeName() const
|
||||
{
|
||||
return modelNode().simplifiedTypeName();
|
||||
}
|
||||
|
||||
} //QmlDesigner
|
||||
|
Reference in New Issue
Block a user