From 1b07f00f9cce686b1ab69554cfdf2c3dae59d267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Meerk=C3=B6tter?= Date: Wed, 18 Nov 2020 19:46:35 +0100 Subject: Adapt to changed upstream API types Task-number: QTBUG-88518 Change-Id: I6a1027cebde2a50640a5f018d101a6facf8ce5e5 Reviewed-by: Maurice Kalinowski (cherry picked from commit fc6832f419444f795794845cea189f0d3d64eae2) Reviewed-by: Frank Meerkoetter --- src/imports/opcua/opcuaattributeoperand.cpp | 4 ++-- src/imports/opcua/opcuaattributeoperand.h | 4 ++-- src/imports/opcua/opcuaeventfilter.cpp | 8 ++++---- src/imports/opcua/opcuaeventfilter.h | 8 ++++---- src/imports/opcua/opcuamethodnode.cpp | 4 ++-- src/imports/opcua/opcuamethodnode.h | 4 ++-- src/imports/opcua/opcuarelativenodeid.cpp | 4 ++-- src/imports/opcua/opcuarelativenodeid.h | 4 ++-- src/imports/opcua/opcuasimpleattributeoperand.cpp | 4 ++-- src/imports/opcua/opcuasimpleattributeoperand.h | 4 ++-- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/imports/opcua/opcuaattributeoperand.cpp b/src/imports/opcua/opcuaattributeoperand.cpp index 3223651..28e1303 100644 --- a/src/imports/opcua/opcuaattributeoperand.cpp +++ b/src/imports/opcua/opcuaattributeoperand.cpp @@ -222,12 +222,12 @@ void OpcUaAttributeOperand::appendBrowsePathElement(QQmlListProperty(list->data)->appendBrowsePathElement(nodeId); } -int OpcUaAttributeOperand::browsePathSize(QQmlListProperty *list) +qsizetype OpcUaAttributeOperand::browsePathSize(QQmlListProperty *list) { return reinterpret_cast(list->data)->browsePathSize(); } -OpcUaRelativeNodePath *OpcUaAttributeOperand::browsePathElement(QQmlListProperty *list, int index) +OpcUaRelativeNodePath *OpcUaAttributeOperand::browsePathElement(QQmlListProperty *list, qsizetype index) { return reinterpret_cast(list->data)->browsePathElement(index); } diff --git a/src/imports/opcua/opcuaattributeoperand.h b/src/imports/opcua/opcuaattributeoperand.h index 7ff05d8..1fd16c6 100644 --- a/src/imports/opcua/opcuaattributeoperand.h +++ b/src/imports/opcua/opcuaattributeoperand.h @@ -84,8 +84,8 @@ signals: private: static void appendBrowsePathElement(QQmlListProperty *list, OpcUaRelativeNodePath *nodeId); - static int browsePathSize(QQmlListProperty *list); - static OpcUaRelativeNodePath* browsePathElement(QQmlListProperty *list, int index); + static qsizetype browsePathSize(QQmlListProperty *list); + static OpcUaRelativeNodePath* browsePathElement(QQmlListProperty *list, qsizetype index); static void clearBrowsePath(QQmlListProperty *list); QList m_browsePath; diff --git a/src/imports/opcua/opcuaeventfilter.cpp b/src/imports/opcua/opcuaeventfilter.cpp index 7002732..cb9e086 100644 --- a/src/imports/opcua/opcuaeventfilter.cpp +++ b/src/imports/opcua/opcuaeventfilter.cpp @@ -185,12 +185,12 @@ void OpcUaEventFilter::appendFilterElement(QQmlListProperty reinterpret_cast(list->data)->appendFilterElement(nodeId); } -int OpcUaEventFilter::filterElementCount(QQmlListProperty *list) +qsizetype OpcUaEventFilter::filterElementCount(QQmlListProperty *list) { return reinterpret_cast(list->data)->filterElementCount(); } -OpcUaFilterElement *OpcUaEventFilter::filterElement(QQmlListProperty *list, int index) +OpcUaFilterElement *OpcUaEventFilter::filterElement(QQmlListProperty *list, qsizetype index) { return reinterpret_cast(list->data)->filterElement(index); } @@ -236,12 +236,12 @@ void OpcUaEventFilter::appendSelector(QQmlListProperty(list->data)->appendSelector(nodeId); } -int OpcUaEventFilter::selectorCount(QQmlListProperty *list) +qsizetype OpcUaEventFilter::selectorCount(QQmlListProperty *list) { return reinterpret_cast(list->data)->selectorCount(); } -OpcUaSimpleAttributeOperand *OpcUaEventFilter::selector(QQmlListProperty *list, int index) +OpcUaSimpleAttributeOperand *OpcUaEventFilter::selector(QQmlListProperty *list, qsizetype index) { return reinterpret_cast(list->data)->selector(index); } diff --git a/src/imports/opcua/opcuaeventfilter.h b/src/imports/opcua/opcuaeventfilter.h index 91db885..631647e 100644 --- a/src/imports/opcua/opcuaeventfilter.h +++ b/src/imports/opcua/opcuaeventfilter.h @@ -77,13 +77,13 @@ signals: private: static void appendSelector(QQmlListProperty *list, OpcUaSimpleAttributeOperand *); - static int selectorCount(QQmlListProperty *list); - static OpcUaSimpleAttributeOperand* selector(QQmlListProperty *list, int index); + static qsizetype selectorCount(QQmlListProperty *list); + static OpcUaSimpleAttributeOperand* selector(QQmlListProperty *list, qsizetype index); static void clearSelectors(QQmlListProperty *list); static void appendFilterElement(QQmlListProperty *list, OpcUaFilterElement *nodeId); - static int filterElementCount(QQmlListProperty *list); - static OpcUaFilterElement* filterElement(QQmlListProperty *list, int index); + static qsizetype filterElementCount(QQmlListProperty *list); + static OpcUaFilterElement* filterElement(QQmlListProperty *list, qsizetype index); static void clearFilterElements(QQmlListProperty *list); QList m_filterElements; diff --git a/src/imports/opcua/opcuamethodnode.cpp b/src/imports/opcua/opcuamethodnode.cpp index cef5a14..61a320e 100644 --- a/src/imports/opcua/opcuamethodnode.cpp +++ b/src/imports/opcua/opcuamethodnode.cpp @@ -275,11 +275,11 @@ void OpcUaMethodNode::clearArguments(QQmlListProperty* list reinterpret_cast< QList* >(list->data)->clear(); } -OpcUaMethodArgument* OpcUaMethodNode::argument(QQmlListProperty* list, int i) { +OpcUaMethodArgument* OpcUaMethodNode::argument(QQmlListProperty* list, qsizetype i) { return reinterpret_cast< QList* >(list->data)->at(i); } -int OpcUaMethodNode::argumentCount(QQmlListProperty* list) { +qsizetype OpcUaMethodNode::argumentCount(QQmlListProperty* list) { return reinterpret_cast< QList* >(list->data)->count(); } diff --git a/src/imports/opcua/opcuamethodnode.h b/src/imports/opcua/opcuamethodnode.h index 33faf79..faffb53 100644 --- a/src/imports/opcua/opcuamethodnode.h +++ b/src/imports/opcua/opcuamethodnode.h @@ -82,8 +82,8 @@ private: bool checkValidity() override; static void appendArgument(QQmlListProperty*, OpcUaMethodArgument *); - static int argumentCount(QQmlListProperty*); - static OpcUaMethodArgument* argument(QQmlListProperty*, int); + static qsizetype argumentCount(QQmlListProperty*); + static OpcUaMethodArgument* argument(QQmlListProperty*, qsizetype); static void clearArguments(QQmlListProperty*); private: diff --git a/src/imports/opcua/opcuarelativenodeid.cpp b/src/imports/opcua/opcuarelativenodeid.cpp index f51425d..3963361 100644 --- a/src/imports/opcua/opcuarelativenodeid.cpp +++ b/src/imports/opcua/opcuarelativenodeid.cpp @@ -162,11 +162,11 @@ void OpcUaRelativeNodeId::clearPaths(QQmlListProperty* li reinterpret_cast< OpcUaRelativeNodeId* >(list->data)->clearPaths(); } -OpcUaRelativeNodePath* OpcUaRelativeNodeId::path(QQmlListProperty* list, int i) { +OpcUaRelativeNodePath* OpcUaRelativeNodeId::path(QQmlListProperty* list, qsizetype i) { return reinterpret_cast< OpcUaRelativeNodeId* >(list->data)->path(i); } -int OpcUaRelativeNodeId::pathCount(QQmlListProperty* list) { +qsizetype OpcUaRelativeNodeId::pathCount(QQmlListProperty* list) { return reinterpret_cast< OpcUaRelativeNodeId* >(list->data)->pathCount(); } diff --git a/src/imports/opcua/opcuarelativenodeid.h b/src/imports/opcua/opcuarelativenodeid.h index 5d7f6db..9b9eab8 100644 --- a/src/imports/opcua/opcuarelativenodeid.h +++ b/src/imports/opcua/opcuarelativenodeid.h @@ -71,8 +71,8 @@ public slots: private: static void appendPath(QQmlListProperty*, OpcUaRelativeNodePath *); - static int pathCount(QQmlListProperty*); - static OpcUaRelativeNodePath* path(QQmlListProperty*, int); + static qsizetype pathCount(QQmlListProperty*); + static OpcUaRelativeNodePath* path(QQmlListProperty*, qsizetype); static void clearPaths(QQmlListProperty*); OpcUaNodeIdType *m_startNode = nullptr; diff --git a/src/imports/opcua/opcuasimpleattributeoperand.cpp b/src/imports/opcua/opcuasimpleattributeoperand.cpp index 75dec51..4226112 100644 --- a/src/imports/opcua/opcuasimpleattributeoperand.cpp +++ b/src/imports/opcua/opcuasimpleattributeoperand.cpp @@ -229,12 +229,12 @@ void OpcUaSimpleAttributeOperand::appendBrowsePathElement(QQmlListProperty(list->data)->appendBrowsePathElement(nodeId); } -int OpcUaSimpleAttributeOperand::browsePathSize(QQmlListProperty *list) +qsizetype OpcUaSimpleAttributeOperand::browsePathSize(QQmlListProperty *list) { return reinterpret_cast(list->data)->browsePathSize(); } -OpcUaNodeId *OpcUaSimpleAttributeOperand::browsePathElement(QQmlListProperty *list, int index) +OpcUaNodeId *OpcUaSimpleAttributeOperand::browsePathElement(QQmlListProperty *list, qsizetype index) { return reinterpret_cast(list->data)->browsePathElement(index); } diff --git a/src/imports/opcua/opcuasimpleattributeoperand.h b/src/imports/opcua/opcuasimpleattributeoperand.h index 80bf4cf..1aa910b 100644 --- a/src/imports/opcua/opcuasimpleattributeoperand.h +++ b/src/imports/opcua/opcuasimpleattributeoperand.h @@ -80,8 +80,8 @@ signals: private: static void appendBrowsePathElement(QQmlListProperty *list, OpcUaNodeId *nodeId); - static int browsePathSize(QQmlListProperty *list); - static OpcUaNodeId* browsePathElement(QQmlListProperty *list, int index); + static qsizetype browsePathSize(QQmlListProperty *list); + static OpcUaNodeId* browsePathElement(QQmlListProperty *list, qsizetype index); static void clearBrowsePath(QQmlListProperty *list); QList m_browsePath; -- cgit v1.2.3