From e3bbb2fdb691866385f8d4941b32ee477da60cae Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Tue, 28 Sep 2021 16:57:23 +0200 Subject: [PATCH] QmlDesigner: Fix qHash warnings Change-Id: I2f281fb8ea1751ead1935d0b2e62d9325aee59e0 Reviewed-by: Tim Jenssen Reviewed-by: Qt CI Bot --- .../designercore/include/abstractproperty.h | 7 +++++-- .../qmldesigner/designercore/include/modelnode.h | 4 ++-- .../designercore/include/nodeabstractproperty.h | 4 ++-- .../qmldesigner/designercore/include/qml3dnode.h | 4 ++-- .../qmldesigner/designercore/include/qmlitemnode.h | 4 ++-- .../designercore/include/qmlmodelnodefacade.h | 3 +-- .../qmldesigner/designercore/include/qmlobjectnode.h | 3 ++- .../qmldesigner/designercore/include/qmlvisualnode.h | 2 -- .../designercore/model/abstractproperty.cpp | 7 ------- .../qmldesigner/designercore/model/modelnode.cpp | 6 ------ .../designercore/model/nodeabstractproperty.cpp | 5 ----- .../qmldesigner/designercore/model/qmlitemnode.cpp | 5 ----- .../designercore/model/qmlmodelnodefacade.cpp | 10 ---------- .../qmldesigner/designercore/model/qmlobjectnode.cpp | 5 ----- 14 files changed, 16 insertions(+), 53 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/include/abstractproperty.h b/src/plugins/qmldesigner/designercore/include/abstractproperty.h index 7f6671be5ea..cb717664454 100644 --- a/src/plugins/qmldesigner/designercore/include/abstractproperty.h +++ b/src/plugins/qmldesigner/designercore/include/abstractproperty.h @@ -66,7 +66,6 @@ class QMLDESIGNERCORE_EXPORT AbstractProperty friend QMLDESIGNERCORE_EXPORT bool operator ==(const AbstractProperty &property1, const AbstractProperty &property2); friend QMLDESIGNERCORE_EXPORT bool operator !=(const AbstractProperty &property1, const AbstractProperty &property2); - friend QMLDESIGNERCORE_EXPORT uint qHash(const AbstractProperty& property); public: AbstractProperty(); @@ -103,6 +102,11 @@ public: Model *model() const; AbstractView *view() const; + friend auto qHash(const AbstractProperty &property) + { + return ::qHash(property.m_internalNode.data()) ^ ::qHash(property.m_propertyName); + } + protected: AbstractProperty(const PropertyName &propertyName, const Internal::InternalNodePointer &internalNode, Model* model, AbstractView *view); AbstractProperty(const Internal::InternalPropertyPointer &property, Model* model, AbstractView *view); @@ -118,7 +122,6 @@ private: QMLDESIGNERCORE_EXPORT bool operator ==(const AbstractProperty &property1, const AbstractProperty &property2); QMLDESIGNERCORE_EXPORT bool operator !=(const AbstractProperty &property1, const AbstractProperty &property2); -QMLDESIGNERCORE_EXPORT uint qHash(const AbstractProperty& property); QMLDESIGNERCORE_EXPORT QTextStream& operator<<(QTextStream &stream, const AbstractProperty &property); QMLDESIGNERCORE_EXPORT QDebug operator<<(QDebug debug, const AbstractProperty &AbstractProperty); } diff --git a/src/plugins/qmldesigner/designercore/include/modelnode.h b/src/plugins/qmldesigner/designercore/include/modelnode.h index 7fba10d3cd9..a34762ff50a 100644 --- a/src/plugins/qmldesigner/designercore/include/modelnode.h +++ b/src/plugins/qmldesigner/designercore/include/modelnode.h @@ -71,7 +71,6 @@ class QMLDESIGNERCORE_EXPORT ModelNode { friend QMLDESIGNERCORE_EXPORT bool operator ==(const ModelNode &firstNode, const ModelNode &secondNode); friend QMLDESIGNERCORE_EXPORT bool operator !=(const ModelNode &firstNode, const ModelNode &secondNode); - friend QMLDESIGNERCORE_EXPORT uint qHash(const ModelNode & node); friend QMLDESIGNERCORE_EXPORT QDebug operator<<(QDebug debug, const ModelNode &modelNode); friend QMLDESIGNERCORE_EXPORT bool operator <(const ModelNode &firstNode, const ModelNode &secondNode); friend QMLDESIGNERCORE_EXPORT QList toInternalNodeList(const QList &nodeList); @@ -248,6 +247,8 @@ public: swap(first.m_view, second.m_view); } + friend auto qHash(const ModelNode &node) { return ::qHash(node.m_internalNode.data()); } + private: // functions Internal::InternalNodePointer internalNode() const; @@ -261,7 +262,6 @@ private: // variables QMLDESIGNERCORE_EXPORT bool operator ==(const ModelNode &firstNode, const ModelNode &secondNode); QMLDESIGNERCORE_EXPORT bool operator !=(const ModelNode &firstNode, const ModelNode &secondNode); -QMLDESIGNERCORE_EXPORT uint qHash(const ModelNode & node); QMLDESIGNERCORE_EXPORT bool operator <(const ModelNode &firstNode, const ModelNode &secondNode); QMLDESIGNERCORE_EXPORT QDebug operator<<(QDebug debug, const ModelNode &modelNode); QMLDESIGNERCORE_EXPORT QTextStream& operator<<(QTextStream &stream, const ModelNode &modelNode); diff --git a/src/plugins/qmldesigner/designercore/include/nodeabstractproperty.h b/src/plugins/qmldesigner/designercore/include/nodeabstractproperty.h index 8c2f67e6ad4..fcca9edd730 100644 --- a/src/plugins/qmldesigner/designercore/include/nodeabstractproperty.h +++ b/src/plugins/qmldesigner/designercore/include/nodeabstractproperty.h @@ -42,7 +42,6 @@ class QMLDESIGNERCORE_EXPORT NodeAbstractProperty : public AbstractProperty friend QMLDESIGNERCORE_EXPORT bool operator ==(const NodeAbstractProperty &property1, const NodeAbstractProperty &property2); friend QMLDESIGNERCORE_EXPORT bool operator !=(const NodeAbstractProperty &property1, const NodeAbstractProperty &property2); - friend QMLDESIGNERCORE_EXPORT uint qHash(const NodeAbstractProperty& property); public: NodeAbstractProperty(); @@ -56,6 +55,8 @@ public: QList allSubNodes(); QList directSubNodes() const; + friend auto qHash(const NodeAbstractProperty &property) { qHash(AbstractProperty(property)); } + protected: NodeAbstractProperty(const PropertyName &propertyName, const Internal::InternalNodePointer &internalNode, Model *model, AbstractView *view); NodeAbstractProperty(const Internal::InternalNodeAbstractPropertyPointer &property, Model *model, AbstractView *view); @@ -65,7 +66,6 @@ protected: QMLDESIGNERCORE_EXPORT bool operator ==(const NodeAbstractProperty &property1, const NodeAbstractProperty &property2); QMLDESIGNERCORE_EXPORT bool operator !=(const NodeAbstractProperty &property1, const NodeAbstractProperty &property2); -QMLDESIGNERCORE_EXPORT uint qHash(const NodeAbstractProperty& property); QMLDESIGNERCORE_EXPORT QTextStream& operator<<(QTextStream &stream, const NodeAbstractProperty &property); QMLDESIGNERCORE_EXPORT QDebug operator<<(QDebug debug, const NodeAbstractProperty &property); diff --git a/src/plugins/qmldesigner/designercore/include/qml3dnode.h b/src/plugins/qmldesigner/designercore/include/qml3dnode.h index e2e76889790..d52cacb49b5 100644 --- a/src/plugins/qmldesigner/designercore/include/qml3dnode.h +++ b/src/plugins/qmldesigner/designercore/include/qml3dnode.h @@ -55,12 +55,12 @@ public: void setBindingProperty(const PropertyName &name, const QString &expression) override; bool isBlocked(const PropertyName &propName) const override; + friend auto qHash(const Qml3DNode &node) { return qHash(node.modelNode()); } + private: void handleEulerRotationSet(); }; -QMLDESIGNERCORE_EXPORT uint qHash(const Qml3DNode &node); - QMLDESIGNERCORE_EXPORT QList toModelNodeList(const QList &fxItemNodeList); QMLDESIGNERCORE_EXPORT QList toQml3DNodeList(const QList &modelNodeList); diff --git a/src/plugins/qmldesigner/designercore/include/qmlitemnode.h b/src/plugins/qmldesigner/designercore/include/qmlitemnode.h index 38b5f24c773..579a4ca7b85 100644 --- a/src/plugins/qmldesigner/designercore/include/qmlitemnode.h +++ b/src/plugins/qmldesigner/designercore/include/qmlitemnode.h @@ -147,6 +147,8 @@ public: bool isFlowItem() const; bool isFlowActionArea() const; ModelNode rootModelNode() const; + + friend auto qHash(const QmlItemNode &node) { return qHash(node.modelNode()); } }; class QmlFlowItemNode; @@ -218,8 +220,6 @@ protected: }; -QMLDESIGNERCORE_EXPORT uint qHash(const QmlItemNode &node); - QMLDESIGNERCORE_EXPORT QList toModelNodeList(const QList &fxItemNodeList); QMLDESIGNERCORE_EXPORT QList toQmlItemNodeList(const QList &modelNodeList); QMLDESIGNERCORE_EXPORT QList toQmlItemNodeListKeppInvalid(const QList &modelNodeList); diff --git a/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h b/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h index db2c36381ba..2a883cf7772 100644 --- a/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h +++ b/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h @@ -37,8 +37,7 @@ class QMLDESIGNERCORE_EXPORT QmlModelNodeFacade { public: operator ModelNode() const; - ModelNode modelNode(); - const ModelNode modelNode() const; + ModelNode modelNode() const { return m_modelNode; } bool hasModelNode() const; static bool isValidQmlModelNodeFacade(const ModelNode &modelNode); virtual bool isValid() const; diff --git a/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h b/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h index 43f975e5cf5..59f99bbe398 100644 --- a/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h +++ b/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h @@ -127,6 +127,8 @@ public: virtual bool isBlocked(const PropertyName &propName) const; + friend auto qHash(const QmlObjectNode &node) { return qHash(node.modelNode()); } + protected: NodeInstance nodeInstance() const; QmlObjectNode nodeForInstance(const NodeInstance &instance) const; @@ -136,7 +138,6 @@ protected: QList allDefinedStates() const; }; -QMLDESIGNERCORE_EXPORT uint qHash(const QmlObjectNode &node); QMLDESIGNERCORE_EXPORT QList toModelNodeList(const QList &fxObjectNodeList); QMLDESIGNERCORE_EXPORT QList toQmlObjectNodeList(const QList &modelNodeList); }// QmlDesigner diff --git a/src/plugins/qmldesigner/designercore/include/qmlvisualnode.h b/src/plugins/qmldesigner/designercore/include/qmlvisualnode.h index aae262686ae..114fef0d63c 100644 --- a/src/plugins/qmldesigner/designercore/include/qmlvisualnode.h +++ b/src/plugins/qmldesigner/designercore/include/qmlvisualnode.h @@ -118,8 +118,6 @@ private: void setDoubleProperty(const PropertyName &name, double value); }; -QMLDESIGNERCORE_EXPORT uint qHash(const QmlItemNode &node); - class QMLDESIGNERCORE_EXPORT QmlModelStateGroup { friend class QmlVisualNode; diff --git a/src/plugins/qmldesigner/designercore/model/abstractproperty.cpp b/src/plugins/qmldesigner/designercore/model/abstractproperty.cpp index 94943349210..4b2ff2f39cc 100644 --- a/src/plugins/qmldesigner/designercore/model/abstractproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/abstractproperty.cpp @@ -357,13 +357,6 @@ bool operator !=(const AbstractProperty &property1, const AbstractProperty &prop return !(property1 == property2); } -uint qHash(const AbstractProperty &property) -{ - //### to do - return ::qHash(property.m_internalNode.data()) - ^ ::qHash(property.m_propertyName); -} - QDebug operator<<(QDebug debug, const AbstractProperty &property) { return debug.nospace() << "AbstractProperty(" << (property.isValid() ? property.name() : PropertyName("invalid")) << ')'; diff --git a/src/plugins/qmldesigner/designercore/model/modelnode.cpp b/src/plugins/qmldesigner/designercore/model/modelnode.cpp index 924172b5b1a..7e4f2b4b2a7 100644 --- a/src/plugins/qmldesigner/designercore/model/modelnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/modelnode.cpp @@ -768,12 +768,6 @@ Internal::InternalNodePointer ModelNode::internalNode() const return m_internalNode; } - -uint qHash(const ModelNode &node) -{ - return ::qHash(node.internalId()); -} - /*! \brief returns the model of the node \return returns the model of the node diff --git a/src/plugins/qmldesigner/designercore/model/nodeabstractproperty.cpp b/src/plugins/qmldesigner/designercore/model/nodeabstractproperty.cpp index 41e7123823e..b34c6fefc05 100644 --- a/src/plugins/qmldesigner/designercore/model/nodeabstractproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/nodeabstractproperty.cpp @@ -183,11 +183,6 @@ bool operator !=(const NodeAbstractProperty &property1, const NodeAbstractProper return !(property1 == property2); } -uint qHash(const NodeAbstractProperty &property) -{ - return qHash(AbstractProperty(property)); -} - QDebug operator<<(QDebug debug, const NodeAbstractProperty &property) { return debug.nospace() << "NodeAbstractProperty(" << (property.isValid() ? property.name() : PropertyName("invalid")) << ')'; diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp index 7dc831caf19..03ae0ecd1dc 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp @@ -480,11 +480,6 @@ QPixmap QmlItemNode::instanceBlurredRenderPixmap() const return nodeInstance().blurredRenderPixmap(); } -uint qHash(const QmlItemNode &node) -{ - return qHash(node.modelNode()); -} - QList toModelNodeList(const QList &qmlItemNodeList) { QList modelNodeList; diff --git a/src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp b/src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp index 5c02c946768..5094f0b2bd2 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp @@ -60,16 +60,6 @@ QmlModelNodeFacade::operator ModelNode() const return m_modelNode; } -ModelNode QmlModelNodeFacade::modelNode() -{ - return m_modelNode; -} - -const ModelNode QmlModelNodeFacade::modelNode() const -{ - return m_modelNode; -} - bool QmlModelNodeFacade::hasModelNode() const { return m_modelNode.isValid(); diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp index 7975fb6d2ef..556a7624ba9 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp @@ -737,11 +737,6 @@ QmlVisualNode QmlObjectNode::toQmlVisualNode() const return QmlVisualNode(modelNode()); } -uint qHash(const QmlObjectNode &node) -{ - return qHash(node.modelNode()); -} - QString QmlObjectNode::simplifiedTypeName() const { return modelNode().simplifiedTypeName();