feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Move simplifiedTypeName() to QmlObjectNode

Browse Source 
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:
Thomas Hartmann
2019-09-05 15:23:42 +02:00
parent fd8b9235b0
commit 58db759768
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/designercore/include/qmlitemnode.h
View File

@@ -115,8 +115,6 @@ public:
QPixmap instanceRenderPixmap() const; QPixmap instanceRenderPixmap() const;
QPixmap instanceBlurredRenderPixmap() const; QPixmap instanceBlurredRenderPixmap() const;
QString simplifiedTypeName() const;
const QList<QmlItemNode> allDirectSubModelNodes() const; const QList<QmlItemNode> allDirectSubModelNodes() const;
const QList<QmlItemNode> allSubModelNodes() const; const QList<QmlItemNode> allSubModelNodes() const;
bool hasAnySubModelNodes() const; bool hasAnySubModelNodes() const;

1
src/plugins/qmldesigner/designercore/include/qmlobjectnode.h
View File

@@ -114,6 +114,7 @@ public:
static QVariant instanceValue(const ModelNode &modelNode, const PropertyName &name); static QVariant instanceValue(const ModelNode &modelNode, const PropertyName &name);
static QString generateTranslatableText(const QString& text); static QString generateTranslatableText(const QString& text);
QString simplifiedTypeName() const;
protected: protected:
NodeInstance nodeInstance() const; NodeInstance nodeInstance() const;

5
src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
View File

@@ -508,11 +508,6 @@ QList<QmlModelState> QmlModelStateGroup::allStates() const
return returnList; return returnList;
} }
QString QmlItemNode::simplifiedTypeName() const
{
return modelNode().simplifiedTypeName();
}
uint qHash(const QmlItemNode &node) uint qHash(const QmlItemNode &node)
{ {
return qHash(node.modelNode()); return qHash(node.modelNode());

6
src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
View File

@@ -693,4 +693,10 @@ uint qHash(const QmlObjectNode &node)
{ {
return qHash(node.modelNode()); return qHash(node.modelNode());
} }
QString QmlObjectNode::simplifiedTypeName() const
{
return modelNode().simplifiedTypeName();
}
} //QmlDesigner } //QmlDesigner