diff --git a/src/plugins/qmldesigner/designercore/include/nodehints.h b/src/plugins/qmldesigner/designercore/include/nodehints.h index 01222c2e4ae..79a26c41e5e 100644 --- a/src/plugins/qmldesigner/designercore/include/nodehints.h +++ b/src/plugins/qmldesigner/designercore/include/nodehints.h @@ -88,7 +88,7 @@ class JSObject : public QObject { Q_PROPERTY(bool currentParentIsRoot READ currentParentIsRoot NOTIFY modelNodeChanged) public: - JSObject(); + JSObject() = default; JSObject(QObject *parent = 0); void setModelNode(const ModelNode &node); bool hasParent() const; diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodehints.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodehints.cpp index 477796516db..dfd46090593 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodehints.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodehints.cpp @@ -222,7 +222,7 @@ bool JSObject::isSubclassOf(const QString &typeName) NodeMetaInfo metaInfo = m_modelNode.metaInfo(); if (metaInfo.isValid()) - metaInfo.isSubclassOf(typeName.toUtf8()); + return metaInfo.isSubclassOf(typeName.toUtf8()); return false; } @@ -232,7 +232,7 @@ bool JSObject::rootItemIsSubclassOf(const QString &typeName) NodeMetaInfo metaInfo = m_modelNode.view()->rootModelNode().metaInfo(); if (metaInfo.isValid()) - metaInfo.isSubclassOf(typeName.toUtf8()); + return metaInfo.isSubclassOf(typeName.toUtf8()); return false; } @@ -243,16 +243,11 @@ bool JSObject::currentParentIsSubclassOf(const QString &typeName) && m_modelNode.parentProperty().isValid()) { NodeMetaInfo metaInfo = m_modelNode.parentProperty().parentModelNode().metaInfo(); if (metaInfo.isValid()) - metaInfo.isSubclassOf(typeName.toUtf8()); + return metaInfo.isSubclassOf(typeName.toUtf8()); } return false; } -JSObject::JSObject() -{ - -} - } //Internal } // namespace QmlDesigner