diff options
author | Frank Meerkötter <frank.meerkoetter@basyskom.com> | 2020-11-18 19:46:35 +0100 |
---|---|---|
committer | Jannis Völker <jannis.voelker@basyskom.com> | 2020-11-20 14:23:00 +0000 |
commit | 1b07f00f9cce686b1ab69554cfdf2c3dae59d267 (patch) | |
tree | 0a5f3f2bc2771a234d8ca8762745de4e89f3fcea | |
parent | b89cedd070a6f705f0be633a3253226e53349761 (diff) |
Adapt to changed upstream API types
Task-number: QTBUG-88518
Change-Id: I6a1027cebde2a50640a5f018d101a6facf8ce5e5
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
(cherry picked from commit fc6832f419444f795794845cea189f0d3d64eae2)
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
-rw-r--r-- | src/imports/opcua/opcuaattributeoperand.cpp | 4 | ||||
-rw-r--r-- | src/imports/opcua/opcuaattributeoperand.h | 4 | ||||
-rw-r--r-- | src/imports/opcua/opcuaeventfilter.cpp | 8 | ||||
-rw-r--r-- | src/imports/opcua/opcuaeventfilter.h | 8 | ||||
-rw-r--r-- | src/imports/opcua/opcuamethodnode.cpp | 4 | ||||
-rw-r--r-- | src/imports/opcua/opcuamethodnode.h | 4 | ||||
-rw-r--r-- | src/imports/opcua/opcuarelativenodeid.cpp | 4 | ||||
-rw-r--r-- | src/imports/opcua/opcuarelativenodeid.h | 4 | ||||
-rw-r--r-- | src/imports/opcua/opcuasimpleattributeoperand.cpp | 4 | ||||
-rw-r--r-- | 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<OpcUaRelati reinterpret_cast<OpcUaAttributeOperand*>(list->data)->appendBrowsePathElement(nodeId); } -int OpcUaAttributeOperand::browsePathSize(QQmlListProperty<OpcUaRelativeNodePath> *list) +qsizetype OpcUaAttributeOperand::browsePathSize(QQmlListProperty<OpcUaRelativeNodePath> *list) { return reinterpret_cast<OpcUaAttributeOperand*>(list->data)->browsePathSize(); } -OpcUaRelativeNodePath *OpcUaAttributeOperand::browsePathElement(QQmlListProperty<OpcUaRelativeNodePath> *list, int index) +OpcUaRelativeNodePath *OpcUaAttributeOperand::browsePathElement(QQmlListProperty<OpcUaRelativeNodePath> *list, qsizetype index) { return reinterpret_cast<OpcUaAttributeOperand*>(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<OpcUaRelativeNodePath> *list, OpcUaRelativeNodePath *nodeId); - static int browsePathSize(QQmlListProperty<OpcUaRelativeNodePath> *list); - static OpcUaRelativeNodePath* browsePathElement(QQmlListProperty<OpcUaRelativeNodePath> *list, int index); + static qsizetype browsePathSize(QQmlListProperty<OpcUaRelativeNodePath> *list); + static OpcUaRelativeNodePath* browsePathElement(QQmlListProperty<OpcUaRelativeNodePath> *list, qsizetype index); static void clearBrowsePath(QQmlListProperty<OpcUaRelativeNodePath> *list); QList<OpcUaRelativeNodePath*> 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<OpcUaFilterElement> reinterpret_cast<OpcUaEventFilter*>(list->data)->appendFilterElement(nodeId); } -int OpcUaEventFilter::filterElementCount(QQmlListProperty<OpcUaFilterElement> *list) +qsizetype OpcUaEventFilter::filterElementCount(QQmlListProperty<OpcUaFilterElement> *list) { return reinterpret_cast<OpcUaEventFilter*>(list->data)->filterElementCount(); } -OpcUaFilterElement *OpcUaEventFilter::filterElement(QQmlListProperty<OpcUaFilterElement> *list, int index) +OpcUaFilterElement *OpcUaEventFilter::filterElement(QQmlListProperty<OpcUaFilterElement> *list, qsizetype index) { return reinterpret_cast<OpcUaEventFilter*>(list->data)->filterElement(index); } @@ -236,12 +236,12 @@ void OpcUaEventFilter::appendSelector(QQmlListProperty<OpcUaSimpleAttributeOpera reinterpret_cast<OpcUaEventFilter*>(list->data)->appendSelector(nodeId); } -int OpcUaEventFilter::selectorCount(QQmlListProperty<OpcUaSimpleAttributeOperand> *list) +qsizetype OpcUaEventFilter::selectorCount(QQmlListProperty<OpcUaSimpleAttributeOperand> *list) { return reinterpret_cast<OpcUaEventFilter*>(list->data)->selectorCount(); } -OpcUaSimpleAttributeOperand *OpcUaEventFilter::selector(QQmlListProperty<OpcUaSimpleAttributeOperand> *list, int index) +OpcUaSimpleAttributeOperand *OpcUaEventFilter::selector(QQmlListProperty<OpcUaSimpleAttributeOperand> *list, qsizetype index) { return reinterpret_cast<OpcUaEventFilter*>(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<OpcUaSimpleAttributeOperand> *list, OpcUaSimpleAttributeOperand *); - static int selectorCount(QQmlListProperty<OpcUaSimpleAttributeOperand> *list); - static OpcUaSimpleAttributeOperand* selector(QQmlListProperty<OpcUaSimpleAttributeOperand> *list, int index); + static qsizetype selectorCount(QQmlListProperty<OpcUaSimpleAttributeOperand> *list); + static OpcUaSimpleAttributeOperand* selector(QQmlListProperty<OpcUaSimpleAttributeOperand> *list, qsizetype index); static void clearSelectors(QQmlListProperty<OpcUaSimpleAttributeOperand> *list); static void appendFilterElement(QQmlListProperty<OpcUaFilterElement> *list, OpcUaFilterElement *nodeId); - static int filterElementCount(QQmlListProperty<OpcUaFilterElement> *list); - static OpcUaFilterElement* filterElement(QQmlListProperty<OpcUaFilterElement> *list, int index); + static qsizetype filterElementCount(QQmlListProperty<OpcUaFilterElement> *list); + static OpcUaFilterElement* filterElement(QQmlListProperty<OpcUaFilterElement> *list, qsizetype index); static void clearFilterElements(QQmlListProperty<OpcUaFilterElement> *list); QList<OpcUaFilterElement*> 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<OpcUaMethodArgument>* list reinterpret_cast< QList<OpcUaMethodArgument*>* >(list->data)->clear(); } -OpcUaMethodArgument* OpcUaMethodNode::argument(QQmlListProperty<OpcUaMethodArgument>* list, int i) { +OpcUaMethodArgument* OpcUaMethodNode::argument(QQmlListProperty<OpcUaMethodArgument>* list, qsizetype i) { return reinterpret_cast< QList<OpcUaMethodArgument*>* >(list->data)->at(i); } -int OpcUaMethodNode::argumentCount(QQmlListProperty<OpcUaMethodArgument>* list) { +qsizetype OpcUaMethodNode::argumentCount(QQmlListProperty<OpcUaMethodArgument>* list) { return reinterpret_cast< QList<OpcUaMethodArgument*>* >(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>*, OpcUaMethodArgument *); - static int argumentCount(QQmlListProperty<OpcUaMethodArgument>*); - static OpcUaMethodArgument* argument(QQmlListProperty<OpcUaMethodArgument>*, int); + static qsizetype argumentCount(QQmlListProperty<OpcUaMethodArgument>*); + static OpcUaMethodArgument* argument(QQmlListProperty<OpcUaMethodArgument>*, qsizetype); static void clearArguments(QQmlListProperty<OpcUaMethodArgument>*); 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<OpcUaRelativeNodePath>* li reinterpret_cast< OpcUaRelativeNodeId* >(list->data)->clearPaths(); } -OpcUaRelativeNodePath* OpcUaRelativeNodeId::path(QQmlListProperty<OpcUaRelativeNodePath>* list, int i) { +OpcUaRelativeNodePath* OpcUaRelativeNodeId::path(QQmlListProperty<OpcUaRelativeNodePath>* list, qsizetype i) { return reinterpret_cast< OpcUaRelativeNodeId* >(list->data)->path(i); } -int OpcUaRelativeNodeId::pathCount(QQmlListProperty<OpcUaRelativeNodePath>* list) { +qsizetype OpcUaRelativeNodeId::pathCount(QQmlListProperty<OpcUaRelativeNodePath>* 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>*, OpcUaRelativeNodePath *); - static int pathCount(QQmlListProperty<OpcUaRelativeNodePath>*); - static OpcUaRelativeNodePath* path(QQmlListProperty<OpcUaRelativeNodePath>*, int); + static qsizetype pathCount(QQmlListProperty<OpcUaRelativeNodePath>*); + static OpcUaRelativeNodePath* path(QQmlListProperty<OpcUaRelativeNodePath>*, qsizetype); static void clearPaths(QQmlListProperty<OpcUaRelativeNodePath>*); 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<OpcUa reinterpret_cast<OpcUaSimpleAttributeOperand*>(list->data)->appendBrowsePathElement(nodeId); } -int OpcUaSimpleAttributeOperand::browsePathSize(QQmlListProperty<OpcUaNodeId> *list) +qsizetype OpcUaSimpleAttributeOperand::browsePathSize(QQmlListProperty<OpcUaNodeId> *list) { return reinterpret_cast<OpcUaSimpleAttributeOperand*>(list->data)->browsePathSize(); } -OpcUaNodeId *OpcUaSimpleAttributeOperand::browsePathElement(QQmlListProperty<OpcUaNodeId> *list, int index) +OpcUaNodeId *OpcUaSimpleAttributeOperand::browsePathElement(QQmlListProperty<OpcUaNodeId> *list, qsizetype index) { return reinterpret_cast<OpcUaSimpleAttributeOperand*>(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<OpcUaNodeId> *list, OpcUaNodeId *nodeId); - static int browsePathSize(QQmlListProperty<OpcUaNodeId> *list); - static OpcUaNodeId* browsePathElement(QQmlListProperty<OpcUaNodeId> *list, int index); + static qsizetype browsePathSize(QQmlListProperty<OpcUaNodeId> *list); + static OpcUaNodeId* browsePathElement(QQmlListProperty<OpcUaNodeId> *list, qsizetype index); static void clearBrowsePath(QQmlListProperty<OpcUaNodeId> *list); QList<OpcUaNodeId*> m_browsePath; |