From 58db759768447b650ef83f7c7488f993dfd6a55d Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Thu, 5 Sep 2019 15:23:42 +0200
Subject: [PATCH] QmlDesigner: Move simplifiedTypeName() to QmlObjectNode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/plugins/qmldesigner/designercore/include/qmlitemnode.h  | 2 --
 .../qmldesigner/designercore/include/qmlobjectnode.h        | 1 +
 src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp  | 5 -----
 .../qmldesigner/designercore/model/qmlobjectnode.cpp        | 6 ++++++
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/plugins/qmldesigner/designercore/include/qmlitemnode.h b/src/plugins/qmldesigner/designercore/include/qmlitemnode.h
index 1560ebb3ff4..3e19515147e 100644
--- a/src/plugins/qmldesigner/designercore/include/qmlitemnode.h
+++ b/src/plugins/qmldesigner/designercore/include/qmlitemnode.h
@@ -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;
diff --git a/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h b/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h
index 8f539bc0369..5a212ba5ce1 100644
--- a/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h
+++ b/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h
@@ -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;
diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
index 65b34f1de4f..3b682afcfb8 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
@@ -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());
diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
index cc44f9c4488..7d55aff5a4f 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
@@ -693,4 +693,10 @@ uint qHash(const QmlObjectNode &node)
 {
     return qHash(node.modelNode());
 }
+
+QString QmlObjectNode::simplifiedTypeName() const
+{
+    return modelNode().simplifiedTypeName();
+}
+
 } //QmlDesigner