summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSona Kurazyan <sona.kurazyan@qt.io>2020-06-25 12:10:43 +0200
committerJannis Voelker <jannis.voelker@basyskom.com>2020-08-31 10:46:04 +0200
commit1b54a5495e9dec5834cc7b51a21a285a41c16734 (patch)
treec31f8345d43524ef2cb62b3926674689e9189786
parent50d01102af91b5c193116fb57c93cf032b3439f8 (diff)
Use QList instead of QVector in qtopcua
Task-number: QTBUG-84469 Change-Id: I18303d5f04b9820885412c6447541b7db0ebcaeb Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
-rw-r--r--examples/opcua/opcuaviewer/mainwindow.cpp6
-rw-r--r--examples/opcua/opcuaviewer/mainwindow.h6
-rw-r--r--examples/opcua/opcuaviewer/treeitem.cpp2
-rw-r--r--examples/opcua/opcuaviewer/treeitem.h6
-rw-r--r--examples/opcua/waterpump/waterpump-qmlcpp/opcuamachinebackend.cpp2
-rw-r--r--examples/opcua/waterpump/waterpump-qmlcpp/opcuamachinebackend.h2
-rw-r--r--src/imports/opcua/opcuaattributeoperand.h4
-rw-r--r--src/imports/opcua/opcuaconnection.cpp8
-rw-r--r--src/imports/opcua/opcuaconnection.h4
-rw-r--r--src/imports/opcua/opcuaendpointdiscovery.cpp2
-rw-r--r--src/imports/opcua/opcuaendpointdiscovery.h6
-rw-r--r--src/imports/opcua/opcuaeventfilter.h6
-rw-r--r--src/imports/opcua/opcuamethodnode.cpp10
-rw-r--r--src/imports/opcua/opcuamethodnode.h4
-rw-r--r--src/imports/opcua/opcuaoperandbase.h1
-rw-r--r--src/imports/opcua/opcuapathresolver.cpp4
-rw-r--r--src/imports/opcua/opcuapathresolver.h2
-rw-r--r--src/imports/opcua/opcuaserverdiscovery.cpp2
-rw-r--r--src/imports/opcua/opcuaserverdiscovery.h2
-rw-r--r--src/imports/opcua/opcuasimpleattributeoperand.h4
-rw-r--r--src/imports/opcua/plugins.qmltypes2
-rw-r--r--src/opcua/client/qopcuaapplicationdescription.cpp8
-rw-r--r--src/opcua/client/qopcuaapplicationdescription.h8
-rw-r--r--src/opcua/client/qopcuaapplicationrecorddatatype.cpp18
-rw-r--r--src/opcua/client/qopcuaapplicationrecorddatatype.h12
-rw-r--r--src/opcua/client/qopcuaargument.cpp10
-rw-r--r--src/opcua/client/qopcuaargument.h8
-rw-r--r--src/opcua/client/qopcuaattributeoperand.cpp8
-rw-r--r--src/opcua/client/qopcuaattributeoperand.h6
-rw-r--r--src/opcua/client/qopcuaaxisinformation.cpp10
-rw-r--r--src/opcua/client/qopcuaaxisinformation.h8
-rw-r--r--src/opcua/client/qopcuabackend_p.h18
-rw-r--r--src/opcua/client/qopcuabinarydataencoding.cpp4
-rw-r--r--src/opcua/client/qopcuabinarydataencoding.h14
-rw-r--r--src/opcua/client/qopcuaclient.cpp20
-rw-r--r--src/opcua/client/qopcuaclient.h14
-rw-r--r--src/opcua/client/qopcuaclientimpl.cpp8
-rw-r--r--src/opcua/client/qopcuaclientimpl_p.h22
-rw-r--r--src/opcua/client/qopcuaclientprivate.cpp8
-rw-r--r--src/opcua/client/qopcuacontentfilterelement.cpp8
-rw-r--r--src/opcua/client/qopcuacontentfilterelement.h6
-rw-r--r--src/opcua/client/qopcuacontentfilterelementresult.cpp8
-rw-r--r--src/opcua/client/qopcuacontentfilterelementresult.h6
-rw-r--r--src/opcua/client/qopcuaendpointdescription.cpp8
-rw-r--r--src/opcua/client/qopcuaendpointdescription.h8
-rw-r--r--src/opcua/client/qopcuaeventfilterresult.cpp16
-rw-r--r--src/opcua/client/qopcuaeventfilterresult.h12
-rw-r--r--src/opcua/client/qopcuagdsclient.cpp38
-rw-r--r--src/opcua/client/qopcuagdsclient.h2
-rw-r--r--src/opcua/client/qopcuagdsclient_p.h2
-rw-r--r--src/opcua/client/qopcuamonitoringparameters.cpp16
-rw-r--r--src/opcua/client/qopcuamonitoringparameters.h12
-rw-r--r--src/opcua/client/qopcuamultidimensionalarray.cpp16
-rw-r--r--src/opcua/client/qopcuamultidimensionalarray.h14
-rw-r--r--src/opcua/client/qopcuanode.cpp10
-rw-r--r--src/opcua/client/qopcuanode.h10
-rw-r--r--src/opcua/client/qopcuanode_p.h6
-rw-r--r--src/opcua/client/qopcuanodecreationattributes.cpp4
-rw-r--r--src/opcua/client/qopcuanodecreationattributes.h4
-rw-r--r--src/opcua/client/qopcuanodecreationattributes_p.h2
-rw-r--r--src/opcua/client/qopcuanodeimpl_p.h12
-rw-r--r--src/opcua/client/qopcuasimpleattributeoperand.cpp8
-rw-r--r--src/opcua/client/qopcuasimpleattributeoperand.h6
-rw-r--r--src/opcua/core/qopcuaprovider.cpp22
-rw-r--r--src/opcua/x509/openssl_symbols.cpp4
-rw-r--r--src/opcua/x509/qopcuax509certificatesigningrequest.h1
-rw-r--r--src/opcua/x509/qopcuax509certificatesigningrequest_openssl.cpp2
-rw-r--r--src/opcua/x509/qopcuax509certificatesigningrequest_p.h4
-rw-r--r--src/opcua/x509/qopcuax509extensionsubjectalternativename.cpp6
-rw-r--r--src/opcua/x509/qopcuax509extensionsubjectalternativename.h2
-rw-r--r--src/plugins/opcua/open62541/qopen62541backend.cpp40
-rw-r--r--src/plugins/opcua/open62541/qopen62541backend.h12
-rw-r--r--src/plugins/opcua/open62541/qopen62541client.cpp12
-rw-r--r--src/plugins/opcua/open62541/qopen62541client.h6
-rw-r--r--src/plugins/opcua/open62541/qopen62541node.cpp10
-rw-r--r--src/plugins/opcua/open62541/qopen62541node.h4
-rw-r--r--src/plugins/opcua/open62541/qopen62541subscription.cpp2
-rw-r--r--src/plugins/opcua/open62541/qopen62541subscription.h2
-rw-r--r--src/plugins/opcua/open62541/qopen62541valueconverter.cpp6
-rw-r--r--src/plugins/opcua/uacpp/quacppbackend.cpp32
-rw-r--r--src/plugins/opcua/uacpp/quacppbackend.h8
-rw-r--r--src/plugins/opcua/uacpp/quacppclient.cpp12
-rw-r--r--src/plugins/opcua/uacpp/quacppclient.h6
-rw-r--r--src/plugins/opcua/uacpp/quacppnode.cpp8
-rw-r--r--src/plugins/opcua/uacpp/quacppnode.h4
-rw-r--r--src/plugins/opcua/uacpp/quacppvalueconverter.cpp12
-rw-r--r--tests/auto/clientSetupInCpp/tst_clientSetupInCpp.cpp2
-rw-r--r--tests/auto/connection/tst_connection.cpp4
-rw-r--r--tests/auto/qopcuaclient/tst_client.cpp92
-rw-r--r--tests/auto/security/tst_security.cpp4
-rw-r--r--tests/manual/gds/tst_gds.cpp6
-rw-r--r--tests/open62541-testserver/main.cpp4
-rw-r--r--tests/open62541-testserver/testserver.cpp4
-rw-r--r--tests/open62541-testserver/testserver.h4
94 files changed, 430 insertions, 430 deletions
diff --git a/examples/opcua/opcuaviewer/mainwindow.cpp b/examples/opcua/opcuaviewer/mainwindow.cpp
index 0449fc9..8eec05d 100644
--- a/examples/opcua/opcuaviewer/mainwindow.cpp
+++ b/examples/opcua/opcuaviewer/mainwindow.cpp
@@ -226,14 +226,14 @@ void MainWindow::findServers()
}
}
-void MainWindow::findServersComplete(const QVector<QOpcUaApplicationDescription> &servers, QOpcUa::UaStatusCode statusCode)
+void MainWindow::findServersComplete(const QList<QOpcUaApplicationDescription> &servers, QOpcUa::UaStatusCode statusCode)
{
QOpcUaApplicationDescription server;
if (isSuccessStatus(statusCode)) {
ui->servers->clear();
for (const auto &server : servers) {
- QVector<QString> urls = server.discoveryUrls();
+ const auto urls = server.discoveryUrls();
for (const auto &url : qAsConst(urls))
ui->servers->addItem(url);
}
@@ -254,7 +254,7 @@ void MainWindow::getEndpoints()
}
}
-void MainWindow::getEndpointsComplete(const QVector<QOpcUaEndpointDescription> &endpoints, QOpcUa::UaStatusCode statusCode)
+void MainWindow::getEndpointsComplete(const QList<QOpcUaEndpointDescription> &endpoints, QOpcUa::UaStatusCode statusCode)
{
int index = 0;
const std::array<const char *, 4> modes = {
diff --git a/examples/opcua/opcuaviewer/mainwindow.h b/examples/opcua/opcuaviewer/mainwindow.h
index 346a555..36f2a28 100644
--- a/examples/opcua/opcuaviewer/mainwindow.h
+++ b/examples/opcua/opcuaviewer/mainwindow.h
@@ -75,9 +75,9 @@ public:
private slots:
void connectToServer();
void findServers();
- void findServersComplete(const QVector<QOpcUaApplicationDescription> &servers, QOpcUa::UaStatusCode statusCode);
+ void findServersComplete(const QList<QOpcUaApplicationDescription> &servers, QOpcUa::UaStatusCode statusCode);
void getEndpoints();
- void getEndpointsComplete(const QVector<QOpcUaEndpointDescription> &endpoints, QOpcUa::UaStatusCode statusCode);
+ void getEndpointsComplete(const QList<QOpcUaEndpointDescription> &endpoints, QOpcUa::UaStatusCode statusCode);
void clientConnected();
void clientDisconnected();
void namespacesArrayUpdated(const QStringList &namespaceArray);
@@ -97,7 +97,7 @@ private:
OpcUaModel *mOpcUaModel;
QOpcUaProvider *mOpcUaProvider;
QOpcUaClient *mOpcUaClient = nullptr;
- QVector<QOpcUaEndpointDescription> mEndpointList;
+ QList<QOpcUaEndpointDescription> mEndpointList;
bool mClientConnected = false;
QOpcUaApplicationIdentity m_identity;
QOpcUaPkiConfiguration m_pkiConfig;
diff --git a/examples/opcua/opcuaviewer/treeitem.cpp b/examples/opcua/opcuaviewer/treeitem.cpp
index b012f95..723474f 100644
--- a/examples/opcua/opcuaviewer/treeitem.cpp
+++ b/examples/opcua/opcuaviewer/treeitem.cpp
@@ -252,7 +252,7 @@ void TreeItem::handleAttributes(QOpcUa::NodeAttributes attr)
emit mModel->dataChanged(mModel->createIndex(row(), 0, this), mModel->createIndex(row(), numberOfDisplayColumns - 1, this));
}
-void TreeItem::browseFinished(const QVector<QOpcUaReferenceDescription> &children, QOpcUa::UaStatusCode statusCode)
+void TreeItem::browseFinished(const QList<QOpcUaReferenceDescription> &children, QOpcUa::UaStatusCode statusCode)
{
if (statusCode != QOpcUa::Good) {
qWarning() << "Browsing node" << mOpcNode->nodeId() << "finally failed:" << statusCode;
diff --git a/examples/opcua/opcuaviewer/treeitem.h b/examples/opcua/opcuaviewer/treeitem.h
index a33a5f8..f308704 100644
--- a/examples/opcua/opcuaviewer/treeitem.h
+++ b/examples/opcua/opcuaviewer/treeitem.h
@@ -83,7 +83,7 @@ public:
private slots:
void startBrowsing();
void handleAttributes(QOpcUa::NodeAttributes attr);
- void browseFinished(const QVector<QOpcUaReferenceDescription> &children, QOpcUa::UaStatusCode statusCode);
+ void browseFinished(const QList<QOpcUaReferenceDescription> &children, QOpcUa::UaStatusCode statusCode);
private:
QString variantToString(const QVariant &value, const QString &typeNodeId = QString()) const;
@@ -91,7 +91,7 @@ private:
QString rangeToString(const QOpcUaRange &range) const;
QString euInformationToString(const QOpcUaEUInformation &info) const;
template <typename T>
- QString numberArrayToString(const QVector<T> &vec) const;
+ QString numberArrayToString(const QList<T> &vec) const;
std::unique_ptr<QOpcUaNode> mOpcNode;
OpcUaModel *mModel = nullptr;
@@ -109,7 +109,7 @@ private:
};
template <typename T>
-QString TreeItem::numberArrayToString(const QVector<T> &vec) const
+QString TreeItem::numberArrayToString(const QList<T> &vec) const
{
QString list(QLatin1Char('['));
for (int i = 0, size = vec.size(); i < size; ++i) {
diff --git a/examples/opcua/waterpump/waterpump-qmlcpp/opcuamachinebackend.cpp b/examples/opcua/waterpump/waterpump-qmlcpp/opcuamachinebackend.cpp
index 858282d..3fa46e4 100644
--- a/examples/opcua/waterpump/waterpump-qmlcpp/opcuamachinebackend.cpp
+++ b/examples/opcua/waterpump/waterpump-qmlcpp/opcuamachinebackend.cpp
@@ -284,7 +284,7 @@ void OpcUaMachineBackend::resetSimulation()
m_machineNode->callMethod("ns=2;s=Machine.Reset");
}
-void OpcUaMachineBackend::requestEndpointsFinished(const QVector<QOpcUaEndpointDescription> &endpoints)
+void OpcUaMachineBackend::requestEndpointsFinished(const QList<QOpcUaEndpointDescription> &endpoints)
{
if (endpoints.isEmpty()) {
qWarning() << "The server did not return any endpoints";
diff --git a/examples/opcua/waterpump/waterpump-qmlcpp/opcuamachinebackend.h b/examples/opcua/waterpump/waterpump-qmlcpp/opcuamachinebackend.h
index 21f564e..d38957e 100644
--- a/examples/opcua/waterpump/waterpump-qmlcpp/opcuamachinebackend.h
+++ b/examples/opcua/waterpump/waterpump-qmlcpp/opcuamachinebackend.h
@@ -102,7 +102,7 @@ public:
Q_INVOKABLE void resetSimulation();
public slots:
- void requestEndpointsFinished(const QVector<QOpcUaEndpointDescription> &endpoints);
+ void requestEndpointsFinished(const QList<QOpcUaEndpointDescription> &endpoints);
void clientStateHandler(QOpcUaClient::ClientState state);
void machineStateUpdated(QOpcUa::NodeAttribute attr, const QVariant &value);
void percentFilledTank1Updated(QOpcUa::NodeAttribute attr, const QVariant &value);
diff --git a/src/imports/opcua/opcuaattributeoperand.h b/src/imports/opcua/opcuaattributeoperand.h
index e232c19..7ff05d8 100644
--- a/src/imports/opcua/opcuaattributeoperand.h
+++ b/src/imports/opcua/opcuaattributeoperand.h
@@ -41,7 +41,7 @@
#include <QOpcUaAttributeOperand>
#include "opcuanodeid.h"
#include <QQmlListProperty>
-#include <QVector>
+#include <QList>
QT_BEGIN_NAMESPACE
@@ -88,7 +88,7 @@ private:
static OpcUaRelativeNodePath* browsePathElement(QQmlListProperty<OpcUaRelativeNodePath> *list, int index);
static void clearBrowsePath(QQmlListProperty<OpcUaRelativeNodePath> *list);
- QVector<OpcUaRelativeNodePath*> m_browsePath;
+ QList<OpcUaRelativeNodePath*> m_browsePath;
OpcUaNodeId *m_nodeId = nullptr;
};
diff --git a/src/imports/opcua/opcuaconnection.cpp b/src/imports/opcua/opcuaconnection.cpp
index 3454520..05fecdd 100644
--- a/src/imports/opcua/opcuaconnection.cpp
+++ b/src/imports/opcua/opcuaconnection.cpp
@@ -464,7 +464,7 @@ bool OpcUaConnection::readNodeAttributes(const QJSValue &value)
return false;
}
- QVector<QOpcUaReadItem> readItemList;
+ QList<QOpcUaReadItem> readItemList;
for (int i = 0; i < value.property("length").toInt(); ++i){
const auto &readItem = qjsvalue_cast<OpcUaReadItem>(value.property(i));
@@ -548,7 +548,7 @@ bool OpcUaConnection::writeNodeAttributes(const QJSValue &value)
return false;
}
- QVector<QOpcUaWriteItem> writeItemList;
+ QList<QOpcUaWriteItem> writeItemList;
for (int i = 0; i < value.property("length").toInt(); ++i){
const auto &writeItem = qjsvalue_cast<OpcUaWriteItem>(value.property(i));
@@ -618,7 +618,7 @@ QOpcUaClient *OpcUaConnection::connection() const
return m_client;
}
-void OpcUaConnection::handleReadNodeAttributesFinished(const QVector<QOpcUaReadResult> &results)
+void OpcUaConnection::handleReadNodeAttributesFinished(const QList<QOpcUaReadResult> &results)
{
QVariantList returnValue;
@@ -628,7 +628,7 @@ void OpcUaConnection::handleReadNodeAttributesFinished(const QVector<QOpcUaReadR
emit readNodeAttributesFinished(QVariant::fromValue(returnValue));
}
-void OpcUaConnection::handleWriteNodeAttributesFinished(const QVector<QOpcUaWriteResult> &results)
+void OpcUaConnection::handleWriteNodeAttributesFinished(const QList<QOpcUaWriteResult> &results)
{
QVariantList returnValue;
diff --git a/src/imports/opcua/opcuaconnection.h b/src/imports/opcua/opcuaconnection.h
index 91b91b3..db06594 100644
--- a/src/imports/opcua/opcuaconnection.h
+++ b/src/imports/opcua/opcuaconnection.h
@@ -104,8 +104,8 @@ signals:
private slots:
void clientStateHandler(QOpcUaClient::ClientState state);
- void handleReadNodeAttributesFinished(const QVector<QOpcUaReadResult> &results);
- void handleWriteNodeAttributesFinished(const QVector<QOpcUaWriteResult> &results);
+ void handleReadNodeAttributesFinished(const QList<QOpcUaReadResult> &results);
+ void handleWriteNodeAttributesFinished(const QList<QOpcUaWriteResult> &results);
private:
void removeConnection();
diff --git a/src/imports/opcua/opcuaendpointdiscovery.cpp b/src/imports/opcua/opcuaendpointdiscovery.cpp
index 80b0d25..4270364 100644
--- a/src/imports/opcua/opcuaendpointdiscovery.cpp
+++ b/src/imports/opcua/opcuaendpointdiscovery.cpp
@@ -203,7 +203,7 @@ void OpcUaEndpointDiscovery::connectSignals()
connect(conn->m_client, &QOpcUaClient::endpointsRequestFinished, this, &OpcUaEndpointDiscovery::handleEndpoints, Qt::UniqueConnection);
}
-void OpcUaEndpointDiscovery::handleEndpoints(const QVector<QOpcUaEndpointDescription> &endpoints, QOpcUa::UaStatusCode statusCode, const QUrl &requestUrl)
+void OpcUaEndpointDiscovery::handleEndpoints(const QList<QOpcUaEndpointDescription> &endpoints, QOpcUa::UaStatusCode statusCode, const QUrl &requestUrl)
{
if (requestUrl != m_serverUrl)
return; // response is not for last request
diff --git a/src/imports/opcua/opcuaendpointdiscovery.h b/src/imports/opcua/opcuaendpointdiscovery.h
index 3a1491f..f813ce0 100644
--- a/src/imports/opcua/opcuaendpointdiscovery.h
+++ b/src/imports/opcua/opcuaendpointdiscovery.h
@@ -45,7 +45,7 @@
#include <QQmlParserStatus>
#include <QObject>
-#include <QVector>
+#include <QList>
QT_BEGIN_NAMESPACE
@@ -79,7 +79,7 @@ signals:
private slots:
void connectSignals();
- void handleEndpoints(const QVector<QOpcUaEndpointDescription> &endpoints, QOpcUa::UaStatusCode statusCode, const QUrl &requestUrl);
+ void handleEndpoints(const QList<QOpcUaEndpointDescription> &endpoints, QOpcUa::UaStatusCode statusCode, const QUrl &requestUrl);
void startRequestEndpoints();
private:
@@ -89,7 +89,7 @@ private:
QString m_serverUrl;
OpcUaConnection *m_connection = nullptr;
- QVector<QOpcUaEndpointDescription> m_endpoints;
+ QList<QOpcUaEndpointDescription> m_endpoints;
OpcUaStatus m_status;
bool m_componentCompleted = false;
};
diff --git a/src/imports/opcua/opcuaeventfilter.h b/src/imports/opcua/opcuaeventfilter.h
index 5f863eb..91db885 100644
--- a/src/imports/opcua/opcuaeventfilter.h
+++ b/src/imports/opcua/opcuaeventfilter.h
@@ -42,7 +42,7 @@
#include "opcuasimpleattributeoperand.h"
#include "opcuafilterelement.h"
#include <QOpcUaMonitoringParameters>
-#include <QVector>
+#include <QList>
QT_BEGIN_NAMESPACE
@@ -86,8 +86,8 @@ private:
static OpcUaFilterElement* filterElement(QQmlListProperty<OpcUaFilterElement> *list, int index);
static void clearFilterElements(QQmlListProperty<OpcUaFilterElement> *list);
- QVector<OpcUaFilterElement*> m_filterElements;
- QVector<OpcUaSimpleAttributeOperand*> m_selectors;
+ QList<OpcUaFilterElement*> m_filterElements;
+ QList<OpcUaSimpleAttributeOperand*> m_selectors;
};
QT_END_NAMESPACE
diff --git a/src/imports/opcua/opcuamethodnode.cpp b/src/imports/opcua/opcuamethodnode.cpp
index 6220242..cef5a14 100644
--- a/src/imports/opcua/opcuamethodnode.cpp
+++ b/src/imports/opcua/opcuamethodnode.cpp
@@ -206,7 +206,7 @@ void OpcUaMethodNode::callMethod()
return;
}
- QVector<QOpcUa::TypedVariant> arguments;
+ QList<QOpcUa::TypedVariant> arguments;
for (const auto item : qAsConst(m_inputArguments))
arguments.push_back(QOpcUa::TypedVariant(item->value(), item->type()));
m_objectNode->node()->callMethod(m_node->nodeId(), arguments);
@@ -268,19 +268,19 @@ OpcUaStatus OpcUaMethodNode::resultStatus() const
}
void OpcUaMethodNode::appendArgument(QQmlListProperty<OpcUaMethodArgument>* list, OpcUaMethodArgument* p) {
- reinterpret_cast< QVector<OpcUaMethodArgument*>* >(list->data)->append(p);
+ reinterpret_cast< QList<OpcUaMethodArgument*>* >(list->data)->append(p);
}
void OpcUaMethodNode::clearArguments(QQmlListProperty<OpcUaMethodArgument>* list) {
- reinterpret_cast< QVector<OpcUaMethodArgument*>* >(list->data)->clear();
+ reinterpret_cast< QList<OpcUaMethodArgument*>* >(list->data)->clear();
}
OpcUaMethodArgument* OpcUaMethodNode::argument(QQmlListProperty<OpcUaMethodArgument>* list, int i) {
- return reinterpret_cast< QVector<OpcUaMethodArgument*>* >(list->data)->at(i);
+ return reinterpret_cast< QList<OpcUaMethodArgument*>* >(list->data)->at(i);
}
int OpcUaMethodNode::argumentCount(QQmlListProperty<OpcUaMethodArgument>* list) {
- return reinterpret_cast< QVector<OpcUaMethodArgument*>* >(list->data)->count();
+ return reinterpret_cast< QList<OpcUaMethodArgument*>* >(list->data)->count();
}
diff --git a/src/imports/opcua/opcuamethodnode.h b/src/imports/opcua/opcuamethodnode.h
index fda8fa5..33faf79 100644
--- a/src/imports/opcua/opcuamethodnode.h
+++ b/src/imports/opcua/opcuamethodnode.h
@@ -40,7 +40,7 @@
#include "opcuamethodargument.h"
#include "opcuastatus.h"
#include <QQmlListProperty>
-#include <QVector>
+#include <QList>
QT_BEGIN_NAMESPACE
@@ -89,7 +89,7 @@ private:
private:
OpcUaNodeIdType *m_objectNodeId = nullptr;
OpcUaNode *m_objectNode = nullptr;
- QVector<OpcUaMethodArgument*> m_inputArguments;
+ QList<OpcUaMethodArgument*> m_inputArguments;
QVariantList m_outputArguments;
OpcUaStatus m_resultStatus;
};
diff --git a/src/imports/opcua/opcuaoperandbase.h b/src/imports/opcua/opcuaoperandbase.h
index ab9f986..5e6bd38 100644
--- a/src/imports/opcua/opcuaoperandbase.h
+++ b/src/imports/opcua/opcuaoperandbase.h
@@ -38,6 +38,7 @@
#define OPCUAOPERANDBASE
#include <QObject>
+#include <QVariant>
QT_BEGIN_NAMESPACE
diff --git a/src/imports/opcua/opcuapathresolver.cpp b/src/imports/opcua/opcuapathresolver.cpp
index 3e73e54..5ec0076 100644
--- a/src/imports/opcua/opcuapathresolver.cpp
+++ b/src/imports/opcua/opcuapathresolver.cpp
@@ -153,7 +153,7 @@ void OpcUaPathResolver::startNodeResolved(UniversalNode startNode, const QString
}
// construct path vector
- QVector<QOpcUaRelativePathElement> path;
+ QList<QOpcUaRelativePathElement> path;
for (int i = 0; i < m_relativeNode->pathCount(); ++i)
path.append(m_relativeNode->path(i)->toRelativePathElement(m_client));
@@ -166,7 +166,7 @@ void OpcUaPathResolver::startNodeResolved(UniversalNode startNode, const QString
}
}
-void OpcUaPathResolver::browsePathFinished(QVector<QOpcUaBrowsePathTarget> results, QVector<QOpcUaRelativePathElement> path, QOpcUa::UaStatusCode status)
+void OpcUaPathResolver::browsePathFinished(QList<QOpcUaBrowsePathTarget> results, QList<QOpcUaRelativePathElement> path, QOpcUa::UaStatusCode status)
{
Q_UNUSED(path);
UniversalNode nodeToUse;
diff --git a/src/imports/opcua/opcuapathresolver.h b/src/imports/opcua/opcuapathresolver.h
index 914d1ff..67039e5 100644
--- a/src/imports/opcua/opcuapathresolver.h
+++ b/src/imports/opcua/opcuapathresolver.h
@@ -64,7 +64,7 @@ signals:
private slots:
void startNodeResolved(UniversalNode startNode, const QString &errorMessage);
- void browsePathFinished(QVector<QOpcUaBrowsePathTarget> results, QVector<QOpcUaRelativePathElement> path, QOpcUa::UaStatusCode status);
+ void browsePathFinished(QList<QOpcUaBrowsePathTarget> results, QList<QOpcUaRelativePathElement> path, QOpcUa::UaStatusCode status);
private:
OpcUaPathResolver(int level, OpcUaRelativeNodeId *relativeNode, QOpcUaClient *client, QObject *target);
diff --git a/src/imports/opcua/opcuaserverdiscovery.cpp b/src/imports/opcua/opcuaserverdiscovery.cpp
index ca56881..ffa539d 100644
--- a/src/imports/opcua/opcuaserverdiscovery.cpp
+++ b/src/imports/opcua/opcuaserverdiscovery.cpp
@@ -214,7 +214,7 @@ void OpcUaServerDiscovery::connectSignals()
startFindServers();
}
-void OpcUaServerDiscovery::handleServers(const QVector<QOpcUaApplicationDescription> &servers, QOpcUa::UaStatusCode statusCode, const QUrl &requestUrl)
+void OpcUaServerDiscovery::handleServers(const QList<QOpcUaApplicationDescription> &servers, QOpcUa::UaStatusCode statusCode, const QUrl &requestUrl)
{
if (requestUrl != m_discoveryUrl)
return; // response is not for last request
diff --git a/src/imports/opcua/opcuaserverdiscovery.h b/src/imports/opcua/opcuaserverdiscovery.h
index 9c0ab3b..013b8ee 100644
--- a/src/imports/opcua/opcuaserverdiscovery.h
+++ b/src/imports/opcua/opcuaserverdiscovery.h
@@ -75,7 +75,7 @@ signals:
private slots:
void connectSignals();
- void handleServers(const QVector<QOpcUaApplicationDescription> &servers, QOpcUa::UaStatusCode statusCode, const QUrl &requestUrl);
+ void handleServers(const QList<QOpcUaApplicationDescription> &servers, QOpcUa::UaStatusCode statusCode, const QUrl &requestUrl);
void startFindServers();
private:
diff --git a/src/imports/opcua/opcuasimpleattributeoperand.h b/src/imports/opcua/opcuasimpleattributeoperand.h
index ba35679..80bf4cf 100644
--- a/src/imports/opcua/opcuasimpleattributeoperand.h
+++ b/src/imports/opcua/opcuasimpleattributeoperand.h
@@ -40,7 +40,7 @@
#include "opcuaoperandbase.h"
#include <QOpcUaSimpleAttributeOperand>
#include <QQmlListProperty>
-#include <QVector>
+#include <QList>
QT_BEGIN_NAMESPACE
@@ -84,7 +84,7 @@ private:
static OpcUaNodeId* browsePathElement(QQmlListProperty<OpcUaNodeId> *list, int index);
static void clearBrowsePath(QQmlListProperty<OpcUaNodeId> *list);
- QVector<OpcUaNodeId*> m_browsePath;
+ QList<OpcUaNodeId*> m_browsePath;
};
QT_END_NAMESPACE
diff --git a/src/imports/opcua/plugins.qmltypes b/src/imports/opcua/plugins.qmltypes
index d087ba7..5f27feb 100644
--- a/src/imports/opcua/plugins.qmltypes
+++ b/src/imports/opcua/plugins.qmltypes
@@ -576,7 +576,7 @@ Module {
}
Property { name: "gatewayServerUri"; type: "string"; isReadonly: true }
Property { name: "discoveryProfileUri"; type: "string"; isReadonly: true }
- Property { name: "discoveryUrls"; type: "QVector<QString>"; isReadonly: true }
+ Property { name: "discoveryUrls"; type: "QList<QString>"; isReadonly: true }
}
Component {
name: "QStandardItemModel"
diff --git a/src/opcua/client/qopcuaapplicationdescription.cpp b/src/opcua/client/qopcuaapplicationdescription.cpp
index a3d599c..0f62d58 100644
--- a/src/opcua/client/qopcuaapplicationdescription.cpp
+++ b/src/opcua/client/qopcuaapplicationdescription.cpp
@@ -171,7 +171,7 @@ public:
QOpcUaApplicationDescription::ApplicationType applicationType{QOpcUaApplicationDescription::ApplicationType::Server};
QString gatewayServerUri;
QString discoveryProfileUri;
- QVector<QString> discoveryUrls;
+ QList<QString> discoveryUrls;
};
QOpcUaApplicationDescription::QOpcUaApplicationDescription()
@@ -217,7 +217,7 @@ QOpcUaApplicationDescription::~QOpcUaApplicationDescription()
/*!
Returns a list of URLs of discovery endpoints.
*/
-QVector<QString> QOpcUaApplicationDescription::discoveryUrls() const
+QList<QString> QOpcUaApplicationDescription::discoveryUrls() const
{
return data->discoveryUrls;
}
@@ -225,7 +225,7 @@ QVector<QString> QOpcUaApplicationDescription::discoveryUrls() const
/*!
Returns a reference to a list of URLs of discovery endpoints.
*/
-QVector<QString> &QOpcUaApplicationDescription::discoveryUrlsRef()
+QList<QString> &QOpcUaApplicationDescription::discoveryUrlsRef()
{
return data->discoveryUrls;
}
@@ -233,7 +233,7 @@ QVector<QString> &QOpcUaApplicationDescription::discoveryUrlsRef()
/*!
Sets the discovery URLs to \a discoveryUrls.
*/
-void QOpcUaApplicationDescription::setDiscoveryUrls(const QVector<QString> &discoveryUrls)
+void QOpcUaApplicationDescription::setDiscoveryUrls(const QList<QString> &discoveryUrls)
{
data->discoveryUrls = discoveryUrls;
}
diff --git a/src/opcua/client/qopcuaapplicationdescription.h b/src/opcua/client/qopcuaapplicationdescription.h
index 5ffac0f..33ae3f3 100644
--- a/src/opcua/client/qopcuaapplicationdescription.h
+++ b/src/opcua/client/qopcuaapplicationdescription.h
@@ -54,7 +54,7 @@ class Q_OPCUA_EXPORT QOpcUaApplicationDescription
Q_PROPERTY(QOpcUaApplicationDescription::ApplicationType applicationType READ applicationType)
Q_PROPERTY(QString gatewayServerUri READ gatewayServerUri)
Q_PROPERTY(QString discoveryProfileUri READ discoveryProfileUri)
- Q_PROPERTY(QVector<QString> discoveryUrls READ discoveryUrls)
+ Q_PROPERTY(QList<QString> discoveryUrls READ discoveryUrls)
public:
QOpcUaApplicationDescription();
@@ -89,9 +89,9 @@ public:
QString discoveryProfileUri() const;
void setDiscoveryProfileUri(const QString &discoveryProfileUri);
- QVector<QString> discoveryUrls() const;
- QVector<QString> &discoveryUrlsRef();
- void setDiscoveryUrls(const QVector<QString> &discoveryUrls);
+ QList<QString> discoveryUrls() const;
+ QList<QString> &discoveryUrlsRef();
+ void setDiscoveryUrls(const QList<QString> &discoveryUrls);
private:
QSharedDataPointer<QOpcUaApplicationDescriptionData> data;
diff --git a/src/opcua/client/qopcuaapplicationrecorddatatype.cpp b/src/opcua/client/qopcuaapplicationrecorddatatype.cpp
index 6c92fb1..d11828d 100644
--- a/src/opcua/client/qopcuaapplicationrecorddatatype.cpp
+++ b/src/opcua/client/qopcuaapplicationrecorddatatype.cpp
@@ -59,9 +59,9 @@ public:
QString applicationUri;
QOpcUaApplicationDescription::ApplicationType applicationType;
QString productUri;
- QVector<QOpcUaLocalizedText> applicationNames;
- QVector<QString> discoveryUrls;
- QVector<QString> serverCapabilityIdentifiers;
+ QList<QOpcUaLocalizedText> applicationNames;
+ QList<QString> discoveryUrls;
+ QList<QString> serverCapabilityIdentifiers;
};
/*!
@@ -171,7 +171,7 @@ QOpcUaApplicationDescription::ApplicationType QOpcUaApplicationRecordDataType::a
/*!
Sets the localized application names to \a applicationNames.
*/
-void QOpcUaApplicationRecordDataType::setApplicationNames(const QVector<QOpcUaLocalizedText> &applicationNames)
+void QOpcUaApplicationRecordDataType::setApplicationNames(const QList<QOpcUaLocalizedText> &applicationNames)
{
data->applicationNames = applicationNames;
}
@@ -179,7 +179,7 @@ void QOpcUaApplicationRecordDataType::setApplicationNames(const QVector<QOpcUaLo
/*!
Returns the localized application names.
*/
-const QVector<QOpcUaLocalizedText> &QOpcUaApplicationRecordDataType::applicationNames() const
+const QList<QOpcUaLocalizedText> &QOpcUaApplicationRecordDataType::applicationNames() const
{
return data->applicationNames;
}
@@ -203,7 +203,7 @@ const QString &QOpcUaApplicationRecordDataType::productUri() const
/*!
Sets the discovery URLs to \a discoverUrls.
*/
-void QOpcUaApplicationRecordDataType::setDiscoveryUrls(const QVector<QString> &discoveryUrls)
+void QOpcUaApplicationRecordDataType::setDiscoveryUrls(const QList<QString> &discoveryUrls)
{
data->discoveryUrls = discoveryUrls;
}
@@ -211,7 +211,7 @@ void QOpcUaApplicationRecordDataType::setDiscoveryUrls(const QVector<QString> &d
/*!
Returns the discovery URLs.
*/
-const QVector<QString> &QOpcUaApplicationRecordDataType::discoveryUrls() const
+const QList<QString> &QOpcUaApplicationRecordDataType::discoveryUrls() const
{
return data->discoveryUrls;
}
@@ -219,7 +219,7 @@ const QVector<QString> &QOpcUaApplicationRecordDataType::discoveryUrls() const
/*!
Sets the server capability identifiers to \a serverCapabilityIdentifiers.
*/
-void QOpcUaApplicationRecordDataType::setServerCapabilityIdentifiers(const QVector<QString> &serverCapabilityIdentifiers)
+void QOpcUaApplicationRecordDataType::setServerCapabilityIdentifiers(const QList<QString> &serverCapabilityIdentifiers)
{
data->serverCapabilityIdentifiers = serverCapabilityIdentifiers;
}
@@ -227,7 +227,7 @@ void QOpcUaApplicationRecordDataType::setServerCapabilityIdentifiers(const QVect
/*!
Returns the server capability identifiers.
*/
-const QVector<QString> &QOpcUaApplicationRecordDataType::serverCapabilityIdentifiers() const
+const QList<QString> &QOpcUaApplicationRecordDataType::serverCapabilityIdentifiers() const
{
return data->serverCapabilityIdentifiers;
}
diff --git a/src/opcua/client/qopcuaapplicationrecorddatatype.h b/src/opcua/client/qopcuaapplicationrecorddatatype.h
index 0988fd4..e794930 100644
--- a/src/opcua/client/qopcuaapplicationrecorddatatype.h
+++ b/src/opcua/client/qopcuaapplicationrecorddatatype.h
@@ -66,17 +66,17 @@ public:
void setApplicationUri(const QString &applicationUri);
const QString &applicationUri() const;
- void setApplicationNames(const QVector<QOpcUaLocalizedText> &applicationNames);
- const QVector<QOpcUaLocalizedText> &applicationNames() const;
+ void setApplicationNames(const QList<QOpcUaLocalizedText> &applicationNames);
+ const QList<QOpcUaLocalizedText> &applicationNames() const;
void setProductUri(const QString &productUri);
const QString &productUri() const;
- void setDiscoveryUrls(const QVector<QString> &discoveryUrls);
- const QVector<QString> &discoveryUrls() const;
+ void setDiscoveryUrls(const QList<QString> &discoveryUrls);
+ const QList<QString> &discoveryUrls() const;
- void setServerCapabilityIdentifiers(const QVector<QString> &serverCapabilityIdentifiers);
- const QVector<QString> &serverCapabilityIdentifiers() const;
+ void setServerCapabilityIdentifiers(const QList<QString> &serverCapabilityIdentifiers);
+ const QList<QString> &serverCapabilityIdentifiers() const;
private:
QSharedDataPointer<QOpcUaApplicationRecordDataTypeData> data;
diff --git a/src/opcua/client/qopcuaargument.cpp b/src/opcua/client/qopcuaargument.cpp
index 65c803c..cab0562 100644
--- a/src/opcua/client/qopcuaargument.cpp
+++ b/src/opcua/client/qopcuaargument.cpp
@@ -55,7 +55,7 @@ public:
QString name;
QString dataTypeId;
qint32 valueRank{-2};
- QVector<quint32> arrayDimensions;
+ QList<quint32> arrayDimensions;
QOpcUaLocalizedText description;
};
@@ -74,7 +74,7 @@ QOpcUaArgument::QOpcUaArgument(const QOpcUaArgument &rhs)
array dimensions \a arrayDimensions and description \a description.
*/
QOpcUaArgument::QOpcUaArgument(const QString &name, const QString &dataTypeId, qint32 valueRank,
- const QVector<quint32> &arrayDimensions, const QOpcUaLocalizedText &description)
+ const QList<quint32> &arrayDimensions, const QOpcUaLocalizedText &description)
: data(new QOpcUaArgumentData)
{
setName(name);
@@ -195,7 +195,7 @@ void QOpcUaArgument::setValueRank(qint32 valueRank)
The array dimensions describe the length of each array dimension.
*/
-QVector<quint32> QOpcUaArgument::arrayDimensions() const
+QList<quint32> QOpcUaArgument::arrayDimensions() const
{
return data->arrayDimensions;
}
@@ -203,7 +203,7 @@ QVector<quint32> QOpcUaArgument::arrayDimensions() const
/*!
Returns a reference to the array dimensions of the argument.
*/
-QVector<quint32> &QOpcUaArgument::arrayDimensionsRef()
+QList<quint32> &QOpcUaArgument::arrayDimensionsRef()
{
return data->arrayDimensions;
}
@@ -211,7 +211,7 @@ QVector<quint32> &QOpcUaArgument::arrayDimensionsRef()
/*!
Sets the array dimensions of the argument to \a arrayDimensions.
*/
-void QOpcUaArgument::setArrayDimensions(const QVector<quint32> &arrayDimensions)
+void QOpcUaArgument::setArrayDimensions(const QList<quint32> &arrayDimensions)
{
data->arrayDimensions = arrayDimensions;
}
diff --git a/src/opcua/client/qopcuaargument.h b/src/opcua/client/qopcuaargument.h
index 43156bb..8493d44 100644
--- a/src/opcua/client/qopcuaargument.h
+++ b/src/opcua/client/qopcuaargument.h
@@ -53,7 +53,7 @@ public:
QOpcUaArgument();
QOpcUaArgument(const QOpcUaArgument &rhs);
QOpcUaArgument(const QString &name, const QString &dataTypeId, qint32 valueRank,
- const QVector<quint32> &arrayDimensions, const QOpcUaLocalizedText &description);
+ const QList<quint32> &arrayDimensions, const QOpcUaLocalizedText &description);
QOpcUaArgument &operator=(const QOpcUaArgument &);
bool operator==(const QOpcUaArgument &other) const;
operator QVariant() const;
@@ -68,9 +68,9 @@ public:
qint32 valueRank() const;
void setValueRank(qint32 valueRank);
- QVector<quint32> arrayDimensions() const;
- QVector<quint32> &arrayDimensionsRef();
- void setArrayDimensions(const QVector<quint32> &arrayDimensions);
+ QList<quint32> arrayDimensions() const;
+ QList<quint32> &arrayDimensionsRef();
+ void setArrayDimensions(const QList<quint32> &arrayDimensions);
QOpcUaLocalizedText description() const;
void setDescription(const QOpcUaLocalizedText &description);
diff --git a/src/opcua/client/qopcuaattributeoperand.cpp b/src/opcua/client/qopcuaattributeoperand.cpp
index d085fc2..3cc7075 100644
--- a/src/opcua/client/qopcuaattributeoperand.cpp
+++ b/src/opcua/client/qopcuaattributeoperand.cpp
@@ -53,7 +53,7 @@ class QOpcUaAttributeOperandData : public QSharedData
public:
QString nodeId;
QString alias;
- QVector<QOpcUaRelativePathElement> browsePath;
+ QList<QOpcUaRelativePathElement> browsePath;
QOpcUa::NodeAttribute attributeId {QOpcUa::NodeAttribute::Value};
QString indexRange;
};
@@ -128,7 +128,7 @@ void QOpcUaAttributeOperand::setAttributeId(QOpcUa::NodeAttribute attributeId)
/*!
Returns the browse path.
*/
-QVector<QOpcUaRelativePathElement> QOpcUaAttributeOperand::browsePath() const
+QList<QOpcUaRelativePathElement> QOpcUaAttributeOperand::browsePath() const
{
return data->browsePath;
}
@@ -138,7 +138,7 @@ QVector<QOpcUaRelativePathElement> QOpcUaAttributeOperand::browsePath() const
\sa browsePath()
*/
-QVector<QOpcUaRelativePathElement> &QOpcUaAttributeOperand::browsePathRef()
+QList<QOpcUaRelativePathElement> &QOpcUaAttributeOperand::browsePathRef()
{
return data->browsePath;
}
@@ -146,7 +146,7 @@ QVector<QOpcUaRelativePathElement> &QOpcUaAttributeOperand::browsePathRef()
/*!
Sets the relative path to a node starting from \l nodeId() to \a browsePath.
*/
-void QOpcUaAttributeOperand::setBrowsePath(const QVector<QOpcUaRelativePathElement> &browsePath)
+void QOpcUaAttributeOperand::setBrowsePath(const QList<QOpcUaRelativePathElement> &browsePath)
{
data->browsePath = browsePath;
}
diff --git a/src/opcua/client/qopcuaattributeoperand.h b/src/opcua/client/qopcuaattributeoperand.h
index 80c24c0..6f42406 100644
--- a/src/opcua/client/qopcuaattributeoperand.h
+++ b/src/opcua/client/qopcuaattributeoperand.h
@@ -66,9 +66,9 @@ public:
QString alias() const;
void setAlias(const QString &alias);
- QVector<QOpcUaRelativePathElement> browsePath() const;
- QVector<QOpcUaRelativePathElement> &browsePathRef();
- void setBrowsePath(const QVector<QOpcUaRelativePathElement> &browsePath);
+ QList<QOpcUaRelativePathElement> browsePath() const;
+ QList<QOpcUaRelativePathElement> &browsePathRef();
+ void setBrowsePath(const QList<QOpcUaRelativePathElement> &browsePath);
QOpcUa::NodeAttribute attributeId() const;
void setAttributeId(QOpcUa::NodeAttribute attributeId);
diff --git a/src/opcua/client/qopcuaaxisinformation.cpp b/src/opcua/client/qopcuaaxisinformation.cpp
index 1a3fd39..8875526 100644
--- a/src/opcua/client/qopcuaaxisinformation.cpp
+++ b/src/opcua/client/qopcuaaxisinformation.cpp
@@ -59,7 +59,7 @@ public:
QOpcUaRange eURange;
QOpcUaLocalizedText title;
QOpcUa::AxisScale axisScaleType{QOpcUa::AxisScale::Linear};
- QVector<double> axisSteps;
+ QList<double> axisSteps;
};
QOpcUaAxisInformation::QOpcUaAxisInformation()
@@ -145,7 +145,7 @@ void QOpcUaAxisInformation::setAxisScaleType(QOpcUa::AxisScale axisScaleType)
If the steps are different for each point but constant over a longer time, there is an entry for
each data point.
*/
-QVector<double> QOpcUaAxisInformation::axisSteps() const
+QList<double> QOpcUaAxisInformation::axisSteps() const
{
return data->axisSteps;
}
@@ -153,7 +153,7 @@ QVector<double> QOpcUaAxisInformation::axisSteps() const
/*!
Sets the axis steps to \a axisSteps.
*/
-void QOpcUaAxisInformation::setAxisSteps(const QVector<double> &axisSteps)
+void QOpcUaAxisInformation::setAxisSteps(const QList<double> &axisSteps)
{
data->axisSteps = axisSteps;
}
@@ -161,7 +161,7 @@ void QOpcUaAxisInformation::setAxisSteps(const QVector<double> &axisSteps)
/*!
Returns a reference to the axis steps.
*/
-QVector<double> &QOpcUaAxisInformation::axisStepsRef()
+QList<double> &QOpcUaAxisInformation::axisStepsRef()
{
return data->axisSteps;
}
@@ -207,7 +207,7 @@ QOpcUaAxisInformation::operator QVariant() const
range \a eURange, title \a title, scaling \a axisScaleType and axis steps \a axisSteps.
*/
QOpcUaAxisInformation::QOpcUaAxisInformation(const QOpcUaEUInformation &engineeringUnits, const QOpcUaRange &eURange, const QOpcUaLocalizedText &title,
- const QOpcUa::AxisScale &axisScaleType, const QVector<double> &axisSteps)
+ const QOpcUa::AxisScale &axisScaleType, const QList<double> &axisSteps)
: data (new QOpcUaAxisInformationData)
{
data->engineeringUnits = engineeringUnits;
diff --git a/src/opcua/client/qopcuaaxisinformation.h b/src/opcua/client/qopcuaaxisinformation.h
index 4afe996..f033230 100644
--- a/src/opcua/client/qopcuaaxisinformation.h
+++ b/src/opcua/client/qopcuaaxisinformation.h
@@ -54,7 +54,7 @@ public:
QOpcUaAxisInformation();
QOpcUaAxisInformation(const QOpcUaAxisInformation &);
QOpcUaAxisInformation(const QOpcUaEUInformation &engineeringUnits, const QOpcUaRange &eURange, const QOpcUaLocalizedText &title,
- const QOpcUa::AxisScale &axisScaleType, const QVector<double> &axisSteps);
+ const QOpcUa::AxisScale &axisScaleType, const QList<double> &axisSteps);
QOpcUaAxisInformation &operator=(const QOpcUaAxisInformation &);
bool operator==(const QOpcUaAxisInformation &rhs) const;
operator QVariant() const;
@@ -72,9 +72,9 @@ public:
QOpcUa::AxisScale axisScaleType() const;
void setAxisScaleType(QOpcUa::AxisScale axisScaleType);
- QVector<double> axisSteps() const;
- void setAxisSteps(const QVector<double> &axisSteps);
- QVector<double> &axisStepsRef();
+ QList<double> axisSteps() const;
+ void setAxisSteps(const QList<double> &axisSteps);
+ QList<double> &axisStepsRef();
private:
QSharedDataPointer<QOpcUaAxisInformationData> data;
diff --git a/src/opcua/client/qopcuabackend_p.h b/src/opcua/client/qopcuabackend_p.h
index 4ad748f..e6efe0e 100644
--- a/src/opcua/client/qopcuabackend_p.h
+++ b/src/opcua/client/qopcuabackend_p.h
@@ -81,7 +81,7 @@ public:
Q_SIGNALS:
void stateAndOrErrorChanged(QOpcUaClient::ClientState state,
QOpcUaClient::ClientError error);
- void attributesRead(quint64 handle, QVector<QOpcUaReadResult> attributes, QOpcUa::UaStatusCode serviceResult);
+ void attributesRead(quint64 handle, QList<QOpcUaReadResult> attributes, QOpcUa::UaStatusCode serviceResult);
void attributeWritten(quint64 hande, QOpcUa::NodeAttribute attribute, QVariant value, QOpcUa::UaStatusCode statusCode);
void methodCallFinished(quint64 handle, QString methodNodeId, QVariant result, QOpcUa::UaStatusCode statusCode);
@@ -90,14 +90,14 @@ Q_SIGNALS:
void monitoringEnableDisable(quint64 handle, QOpcUa::NodeAttribute attr, bool subscribe, QOpcUaMonitoringParameters status);
void monitoringStatusChanged(quint64 handle, QOpcUa::NodeAttribute attr, QOpcUaMonitoringParameters::Parameters items,
QOpcUaMonitoringParameters param);
- void browseFinished(quint64 handle, QVector<QOpcUaReferenceDescription> children, QOpcUa::UaStatusCode statusCode);
-
- void resolveBrowsePathFinished(quint64 handle, const QVector<QOpcUaBrowsePathTarget> &targets,
- const QVector<QOpcUaRelativePathElement> &path, QOpcUa::UaStatusCode statusCode);
- void endpointsRequestFinished(QVector<QOpcUaEndpointDescription> endpoints, QOpcUa::UaStatusCode statusCode, QUrl requestUrl);
- void findServersFinished(QVector<QOpcUaApplicationDescription> servers, QOpcUa::UaStatusCode statusCode, QUrl requestUrl);
- void readNodeAttributesFinished(QVector<QOpcUaReadResult> results, QOpcUa::UaStatusCode serviceResult);
- void writeNodeAttributesFinished(QVector<QOpcUaWriteResult> results, QOpcUa::UaStatusCode serviceResult);
+ void browseFinished(quint64 handle, QList<QOpcUaReferenceDescription> children, QOpcUa::UaStatusCode statusCode);
+
+ void resolveBrowsePathFinished(quint64 handle, const QList<QOpcUaBrowsePathTarget> &targets,
+ const QList<QOpcUaRelativePathElement> &path, QOpcUa::UaStatusCode statusCode);
+ void endpointsRequestFinished(QList<QOpcUaEndpointDescription> endpoints, QOpcUa::UaStatusCode statusCode, QUrl requestUrl);
+ void findServersFinished(QList<QOpcUaApplicationDescription> servers, QOpcUa::UaStatusCode statusCode, QUrl requestUrl);
+ void readNodeAttributesFinished(QList<QOpcUaReadResult> results, QOpcUa::UaStatusCode serviceResult);
+ void writeNodeAttributesFinished(QList<QOpcUaWriteResult> results, QOpcUa::UaStatusCode serviceResult);
void addNodeFinished(QOpcUaExpandedNodeId requestedNodeId, QString assignedNodeId, QOpcUa::UaStatusCode statusCode);
void deleteNodeFinished(QString nodeId, QOpcUa::UaStatusCode statusCode);
diff --git a/src/opcua/client/qopcuabinarydataencoding.cpp b/src/opcua/client/qopcuabinarydataencoding.cpp
index 1746ff0..27674be 100644
--- a/src/opcua/client/qopcuabinarydataencoding.cpp
+++ b/src/opcua/client/qopcuabinarydataencoding.cpp
@@ -160,7 +160,7 @@ QT_BEGIN_NAMESPACE
*/
/*!
- \fn template<typename T, QOpcUa::Types OVERLAY> QVector<T> QOpcUaBinaryDataEncoding::decodeArray(bool &success)
+ \fn template<typename T, QOpcUa::Types OVERLAY> QList<T> QOpcUaBinaryDataEncoding::decodeArray(bool &success)
Decodes an array of type T from the data buffer.
\a success is set to \c true if the decoding was successful, \c false if not.
@@ -171,7 +171,7 @@ QT_BEGIN_NAMESPACE
*/
/*!
- \fn template<typename T, QOpcUa::Types OVERLAY> bool QOpcUaBinaryDataEncoding::encodeArray(const QVector<T> &src)
+ \fn template<typename T, QOpcUa::Types OVERLAY> bool QOpcUaBinaryDataEncoding::encodeArray(const QList<T> &src)
Encodes all elements of type T in \a src and appends the encoded values to the data buffer.
diff --git a/src/opcua/client/qopcuabinarydataencoding.h b/src/opcua/client/qopcuabinarydataencoding.h
index 0448b25..2d85aed 100644
--- a/src/opcua/client/qopcuabinarydataencoding.h
+++ b/src/opcua/client/qopcuabinarydataencoding.h
@@ -55,7 +55,7 @@
#include <QtCore/qmetatype.h>
#include <QtCore/quuid.h>
#include <QtCore/qendian.h>
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
#include <limits>
@@ -72,12 +72,12 @@ public:
template <typename T, QOpcUa::Types OVERLAY = QOpcUa::Types::Undefined>
T decode(bool &success);
template <typename T, QOpcUa::Types OVERLAY = QOpcUa::Types::Undefined>
- QVector<T> decodeArray(bool &success);
+ QList<T> decodeArray(bool &success);
template <typename T, QOpcUa::Types OVERLAY = QOpcUa::Types::Undefined>
bool encode(const T &src);
template <typename T, QOpcUa::Types OVERLAY = QOpcUa::Types::Undefined>
- bool encodeArray(const QVector<T> &src);
+ bool encodeArray(const QList<T> &src);
int offset() const;
@@ -962,9 +962,9 @@ inline bool QOpcUaBinaryDataEncoding::encode<QOpcUaArgument>(const QOpcUaArgumen
}
template<typename T, QOpcUa::Types OVERLAY>
-inline QVector<T> QOpcUaBinaryDataEncoding::decodeArray(bool &success)
+inline QList<T> QOpcUaBinaryDataEncoding::decodeArray(bool &success)
{
- QVector<T> temp;
+ QList<T> temp;
qint32 size = decode<qint32>(success);
if (!success)
@@ -973,14 +973,14 @@ inline QVector<T> QOpcUaBinaryDataEncoding::decodeArray(bool &success)
for (int i = 0; i < size; ++i) {
temp.push_back(decode<T, OVERLAY>(success));
if (!success)
- return QVector<T>();
+ return QList<T>();
}
return temp;
}
template<typename T, QOpcUa::Types OVERLAY>
-inline bool QOpcUaBinaryDataEncoding::encodeArray(const QVector<T> &src)
+inline bool QOpcUaBinaryDataEncoding::encodeArray(const QList<T> &src)
{
if (src.size() > upperBound<qint32>())
return false;
diff --git a/src/opcua/client/qopcuaclient.cpp b/src/opcua/client/qopcuaclient.cpp
index 16924a0..ef1df06 100644
--- a/src/opcua/client/qopcuaclient.cpp
+++ b/src/opcua/client/qopcuaclient.cpp
@@ -96,7 +96,7 @@ Q_DECLARE_LOGGING_CATEGORY(QT_OPCUA)
});
QObject::connect(client, &QOpcUaClient::endpointsRequestFinished,
- [client](QVector<QOpcUaEndpointDescription> endpoints) {
+ [client](QList<QOpcUaEndpointDescription> endpoints) {
qDebug() << "Endpoints returned:" << endpoints.count();
if (endpoints.size())
client->connectToEndpoint(endpoints.first()); // Connect to the first endpoint in the list
@@ -215,7 +215,7 @@ Q_DECLARE_LOGGING_CATEGORY(QT_OPCUA)
*/
/*!
- \fn void QOpcUaClient::endpointsRequestFinished(QVector<QOpcUaEndpointDescription> endpoints, QOpcUa::UaStatusCode statusCode, QUrl requestUrl)
+ \fn void QOpcUaClient::endpointsRequestFinished(QList<QOpcUaEndpointDescription> endpoints, QOpcUa::UaStatusCode statusCode, QUrl requestUrl)
This signal is emitted after a \l requestEndpoints() operation has finished.
\a statusCode contains the result of the operation. If the result is \l {QOpcUa::UaStatusCode} {Good},
@@ -224,7 +224,7 @@ Q_DECLARE_LOGGING_CATEGORY(QT_OPCUA)
*/
/*!
- \fn void QOpcUaClient::findServersFinished(QVector<QOpcUaApplicationDescription> servers, QOpcUa::UaStatusCode statusCode, QUrl requestUrl);
+ \fn void QOpcUaClient::findServersFinished(QList<QOpcUaApplicationDescription> servers, QOpcUa::UaStatusCode statusCode, QUrl requestUrl);
This signal is emitted after a \l findServers() operation has finished.
\a statusCode contains the result of the operation. If the result is \l {QOpcUa::UaStatusCode} {Good},
@@ -233,7 +233,7 @@ Q_DECLARE_LOGGING_CATEGORY(QT_OPCUA)
*/
/*!
- \fn void QOpcUaClient::readNodeAttributesFinished(QVector<QOpcUaReadResult> results, QOpcUa::UaStatusCode serviceResult)
+ \fn void QOpcUaClient::readNodeAttributesFinished(QList<QOpcUaReadResult> results, QOpcUa::UaStatusCode serviceResult)
This signal is emitted after a \l readNodeAttributes() operation has finished.
@@ -245,7 +245,7 @@ Q_DECLARE_LOGGING_CATEGORY(QT_OPCUA)
*/
/*!
- \fn void QOpcUaClient::writeNodeAttributesFinished(QVector<QOpcUaWriteResult> results, QOpcUa::UaStatusCode serviceResult)
+ \fn void QOpcUaClient::writeNodeAttributesFinished(QList<QOpcUaWriteResult> results, QOpcUa::UaStatusCode serviceResult)
This signal is emitted after a \l writeNodeAttributes() operation has finished.
@@ -755,7 +755,7 @@ bool QOpcUaClient::findServers(const QUrl &url, const QStringList &localeIds, co
In the following example, the display name attribute and the two index ranges "0:2" and "5:7" of the value
attribute of the same node and the entire value attribute of a second node are read using a single service call:
\code
- QVector<QOpcUaReadItem> request;
+ QList<QOpcUaReadItem> request;
request.push_back(QOpcUaReadItem("ns=1;s=MyArrayNode",
QOpcUa::NodeAttribute::DisplayName));
request.push_back(QOpcUaReadItem("ns=1;s=MyArrayNode",
@@ -768,7 +768,7 @@ bool QOpcUaClient::findServers(const QUrl &url, const QStringList &localeIds, co
\sa QOpcUaReadItem readNodeAttributesFinished()
*/
-bool QOpcUaClient::readNodeAttributes(const QVector<QOpcUaReadItem> &nodesToRead)
+bool QOpcUaClient::readNodeAttributes(const QList<QOpcUaReadItem> &nodesToRead)
{
if (state() != QOpcUaClient::Connected)
return false;
@@ -796,7 +796,7 @@ bool QOpcUaClient::readNodeAttributes(const QVector<QOpcUaReadItem> &nodesToRead
The second node has an array value of which only the first two elements are overwritten:
\code
- QVector<QOpcUaWriteItem> request;
+ QList<QOpcUaWriteItem> request;
request.append(QOpcUaWriteItem("ns=2;s=Demo.Static.Scalar.Double", QOpcUa::NodeAttribute::Value,
23.0, QOpcUa::Types::Double));
@@ -808,7 +808,7 @@ bool QOpcUaClient::readNodeAttributes(const QVector<QOpcUaReadItem> &nodesToRead
\sa QOpcUaWriteItem writeNodeAttributesFinished()
*/
-bool QOpcUaClient::writeNodeAttributes(const QVector<QOpcUaWriteItem> &nodesToWrite)
+bool QOpcUaClient::writeNodeAttributes(const QList<QOpcUaWriteItem> &nodesToWrite)
{
if (state() != QOpcUaClient::Connected)
return false;
@@ -929,7 +929,7 @@ QStringList QOpcUaClient::supportedSecurityPolicies() const
\sa QOpcUaUserTokenPolicy::TokenType
*/
-QVector<QOpcUaUserTokenPolicy::TokenType> QOpcUaClient::supportedUserTokenTypes() const
+QList<QOpcUaUserTokenPolicy::TokenType> QOpcUaClient::supportedUserTokenTypes() const
{
Q_D(const QOpcUaClient);
return d->m_impl->supportedUserTokenTypes();
diff --git a/src/opcua/client/qopcuaclient.h b/src/opcua/client/qopcuaclient.h
index 2824922..c897ad6 100644
--- a/src/opcua/client/qopcuaclient.h
+++ b/src/opcua/client/qopcuaclient.h
@@ -114,8 +114,8 @@ public:
bool findServers(const QUrl &url, const QStringList &localeIds = QStringList(),
const QStringList &serverUris = QStringList());
- bool readNodeAttributes(const QVector<QOpcUaReadItem> &nodesToRead);
- bool writeNodeAttributes(const QVector<QOpcUaWriteItem> &nodesToWrite);
+ bool readNodeAttributes(const QList<QOpcUaReadItem> &nodesToRead);
+ bool writeNodeAttributes(const QList<QOpcUaWriteItem> &nodesToWrite);
bool addNode(const QOpcUaAddNodeItem &nodeToAdd);
bool deleteNode(const QString &nodeId, bool deleteTargetReferences = true);
@@ -139,7 +139,7 @@ public:
const QOpcUaAuthenticationInformation &authenticationInformation() const;
QStringList supportedSecurityPolicies() const;
- QVector<QOpcUaUserTokenPolicy::TokenType> supportedUserTokenTypes() const;
+ QList<QOpcUaUserTokenPolicy::TokenType> supportedUserTokenTypes() const;
Q_SIGNALS:
void connected();
@@ -149,10 +149,10 @@ Q_SIGNALS:
void connectError(QOpcUaErrorState *errorState);
void namespaceArrayUpdated(QStringList namespaces);
void namespaceArrayChanged(QStringList namespaces);
- void endpointsRequestFinished(QVector<QOpcUaEndpointDescription> endpoints, QOpcUa::UaStatusCode statusCode, QUrl requestUrl);
- void findServersFinished(QVector<QOpcUaApplicationDescription> servers, QOpcUa::UaStatusCode statusCode, QUrl requestUrl);
- void readNodeAttributesFinished(QVector<QOpcUaReadResult> results, QOpcUa::UaStatusCode serviceResult);
- void writeNodeAttributesFinished(QVector<QOpcUaWriteResult> results, QOpcUa::UaStatusCode serviceResult);
+ void endpointsRequestFinished(QList<QOpcUaEndpointDescription> endpoints, QOpcUa::UaStatusCode statusCode, QUrl requestUrl);
+ void findServersFinished(QList<QOpcUaApplicationDescription> servers, QOpcUa::UaStatusCode statusCode, QUrl requestUrl);
+ void readNodeAttributesFinished(QList<QOpcUaReadResult> results, QOpcUa::UaStatusCode serviceResult);
+ void writeNodeAttributesFinished(QList<QOpcUaWriteResult> results, QOpcUa::UaStatusCode serviceResult);
void addNodeFinished(QOpcUaExpandedNodeId requestedNodeId, QString assignedNodeId, QOpcUa::UaStatusCode statusCode);
void deleteNodeFinished(QString nodeId, QOpcUa::UaStatusCode statusCode);
void addReferenceFinished(QString sourceNodeId, QString referenceTypeId, QOpcUaExpandedNodeId targetNodeId, bool isForwardReference,
diff --git a/src/opcua/client/qopcuaclientimpl.cpp b/src/opcua/client/qopcuaclientimpl.cpp
index fa18795..5113085 100644
--- a/src/opcua/client/qopcuaclientimpl.cpp
+++ b/src/opcua/client/qopcuaclientimpl.cpp
@@ -97,7 +97,7 @@ void QOpcUaClientImpl::connectBackendWithClient(QOpcUaBackend *backend)
connect(backend, &QOpcUaBackend::passwordForPrivateKeyRequired, this, &QOpcUaClientImpl::passwordForPrivateKeyRequired, Qt::BlockingQueuedConnection);
}
-void QOpcUaClientImpl::handleAttributesRead(quint64 handle, QVector<QOpcUaReadResult> attr, QOpcUa::UaStatusCode serviceResult)
+void QOpcUaClientImpl::handleAttributesRead(quint64 handle, QList<QOpcUaReadResult> attr, QOpcUa::UaStatusCode serviceResult)
{
auto it = m_handles.constFind(handle);
if (it != m_handles.constEnd() && !it->isNull())
@@ -139,15 +139,15 @@ void QOpcUaClientImpl::handleMethodCallFinished(quint64 handle, QString methodNo
emit (*it)->methodCallFinished(methodNodeId, result, statusCode);
}
-void QOpcUaClientImpl::handleBrowseFinished(quint64 handle, const QVector<QOpcUaReferenceDescription> &children, QOpcUa::UaStatusCode statusCode)
+void QOpcUaClientImpl::handleBrowseFinished(quint64 handle, const QList<QOpcUaReferenceDescription> &children, QOpcUa::UaStatusCode statusCode)
{
auto it = m_handles.constFind(handle);
if (it != m_handles.constEnd() && !it->isNull())
emit (*it)->browseFinished(children, statusCode);
}
-void QOpcUaClientImpl::handleResolveBrowsePathFinished(quint64 handle, QVector<QOpcUaBrowsePathTarget> targets,
- QVector<QOpcUaRelativePathElement> path, QOpcUa::UaStatusCode status)
+void QOpcUaClientImpl::handleResolveBrowsePathFinished(quint64 handle, QList<QOpcUaBrowsePathTarget> targets,
+ QList<QOpcUaRelativePathElement> path, QOpcUa::UaStatusCode status)
{
auto it = m_handles.constFind(handle);
if (it != m_handles.constEnd() && !it->isNull())
diff --git a/src/opcua/client/qopcuaclientimpl_p.h b/src/opcua/client/qopcuaclientimpl_p.h
index fc468b0..c04dccb 100644
--- a/src/opcua/client/qopcuaclientimpl_p.h
+++ b/src/opcua/client/qopcuaclientimpl_p.h
@@ -78,8 +78,8 @@ public:
virtual QString backend() const = 0;
virtual bool requestEndpoints(const QUrl &url) = 0;
virtual bool findServers(const QUrl &url, const QStringList &localeIds, const QStringList &serverUris) = 0;
- virtual bool readNodeAttributes(const QVector<QOpcUaReadItem> &nodesToRead) = 0;
- virtual bool writeNodeAttributes(const QVector<QOpcUaWriteItem> &nodesToWrite) = 0;
+ virtual bool readNodeAttributes(const QList<QOpcUaReadItem> &nodesToRead) = 0;
+ virtual bool writeNodeAttributes(const QList<QOpcUaWriteItem> &nodesToWrite) = 0;
bool registerNode(QPointer<QOpcUaNodeImpl> obj);
void unregisterNode(QPointer<QOpcUaNodeImpl> obj);
@@ -93,22 +93,22 @@ public:
void connectBackendWithClient(QOpcUaBackend *backend);
virtual QStringList supportedSecurityPolicies() const = 0;
- virtual QVector<QOpcUaUserTokenPolicy::TokenType> supportedUserTokenTypes() const = 0;
+ virtual QList<QOpcUaUserTokenPolicy::TokenType> supportedUserTokenTypes() const = 0;
QOpcUaClient *m_client;
private Q_SLOTS:
- void handleAttributesRead(quint64 handle, QVector<QOpcUaReadResult> attr, QOpcUa::UaStatusCode serviceResult);
+ void handleAttributesRead(quint64 handle, QList<QOpcUaReadResult> attr, QOpcUa::UaStatusCode serviceResult);
void handleAttributeWritten(quint64 handle, QOpcUa::NodeAttribute attr, const QVariant &value, QOpcUa::UaStatusCode statusCode);
void handleDataChangeOccurred(quint64 handle, const QOpcUaReadResult &value);
void handleMonitoringEnableDisable(quint64 handle, QOpcUa::NodeAttribute attr, bool subscribe, QOpcUaMonitoringParameters status);
void handleMonitoringStatusChanged(quint64 handle, QOpcUa::NodeAttribute attr, QOpcUaMonitoringParameters::Parameters items,
QOpcUaMonitoringParameters param);
void handleMethodCallFinished(quint64 handle, QString methodNodeId, QVariant result, QOpcUa::UaStatusCode statusCode);
- void handleBrowseFinished(quint64 handle, const QVector<QOpcUaReferenceDescription> &children, QOpcUa::UaStatusCode statusCode);
+ void handleBrowseFinished(quint64 handle, const QList<QOpcUaReferenceDescription> &children, QOpcUa::UaStatusCode statusCode);
- void handleResolveBrowsePathFinished(quint64 handle, QVector<QOpcUaBrowsePathTarget> targets,
- QVector<QOpcUaRelativePathElement> path, QOpcUa::UaStatusCode status);
+ void handleResolveBrowsePathFinished(quint64 handle, QList<QOpcUaBrowsePathTarget> targets,
+ QList<QOpcUaRelativePathElement> path, QOpcUa::UaStatusCode status);
void handleNewEvent(quint64 handle, QVariantList eventFields);
@@ -117,10 +117,10 @@ signals:
void disconnected();
void stateAndOrErrorChanged(QOpcUaClient::ClientState state,
QOpcUaClient::ClientError error);
- void endpointsRequestFinished(QVector<QOpcUaEndpointDescription> endpoints, QOpcUa::UaStatusCode statusCode, QUrl requestUrl);
- void findServersFinished(QVector<QOpcUaApplicationDescription> servers, QOpcUa::UaStatusCode statusCode, QUrl requestUrl);
- void readNodeAttributesFinished(QVector<QOpcUaReadResult> results, QOpcUa::UaStatusCode serviceResult);
- void writeNodeAttributesFinished(QVector<QOpcUaWriteResult> results, QOpcUa::UaStatusCode serviceResult);
+ void endpointsRequestFinished(QList<QOpcUaEndpointDescription> endpoints, QOpcUa::UaStatusCode statusCode, QUrl requestUrl);
+ void findServersFinished(QList<QOpcUaApplicationDescription> servers, QOpcUa::UaStatusCode statusCode, QUrl requestUrl);
+ void readNodeAttributesFinished(QList<QOpcUaReadResult> results, QOpcUa::UaStatusCode serviceResult);
+ void writeNodeAttributesFinished(QList<QOpcUaWriteResult> results, QOpcUa::UaStatusCode serviceResult);
void addNodeFinished(QOpcUaExpandedNodeId requestedNodeId, QString assignedNodeId, QOpcUa::UaStatusCode statusCode);
void deleteNodeFinished(QString nodeId, QOpcUa::UaStatusCode statusCode);
void addReferenceFinished(QString sourceNodeId, QString referenceTypeId, QOpcUaExpandedNodeId targetNodeId, bool isForwardReference,
diff --git a/src/opcua/client/qopcuaclientprivate.cpp b/src/opcua/client/qopcuaclientprivate.cpp
index dfec694..4044f45 100644
--- a/src/opcua/client/qopcuaclientprivate.cpp
+++ b/src/opcua/client/qopcuaclientprivate.cpp
@@ -66,22 +66,22 @@ QOpcUaClientPrivate::QOpcUaClientPrivate(QOpcUaClientImpl *impl)
});
QObject::connect(m_impl.data(), &QOpcUaClientImpl::endpointsRequestFinished, m_impl.data(),
- [this](const QVector<QOpcUaEndpointDescription> &e, QOpcUa::UaStatusCode s, const QUrl &requestUrl) {
+ [this](const QList<QOpcUaEndpointDescription> &e, QOpcUa::UaStatusCode s, const QUrl &requestUrl) {
Q_Q(QOpcUaClient);
emit q->endpointsRequestFinished(e, s, requestUrl);
});
- QObject::connect(m_impl.data(), &QOpcUaClientImpl::findServersFinished, [this](const QVector<QOpcUaApplicationDescription> &a, QOpcUa::UaStatusCode s, const QUrl &requestUrl) {
+ QObject::connect(m_impl.data(), &QOpcUaClientImpl::findServersFinished, [this](const QList<QOpcUaApplicationDescription> &a, QOpcUa::UaStatusCode s, const QUrl &requestUrl) {
Q_Q(QOpcUaClient);
emit q->findServersFinished(a, s, requestUrl);
});
- QObject::connect(m_impl.data(), &QOpcUaClientImpl::readNodeAttributesFinished, [this](const QVector<QOpcUaReadResult> &results, QOpcUa::UaStatusCode serviceResult) {
+ QObject::connect(m_impl.data(), &QOpcUaClientImpl::readNodeAttributesFinished, [this](const QList<QOpcUaReadResult> &results, QOpcUa::UaStatusCode serviceResult) {
Q_Q(QOpcUaClient);
emit q->readNodeAttributesFinished(results, serviceResult);
});
- QObject::connect(m_impl.data(), &QOpcUaClientImpl::writeNodeAttributesFinished, [this](const QVector<QOpcUaWriteResult> &results, QOpcUa::UaStatusCode serviceResult) {
+ QObject::connect(m_impl.data(), &QOpcUaClientImpl::writeNodeAttributesFinished, [this](const QList<QOpcUaWriteResult> &results, QOpcUa::UaStatusCode serviceResult) {
Q_Q(QOpcUaClient);
emit q->writeNodeAttributesFinished(results, serviceResult);
});
diff --git a/src/opcua/client/qopcuacontentfilterelement.cpp b/src/opcua/client/qopcuacontentfilterelement.cpp
index 583a154..522fab3 100644
--- a/src/opcua/client/qopcuacontentfilterelement.cpp
+++ b/src/opcua/client/qopcuacontentfilterelement.cpp
@@ -87,7 +87,7 @@ class QOpcUaContentFilterElementData : public QSharedData
{
public:
QOpcUaContentFilterElement::FilterOperator filterOperator;
- QVector<QVariant> filterOperands;
+ QList<QVariant> filterOperands;
};
QOpcUaContentFilterElement::QOpcUaContentFilterElement()
@@ -134,7 +134,7 @@ QOpcUaContentFilterElement::operator QVariant() const
/*!
Returns the operands of the filter element.
*/
-QVector<QVariant> QOpcUaContentFilterElement::filterOperands() const
+QList<QVariant> QOpcUaContentFilterElement::filterOperands() const
{
return data->filterOperands;
}
@@ -144,7 +144,7 @@ QVector<QVariant> QOpcUaContentFilterElement::filterOperands() const
\sa filterOperands()
*/
-QVector<QVariant> &QOpcUaContentFilterElement::filterOperandsRef()
+QList<QVariant> &QOpcUaContentFilterElement::filterOperandsRef()
{
return data->filterOperands;
}
@@ -154,7 +154,7 @@ QVector<QVariant> &QOpcUaContentFilterElement::filterOperandsRef()
Supported classes are \l QOpcUaElementOperand, \l QOpcUaLiteralOperand,
\l QOpcUaSimpleAttributeOperand and \l QOpcUaAttributeOperand.
*/
-void QOpcUaContentFilterElement::setFilterOperands(const QVector<QVariant> &filterOperands)
+void QOpcUaContentFilterElement::setFilterOperands(const QList<QVariant> &filterOperands)
{
data->filterOperands = filterOperands;
}
diff --git a/src/opcua/client/qopcuacontentfilterelement.h b/src/opcua/client/qopcuacontentfilterelement.h
index 644acf7..0bfda27 100644
--- a/src/opcua/client/qopcuacontentfilterelement.h
+++ b/src/opcua/client/qopcuacontentfilterelement.h
@@ -92,9 +92,9 @@ public:
QOpcUaContentFilterElement::FilterOperator filterOperator() const;
void setFilterOperator(QOpcUaContentFilterElement::FilterOperator filterOperator);
- QVector<QVariant> filterOperands() const;
- QVector<QVariant> &filterOperandsRef();
- void setFilterOperands(const QVector<QVariant> &filterOperands);
+ QList<QVariant> filterOperands() const;
+ QList<QVariant> &filterOperandsRef();
+ void setFilterOperands(const QList<QVariant> &filterOperands);
private:
QSharedDataPointer<QOpcUaContentFilterElementData> data;
diff --git a/src/opcua/client/qopcuacontentfilterelementresult.cpp b/src/opcua/client/qopcuacontentfilterelementresult.cpp
index 09802e6..515cf78 100644
--- a/src/opcua/client/qopcuacontentfilterelementresult.cpp
+++ b/src/opcua/client/qopcuacontentfilterelementresult.cpp
@@ -51,7 +51,7 @@ class QOpcUaContentFilterElementResultData : public QSharedData
{
public:
QOpcUa::UaStatusCode statusCode {QOpcUa::UaStatusCode::Good};
- QVector<QOpcUa::UaStatusCode> operandStatusCodes;
+ QList<QOpcUa::UaStatusCode> operandStatusCodes;
};
QOpcUaContentFilterElementResult::QOpcUaContentFilterElementResult()
@@ -100,7 +100,7 @@ void QOpcUaContentFilterElementResult::setStatusCode(QOpcUa::UaStatusCode status
/*!
Returns the status codes for all filter operands in the order that was used in the filter.
*/
-QVector<QOpcUa::UaStatusCode> QOpcUaContentFilterElementResult::operandStatusCodes() const
+QList<QOpcUa::UaStatusCode> QOpcUaContentFilterElementResult::operandStatusCodes() const
{
return data->operandStatusCodes;
}
@@ -108,7 +108,7 @@ QVector<QOpcUa::UaStatusCode> QOpcUaContentFilterElementResult::operandStatusCod
/*!
Sets the status codes for all filter operands to \a operandStatusCodes.
*/
-void QOpcUaContentFilterElementResult::setOperandStatusCodes(const QVector<QOpcUa::UaStatusCode> &operandStatusCodes)
+void QOpcUaContentFilterElementResult::setOperandStatusCodes(const QList<QOpcUa::UaStatusCode> &operandStatusCodes)
{
data->operandStatusCodes = operandStatusCodes;
}
@@ -118,7 +118,7 @@ void QOpcUaContentFilterElementResult::setOperandStatusCodes(const QVector<QOpcU
\sa operandStatusCodes()
*/
-QVector<QOpcUa::UaStatusCode> &QOpcUaContentFilterElementResult::operandStatusCodesRef()
+QList<QOpcUa::UaStatusCode> &QOpcUaContentFilterElementResult::operandStatusCodesRef()
{
return data->operandStatusCodes;
}
diff --git a/src/opcua/client/qopcuacontentfilterelementresult.h b/src/opcua/client/qopcuacontentfilterelementresult.h
index 3798e6b..33f7986 100644
--- a/src/opcua/client/qopcuacontentfilterelementresult.h
+++ b/src/opcua/client/qopcuacontentfilterelementresult.h
@@ -55,9 +55,9 @@ public:
QOpcUa::UaStatusCode statusCode() const;
void setStatusCode(QOpcUa::UaStatusCode statusCode);
- QVector<QOpcUa::UaStatusCode> operandStatusCodes() const;
- QVector<QOpcUa::UaStatusCode> &operandStatusCodesRef();
- void setOperandStatusCodes(const QVector<QOpcUa::UaStatusCode> &operandStatusCodes);
+ QList<QOpcUa::UaStatusCode> operandStatusCodes() const;
+ QList<QOpcUa::UaStatusCode> &operandStatusCodesRef();
+ void setOperandStatusCodes(const QList<QOpcUa::UaStatusCode> &operandStatusCodes);
private:
QSharedDataPointer<QOpcUaContentFilterElementResultData> data;
diff --git a/src/opcua/client/qopcuaendpointdescription.cpp b/src/opcua/client/qopcuaendpointdescription.cpp
index 91f916e..b7993cd 100644
--- a/src/opcua/client/qopcuaendpointdescription.cpp
+++ b/src/opcua/client/qopcuaendpointdescription.cpp
@@ -148,7 +148,7 @@ public:
QByteArray serverCertificate;
QOpcUaEndpointDescription::MessageSecurityMode securityMode{QOpcUaEndpointDescription::MessageSecurityMode::None};
QString securityPolicy;
- QVector<QOpcUaUserTokenPolicy> userIdentityTokens;
+ QList<QOpcUaUserTokenPolicy> userIdentityTokens;
QString transportProfileUri;
quint8 securityLevel{0};
};
@@ -237,7 +237,7 @@ void QOpcUaEndpointDescription::setTransportProfileUri(const QString &transportP
/*!
Returns a list of user identity tokens the endpoint will accept.
*/
-QVector<QOpcUaUserTokenPolicy> QOpcUaEndpointDescription::userIdentityTokens() const
+QList<QOpcUaUserTokenPolicy> QOpcUaEndpointDescription::userIdentityTokens() const
{
return data->userIdentityTokens;
}
@@ -245,7 +245,7 @@ QVector<QOpcUaUserTokenPolicy> QOpcUaEndpointDescription::userIdentityTokens() c
/*!
Returns a reference to a list of user identity tokens the endpoint will accept.
*/
-QVector<QOpcUaUserTokenPolicy> &QOpcUaEndpointDescription::userIdentityTokensRef()
+QList<QOpcUaUserTokenPolicy> &QOpcUaEndpointDescription::userIdentityTokensRef()
{
return data->userIdentityTokens;
}
@@ -253,7 +253,7 @@ QVector<QOpcUaUserTokenPolicy> &QOpcUaEndpointDescription::userIdentityTokensRef
/*!
Sets the user identity tokens to \a userIdentityTokens.
*/
-void QOpcUaEndpointDescription::setUserIdentityTokens(const QVector<QOpcUaUserTokenPolicy> &userIdentityTokens)
+void QOpcUaEndpointDescription::setUserIdentityTokens(const QList<QOpcUaUserTokenPolicy> &userIdentityTokens)
{
data->userIdentityTokens = userIdentityTokens;
}
diff --git a/src/opcua/client/qopcuaendpointdescription.h b/src/opcua/client/qopcuaendpointdescription.h
index 478b5ba..64b4a8e 100644
--- a/src/opcua/client/qopcuaendpointdescription.h
+++ b/src/opcua/client/qopcuaendpointdescription.h
@@ -53,7 +53,7 @@ class Q_OPCUA_EXPORT QOpcUaEndpointDescription
Q_PROPERTY(QOpcUaApplicationDescription server READ server)
Q_PROPERTY(QOpcUaEndpointDescription::MessageSecurityMode securityMode READ securityMode)
Q_PROPERTY(QString securityPolicy READ securityPolicy)
- Q_PROPERTY(QVector<QOpcUaUserTokenPolicy> userIdentityTokens READ userIdentityTokens)
+ Q_PROPERTY(QList<QOpcUaUserTokenPolicy> userIdentityTokens READ userIdentityTokens)
public:
QOpcUaEndpointDescription();
@@ -86,9 +86,9 @@ public:
QString securityPolicy() const;
void setSecurityPolicy(const QString &securityPolicy);
- QVector<QOpcUaUserTokenPolicy> userIdentityTokens() const;
- QVector<QOpcUaUserTokenPolicy> &userIdentityTokensRef();
- void setUserIdentityTokens(const QVector<QOpcUaUserTokenPolicy> &userIdentityTokens);
+ QList<QOpcUaUserTokenPolicy> userIdentityTokens() const;
+ QList<QOpcUaUserTokenPolicy> &userIdentityTokensRef();
+ void setUserIdentityTokens(const QList<QOpcUaUserTokenPolicy> &userIdentityTokens);
QString transportProfileUri() const;
void setTransportProfileUri(const QString &transportProfileUri);
diff --git a/src/opcua/client/qopcuaeventfilterresult.cpp b/src/opcua/client/qopcuaeventfilterresult.cpp
index 1f2ab8d..e65aeda 100644
--- a/src/opcua/client/qopcuaeventfilterresult.cpp
+++ b/src/opcua/client/qopcuaeventfilterresult.cpp
@@ -51,8 +51,8 @@ QT_BEGIN_NAMESPACE
class QOpcUaEventFilterResultData : public QSharedData
{
public:
- QVector<QOpcUa::UaStatusCode> selectClauseResults;
- QVector<QOpcUaContentFilterElementResult> whereClauseResults;
+ QList<QOpcUa::UaStatusCode> selectClauseResults;
+ QList<QOpcUaContentFilterElementResult> whereClauseResults;
};
QOpcUaEventFilterResult::QOpcUaEventFilterResult()
@@ -106,7 +106,7 @@ bool QOpcUaEventFilterResult::isGood() const
/*!
Returns the status codes for all elements of the \c where clause in the order that was used in the filter.
*/
-QVector<QOpcUaContentFilterElementResult> QOpcUaEventFilterResult::whereClauseResults() const
+QList<QOpcUaContentFilterElementResult> QOpcUaEventFilterResult::whereClauseResults() const
{
return data->whereClauseResults;
}
@@ -116,7 +116,7 @@ QVector<QOpcUaContentFilterElementResult> QOpcUaEventFilterResult::whereClauseRe
\sa whereClauseResults()
*/
-QVector<QOpcUaContentFilterElementResult> &QOpcUaEventFilterResult::whereClauseResultsRef()
+QList<QOpcUaContentFilterElementResult> &QOpcUaEventFilterResult::whereClauseResultsRef()
{
return data->whereClauseResults;
}
@@ -124,7 +124,7 @@ QVector<QOpcUaContentFilterElementResult> &QOpcUaEventFilterResult::whereClauseR
/*!
Sets the \c where clause results to \a whereClausesResult.
*/
-void QOpcUaEventFilterResult::setWhereClauseResults(const QVector<QOpcUaContentFilterElementResult> &whereClausesResult)
+void QOpcUaEventFilterResult::setWhereClauseResults(const QList<QOpcUaContentFilterElementResult> &whereClausesResult)
{
data->whereClauseResults = whereClausesResult;
}
@@ -132,7 +132,7 @@ void QOpcUaEventFilterResult::setWhereClauseResults(const QVector<QOpcUaContentF
/*!
Returns the status codes for all elements of the \c select clauses in the order that was used in the filter.
*/
-QVector<QOpcUa::UaStatusCode> QOpcUaEventFilterResult::selectClauseResults() const
+QList<QOpcUa::UaStatusCode> QOpcUaEventFilterResult::selectClauseResults() const
{
return data->selectClauseResults;
}
@@ -142,7 +142,7 @@ QVector<QOpcUa::UaStatusCode> QOpcUaEventFilterResult::selectClauseResults() con
\sa selectClauseResults()
*/
-QVector<QOpcUa::UaStatusCode> &QOpcUaEventFilterResult::selectClauseResultsRef()
+QList<QOpcUa::UaStatusCode> &QOpcUaEventFilterResult::selectClauseResultsRef()
{
return data->selectClauseResults;
}
@@ -150,7 +150,7 @@ QVector<QOpcUa::UaStatusCode> &QOpcUaEventFilterResult::selectClauseResultsRef()
/*!
Sets the \c select clause results to \a selectClausesResult.
*/
-void QOpcUaEventFilterResult::setSelectClauseResults(const QVector<QOpcUa::UaStatusCode> &selectClausesResult)
+void QOpcUaEventFilterResult::setSelectClauseResults(const QList<QOpcUa::UaStatusCode> &selectClausesResult)
{
data->selectClauseResults = selectClausesResult;
}
diff --git a/src/opcua/client/qopcuaeventfilterresult.h b/src/opcua/client/qopcuaeventfilterresult.h
index e4587ac..97ddfbb 100644
--- a/src/opcua/client/qopcuaeventfilterresult.h
+++ b/src/opcua/client/qopcuaeventfilterresult.h
@@ -56,13 +56,13 @@ public:
bool isGood() const;
- QVector<QOpcUa::UaStatusCode> selectClauseResults() const;
- QVector<QOpcUa::UaStatusCode> &selectClauseResultsRef();
- void setSelectClauseResults(const QVector<QOpcUa::UaStatusCode> &selectClausesResult);
+ QList<QOpcUa::UaStatusCode> selectClauseResults() const;
+ QList<QOpcUa::UaStatusCode> &selectClauseResultsRef();
+ void setSelectClauseResults(const QList<QOpcUa::UaStatusCode> &selectClausesResult);
- QVector<QOpcUaContentFilterElementResult> whereClauseResults() const;
- QVector<QOpcUaContentFilterElementResult> &whereClauseResultsRef();
- void setWhereClauseResults(const QVector<QOpcUaContentFilterElementResult> &whereClauseResult);
+ QList<QOpcUaContentFilterElementResult> whereClauseResults() const;
+ QList<QOpcUaContentFilterElementResult> &whereClauseResultsRef();
+ void setWhereClauseResults(const QList<QOpcUaContentFilterElementResult> &whereClauseResult);
private:
QSharedDataPointer<QOpcUaEventFilterResultData> data;
diff --git a/src/opcua/client/qopcuagdsclient.cpp b/src/opcua/client/qopcuagdsclient.cpp
index 55cc20c..3289bd1 100644
--- a/src/opcua/client/qopcuagdsclient.cpp
+++ b/src/opcua/client/qopcuagdsclient.cpp
@@ -863,8 +863,8 @@ void QOpcUaGdsClientPrivate::resolveDirectoryNode()
return;
}
- QObject::connect(m_directoryNode, &QOpcUaNode::resolveBrowsePathFinished, [this, q](QVector<QOpcUaBrowsePathTarget> targets,
- QVector<QOpcUaRelativePathElement> path,
+ QObject::connect(m_directoryNode, &QOpcUaNode::resolveBrowsePathFinished, [this, q](QList<QOpcUaBrowsePathTarget> targets,
+ QList<QOpcUaRelativePathElement> path,
QOpcUa::UaStatusCode statusCode) {
m_directoryNode->deleteLater();
m_directoryNode = nullptr;
@@ -906,8 +906,8 @@ void QOpcUaGdsClientPrivate::resolveDirectoryNode()
return;
}
- QObject::connect(m_directoryNode, SIGNAL(resolveBrowsePathFinished(QVector<QOpcUaBrowsePathTarget>, QVector<QOpcUaRelativePathElement>, QOpcUa::UaStatusCode)),
- q, SLOT(_q_handleResolveBrowsePathFinished(QVector<QOpcUaBrowsePathTarget>, QVector<QOpcUaRelativePathElement>, QOpcUa::UaStatusCode)));
+ QObject::connect(m_directoryNode, SIGNAL(resolveBrowsePathFinished(QList<QOpcUaBrowsePathTarget>, QList<QOpcUaRelativePathElement>, QOpcUa::UaStatusCode)),
+ q, SLOT(_q_handleResolveBrowsePathFinished(QList<QOpcUaBrowsePathTarget>, QList<QOpcUaRelativePathElement>, QOpcUa::UaStatusCode)));
QObject::connect(m_directoryNode, SIGNAL(methodCallFinished(QString, QVariant, QOpcUa::UaStatusCode)),
q, SLOT(_q_handleDirectoryNodeMethodCallFinished(QString, QVariant, QOpcUa::UaStatusCode)));
@@ -917,7 +917,7 @@ void QOpcUaGdsClientPrivate::resolveDirectoryNode()
QOpcUaRelativePathElement pathElement(QOpcUaQualifiedName(m_gdsNamespaceIndex, QLatin1String("Directory")),
QOpcUa::ReferenceTypeId::Organizes);
- QVector<QOpcUaRelativePathElement> browsePath { pathElement };
+ QList<QOpcUaRelativePathElement> browsePath { pathElement };
if (!m_directoryNode->resolveBrowsePath(browsePath)) {
qCWarning(QT_OPCUA_GDSCLIENT) << "Failed to resolve directory node";
@@ -934,7 +934,7 @@ void QOpcUaGdsClientPrivate::resolveMethodNodes()
QOpcUaRelativePathElement pathElement(QOpcUaQualifiedName(m_gdsNamespaceIndex, QLatin1String()),
QOpcUa::ReferenceTypeId::HasComponent);
- QVector<QOpcUaRelativePathElement> browsePath { pathElement };
+ QList<QOpcUaRelativePathElement> browsePath { pathElement };
// Resolve all needed nodes from the directory
@@ -954,7 +954,7 @@ void QOpcUaGdsClientPrivate::resolveMethodNodes()
}
}
-void QOpcUaGdsClientPrivate::_q_handleResolveBrowsePathFinished(QVector<QOpcUaBrowsePathTarget> targets, QVector<QOpcUaRelativePathElement> path, QOpcUa::UaStatusCode statusCode) {
+void QOpcUaGdsClientPrivate::_q_handleResolveBrowsePathFinished(QList<QOpcUaBrowsePathTarget> targets, QList<QOpcUaRelativePathElement> path, QOpcUa::UaStatusCode statusCode) {
if (path.size() != 1) {
qCWarning(QT_OPCUA_GDSCLIENT) << "Invalid path size";
setError(QOpcUaGdsClient::Error::DirectoryNodeNotFound);
@@ -1013,7 +1013,7 @@ void QOpcUaGdsClientPrivate::getApplication()
}
if (!m_directoryNode->callMethod(m_directoryNodes[QLatin1String("GetApplication")],
- QVector<QPair<QVariant, QOpcUa::Types>> { qMakePair(QVariant(m_appRecord.applicationId()), QOpcUa::Types::NodeId) })) {
+ QList<QPair<QVariant, QOpcUa::Types>> { qMakePair(QVariant(m_appRecord.applicationId()), QOpcUa::Types::NodeId) })) {
qCWarning(QT_OPCUA_GDSCLIENT) << "Failed to call method GetApplication";
setError(QOpcUaGdsClient::Error::FailedToRegisterApplication);
return;
@@ -1087,7 +1087,7 @@ void QOpcUaGdsClientPrivate::findRegisteredApplication()
}
if (!m_directoryNode->callMethod(m_directoryNodes[QLatin1String("FindApplications")],
- QVector<QPair<QVariant, QOpcUa::Types>> { qMakePair(QVariant(m_appRecord.applicationUri()), QOpcUa::Types::String) })) {
+ QList<QPair<QVariant, QOpcUa::Types>> { qMakePair(QVariant(m_appRecord.applicationUri()), QOpcUa::Types::String) })) {
qCWarning(QT_OPCUA_GDSCLIENT) << "Failed to call method";
setError(QOpcUaGdsClient::Error::FailedToRegisterApplication);
return;
@@ -1160,7 +1160,7 @@ void QOpcUaGdsClientPrivate::registerApplication()
parameter.setBinaryEncodedBody(buffer, QOpcUa::nodeIdFromInteger(m_gdsNamespaceIndex, ApplicationRecordDataType_Encoding_DefaultBinary));
if (!m_directoryNode->callMethod(m_directoryNodes[QLatin1String("RegisterApplication")],
- QVector<QOpcUa::TypedVariant> { QOpcUa::TypedVariant(parameter, QOpcUa::ExtensionObject) })) {
+ QList<QOpcUa::TypedVariant> { QOpcUa::TypedVariant(parameter, QOpcUa::ExtensionObject) })) {
qCWarning(QT_OPCUA_GDSCLIENT) << "Failed to call method RegisterApplication";
setError(QOpcUaGdsClient::Error::FailedToRegisterApplication);
}
@@ -1204,7 +1204,7 @@ void QOpcUaGdsClientPrivate::getCertificateGroups()
return;
}
- QVector<QOpcUa::TypedVariant> arguments;
+ QList<QOpcUa::TypedVariant> arguments;
arguments.push_back(QOpcUa::TypedVariant(m_appRecord.applicationId(), QOpcUa::NodeId));
if (!m_directoryNode->callMethod(m_directoryNodes[QLatin1String("GetCertificateGroups")], arguments)) {
@@ -1253,8 +1253,8 @@ void QOpcUaGdsClientPrivate::resolveCertificateTypes()
return;
}
- QObject::connect(m_certificateGroupNode, &QOpcUaNode::resolveBrowsePathFinished, [this](QVector<QOpcUaBrowsePathTarget> targets,
- QVector<QOpcUaRelativePathElement> path,
+ QObject::connect(m_certificateGroupNode, &QOpcUaNode::resolveBrowsePathFinished, [this](QList<QOpcUaBrowsePathTarget> targets,
+ QList<QOpcUaRelativePathElement> path,
QOpcUa::UaStatusCode statusCode) {
if (path.size() != 1) {
qCWarning(QT_OPCUA_GDSCLIENT) << "Invalid path size";
@@ -1292,7 +1292,7 @@ void QOpcUaGdsClientPrivate::resolveCertificateTypes()
QOpcUaRelativePathElement pathElement(QOpcUaQualifiedName(0, QLatin1String("CertificateTypes")),
QOpcUa::ReferenceTypeId::Unspecified);
- QVector<QOpcUaRelativePathElement> browsePath { pathElement };
+ QList<QOpcUaRelativePathElement> browsePath { pathElement };
if (!m_certificateGroupNode->resolveBrowsePath(browsePath)) {
@@ -1375,7 +1375,7 @@ void QOpcUaGdsClientPrivate::getCertificateStatus()
QString certificateType = QLatin1String("ns=0;i=0"); // null node
- QVector<QOpcUa::TypedVariant> arguments;
+ QList<QOpcUa::TypedVariant> arguments;
arguments.push_back(QOpcUa::TypedVariant(m_appRecord.applicationId(), QOpcUa::NodeId));
// Let the server choose the certificate group id
arguments.push_back(QOpcUa::TypedVariant(m_certificateGroups[0], QOpcUa::NodeId));
@@ -1451,7 +1451,7 @@ void QOpcUaGdsClientPrivate::startCertificateRequest()
const auto csrData = csr.createRequest(keyPair);
- QVector<QOpcUa::TypedVariant> arguments;
+ QList<QOpcUa::TypedVariant> arguments;
arguments.push_back(QOpcUa::TypedVariant(m_appRecord.applicationId(), QOpcUa::NodeId));
// Let the server choose the certificate group id
arguments.push_back(QOpcUa::TypedVariant(QLatin1String("ns=0;i=0"), QOpcUa::NodeId));
@@ -1503,7 +1503,7 @@ void QOpcUaGdsClientPrivate::finishCertificateRequest()
return;
}
- QVector<QOpcUa::TypedVariant> arguments;
+ QList<QOpcUa::TypedVariant> arguments;
arguments.push_back(QOpcUa::TypedVariant(m_appRecord.applicationId(), QOpcUa::NodeId));
arguments.push_back(QOpcUa::TypedVariant(m_certificateRequestId, QOpcUa::NodeId));
@@ -1609,7 +1609,7 @@ void QOpcUaGdsClientPrivate::unregisterApplication()
}
if (!m_directoryNode->callMethod(m_directoryNodes[QLatin1String("UnregisterApplication")],
- QVector<QOpcUa::TypedVariant> { QOpcUa::TypedVariant(m_appRecord.applicationId(), QOpcUa::NodeId) })) {
+ QList<QOpcUa::TypedVariant> { QOpcUa::TypedVariant(m_appRecord.applicationId(), QOpcUa::NodeId) })) {
qCWarning(QT_OPCUA_GDSCLIENT) << "Failed to call method UnregisterApplication";
setError(QOpcUaGdsClient::Error::FailedToUnregisterApplication);
}
@@ -1813,7 +1813,7 @@ void QOpcUaGdsClientPrivate::_q_updateTrustList()
return;
}
- QVector<QOpcUa::TypedVariant> arguments;
+ QList<QOpcUa::TypedVariant> arguments;
arguments.push_back(QOpcUa::TypedVariant(m_appRecord.applicationId(), QOpcUa::NodeId));
arguments.push_back(QOpcUa::TypedVariant(m_certificateGroupNode->nodeId(), QOpcUa::NodeId));
diff --git a/src/opcua/client/qopcuagdsclient.h b/src/opcua/client/qopcuagdsclient.h
index e4281d2..fba4693 100644
--- a/src/opcua/client/qopcuagdsclient.h
+++ b/src/opcua/client/qopcuagdsclient.h
@@ -130,7 +130,7 @@ Q_SIGNALS:
private:
Q_PRIVATE_SLOT(d_func(), void _q_handleDirectoryNodeMethodCallFinished(QString, QVariant, QOpcUa::UaStatusCode))
- Q_PRIVATE_SLOT(d_func(), void _q_handleResolveBrowsePathFinished(QVector<QOpcUaBrowsePathTarget>, QVector<QOpcUaRelativePathElement>, QOpcUa::UaStatusCode))
+ Q_PRIVATE_SLOT(d_func(), void _q_handleResolveBrowsePathFinished(QList<QOpcUaBrowsePathTarget>, QList<QOpcUaRelativePathElement>, QOpcUa::UaStatusCode))
Q_PRIVATE_SLOT(d_func(), void _q_certificateCheckTimeout())
Q_PRIVATE_SLOT(d_func(), void _q_updateTrustList())
};
diff --git a/src/opcua/client/qopcuagdsclient_p.h b/src/opcua/client/qopcuagdsclient_p.h
index 1a8155e..1915ba1 100644
--- a/src/opcua/client/qopcuagdsclient_p.h
+++ b/src/opcua/client/qopcuagdsclient_p.h
@@ -109,7 +109,7 @@ private:
void setError(QOpcUaGdsClient::Error);
void setState(QOpcUaGdsClient::State);
void _q_handleDirectoryNodeMethodCallFinished(QString methodNodeId, QVariant result, QOpcUa::UaStatusCode statusCode);
- void _q_handleResolveBrowsePathFinished(QVector<QOpcUaBrowsePathTarget> targets, QVector<QOpcUaRelativePathElement> path, QOpcUa::UaStatusCode statusCode);
+ void _q_handleResolveBrowsePathFinished(QList<QOpcUaBrowsePathTarget> targets, QList<QOpcUaRelativePathElement> path, QOpcUa::UaStatusCode statusCode);
void _q_certificateCheckTimeout();
void _q_updateTrustList();
diff --git a/src/opcua/client/qopcuamonitoringparameters.cpp b/src/opcua/client/qopcuamonitoringparameters.cpp
index c71dacd..4a63287 100644
--- a/src/opcua/client/qopcuamonitoringparameters.cpp
+++ b/src/opcua/client/qopcuamonitoringparameters.cpp
@@ -747,8 +747,8 @@ QOpcUaMonitoringParameters::DataChangeFilter::operator QVariant() const
class QOpcUaMonitoringParameters::EventFilterData : public QSharedData
{
public:
- QVector<QOpcUaSimpleAttributeOperand> selectClauses;
- QVector<QOpcUaContentFilterElement> whereClause;
+ QList<QOpcUaSimpleAttributeOperand> selectClauses;
+ QList<QOpcUaContentFilterElement> whereClause;
};
QOpcUaMonitoringParameters::EventFilter::EventFilter()
@@ -815,7 +815,7 @@ QOpcUaMonitoringParameters::EventFilter::~EventFilter()
/*!
Returns the content filter used to restrict the reported events to events matching certain criteria.
*/
-QVector<QOpcUaContentFilterElement> QOpcUaMonitoringParameters::EventFilter::whereClause() const
+QList<QOpcUaContentFilterElement> QOpcUaMonitoringParameters::EventFilter::whereClause() const
{
return data->whereClause;
}
@@ -825,7 +825,7 @@ QVector<QOpcUaContentFilterElement> QOpcUaMonitoringParameters::EventFilter::whe
\sa whereClause()
*/
-QVector<QOpcUaContentFilterElement> &QOpcUaMonitoringParameters::EventFilter::whereClauseRef()
+QList<QOpcUaContentFilterElement> &QOpcUaMonitoringParameters::EventFilter::whereClauseRef()
{
return data->whereClause;
}
@@ -833,7 +833,7 @@ QVector<QOpcUaContentFilterElement> &QOpcUaMonitoringParameters::EventFilter::wh
/*!
Sets the where clause to \a whereClause.
*/
-void QOpcUaMonitoringParameters::EventFilter::setWhereClause(const QVector<QOpcUaContentFilterElement> &whereClause)
+void QOpcUaMonitoringParameters::EventFilter::setWhereClause(const QList<QOpcUaContentFilterElement> &whereClause)
{
data->whereClause = whereClause;
}
@@ -841,7 +841,7 @@ void QOpcUaMonitoringParameters::EventFilter::setWhereClause(const QVector<QOpcU
/*!
Returns the selected event fields that shall be included when a new event is reported.
*/
-QVector<QOpcUaSimpleAttributeOperand> QOpcUaMonitoringParameters::EventFilter::selectClauses() const
+QList<QOpcUaSimpleAttributeOperand> QOpcUaMonitoringParameters::EventFilter::selectClauses() const
{
return data->selectClauses;
}
@@ -849,7 +849,7 @@ QVector<QOpcUaSimpleAttributeOperand> QOpcUaMonitoringParameters::EventFilter::s
/*!
Returns a reference to the select clauses.
*/
-QVector<QOpcUaSimpleAttributeOperand> &QOpcUaMonitoringParameters::EventFilter::selectClausesRef()
+QList<QOpcUaSimpleAttributeOperand> &QOpcUaMonitoringParameters::EventFilter::selectClausesRef()
{
return data->selectClauses;
}
@@ -857,7 +857,7 @@ QVector<QOpcUaSimpleAttributeOperand> &QOpcUaMonitoringParameters::EventFilter::
/*!
Sets the select clauses to \a selectClauses.
*/
-void QOpcUaMonitoringParameters::EventFilter::setSelectClauses(const QVector<QOpcUaSimpleAttributeOperand> &selectClauses)
+void QOpcUaMonitoringParameters::EventFilter::setSelectClauses(const QList<QOpcUaSimpleAttributeOperand> &selectClauses)
{
data->selectClauses = selectClauses;
}
diff --git a/src/opcua/client/qopcuamonitoringparameters.h b/src/opcua/client/qopcuamonitoringparameters.h
index bfbac98..a1cfa87 100644
--- a/src/opcua/client/qopcuamonitoringparameters.h
+++ b/src/opcua/client/qopcuamonitoringparameters.h
@@ -132,13 +132,13 @@ public:
EventFilter &operator<<(const QOpcUaSimpleAttributeOperand &selectClauseElement);
~EventFilter();
- QVector<QOpcUaSimpleAttributeOperand> selectClauses() const;
- QVector<QOpcUaSimpleAttributeOperand> &selectClausesRef();
- void setSelectClauses(const QVector<QOpcUaSimpleAttributeOperand> &selectClauses);
+ QList<QOpcUaSimpleAttributeOperand> selectClauses() const;
+ QList<QOpcUaSimpleAttributeOperand> &selectClausesRef();
+ void setSelectClauses(const QList<QOpcUaSimpleAttributeOperand> &selectClauses);
- QVector<QOpcUaContentFilterElement> whereClause() const;
- QVector<QOpcUaContentFilterElement> &whereClauseRef();
- void setWhereClause(const QVector<QOpcUaContentFilterElement> &whereClause);
+ QList<QOpcUaContentFilterElement> whereClause() const;
+ QList<QOpcUaContentFilterElement> &whereClauseRef();
+ void setWhereClause(const QList<QOpcUaContentFilterElement> &whereClause);
private:
QSharedDataPointer<QOpcUaMonitoringParameters::EventFilterData> data;
diff --git a/src/opcua/client/qopcuamultidimensionalarray.cpp b/src/opcua/client/qopcuamultidimensionalarray.cpp
index 74372cb..565f312 100644
--- a/src/opcua/client/qopcuamultidimensionalarray.cpp
+++ b/src/opcua/client/qopcuamultidimensionalarray.cpp
@@ -68,7 +68,7 @@ class QOpcUaMultiDimensionalArrayData : public QSharedData
{
public:
QVariantList value;
- QVector<quint32> arrayDimensions;
+ QList<quint32> arrayDimensions;
quint32 expectedArrayLength{0};
};
@@ -98,7 +98,7 @@ QOpcUaMultiDimensionalArray &QOpcUaMultiDimensionalArray::operator=(const QOpcUa
/*!
Constructs a multidimensional array with value \a value and array dimensions \a arrayDimensions.
*/
-QOpcUaMultiDimensionalArray::QOpcUaMultiDimensionalArray(const QVariantList &value, const QVector<quint32> &arrayDimensions)
+QOpcUaMultiDimensionalArray::QOpcUaMultiDimensionalArray(const QVariantList &value, const QList<quint32> &arrayDimensions)
: data(new QOpcUaMultiDimensionalArrayData)
{
setValueArray(value);
@@ -108,7 +108,7 @@ QOpcUaMultiDimensionalArray::QOpcUaMultiDimensionalArray(const QVariantList &val
/*!
Creates a multidimensional array with preallocated data fitting \a arrayDimensions.
*/
-QOpcUaMultiDimensionalArray::QOpcUaMultiDimensionalArray(const QVector<quint32> &arrayDimensions)
+QOpcUaMultiDimensionalArray::QOpcUaMultiDimensionalArray(const QList<quint32> &arrayDimensions)
: data(new QOpcUaMultiDimensionalArrayData)
{
setArrayDimensions(arrayDimensions);
@@ -127,7 +127,7 @@ QOpcUaMultiDimensionalArray::~QOpcUaMultiDimensionalArray()
Returns the dimensions of the multidimensional array.
The element at position n contains the length of the n-th dimension.
*/
-QVector<quint32> QOpcUaMultiDimensionalArray::arrayDimensions() const
+QList<quint32> QOpcUaMultiDimensionalArray::arrayDimensions() const
{
return data->arrayDimensions;
}
@@ -135,7 +135,7 @@ QVector<quint32> QOpcUaMultiDimensionalArray::arrayDimensions() const
/*!
Sets the dimensions of the multidimensional array to \a arrayDimensions.
*/
-void QOpcUaMultiDimensionalArray::setArrayDimensions(const QVector<quint32> &arrayDimensions)
+void QOpcUaMultiDimensionalArray::setArrayDimensions(const QList<quint32> &arrayDimensions)
{
data->arrayDimensions = arrayDimensions;
data->expectedArrayLength = std::accumulate(data->arrayDimensions.begin(), data->arrayDimensions.end(),
@@ -188,7 +188,7 @@ void QOpcUaMultiDimensionalArray::setValueArray(const QVariantList &value)
If \a indices is invalid for the array or if the array's dimensions don't match
the size of \l valueArray(), the invalid index \c -1 is returned.
*/
-int QOpcUaMultiDimensionalArray::arrayIndex(const QVector<quint32> &indices) const
+int QOpcUaMultiDimensionalArray::arrayIndex(const QList<quint32> &indices) const
{
// A QList can store INT_MAX values. Depending on the platform, this allows a size > UINT32_MAX
if (data->expectedArrayLength > static_cast<quint64>((std::numeric_limits<int>::max)()) ||
@@ -222,7 +222,7 @@ int QOpcUaMultiDimensionalArray::arrayIndex(const QVector<quint32> &indices) con
Returns the value of the element identified by \a indices.
If the indices are invalid for the array, an empty \l QVariant is returned.
*/
-QVariant QOpcUaMultiDimensionalArray::value(const QVector<quint32> &indices) const
+QVariant QOpcUaMultiDimensionalArray::value(const QList<quint32> &indices) const
{
int index = arrayIndex(indices);
@@ -236,7 +236,7 @@ QVariant QOpcUaMultiDimensionalArray::value(const QVector<quint32> &indices) con
Sets the value at position \a indices to \a value.
Returns \c true if the value has been successfully set.
*/
-bool QOpcUaMultiDimensionalArray::setValue(const QVector<quint32> &indices, const QVariant &value)
+bool QOpcUaMultiDimensionalArray::setValue(const QList<quint32> &indices, const QVariant &value)
{
int index = arrayIndex(indices);
diff --git a/src/opcua/client/qopcuamultidimensionalarray.h b/src/opcua/client/qopcuamultidimensionalarray.h
index ee1541c..61afbe2 100644
--- a/src/opcua/client/qopcuamultidimensionalarray.h
+++ b/src/opcua/client/qopcuamultidimensionalarray.h
@@ -51,22 +51,22 @@ public:
QOpcUaMultiDimensionalArray();
QOpcUaMultiDimensionalArray(const QOpcUaMultiDimensionalArray &other);
QOpcUaMultiDimensionalArray &operator=(const QOpcUaMultiDimensionalArray &rhs);
- QOpcUaMultiDimensionalArray(const QVariantList &valueArray, const QVector<quint32> &arrayDimensions);
- QOpcUaMultiDimensionalArray(const QVector<quint32> &arrayDimensions);
+ QOpcUaMultiDimensionalArray(const QVariantList &valueArray, const QList<quint32> &arrayDimensions);
+ QOpcUaMultiDimensionalArray(const QList<quint32> &arrayDimensions);
~QOpcUaMultiDimensionalArray();
QVariantList valueArray() const;
QVariantList &valueArrayRef();
void setValueArray(const QVariantList &valueArray);
- int arrayIndex(const QVector<quint32> &indices) const;
- QVariant value(const QVector<quint32> &indices) const;
- bool setValue(const QVector<quint32> &indices, const QVariant &value);
+ int arrayIndex(const QList<quint32> &indices) const;
+ QVariant value(const QList<quint32> &indices) const;
+ bool setValue(const QList<quint32> &indices, const QVariant &value);
bool isValid() const;
- QVector<quint32> arrayDimensions() const;
- void setArrayDimensions(const QVector<quint32> &arrayDimensions);
+ QList<quint32> arrayDimensions() const;
+ void setArrayDimensions(const QList<quint32> &arrayDimensions);
bool operator==(const QOpcUaMultiDimensionalArray &other) const;
diff --git a/src/opcua/client/qopcuanode.cpp b/src/opcua/client/qopcuanode.cpp
index 772340b..27003a3 100644
--- a/src/opcua/client/qopcuanode.cpp
+++ b/src/opcua/client/qopcuanode.cpp
@@ -230,7 +230,7 @@ QT_BEGIN_NAMESPACE
*/
/*!
- \fn void QOpcUaNode::browseFinished(QVector<QOpcUaReferenceDescription> children, QOpcUa::UaStatusCode statusCode)
+ \fn void QOpcUaNode::browseFinished(QList<QOpcUaReferenceDescription> children, QOpcUa::UaStatusCode statusCode)
This signal is emitted after a \l browseChildren() or \l browse() operation has finished.
@@ -241,7 +241,7 @@ QT_BEGIN_NAMESPACE
*/
/*!
- \fn void QOpcUaNode::resolveBrowsePathFinished(QVector<QOpcUaBrowsePathTarget> targets, QVector<QOpcUaRelativePathElement> path, QOpcUa::UaStatusCode statusCode)
+ \fn void QOpcUaNode::resolveBrowsePathFinished(QList<QOpcUaBrowsePathTarget> targets, QList<QOpcUaRelativePathElement> path, QOpcUa::UaStatusCode statusCode)
This signal is emitted after a \l resolveBrowsePath() call has finished.
@@ -695,7 +695,7 @@ QOpcUaClient *QOpcUaNode::client() const
Returns \c true if the asynchronous call has been successfully dispatched.
*/
-bool QOpcUaNode::callMethod(const QString &methodNodeId, const QVector<QOpcUa::TypedVariant> &args)
+bool QOpcUaNode::callMethod(const QString &methodNodeId, const QList<QOpcUa::TypedVariant> &args)
{
Q_D(QOpcUaNode);
if (d->m_client.isNull() || d->m_client->state() != QOpcUaClient::Connected)
@@ -723,7 +723,7 @@ bool QOpcUaNode::callMethod(const QString &methodNodeId, const QVector<QOpcUa::T
\code
QScopedPointer<QOpcUaNode> node(opcuaClient->node("ns=1;s=machine1"));
- QVector<QOpcUaRelativePathElement> path;
+ QList<QOpcUaRelativePathElement> path;
path.append(QOpcUaRelativePathElement(QOpcUaQualifiedName(1, "Fan"), QOpcUa::ReferenceTypeId::HasComponent));
path.append(QOpcUaRelativePathElement(QOpcUaQualifiedName(1, "RPM"), QOpcUa::ReferenceTypeId::HasComponent));
node->resolveBrowsePath(path);
@@ -751,7 +751,7 @@ bool QOpcUaNode::callMethod(const QString &methodNodeId, const QVector<QOpcUa::T
}
\endcode
*/
-bool QOpcUaNode::resolveBrowsePath(const QVector<QOpcUaRelativePathElement> &path)
+bool QOpcUaNode::resolveBrowsePath(const QList<QOpcUaRelativePathElement> &path)
{
Q_D(QOpcUaNode);
if (d->m_client.isNull() || d->m_client->state() != QOpcUaClient::Connected)
diff --git a/src/opcua/client/qopcuanode.h b/src/opcua/client/qopcuanode.h
index b41a318..390b1ad 100644
--- a/src/opcua/client/qopcuanode.h
+++ b/src/opcua/client/qopcuanode.h
@@ -98,9 +98,9 @@ public:
QString nodeId() const;
QOpcUaClient *client() const;
- bool callMethod(const QString &methodNodeId, const QVector<QOpcUa::TypedVariant> &args = QVector<QOpcUa::TypedVariant>());
+ bool callMethod(const QString &methodNodeId, const QList<QOpcUa::TypedVariant> &args = QList<QOpcUa::TypedVariant>());
- bool resolveBrowsePath(const QVector<QOpcUaRelativePathElement> &path);
+ bool resolveBrowsePath(const QList<QOpcUaRelativePathElement> &path);
bool browse(const QOpcUaBrowseRequest &request);
@@ -116,9 +116,9 @@ Q_SIGNALS:
void enableMonitoringFinished(QOpcUa::NodeAttribute attr, QOpcUa::UaStatusCode statusCode);
void disableMonitoringFinished(QOpcUa::NodeAttribute attr, QOpcUa::UaStatusCode statusCode);
void methodCallFinished(QString methodNodeId, QVariant result, QOpcUa::UaStatusCode statusCode);
- void browseFinished(QVector<QOpcUaReferenceDescription> children, QOpcUa::UaStatusCode statusCode);
- void resolveBrowsePathFinished(QVector<QOpcUaBrowsePathTarget> targets,
- QVector<QOpcUaRelativePathElement> path, QOpcUa::UaStatusCode statusCode);
+ void browseFinished(QList<QOpcUaReferenceDescription> children, QOpcUa::UaStatusCode statusCode);
+ void resolveBrowsePathFinished(QList<QOpcUaBrowsePathTarget> targets,
+ QList<QOpcUaRelativePathElement> path, QOpcUa::UaStatusCode statusCode);
private:
Q_DISABLE_COPY(QOpcUaNode)
diff --git a/src/opcua/client/qopcuanode_p.h b/src/opcua/client/qopcuanode_p.h
index 4691a43..73e5bc6 100644
--- a/src/opcua/client/qopcuanode_p.h
+++ b/src/opcua/client/qopcuanode_p.h
@@ -70,7 +70,7 @@ public:
, m_client(client)
{
m_attributesReadConnection = QObject::connect(impl, &QOpcUaNodeImpl::attributesRead,
- [this](QVector<QOpcUaReadResult> attr, QOpcUa::UaStatusCode serviceResult)
+ [this](QList<QOpcUaReadResult> attr, QOpcUa::UaStatusCode serviceResult)
{
QOpcUa::NodeAttributes updatedAttributes;
Q_Q(QOpcUaNode);
@@ -183,14 +183,14 @@ public:
});
m_browseFinishedConnection = QObject::connect(impl, &QOpcUaNodeImpl::browseFinished,
- [this](QVector<QOpcUaReferenceDescription> children, QOpcUa::UaStatusCode statusCode)
+ [this](QList<QOpcUaReferenceDescription> children, QOpcUa::UaStatusCode statusCode)
{
Q_Q(QOpcUaNode);
emit q->browseFinished(children, statusCode);
});
m_resolveBrowsePathFinishedConnection = QObject::connect(impl, &QOpcUaNodeImpl::resolveBrowsePathFinished,
- [this](QVector<QOpcUaBrowsePathTarget> targets, QVector<QOpcUaRelativePathElement> path,
+ [this](QList<QOpcUaBrowsePathTarget> targets, QList<QOpcUaRelativePathElement> path,
QOpcUa::UaStatusCode statusCode)
{
Q_Q(QOpcUaNode);
diff --git a/src/opcua/client/qopcuanodecreationattributes.cpp b/src/opcua/client/qopcuanodecreationattributes.cpp
index e9ccf83..04f34a6 100644
--- a/src/opcua/client/qopcuanodecreationattributes.cpp
+++ b/src/opcua/client/qopcuanodecreationattributes.cpp
@@ -308,7 +308,7 @@ bool QOpcUaNodeCreationAttributes::hasAccessLevel() const
/*!
Returns the value for the ArrayDimensions attribute.
*/
-QVector<quint32> QOpcUaNodeCreationAttributes::arrayDimensions() const
+QList<quint32> QOpcUaNodeCreationAttributes::arrayDimensions() const
{
return data->arrayDimensions;
}
@@ -316,7 +316,7 @@ QVector<quint32> QOpcUaNodeCreationAttributes::arrayDimensions() const
/*!
Sets the value for the ArrayDimensions attribute to \a arrayDimensions.
*/
-void QOpcUaNodeCreationAttributes::setArrayDimensions(const QVector<quint32> &arrayDimensions)
+void QOpcUaNodeCreationAttributes::setArrayDimensions(const QList<quint32> &arrayDimensions)
{
data->arrayDimensions = arrayDimensions;
data->setAttributeInMask(QOpcUaNodeCreationAttributesPrivate::BitMask::ArrayDimensions);
diff --git a/src/opcua/client/qopcuanodecreationattributes.h b/src/opcua/client/qopcuanodecreationattributes.h
index 522a174..b12c621 100644
--- a/src/opcua/client/qopcuanodecreationattributes.h
+++ b/src/opcua/client/qopcuanodecreationattributes.h
@@ -58,8 +58,8 @@ public:
void setAccessLevel(QOpcUa::AccessLevel accessLevel);
bool hasAccessLevel() const;
- QVector<quint32> arrayDimensions() const;
- void setArrayDimensions(const QVector<quint32> &arrayDimensions);
+ QList<quint32> arrayDimensions() const;
+ void setArrayDimensions(const QList<quint32> &arrayDimensions);
bool hasArrayDimensions() const;
bool containsNoLoops() const;
diff --git a/src/opcua/client/qopcuanodecreationattributes_p.h b/src/opcua/client/qopcuanodecreationattributes_p.h
index 8092c02..7a9c562 100644
--- a/src/opcua/client/qopcuanodecreationattributes_p.h
+++ b/src/opcua/client/qopcuanodecreationattributes_p.h
@@ -98,7 +98,7 @@ public:
quint32 mask {0};
QOpcUa::AccessLevel accessLevel {QOpcUa::AccessLevelBit::None};
- QVector<quint32> arrayDimensions;
+ QList<quint32> arrayDimensions;
bool containsNoLoops {false};
QString dataTypeId;
QOpcUaLocalizedText description;
diff --git a/src/opcua/client/qopcuanodeimpl_p.h b/src/opcua/client/qopcuanodeimpl_p.h
index e385b86..9c32bd9 100644
--- a/src/opcua/client/qopcuanodeimpl_p.h
+++ b/src/opcua/client/qopcuanodeimpl_p.h
@@ -79,9 +79,9 @@ public:
virtual bool modifyMonitoring(QOpcUa::NodeAttribute attr, QOpcUaMonitoringParameters::Parameter item,
const QVariant &value) = 0;
- virtual bool callMethod(const QString &methodNodeId, const QVector<QOpcUa::TypedVariant> &args) = 0;
+ virtual bool callMethod(const QString &methodNodeId, const QList<QOpcUa::TypedVariant> &args) = 0;
- virtual bool resolveBrowsePath(const QVector<QOpcUaRelativePathElement> &path) = 0;
+ virtual bool resolveBrowsePath(const QList<QOpcUaRelativePathElement> &path) = 0;
quint64 handle() const;
void setHandle(quint64 handle);
@@ -90,9 +90,9 @@ public:
void setRegistered(bool registered);
Q_SIGNALS:
- void attributesRead(QVector<QOpcUaReadResult> attr, QOpcUa::UaStatusCode serviceResult);
+ void attributesRead(QList<QOpcUaReadResult> attr, QOpcUa::UaStatusCode serviceResult);
void attributeWritten(QOpcUa::NodeAttribute attr, QVariant value, QOpcUa::UaStatusCode statusCode);
- void browseFinished(QVector<QOpcUaReferenceDescription> children, QOpcUa::UaStatusCode statusCode);
+ void browseFinished(QList<QOpcUaReferenceDescription> children, QOpcUa::UaStatusCode statusCode);
void dataChangeOccurred(QOpcUa::NodeAttribute attr, QOpcUaReadResult value);
void eventOccurred(QVariantList eventFields);
@@ -100,8 +100,8 @@ Q_SIGNALS:
void monitoringStatusChanged(QOpcUa::NodeAttribute attr, QOpcUaMonitoringParameters::Parameters items,
QOpcUaMonitoringParameters param);
void methodCallFinished(QString methodNodeId, QVariant result, QOpcUa::UaStatusCode statusCode);
- void resolveBrowsePathFinished(QVector<QOpcUaBrowsePathTarget> targets,
- QVector<QOpcUaRelativePathElement> path, QOpcUa::UaStatusCode status);
+ void resolveBrowsePathFinished(QList<QOpcUaBrowsePathTarget> targets,
+ QList<QOpcUaRelativePathElement> path, QOpcUa::UaStatusCode status);
private:
quint64 m_handle;
diff --git a/src/opcua/client/qopcuasimpleattributeoperand.cpp b/src/opcua/client/qopcuasimpleattributeoperand.cpp
index bf5ca52..e4bb1c2 100644
--- a/src/opcua/client/qopcuasimpleattributeoperand.cpp
+++ b/src/opcua/client/qopcuasimpleattributeoperand.cpp
@@ -57,7 +57,7 @@ class QOpcUaSimpleAttributeOperandData : public QSharedData
{
public:
QString typeId{QStringLiteral("ns=0;i=2041")}; // BaseEventType
- QVector<QOpcUaQualifiedName> browsePath;
+ QList<QOpcUaQualifiedName> browsePath;
QOpcUa::NodeAttribute attributeId {QOpcUa::NodeAttribute::Value};
QString indexRange;
};
@@ -165,7 +165,7 @@ void QOpcUaSimpleAttributeOperand::setAttributeId(QOpcUa::NodeAttribute attribut
/*!
Returns the relative path to a node starting from \l typeId.
*/
-QVector<QOpcUaQualifiedName> QOpcUaSimpleAttributeOperand::browsePath() const
+QList<QOpcUaQualifiedName> QOpcUaSimpleAttributeOperand::browsePath() const
{
return data->browsePath;
}
@@ -175,7 +175,7 @@ QVector<QOpcUaQualifiedName> QOpcUaSimpleAttributeOperand::browsePath() const
\sa browsePath()
*/
-QVector<QOpcUaQualifiedName> &QOpcUaSimpleAttributeOperand::browsePathRef()
+QList<QOpcUaQualifiedName> &QOpcUaSimpleAttributeOperand::browsePathRef()
{
return data->browsePath;
}
@@ -183,7 +183,7 @@ QVector<QOpcUaQualifiedName> &QOpcUaSimpleAttributeOperand::browsePathRef()
/*!
Sets the browse path to the node holding the attribute to \a browsePath.
*/
-void QOpcUaSimpleAttributeOperand::setBrowsePath(const QVector<QOpcUaQualifiedName> &browsePath)
+void QOpcUaSimpleAttributeOperand::setBrowsePath(const QList<QOpcUaQualifiedName> &browsePath)
{
data->browsePath = browsePath;
}
diff --git a/src/opcua/client/qopcuasimpleattributeoperand.h b/src/opcua/client/qopcuasimpleattributeoperand.h
index 711d17d..e3b6f75 100644
--- a/src/opcua/client/qopcuasimpleattributeoperand.h
+++ b/src/opcua/client/qopcuasimpleattributeoperand.h
@@ -65,9 +65,9 @@ public:
QString typeId() const;
void setTypeId(const QString &typeId);
- QVector<QOpcUaQualifiedName> browsePath() const;
- QVector<QOpcUaQualifiedName> &browsePathRef();
- void setBrowsePath(const QVector<QOpcUaQualifiedName> &browsePath);
+ QList<QOpcUaQualifiedName> browsePath() const;
+ QList<QOpcUaQualifiedName> &browsePathRef();
+ void setBrowsePath(const QList<QOpcUaQualifiedName> &browsePath);
QOpcUa::NodeAttribute attributeId() const;
void setAttributeId(QOpcUa::NodeAttribute attributeId);
diff --git a/src/opcua/core/qopcuaprovider.cpp b/src/opcua/core/qopcuaprovider.cpp
index 06a0da1..352bed3 100644
--- a/src/opcua/core/qopcuaprovider.cpp
+++ b/src/opcua/core/qopcuaprovider.cpp
@@ -138,7 +138,7 @@ QOpcUaProvider::QOpcUaProvider(QObject *parent)
{
qRegisterMetaType<QOpcUa::Types>();
qRegisterMetaType<QOpcUa::TypedVariant>();
- qRegisterMetaType<QVector<QOpcUa::TypedVariant>>();
+ qRegisterMetaType<QList<QOpcUa::TypedVariant>>();
qRegisterMetaType<QOpcUa::UaStatusCode>();
qRegisterMetaType<QOpcUa::NodeClass>();
qRegisterMetaType<QOpcUa::NodeClasses>();
@@ -146,7 +146,7 @@ QOpcUaProvider::QOpcUaProvider(QObject *parent)
qRegisterMetaType<QOpcUa::NodeAttribute>();
qRegisterMetaType<QOpcUa::NodeAttributes>();
qRegisterMetaType<QOpcUaNode::AttributeMap>();
- qRegisterMetaType<QVector<QOpcUaReadResult>>();
+ qRegisterMetaType<QList<QOpcUaReadResult>>();
qRegisterMetaType<QOpcUaClient::ClientState>();
qRegisterMetaType<QOpcUaClient::ClientError>();
qRegisterMetaType<QOpcUa::ReferenceTypeId>();
@@ -155,7 +155,7 @@ QOpcUaProvider::QOpcUaProvider(QObject *parent)
qRegisterMetaType<QOpcUaMonitoringParameters::Parameters>();
qRegisterMetaType<QOpcUaMonitoringParameters>();
qRegisterMetaType<QOpcUaReferenceDescription>();
- qRegisterMetaType<QVector<QOpcUaReferenceDescription>>();
+ qRegisterMetaType<QList<QOpcUaReferenceDescription>>();
qRegisterMetaType<QOpcUa::ReferenceTypeId>();
qRegisterMetaType<QOpcUaRange>();
qRegisterMetaType<QOpcUaEUInformation>();
@@ -165,27 +165,27 @@ QOpcUaProvider::QOpcUaProvider(QObject *parent)
qRegisterMetaType<QOpcUaXValue>();
qRegisterMetaType<QOpcUaExpandedNodeId>();
qRegisterMetaType<QOpcUaRelativePathElement>();
- qRegisterMetaType<QVector<QOpcUaRelativePathElement>>();
+ qRegisterMetaType<QList<QOpcUaRelativePathElement>>();
qRegisterMetaType<QOpcUaBrowsePathTarget>();
- qRegisterMetaType<QVector<QOpcUaBrowsePathTarget>>();
+ qRegisterMetaType<QList<QOpcUaBrowsePathTarget>>();
qRegisterMetaType<QOpcUaEndpointDescription>();
- qRegisterMetaType<QVector<QOpcUaEndpointDescription>>();
+ qRegisterMetaType<QList<QOpcUaEndpointDescription>>();
qRegisterMetaType<QOpcUaArgument>();
qRegisterMetaType<QOpcUaExtensionObject>();
qRegisterMetaType<QOpcUaBrowseRequest>();
qRegisterMetaType<QOpcUaReadItem>();
qRegisterMetaType<QOpcUaReadResult>();
- qRegisterMetaType<QVector<QOpcUaReadItem>>();
- qRegisterMetaType<QVector<QOpcUaReadResult>>();
+ qRegisterMetaType<QList<QOpcUaReadItem>>();
+ qRegisterMetaType<QList<QOpcUaReadResult>>();
qRegisterMetaType<QOpcUaWriteItem>();
qRegisterMetaType<QOpcUaWriteResult>();
- qRegisterMetaType<QVector<QOpcUaWriteItem>>();
- qRegisterMetaType<QVector<QOpcUaWriteResult>>();
+ qRegisterMetaType<QList<QOpcUaWriteItem>>();
+ qRegisterMetaType<QList<QOpcUaWriteResult>>();
qRegisterMetaType<QOpcUaNodeCreationAttributes>();
qRegisterMetaType<QOpcUaAddNodeItem>();
qRegisterMetaType<QOpcUaAddReferenceItem>();
qRegisterMetaType<QOpcUaDeleteReferenceItem>();
- qRegisterMetaType<QVector<QOpcUaApplicationDescription>>();
+ qRegisterMetaType<QList<QOpcUaApplicationDescription>>();
qRegisterMetaType<QOpcUaApplicationIdentity>();
qRegisterMetaType<QOpcUaPkiConfiguration>();
}
diff --git a/src/opcua/x509/openssl_symbols.cpp b/src/opcua/x509/openssl_symbols.cpp
index 4cb1360..10c5d35 100644
--- a/src/opcua/x509/openssl_symbols.cpp
+++ b/src/opcua/x509/openssl_symbols.cpp
@@ -557,8 +557,8 @@ struct LibGreaterThan
typedef bool result_type;
result_type operator()(const QString &lhs, const QString &rhs) const
{
- const QVector<QStringView> lhsparts = QStringView{lhs}.split(QLatin1Char('.'));
- const QVector<QStringView> rhsparts = QStringView{rhs}.split(QLatin1Char('.'));
+ const QList<QStringView> lhsparts = QStringView{lhs}.split(QLatin1Char('.'));
+ const QList<QStringView> rhsparts = QStringView{rhs}.split(QLatin1Char('.'));
Q_ASSERT(lhsparts.count() > 1 && rhsparts.count() > 1);
// note: checking rhs < lhs, the same as lhs > rhs
diff --git a/src/opcua/x509/qopcuax509certificatesigningrequest.h b/src/opcua/x509/qopcuax509certificatesigningrequest.h
index eb750c0..b8411d5 100644
--- a/src/opcua/x509/qopcuax509certificatesigningrequest.h
+++ b/src/opcua/x509/qopcuax509certificatesigningrequest.h
@@ -40,7 +40,6 @@
#include "QtOpcUa/qopcuakeypair.h"
#include "QtOpcUa/qopcuax509extension.h"
#include "QtOpcUa/qopcuax509distinguishedname.h"
-#include <QVector>
#include <QtOpcUa/qopcuaglobal.h>
#include <QtOpcUa/qopcuax509certificatesigningrequest.h>
diff --git a/src/opcua/x509/qopcuax509certificatesigningrequest_openssl.cpp b/src/opcua/x509/qopcuax509certificatesigningrequest_openssl.cpp
index 4ec4421..66c4845 100644
--- a/src/opcua/x509/qopcuax509certificatesigningrequest_openssl.cpp
+++ b/src/opcua/x509/qopcuax509certificatesigningrequest_openssl.cpp
@@ -195,7 +195,7 @@ static X509_EXTENSION *createExtension(QOpcUaX509Extension *extension)
}
static bool setSubjectName(X509_NAME *subject, const QOpcUaX509DistinguishedName &dn) {
- QVector<QOpcUaX509DistinguishedName::Type> entries = {
+ QList<QOpcUaX509DistinguishedName::Type> entries = {
QOpcUaX509DistinguishedName::Type::CommonName,
QOpcUaX509DistinguishedName::Type::CountryName,
QOpcUaX509DistinguishedName::Type::LocalityName,
diff --git a/src/opcua/x509/qopcuax509certificatesigningrequest_p.h b/src/opcua/x509/qopcuax509certificatesigningrequest_p.h
index 6406d46..a61568a 100644
--- a/src/opcua/x509/qopcuax509certificatesigningrequest_p.h
+++ b/src/opcua/x509/qopcuax509certificatesigningrequest_p.h
@@ -51,7 +51,7 @@
#include "QtOpcUa/qopcuax509extension.h"
#include "QtOpcUa/qopcuax509distinguishedname.h"
#include "QtOpcUa/qopcuakeypair.h"
-#include <QVector>
+#include <QList>
#include <QtOpcUa/qopcuaglobal.h>
#include "qopcuax509certificatesigningrequest.h"
@@ -77,7 +77,7 @@ public:
QByteArray createSelfSignedCertificate(const QOpcUaKeyPair &privateKey, int validityInDays);
private:
- QVector<QOpcUaX509Extension *> m_extensions;
+ QList<QOpcUaX509Extension *> m_extensions;
QOpcUaX509CertificateSigningRequest::MessageDigest m_messageDigest = QOpcUaX509CertificateSigningRequest::MessageDigest::SHA256;
QOpcUaX509DistinguishedName m_subject;
QOpcUaX509CertificateSigningRequest::Encoding m_encoding = QOpcUaX509CertificateSigningRequest::Encoding::PEM;
diff --git a/src/opcua/x509/qopcuax509extensionsubjectalternativename.cpp b/src/opcua/x509/qopcuax509extensionsubjectalternativename.cpp
index eb7d808..ced79e8 100644
--- a/src/opcua/x509/qopcuax509extensionsubjectalternativename.cpp
+++ b/src/opcua/x509/qopcuax509extensionsubjectalternativename.cpp
@@ -37,7 +37,7 @@
#include "qopcuax509extensionsubjectalternativename.h"
#include "qopcuax509extension_p.h"
-#include <QVector>
+#include <QList>
QT_BEGIN_NAMESPACE
@@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE
class QOpcUaX509ExtensionSubjectAlternativeNameData : public QOpcUaX509ExtensionData
{
public:
- QVector <QPair<QOpcUaX509ExtensionSubjectAlternativeName::Type, QString>> entries;
+ QList <QPair<QOpcUaX509ExtensionSubjectAlternativeName::Type, QString>> entries;
};
/*!
@@ -127,7 +127,7 @@ void QOpcUaX509ExtensionSubjectAlternativeName::addEntry(QOpcUaX509ExtensionSubj
/*!
Returns the vector of entries.
*/
-const QVector<QPair<QOpcUaX509ExtensionSubjectAlternativeName::Type, QString>> &QOpcUaX509ExtensionSubjectAlternativeName::entries() const
+const QList<QPair<QOpcUaX509ExtensionSubjectAlternativeName::Type, QString>> &QOpcUaX509ExtensionSubjectAlternativeName::entries() const
{
const QOpcUaX509ExtensionSubjectAlternativeNameData *d = static_cast<const QOpcUaX509ExtensionSubjectAlternativeNameData*>(data.data());
return d->entries;
diff --git a/src/opcua/x509/qopcuax509extensionsubjectalternativename.h b/src/opcua/x509/qopcuax509extensionsubjectalternativename.h
index 4f13117..67a635b 100644
--- a/src/opcua/x509/qopcuax509extensionsubjectalternativename.h
+++ b/src/opcua/x509/qopcuax509extensionsubjectalternativename.h
@@ -60,7 +60,7 @@ public:
~QOpcUaX509ExtensionSubjectAlternativeName();
void addEntry(Type type, const QString &value);
- const QVector<QPair<Type, QString>> &entries() const;
+ const QList<QPair<Type, QString>> &entries() const;
};
QT_END_NAMESPACE
diff --git a/src/plugins/opcua/open62541/qopen62541backend.cpp b/src/plugins/opcua/open62541/qopen62541backend.cpp
index 8c9dc45..bbbc9af 100644
--- a/src/plugins/opcua/open62541/qopen62541backend.cpp
+++ b/src/plugins/opcua/open62541/qopen62541backend.cpp
@@ -80,14 +80,14 @@ void Open62541AsyncBackend::readAttributes(quint64 handle, UA_NodeId id, QOpcUa:
{
UA_ReadRequest req;
UA_ReadRequest_init(&req);
- QVector<UA_ReadValueId> valueIds;
+ QList<UA_ReadValueId> valueIds;
UA_ReadValueId readId;
UA_ReadValueId_init(&readId);
UaDeleter<UA_ReadValueId> readIdDeleter(&readId, UA_ReadValueId_deleteMembers);
readId.nodeId = id;
- QVector<QOpcUaReadResult> vec;
+ QList<QOpcUaReadResult> vec;
qt_forEachAttribute(attr, [&](QOpcUa::NodeAttribute attribute){
readId.attributeId = QOpen62541ValueConverter::toUaAttributeId(attribute);
@@ -312,7 +312,7 @@ bool Open62541AsyncBackend::removeSubscription(UA_UInt32 subscriptionId)
return false;
}
-void Open62541AsyncBackend::callMethod(quint64 handle, UA_NodeId objectId, UA_NodeId methodId, QVector<QOpcUa::TypedVariant> args)
+void Open62541AsyncBackend::callMethod(quint64 handle, UA_NodeId objectId, UA_NodeId methodId, QList<QOpcUa::TypedVariant> args)
{
UaDeleter<UA_NodeId> objectIdDeleter(&objectId, UA_NodeId_deleteMembers);
UaDeleter<UA_NodeId> methodIdDeleter(&methodId, UA_NodeId_deleteMembers);
@@ -349,7 +349,7 @@ void Open62541AsyncBackend::callMethod(quint64 handle, UA_NodeId objectId, UA_No
emit methodCallFinished(handle, Open62541Utils::nodeIdToQString(methodId), result, static_cast<QOpcUa::UaStatusCode>(res));
}
-void Open62541AsyncBackend::resolveBrowsePath(quint64 handle, UA_NodeId startNode, const QVector<QOpcUaRelativePathElement> &path)
+void Open62541AsyncBackend::resolveBrowsePath(quint64 handle, UA_NodeId startNode, const QList<QOpcUaRelativePathElement> &path)
{
UA_TranslateBrowsePathsToNodeIdsRequest req;
UA_TranslateBrowsePathsToNodeIdsRequest_init(&req);
@@ -377,12 +377,12 @@ void Open62541AsyncBackend::resolveBrowsePath(quint64 handle, UA_NodeId startNod
if (res.responseHeader.serviceResult != UA_STATUSCODE_GOOD || res.resultsSize != 1) {
qCWarning(QT_OPCUA_PLUGINS_OPEN62541) << "Translate browse path failed:" << UA_StatusCode_name(res.responseHeader.serviceResult);
- emit resolveBrowsePathFinished(handle, QVector<QOpcUaBrowsePathTarget>(), path,
+ emit resolveBrowsePathFinished(handle, QList<QOpcUaBrowsePathTarget>(), path,
static_cast<QOpcUa::UaStatusCode>(res.responseHeader.serviceResult));
return;
}
- QVector<QOpcUaBrowsePathTarget> ret;
+ QList<QOpcUaBrowsePathTarget> ret;
for (size_t i = 0; i < res.results[0].targetsSize ; ++i) {
QOpcUaBrowsePathTarget temp;
temp.setRemainingPathIndex(res.results[0].targets[i].remainingPathIndex);
@@ -426,7 +426,7 @@ void Open62541AsyncBackend::findServers(const QUrl &url, const QStringList &loca
UaArrayDeleter<UA_TYPES_APPLICATIONDESCRIPTION> serversDeleter(servers, serversSize);
- QVector<QOpcUaApplicationDescription> ret;
+ QList<QOpcUaApplicationDescription> ret;
for (size_t i = 0; i < serversSize; ++i)
ret.append(convertApplicationDescription(servers[i]));
@@ -438,10 +438,10 @@ void Open62541AsyncBackend::findServers(const QUrl &url, const QStringList &loca
emit findServersFinished(ret, static_cast<QOpcUa::UaStatusCode>(result), url);
}
-void Open62541AsyncBackend::readNodeAttributes(const QVector<QOpcUaReadItem> &nodesToRead)
+void Open62541AsyncBackend::readNodeAttributes(const QList<QOpcUaReadItem> &nodesToRead)
{
if (nodesToRead.size() == 0) {
- emit readNodeAttributesFinished(QVector<QOpcUaReadResult>(), QOpcUa::UaStatusCode::BadNothingToDo);
+ emit readNodeAttributesFinished(QList<QOpcUaReadResult>(), QOpcUa::UaStatusCode::BadNothingToDo);
return;
}
@@ -469,9 +469,9 @@ void Open62541AsyncBackend::readNodeAttributes(const QVector<QOpcUaReadItem> &no
if (serviceResult != QOpcUa::UaStatusCode::Good) {
qCWarning(QT_OPCUA_PLUGINS_OPEN62541) << "Batch read failed:" << serviceResult;
- emit readNodeAttributesFinished(QVector<QOpcUaReadResult>(), serviceResult);
+ emit readNodeAttributesFinished(QList<QOpcUaReadResult>(), serviceResult);
} else {
- QVector<QOpcUaReadResult> ret;
+ QList<QOpcUaReadResult> ret;
for (int i = 0; i < nodesToRead.size(); ++i) {
QOpcUaReadResult item;
@@ -498,10 +498,10 @@ void Open62541AsyncBackend::readNodeAttributes(const QVector<QOpcUaReadItem> &no
}
}
-void Open62541AsyncBackend::writeNodeAttributes(const QVector<QOpcUaWriteItem> &nodesToWrite)
+void Open62541AsyncBackend::writeNodeAttributes(const QList<QOpcUaWriteItem> &nodesToWrite)
{
if (nodesToWrite.isEmpty()) {
- emit writeNodeAttributesFinished(QVector<QOpcUaWriteResult>(), QOpcUa::UaStatusCode::BadNothingToDo);
+ emit writeNodeAttributesFinished(QList<QOpcUaWriteResult>(), QOpcUa::UaStatusCode::BadNothingToDo);
return;
}
@@ -546,9 +546,9 @@ void Open62541AsyncBackend::writeNodeAttributes(const QVector<QOpcUaWriteItem> &
if (serviceResult != QOpcUa::UaStatusCode::Good) {
qCWarning(QT_OPCUA_PLUGINS_OPEN62541) << "Batch write failed:" << serviceResult;
- emit writeNodeAttributesFinished(QVector<QOpcUaWriteResult>(), serviceResult);
+ emit writeNodeAttributesFinished(QList<QOpcUaWriteResult>(), serviceResult);
} else {
- QVector<QOpcUaWriteResult> ret;
+ QList<QOpcUaWriteResult> ret;
for (int i = 0; i < nodesToWrite.size(); ++i) {
QOpcUaWriteResult item;
@@ -685,7 +685,7 @@ void Open62541AsyncBackend::deleteReference(const QOpcUaDeleteReferenceItem &ref
referenceToDelete.isForwardReference(), statusCode);
}
-static void convertBrowseResult(UA_BrowseResult *src, quint32 referencesSize, QVector<QOpcUaReferenceDescription> &dst)
+static void convertBrowseResult(UA_BrowseResult *src, quint32 referencesSize, QList<QOpcUaReferenceDescription> &dst)
{
if (!src)
return;
@@ -723,7 +723,7 @@ void Open62541AsyncBackend::browse(quint64 handle, UA_NodeId id, const QOpcUaBro
UaDeleter<UA_BrowseResponse> responseDeleter(response, UA_BrowseResponse_delete);
*response = UA_Client_Service_browse(m_uaclient, uaRequest);
- QVector<QOpcUaReferenceDescription> ret;
+ QList<QOpcUaReferenceDescription> ret;
QOpcUa::UaStatusCode statusCode = QOpcUa::UaStatusCode::Good;
@@ -990,7 +990,7 @@ void Open62541AsyncBackend::requestEndpoints(const QUrl &url)
UA_EndpointDescription *endpoints = nullptr;
UA_StatusCode res = UA_Client_getEndpoints(tmpClient, url.toString(QUrl::RemoveUserInfo).toUtf8().constData(), &numEndpoints, &endpoints);
UaArrayDeleter<UA_TYPES_ENDPOINTDESCRIPTION> endpointDescriptionDeleter(endpoints, numEndpoints);
- QVector<QOpcUaEndpointDescription> ret;
+ QList<QOpcUaEndpointDescription> ret;
namespace vc = QOpen62541ValueConverter;
using namespace QOpcUa;
@@ -1065,7 +1065,7 @@ void Open62541AsyncBackend::reevaluateClientIterateTimer()
}
}
-void Open62541AsyncBackend::handleSubscriptionTimeout(QOpen62541Subscription *sub, QVector<QPair<quint64, QOpcUa::NodeAttribute>> items)
+void Open62541AsyncBackend::handleSubscriptionTimeout(QOpen62541Subscription *sub, QList<QPair<quint64, QOpcUa::NodeAttribute>> items)
{
for (auto it : qAsConst(items)) {
auto item = m_attributeMapping.find(it.first);
@@ -1402,7 +1402,7 @@ UA_ExtensionObject Open62541AsyncBackend::assembleNodeAttributes(const QOpcUaNod
return obj;
}
-UA_UInt32 *Open62541AsyncBackend::copyArrayDimensions(const QVector<quint32> &arrayDimensions, size_t *outputSize)
+UA_UInt32 *Open62541AsyncBackend::copyArrayDimensions(const QList<quint32> &arrayDimensions, size_t *outputSize)
{
if (outputSize)
*outputSize = arrayDimensions.size();
diff --git a/src/plugins/opcua/open62541/qopen62541backend.h b/src/plugins/opcua/open62541/qopen62541backend.h
index 9ec945d..92a2e20 100644
--- a/src/plugins/opcua/open62541/qopen62541backend.h
+++ b/src/plugins/opcua/open62541/qopen62541backend.h
@@ -65,12 +65,12 @@ public Q_SLOTS:
void enableMonitoring(quint64 handle, UA_NodeId id, QOpcUa::NodeAttributes attr, const QOpcUaMonitoringParameters &settings);
void disableMonitoring(quint64 handle, QOpcUa::NodeAttributes attr);
void modifyMonitoring(quint64 handle, QOpcUa::NodeAttribute attr, QOpcUaMonitoringParameters::Parameter item, QVariant value);
- void callMethod(quint64 handle, UA_NodeId objectId, UA_NodeId methodId, QVector<QOpcUa::TypedVariant> args);
- void resolveBrowsePath(quint64 handle, UA_NodeId startNode, const QVector<QOpcUaRelativePathElement> &path);
+ void callMethod(quint64 handle, UA_NodeId objectId, UA_NodeId methodId, QList<QOpcUa::TypedVariant> args);
+ void resolveBrowsePath(quint64 handle, UA_NodeId startNode, const QList<QOpcUaRelativePathElement> &path);
void findServers(const QUrl &url, const QStringList &localeIds, const QStringList &serverUris);
- void readNodeAttributes(const QVector<QOpcUaReadItem> &nodesToRead);
- void writeNodeAttributes(const QVector<QOpcUaWriteItem> &nodesToWrite);
+ void readNodeAttributes(const QList<QOpcUaReadItem> &nodesToRead);
+ void writeNodeAttributes(const QList<QOpcUaWriteItem> &nodesToWrite);
// Node management
void addNode(const QOpcUaAddNodeItem &nodeToAdd);
@@ -83,7 +83,7 @@ public Q_SLOTS:
bool removeSubscription(UA_UInt32 subscriptionId);
void iterateClient();
void reevaluateClientIterateTimer();
- void handleSubscriptionTimeout(QOpen62541Subscription *sub, QVector<QPair<quint64, QOpcUa::NodeAttribute>> items);
+ void handleSubscriptionTimeout(QOpen62541Subscription *sub, QList<QPair<quint64, QOpcUa::NodeAttribute>> items);
void cleanupSubscriptions();
public:
@@ -105,7 +105,7 @@ private:
QOpcUaApplicationDescription convertApplicationDescription(UA_ApplicationDescription &desc);
UA_ExtensionObject assembleNodeAttributes(const QOpcUaNodeCreationAttributes &nodeAttributes, QOpcUa::NodeClass nodeClass);
- UA_UInt32 *copyArrayDimensions(const QVector<quint32> &arrayDimensions, size_t *outputSize);
+ UA_UInt32 *copyArrayDimensions(const QList<quint32> &arrayDimensions, size_t *outputSize);
// Helper
bool loadFileToByteString(const QString &location, UA_ByteString *target) const;
diff --git a/src/plugins/opcua/open62541/qopen62541client.cpp b/src/plugins/opcua/open62541/qopen62541client.cpp
index 2777702..f4ae072 100644
--- a/src/plugins/opcua/open62541/qopen62541client.cpp
+++ b/src/plugins/opcua/open62541/qopen62541client.cpp
@@ -120,16 +120,16 @@ bool QOpen62541Client::findServers(const QUrl &url, const QStringList &localeIds
Q_ARG(QStringList, serverUris));
}
-bool QOpen62541Client::readNodeAttributes(const QVector<QOpcUaReadItem> &nodesToRead)
+bool QOpen62541Client::readNodeAttributes(const QList<QOpcUaReadItem> &nodesToRead)
{
return QMetaObject::invokeMethod(m_backend, "readNodeAttributes", Qt::QueuedConnection,
- Q_ARG(QVector<QOpcUaReadItem>, nodesToRead));
+ Q_ARG(QList<QOpcUaReadItem>, nodesToRead));
}
-bool QOpen62541Client::writeNodeAttributes(const QVector<QOpcUaWriteItem> &nodesToWrite)
+bool QOpen62541Client::writeNodeAttributes(const QList<QOpcUaWriteItem> &nodesToWrite)
{
return QMetaObject::invokeMethod(m_backend, "writeNodeAttributes", Qt::QueuedConnection,
- Q_ARG(QVector<QOpcUaWriteItem>, nodesToWrite));
+ Q_ARG(QList<QOpcUaWriteItem>, nodesToWrite));
}
bool QOpen62541Client::addNode(const QOpcUaAddNodeItem &nodeToAdd)
@@ -169,9 +169,9 @@ QStringList QOpen62541Client::supportedSecurityPolicies() const
};
}
-QVector<QOpcUaUserTokenPolicy::TokenType> QOpen62541Client::supportedUserTokenTypes() const
+QList<QOpcUaUserTokenPolicy::TokenType> QOpen62541Client::supportedUserTokenTypes() const
{
- return QVector<QOpcUaUserTokenPolicy::TokenType> {
+ return QList<QOpcUaUserTokenPolicy::TokenType> {
QOpcUaUserTokenPolicy::TokenType::Anonymous,
QOpcUaUserTokenPolicy::TokenType::Username
};
diff --git a/src/plugins/opcua/open62541/qopen62541client.h b/src/plugins/opcua/open62541/qopen62541client.h
index 6a5fc0f..a359b29 100644
--- a/src/plugins/opcua/open62541/qopen62541client.h
+++ b/src/plugins/opcua/open62541/qopen62541client.h
@@ -65,8 +65,8 @@ public:
bool findServers(const QUrl &url, const QStringList &localeIds, const QStringList &serverUris) override;
- bool readNodeAttributes(const QVector<QOpcUaReadItem> &nodesToRead) override;
- bool writeNodeAttributes(const QVector<QOpcUaWriteItem> &nodesToWrite) override;
+ bool readNodeAttributes(const QList<QOpcUaReadItem> &nodesToRead) override;
+ bool writeNodeAttributes(const QList<QOpcUaWriteItem> &nodesToWrite) override;
bool addNode(const QOpcUaAddNodeItem &nodeToAdd) override;
bool deleteNode(const QString &nodeId, bool deleteTargetReferences) override;
@@ -75,7 +75,7 @@ public:
bool deleteReference(const QOpcUaDeleteReferenceItem &referenceToDelete) override;
QStringList supportedSecurityPolicies() const override;
- QVector<QOpcUaUserTokenPolicy::TokenType> supportedUserTokenTypes() const override;
+ QList<QOpcUaUserTokenPolicy::TokenType> supportedUserTokenTypes() const override;
private slots:
diff --git a/src/plugins/opcua/open62541/qopen62541node.cpp b/src/plugins/opcua/open62541/qopen62541node.cpp
index 80602c5..0a784a8 100644
--- a/src/plugins/opcua/open62541/qopen62541node.cpp
+++ b/src/plugins/opcua/open62541/qopen62541node.cpp
@@ -42,7 +42,7 @@
#include <QtCore/qdatetime.h>
#include <QtCore/qstring.h>
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
QT_BEGIN_NAMESPACE
@@ -168,7 +168,7 @@ bool QOpen62541Node::writeAttributes(const QOpcUaNode::AttributeMap &toWrite, QO
Q_ARG(QOpcUa::Types, valueAttributeType));
}
-bool QOpen62541Node::callMethod(const QString &methodNodeId, const QVector<QOpcUa::TypedVariant> &args)
+bool QOpen62541Node::callMethod(const QString &methodNodeId, const QList<QOpcUa::TypedVariant> &args)
{
if (!m_client)
return false;
@@ -180,10 +180,10 @@ bool QOpen62541Node::callMethod(const QString &methodNodeId, const QVector<QOpcU
Q_ARG(quint64, handle()),
Q_ARG(UA_NodeId, obj),
Q_ARG(UA_NodeId, Open62541Utils::nodeIdFromQString(methodNodeId)),
- Q_ARG(QVector<QOpcUa::TypedVariant>, args));
+ Q_ARG(QList<QOpcUa::TypedVariant>, args));
}
-bool QOpen62541Node::resolveBrowsePath(const QVector<QOpcUaRelativePathElement> &path)
+bool QOpen62541Node::resolveBrowsePath(const QList<QOpcUaRelativePathElement> &path)
{
if (!m_client)
return false;
@@ -194,7 +194,7 @@ bool QOpen62541Node::resolveBrowsePath(const QVector<QOpcUaRelativePathElement>
return QMetaObject::invokeMethod(m_client->m_backend, "resolveBrowsePath", Qt::QueuedConnection,
Q_ARG(quint64, handle()),
Q_ARG(UA_NodeId, start),
- Q_ARG(QVector<QOpcUaRelativePathElement>, path));
+ Q_ARG(QList<QOpcUaRelativePathElement>, path));
}
QT_END_NAMESPACE
diff --git a/src/plugins/opcua/open62541/qopen62541node.h b/src/plugins/opcua/open62541/qopen62541node.h
index f7535d2..f5e5133 100644
--- a/src/plugins/opcua/open62541/qopen62541node.h
+++ b/src/plugins/opcua/open62541/qopen62541node.h
@@ -59,9 +59,9 @@ public:
bool writeAttribute(QOpcUa::NodeAttribute attribute, const QVariant &value, QOpcUa::Types type, const QString &indexRange) override;
bool writeAttributes(const QOpcUaNode::AttributeMap &toWrite, QOpcUa::Types valueAttributeType) override;
- bool callMethod(const QString &methodNodeId, const QVector<QOpcUa::TypedVariant> &args) override;
+ bool callMethod(const QString &methodNodeId, const QList<QOpcUa::TypedVariant> &args) override;
- bool resolveBrowsePath(const QVector<QOpcUaRelativePathElement> &path) override;
+ bool resolveBrowsePath(const QList<QOpcUaRelativePathElement> &path) override;
private:
QPointer<QOpen62541Client> m_client;
diff --git a/src/plugins/opcua/open62541/qopen62541subscription.cpp b/src/plugins/opcua/open62541/qopen62541subscription.cpp
index 14a782e..0fc5d51 100644
--- a/src/plugins/opcua/open62541/qopen62541subscription.cpp
+++ b/src/plugins/opcua/open62541/qopen62541subscription.cpp
@@ -375,7 +375,7 @@ void QOpen62541Subscription::monitoredValueUpdated(UA_UInt32 monId, UA_DataValue
void QOpen62541Subscription::sendTimeoutNotification()
{
- QVector<QPair<quint64, QOpcUa::NodeAttribute>> items;
+ QList<QPair<quint64, QOpcUa::NodeAttribute>> items;
for (auto it : qAsConst(m_nodeHandleToItemMapping)) {
for (auto item : it) {
items.push_back({item->handle, item->attr});
diff --git a/src/plugins/opcua/open62541/qopen62541subscription.h b/src/plugins/opcua/open62541/qopen62541subscription.h
index 5214599..d1a8302 100644
--- a/src/plugins/opcua/open62541/qopen62541subscription.h
+++ b/src/plugins/opcua/open62541/qopen62541subscription.h
@@ -89,7 +89,7 @@ public:
QOpcUaMonitoringParameters::SubscriptionType shared() const;
signals:
- void timeout(QOpen62541Subscription *sub, QVector<QPair<quint64, QOpcUa::NodeAttribute>> items);
+ void timeout(QOpen62541Subscription *sub, QList<QPair<quint64, QOpcUa::NodeAttribute>> items);
private:
MonitoredItem *getItemForAttribute(quint64 nodeHandle, QOpcUa::NodeAttribute attr);
diff --git a/src/plugins/opcua/open62541/qopen62541valueconverter.cpp b/src/plugins/opcua/open62541/qopen62541valueconverter.cpp
index ab09860..13aa932 100644
--- a/src/plugins/opcua/open62541/qopen62541valueconverter.cpp
+++ b/src/plugins/opcua/open62541/qopen62541valueconverter.cpp
@@ -388,7 +388,7 @@ QOpcUaDoubleComplexNumber scalarToQt<QOpcUaDoubleComplexNumber, UA_DoubleComplex
template<>
QOpcUaAxisInformation scalarToQt<QOpcUaAxisInformation, UA_AxisInformation>(const UA_AxisInformation *data)
{
- QVector<double> axisSteps;
+ QList<double> axisSteps;
if (data->axisStepsSize) {
axisSteps.reserve(data->axisStepsSize);
@@ -530,10 +530,10 @@ QVariant arrayToQVariant(const UA_Variant &var, QMetaType::Type type)
}
if (var.arrayDimensionsSize > 0) {
- // Ensure that the array dimensions fit in a QVector
+ // Ensure that the array dimensions fit in a QList
if (var.arrayDimensionsSize > static_cast<quint64>((std::numeric_limits<int>::max)()))
return QOpcUaMultiDimensionalArray();
- QVector<quint32> arrayDimensions;
+ QList<quint32> arrayDimensions;
std::copy(var.arrayDimensions, var.arrayDimensions+var.arrayDimensionsSize, std::back_inserter(arrayDimensions));
return QOpcUaMultiDimensionalArray(list, arrayDimensions);
}
diff --git a/src/plugins/opcua/uacpp/quacppbackend.cpp b/src/plugins/opcua/uacpp/quacppbackend.cpp
index 93f0fd8..d7e8507 100644
--- a/src/plugins/opcua/uacpp/quacppbackend.cpp
+++ b/src/plugins/opcua/uacpp/quacppbackend.cpp
@@ -167,7 +167,7 @@ void UACppAsyncBackend::browse(quint64 handle, const UaNodeId &id, const QOpcUaB
browseContext.browseDirection = static_cast<OpcUa_BrowseDirection>(request.browseDirection());
QStringList result;
- QVector<QOpcUaReferenceDescription> ret;
+ QList<QOpcUaReferenceDescription> ret;
status = m_nativeSession->browse(serviceSettings, id, browseContext, continuationPoint, referenceDescriptions);
bool initialBrowse = true;
do {
@@ -377,7 +377,7 @@ void UACppAsyncBackend::requestEndpoints(const QUrl &url)
ServiceSettings ServiceSettings;
ClientSecurityInfo clientSecurityInfo;
UaEndpointDescriptions endpoints;
- QVector<QOpcUaEndpointDescription> ret;
+ QList<QOpcUaEndpointDescription> ret;
UaStatus res = discovery.getEndpoints(ServiceSettings, UaString(url.toString(QUrl::RemoveUserInfo).toUtf8().data()), clientSecurityInfo, endpoints);
@@ -432,7 +432,7 @@ void UACppAsyncBackend::readAttributes(quint64 handle, const UaNodeId &id, QOpcU
UaDataValues values;
UaDiagnosticInfos diagnosticInfos;
- QVector<QOpcUaReadResult> vec;
+ QList<QOpcUaReadResult> vec;
int attributeSize = 0;
@@ -612,7 +612,7 @@ void UACppAsyncBackend::disableMonitoring(quint64 handle, QOpcUa::NodeAttributes
});
}
-void UACppAsyncBackend::callMethod(quint64 handle, const UaNodeId &objectId, const UaNodeId &methodId, QVector<QOpcUa::TypedVariant> args)
+void UACppAsyncBackend::callMethod(quint64 handle, const UaNodeId &objectId, const UaNodeId &methodId, QList<QOpcUa::TypedVariant> args)
{
ServiceSettings settings;
CallIn in;
@@ -649,7 +649,7 @@ void UACppAsyncBackend::callMethod(quint64 handle, const UaNodeId &objectId, con
emit methodCallFinished(handle, UACppUtils::nodeIdToQString(methodId), result, static_cast<QOpcUa::UaStatusCode>(status.statusCode()));
}
-void UACppAsyncBackend::resolveBrowsePath(quint64 handle, const UaNodeId &startNode, const QVector<QOpcUaRelativePathElement> &path)
+void UACppAsyncBackend::resolveBrowsePath(quint64 handle, const UaNodeId &startNode, const QList<QOpcUaRelativePathElement> &path)
{
ServiceSettings settings;
UaDiagnosticInfos diagnosticInfos;
@@ -674,7 +674,7 @@ void UACppAsyncBackend::resolveBrowsePath(quint64 handle, const UaNodeId &startN
UaStatusCode serviceResult = m_nativeSession->translateBrowsePathsToNodeIds(settings, paths, result, diagnosticInfos);
QOpcUa::UaStatusCode status = static_cast<QOpcUa::UaStatusCode>(serviceResult.code());
- QVector<QOpcUaBrowsePathTarget> ret;
+ QList<QOpcUaBrowsePathTarget> ret;
if (status == QOpcUa::UaStatusCode::Good && result.length()) {
status = static_cast<QOpcUa::UaStatusCode>(result[0].StatusCode);
@@ -762,7 +762,7 @@ void UACppAsyncBackend::findServers(const QUrl &url, const QStringList &localeId
uaServerUris,
applicationDescriptions);
- QVector<QOpcUaApplicationDescription> ret;
+ QList<QOpcUaApplicationDescription> ret;
for (OpcUa_UInt32 i = 0; i < applicationDescriptions.length(); ++i) {
QOpcUaApplicationDescription temp;
@@ -792,10 +792,10 @@ void UACppAsyncBackend::findServers(const QUrl &url, const QStringList &localeId
emit findServersFinished(ret, static_cast<QOpcUa::UaStatusCode>(result.statusCode()), url);
}
-void UACppAsyncBackend::readNodeAttributes(const QVector<QOpcUaReadItem> &nodesToRead)
+void UACppAsyncBackend::readNodeAttributes(const QList<QOpcUaReadItem> &nodesToRead)
{
if (nodesToRead.size() == 0) {
- emit readNodeAttributesFinished(QVector<QOpcUaReadResult>(), QOpcUa::UaStatusCode::BadNothingToDo);
+ emit readNodeAttributesFinished(QList<QOpcUaReadResult>(), QOpcUa::UaStatusCode::BadNothingToDo);
return;
}
@@ -823,9 +823,9 @@ void UACppAsyncBackend::readNodeAttributes(const QVector<QOpcUaReadItem> &nodesT
if (result.isBad()) {
qCWarning(QT_OPCUA_PLUGINS_UACPP) << "Batch read failed:" << result.toString();
- emit readNodeAttributesFinished(QVector<QOpcUaReadResult>(), status);
+ emit readNodeAttributesFinished(QList<QOpcUaReadResult>(), status);
} else {
- QVector<QOpcUaReadResult> ret;
+ QList<QOpcUaReadResult> ret;
for (int i = 0; i < nodesToRead.size(); ++i) {
QOpcUaReadResult item;
@@ -854,10 +854,10 @@ void UACppAsyncBackend::readNodeAttributes(const QVector<QOpcUaReadItem> &nodesT
}
}
-void UACppAsyncBackend::writeNodeAttributes(const QVector<QOpcUaWriteItem> &nodesToWrite)
+void UACppAsyncBackend::writeNodeAttributes(const QList<QOpcUaWriteItem> &nodesToWrite)
{
if (nodesToWrite.isEmpty()) {
- emit writeNodeAttributesFinished(QVector<QOpcUaWriteResult>(), QOpcUa::UaStatusCode::BadNothingToDo);
+ emit writeNodeAttributesFinished(QList<QOpcUaWriteResult>(), QOpcUa::UaStatusCode::BadNothingToDo);
return;
}
@@ -895,9 +895,9 @@ void UACppAsyncBackend::writeNodeAttributes(const QVector<QOpcUaWriteItem> &node
if (result.isBad()) {
qCWarning(QT_OPCUA_PLUGINS_UACPP) << "Batch write failed:" << result.toString();
- emit writeNodeAttributesFinished(QVector<QOpcUaWriteResult>(), status);
+ emit writeNodeAttributesFinished(QList<QOpcUaWriteResult>(), status);
} else {
- QVector<QOpcUaWriteResult> ret;
+ QList<QOpcUaWriteResult> ret;
for (int i = 0; i < nodesToWrite.size(); ++i) {
QOpcUaWriteResult item;
@@ -1061,7 +1061,7 @@ QOpcUaErrorState::ConnectionStep UACppAsyncBackend::connectionStepFromUaServiceT
}
}
-static void copyArrayDimensions(OpcUa_Int32 *noOfDimensions, OpcUa_UInt32 **arrayDimensions, const QVector<quint32> &dimensions)
+static void copyArrayDimensions(OpcUa_Int32 *noOfDimensions, OpcUa_UInt32 **arrayDimensions, const QList<quint32> &dimensions)
{
*noOfDimensions = static_cast<OpcUa_Int32>(dimensions.size());
*arrayDimensions = static_cast<OpcUa_UInt32 *>(OpcUa_Alloc(*noOfDimensions * sizeof(OpcUa_UInt32)));
diff --git a/src/plugins/opcua/uacpp/quacppbackend.h b/src/plugins/opcua/uacpp/quacppbackend.h
index 16c4ac1..c83d80a 100644
--- a/src/plugins/opcua/uacpp/quacppbackend.h
+++ b/src/plugins/opcua/uacpp/quacppbackend.h
@@ -70,16 +70,16 @@ public Q_SLOTS:
void enableMonitoring(quint64 handle, const UaNodeId &id, QOpcUa::NodeAttributes attr, const QOpcUaMonitoringParameters &settings);
void modifyMonitoring(quint64 handle, QOpcUa::NodeAttribute attr, QOpcUaMonitoringParameters::Parameter item, QVariant value);
void disableMonitoring(quint64 handle, QOpcUa::NodeAttributes attr);
- void callMethod(quint64 handle, const UaNodeId &objectId, const UaNodeId &methodId, QVector<QOpcUa::TypedVariant> args);
- void resolveBrowsePath(quint64 handle, const UaNodeId &startNode, const QVector<QOpcUaRelativePathElement> &path);
+ void callMethod(quint64 handle, const UaNodeId &objectId, const UaNodeId &methodId, QList<QOpcUa::TypedVariant> args);
+ void resolveBrowsePath(quint64 handle, const UaNodeId &startNode, const QList<QOpcUaRelativePathElement> &path);
void requestEndpoints(const QUrl &url);
bool removeSubscription(quint32 subscriptionId);
void findServers(const QUrl &url, const QStringList &localeIds, const QStringList &serverUris);
- void readNodeAttributes(const QVector<QOpcUaReadItem> &nodesToRead);
- void writeNodeAttributes(const QVector<QOpcUaWriteItem> &nodesToWrite);
+ void readNodeAttributes(const QList<QOpcUaReadItem> &nodesToRead);
+ void writeNodeAttributes(const QList<QOpcUaWriteItem> &nodesToWrite);
// Node management
void addNode(const QOpcUaAddNodeItem &nodeToAdd);
diff --git a/src/plugins/opcua/uacpp/quacppclient.cpp b/src/plugins/opcua/uacpp/quacppclient.cpp
index 9cd929a..2b66bc8 100644
--- a/src/plugins/opcua/uacpp/quacppclient.cpp
+++ b/src/plugins/opcua/uacpp/quacppclient.cpp
@@ -117,16 +117,16 @@ bool QUACppClient::findServers(const QUrl &url, const QStringList &localeIds, co
Q_ARG(QStringList, serverUris));
}
-bool QUACppClient::readNodeAttributes(const QVector<QOpcUaReadItem> &nodesToRead)
+bool QUACppClient::readNodeAttributes(const QList<QOpcUaReadItem> &nodesToRead)
{
return QMetaObject::invokeMethod(m_backend, "readNodeAttributes", Qt::QueuedConnection,
- Q_ARG(QVector<QOpcUaReadItem>, nodesToRead));
+ Q_ARG(QList<QOpcUaReadItem>, nodesToRead));
}
-bool QUACppClient::writeNodeAttributes(const QVector<QOpcUaWriteItem> &nodesToWrite)
+bool QUACppClient::writeNodeAttributes(const QList<QOpcUaWriteItem> &nodesToWrite)
{
return QMetaObject::invokeMethod(m_backend, "writeNodeAttributes", Qt::QueuedConnection,
- Q_ARG(QVector<QOpcUaWriteItem>, nodesToWrite));
+ Q_ARG(QList<QOpcUaWriteItem>, nodesToWrite));
}
bool QUACppClient::addNode(const QOpcUaAddNodeItem &nodeToAdd)
@@ -178,9 +178,9 @@ QStringList QUACppClient::supportedSecurityPolicies() const
};
}
-QVector<QOpcUaUserTokenPolicy::TokenType> QUACppClient::supportedUserTokenTypes() const
+QList<QOpcUaUserTokenPolicy::TokenType> QUACppClient::supportedUserTokenTypes() const
{
- return QVector<QOpcUaUserTokenPolicy::TokenType> {
+ return QList<QOpcUaUserTokenPolicy::TokenType> {
QOpcUaUserTokenPolicy::TokenType::Certificate,
QOpcUaUserTokenPolicy::TokenType::Username,
QOpcUaUserTokenPolicy::TokenType::Anonymous
diff --git a/src/plugins/opcua/uacpp/quacppclient.h b/src/plugins/opcua/uacpp/quacppclient.h
index c0f8f44..4bf75ca 100644
--- a/src/plugins/opcua/uacpp/quacppclient.h
+++ b/src/plugins/opcua/uacpp/quacppclient.h
@@ -57,8 +57,8 @@ public:
bool findServers(const QUrl &url, const QStringList &localeIds, const QStringList &serverUris) override;
- bool readNodeAttributes(const QVector<QOpcUaReadItem> &nodesToRead) override;
- bool writeNodeAttributes(const QVector<QOpcUaWriteItem> &nodesToWrite) override;
+ bool readNodeAttributes(const QList<QOpcUaReadItem> &nodesToRead) override;
+ bool writeNodeAttributes(const QList<QOpcUaWriteItem> &nodesToWrite) override;
bool addNode(const QOpcUaAddNodeItem &nodeToAdd) override;
bool deleteNode(const QString &nodeId, bool deleteTargetReferences) override;
@@ -67,7 +67,7 @@ public:
bool deleteReference(const QOpcUaDeleteReferenceItem &referenceToDelete) override;
QStringList supportedSecurityPolicies() const override;
- QVector<QOpcUaUserTokenPolicy::TokenType> supportedUserTokenTypes() const override;
+ QList<QOpcUaUserTokenPolicy::TokenType> supportedUserTokenTypes() const override;
private:
friend class QUACppNode;
diff --git a/src/plugins/opcua/uacpp/quacppnode.cpp b/src/plugins/opcua/uacpp/quacppnode.cpp
index dd9c27c..2d1a1a3 100644
--- a/src/plugins/opcua/uacpp/quacppnode.cpp
+++ b/src/plugins/opcua/uacpp/quacppnode.cpp
@@ -150,7 +150,7 @@ bool QUACppNode::writeAttributes(const QOpcUaNode::AttributeMap &toWrite, QOpcUa
}
-bool QUACppNode::callMethod(const QString &methodNodeId, const QVector<QOpcUa::TypedVariant> &args)
+bool QUACppNode::callMethod(const QString &methodNodeId, const QList<QOpcUa::TypedVariant> &args)
{
if (!m_client)
return false;
@@ -162,10 +162,10 @@ bool QUACppNode::callMethod(const QString &methodNodeId, const QVector<QOpcUa::T
Q_ARG(quint64, handle()),
Q_ARG(UaNodeId, m_nodeId),
Q_ARG(UaNodeId, methodId),
- Q_ARG(QVector<QOpcUa::TypedVariant>, args));
+ Q_ARG(QList<QOpcUa::TypedVariant>, args));
}
-bool QUACppNode::resolveBrowsePath(const QVector<QOpcUaRelativePathElement> &path)
+bool QUACppNode::resolveBrowsePath(const QList<QOpcUaRelativePathElement> &path)
{
if (!m_client)
return false;
@@ -174,7 +174,7 @@ bool QUACppNode::resolveBrowsePath(const QVector<QOpcUaRelativePathElement> &pat
Qt::QueuedConnection,
Q_ARG(quint64, handle()),
Q_ARG(UaNodeId, m_nodeId),
- Q_ARG(QVector<QOpcUaRelativePathElement>, path));
+ Q_ARG(QList<QOpcUaRelativePathElement>, path));
}
QT_END_NAMESPACE
diff --git a/src/plugins/opcua/uacpp/quacppnode.h b/src/plugins/opcua/uacpp/quacppnode.h
index b591060..dd720a2 100644
--- a/src/plugins/opcua/uacpp/quacppnode.h
+++ b/src/plugins/opcua/uacpp/quacppnode.h
@@ -56,9 +56,9 @@ public:
bool writeAttribute(QOpcUa::NodeAttribute attribute, const QVariant &value, QOpcUa::Types type, const QString &indexRange) override;
bool writeAttributes(const QOpcUaNode::AttributeMap &toWrite, QOpcUa::Types valueAttributeType) override;
- bool callMethod(const QString &methodNodeId, const QVector<QOpcUa::TypedVariant> &args) override;
+ bool callMethod(const QString &methodNodeId, const QList<QOpcUa::TypedVariant> &args) override;
- bool resolveBrowsePath(const QVector<QOpcUaRelativePathElement> &path) override;
+ bool resolveBrowsePath(const QList<QOpcUaRelativePathElement> &path) override;
private:
QPointer<QUACppClient> m_client;
diff --git a/src/plugins/opcua/uacpp/quacppvalueconverter.cpp b/src/plugins/opcua/uacpp/quacppvalueconverter.cpp
index 3aac31d..d56a78b 100644
--- a/src/plugins/opcua/uacpp/quacppvalueconverter.cpp
+++ b/src/plugins/opcua/uacpp/quacppvalueconverter.cpp
@@ -289,7 +289,7 @@ QVariant scalarToQVariant<QVariant, OpcUa_ExtensionObject>(OpcUa_ExtensionObject
const QOpcUaRange qRange(uaRange.getLow(), uaRange.getHigh());
const QOpcUaLocalizedText qTitle = scalarToQVariant<QOpcUaLocalizedText, OpcUa_LocalizedText>(const_cast<OpcUa_LocalizedText *>(&*uaTitle)).value<QOpcUaLocalizedText>();;
const QOpcUa::AxisScale qScale = static_cast<QOpcUa::AxisScale>(info.getAxisScaleType());
- QVector<double> qAxisSteps;
+ QList<double> qAxisSteps;
for (OpcUa_UInt32 i = 0; i < uaDoubleArray.length(); ++i)
qAxisSteps.append(uaDoubleArray[i]);
@@ -325,9 +325,9 @@ QVariant arrayToQVariant(const OpcUa_Variant &var, QMetaType::Type type)
if (var.ArrayType == OpcUa_VariantArrayType_Matrix) {
UaVariant variant(var);
- // Ensure that the array dimensions fit in a QVector
+ // Ensure that the array dimensions fit in a QList
if (variant.dimensionSize() > static_cast<OpcUa_Int32>((std::numeric_limits<int>::max)())) {
- qCWarning(QT_OPCUA_PLUGINS_UACPP) << "The array dimensions do not fit in a QVector.";
+ qCWarning(QT_OPCUA_PLUGINS_UACPP) << "The array dimensions do not fit in a QList.";
return QOpcUaMultiDimensionalArray();
}
@@ -337,7 +337,7 @@ QVariant arrayToQVariant(const OpcUa_Variant &var, QMetaType::Type type)
list.append(scalarToQVariant<TARGETTYPE, UATYPE>(&temp[i], type));
}
- QVector<quint32> arrayDimensions;
+ QList<quint32> arrayDimensions;
for (qint32 i = 0; i < variant.dimensionSize(); ++i)
arrayDimensions.append(var.Value.Matrix.Dimensions[i]);
return QOpcUaMultiDimensionalArray(list, arrayDimensions);
@@ -885,7 +885,7 @@ OpcUa_Variant toUACppVariant(const QVariant &value, QOpcUa::Types type)
if (!data.arrayDimensions().isEmpty()) {
// Ensure that the array dimensions size is < UINT32_MAX
if (static_cast<quint64>(data.arrayDimensions().size()) > (std::numeric_limits<qint32>::max)()){
- qCWarning(QT_OPCUA_PLUGINS_UACPP) << "The array dimensions do not fit in a QVector.";
+ qCWarning(QT_OPCUA_PLUGINS_UACPP) << "The array dimensions do not fit in a QList.";
return uacppvalue;
}
result.ArrayType = OpcUa_VariantArrayType_Matrix;
@@ -1073,7 +1073,7 @@ void scalarFromQVariant<OpcUa_ExtensionObject, QOpcUaArgument>(const QVariant &v
QOpcUaArgument toQArgument(const UaArgument *data)
{
- QVector<quint32> arrayDimensions;
+ QList<quint32> arrayDimensions;
UaUInt32Array dataArrayDimensions;
data->getArrayDimensions(dataArrayDimensions);
for (quint32 i = 0; i < dataArrayDimensions.length(); ++i)
diff --git a/tests/auto/clientSetupInCpp/tst_clientSetupInCpp.cpp b/tests/auto/clientSetupInCpp/tst_clientSetupInCpp.cpp
index 1108e84..99f3871 100644
--- a/tests/auto/clientSetupInCpp/tst_clientSetupInCpp.cpp
+++ b/tests/auto/clientSetupInCpp/tst_clientSetupInCpp.cpp
@@ -90,7 +90,7 @@ public slots:
endpointSpy.wait(signalSpyTimeout);
QCOMPARE(endpointSpy.size(), 1);
- const QVector<QOpcUaEndpointDescription> desc = endpointSpy.at(0).at(0).value<QVector<QOpcUaEndpointDescription>>();
+ const auto desc = endpointSpy.at(0).at(0).value<QList<QOpcUaEndpointDescription>>();
QVERIFY(desc.size() > 0);
QCOMPARE(endpointSpy.at(0).at(2).value<QUrl>(), discoveryEndpoint);
diff --git a/tests/auto/connection/tst_connection.cpp b/tests/auto/connection/tst_connection.cpp
index db7e562..4fa884f 100644
--- a/tests/auto/connection/tst_connection.cpp
+++ b/tests/auto/connection/tst_connection.cpp
@@ -82,7 +82,7 @@ private:
QString m_discoveryEndpoint;
QOpcUaProvider m_opcUa;
QStringList m_backends;
- QVector<QOpcUaClient *> m_clients;
+ QList<QOpcUaClient *> m_clients;
QProcess m_serverProcess;
QString m_testServerPath;
QOpcUaEndpointDescription m_endpoint;
@@ -166,7 +166,7 @@ void Tst_Connection::initTestCase()
endpointSpy.wait(signalSpyTimeout);
QCOMPARE(endpointSpy.size(), 1);
- const QVector<QOpcUaEndpointDescription> desc = endpointSpy.at(0).at(0).value<QVector<QOpcUaEndpointDescription>>();
+ const auto desc = endpointSpy.at(0).at(0).value<QList<QOpcUaEndpointDescription>>();
QVERIFY(desc.size() > 0);
QCOMPARE(endpointSpy.at(0).at(2).value<QUrl>(), m_discoveryEndpoint);
diff --git a/tests/auto/qopcuaclient/tst_client.cpp b/tests/auto/qopcuaclient/tst_client.cpp
index 179b54f..d0b0093 100644
--- a/tests/auto/qopcuaclient/tst_client.cpp
+++ b/tests/auto/qopcuaclient/tst_client.cpp
@@ -120,20 +120,20 @@ public:
};
const QString readWriteNode = QStringLiteral("ns=3;s=TestNode.ReadWrite");
-const QVector<QString> xmlElements = {
+const QList<QString> xmlElements = {
QStringLiteral("<?xml version=\"1\" encoding=\"UTF-8\"?>"),
QStringLiteral("<?xml version=\"2\" encoding=\"UTF-8\"?>"),
QStringLiteral("<?xml version=\"3\" encoding=\"UTF-8\"?>")};
-const QVector<QOpcUaLocalizedText> localizedTexts = {
+const QList<QOpcUaLocalizedText> localizedTexts = {
QOpcUaLocalizedText("en", "English"),
QOpcUaLocalizedText("de", "German"),
QOpcUaLocalizedText("fr", "French")};
-const QVector<QOpcUaRange> testRanges = {
+const QList<QOpcUaRange> testRanges = {
QOpcUaRange(-100, 100),
QOpcUaRange(0, 100),
QOpcUaRange(-200, -100)
};
-const QVector<QOpcUaEUInformation> testEUInfos = {
+const QList<QOpcUaEUInformation> testEUInfos = {
QOpcUaEUInformation(QLatin1String("http://www.opcfoundation.org/UA/units/un/cefact"),
4408652, QOpcUaLocalizedText(QString(), QStringLiteral("°C")), QOpcUaLocalizedText(QString(), QLatin1String("degree Celsius"))),
QOpcUaEUInformation(QLatin1String("http://www.opcfoundation.org/UA/units/un/cefact"),
@@ -141,57 +141,57 @@ const QVector<QOpcUaEUInformation> testEUInfos = {
QOpcUaEUInformation(QLatin1String("http://www.opcfoundation.org/UA/units/un/cefact"),
5067858, QOpcUaLocalizedText(QString(), QLatin1String("m")), QOpcUaLocalizedText(QString(), QLatin1String("metre"))),
};
-const QVector<QOpcUaComplexNumber> testComplex = {
+const QList<QOpcUaComplexNumber> testComplex = {
QOpcUaComplexNumber(1,2),
QOpcUaComplexNumber(-1,2),
QOpcUaComplexNumber(1,-2)
};
-const QVector<QOpcUaDoubleComplexNumber> testDoubleComplex = {
+const QList<QOpcUaDoubleComplexNumber> testDoubleComplex = {
QOpcUaDoubleComplexNumber(1,2),
QOpcUaDoubleComplexNumber(-1,2),
QOpcUaDoubleComplexNumber(1,-2)
};
-const QVector<QOpcUaAxisInformation> testAxisInfo = {
- QOpcUaAxisInformation(testEUInfos[0], testRanges[0], localizedTexts[0], QOpcUa::AxisScale::Linear, QVector<double>({1, 2, 3})),
- QOpcUaAxisInformation(testEUInfos[1], testRanges[1], localizedTexts[1], QOpcUa::AxisScale::Ln, QVector<double>({4, 5, 6})),
- QOpcUaAxisInformation(testEUInfos[2], testRanges[2], localizedTexts[2], QOpcUa::AxisScale::Log, QVector<double>({7, 8, 9}))
+const QList<QOpcUaAxisInformation> testAxisInfo = {
+ QOpcUaAxisInformation(testEUInfos[0], testRanges[0], localizedTexts[0], QOpcUa::AxisScale::Linear, QList<double>({1, 2, 3})),
+ QOpcUaAxisInformation(testEUInfos[1], testRanges[1], localizedTexts[1], QOpcUa::AxisScale::Ln, QList<double>({4, 5, 6})),
+ QOpcUaAxisInformation(testEUInfos[2], testRanges[2], localizedTexts[2], QOpcUa::AxisScale::Log, QList<double>({7, 8, 9}))
};
-const QVector<QOpcUaXValue> testXV = {
+const QList<QOpcUaXValue> testXV = {
QOpcUaXValue(0, 100),
QOpcUaXValue(-10, 100.5),
QOpcUaXValue(10, -100.5)
};
-const QVector<QUuid> testUuid = {
+const QList<QUuid> testUuid = {
QUuid("e0bd5ccd-f571-4545-9352-61a0f8cb9216"),
QUuid("460ebe04-89d8-42f3-a0e0-7b45940f1a4e"),
QUuid("72962b91-fa75-4ae6-8d28-b404dc7daf63")
};
-const QVector<QString> testNodeId = {
+const QList<QString> testNodeId = {
QStringLiteral("ns=1;i=42"),
QStringLiteral("ns=2;s=TestString"),
QStringLiteral("ns=3;g=72962b91-fa75-4ae6-8d28-b404dc7daf63")
};
-const QVector<QDateTime> testDateTime = {
+const QList<QDateTime> testDateTime = {
QDateTime(QDate(1601, 1, 1), QTime(0, 0)),
QDateTime(QDate(2014, 01, 23), QTime(21, 0)),
QDateTime(QDate(2300, 01, 01), QTime(12, 0)),
};
-const QVector<QOpcUa::UaStatusCode> testStatusCode = {
+const QList<QOpcUa::UaStatusCode> testStatusCode = {
QOpcUa::UaStatusCode::Good,
QOpcUa::UaStatusCode::BadInvalidArgument,
QOpcUa::UaStatusCode::BadNodeIdUnknown
};
-const QVector<QOpcUaExpandedNodeId> testExpandedId = {
+const QList<QOpcUaExpandedNodeId> testExpandedId = {
QOpcUaExpandedNodeId(QString(), QLatin1String("ns=1;i=23")),
QOpcUaExpandedNodeId(QLatin1String("MyNamespace"), QLatin1String("ns=2;s=MyNode")),
QOpcUaExpandedNodeId(QLatin1String("RemoteNamespace"), QLatin1String("ns=3;b=UXQgZnR3IQ=="), 1)
};
-const QVector<QOpcUaExpandedNodeId> testExpandedNodeId = {
+const QList<QOpcUaExpandedNodeId> testExpandedNodeId = {
QOpcUaExpandedNodeId(QStringLiteral("namespace1"), QStringLiteral("ns=0;i=99"), 1),
QOpcUaExpandedNodeId(QString(), QStringLiteral("ns=1;i=99")),
QOpcUaExpandedNodeId(QString(), QStringLiteral("ns=1;s=test"))
};
-const QVector<QOpcUaArgument> testArguments = {
+const QList<QOpcUaArgument> testArguments = {
QOpcUaArgument(QStringLiteral("Argument1"), QStringLiteral("ns=0;i=12"), -1,
{},QOpcUaLocalizedText(QStringLiteral("en"), QStringLiteral("Description1"))),
QOpcUaArgument(QStringLiteral("Argument2"), QStringLiteral("ns=0;i=12"), 2,
@@ -501,7 +501,7 @@ private:
QString m_discoveryEndpoint;
QOpcUaProvider m_opcUa;
QStringList m_backends;
- QVector<QOpcUaClient *> m_clients;
+ QList<QOpcUaClient *> m_clients;
QProcess m_serverProcess;
QString m_testServerPath;
QOpcUaEndpointDescription m_endpoint;
@@ -636,7 +636,7 @@ void Tst_QOpcUaClient::initTestCase()
endpointSpy.wait(signalSpyTimeout);
QCOMPARE(endpointSpy.size(), 1);
- const QVector<QOpcUaEndpointDescription> desc = endpointSpy.at(0).at(0).value<QVector<QOpcUaEndpointDescription>>();
+ const auto desc = endpointSpy.at(0).at(0).value<QList<QOpcUaEndpointDescription>>();
QVERIFY(desc.size() > 0);
QCOMPARE(endpointSpy.at(0).at(2).value<QUrl>(), m_discoveryEndpoint);
@@ -732,7 +732,7 @@ void Tst_QOpcUaClient::findServers()
QCOMPARE(discoverySpy.at(0).at(2).value<QUrl>(), m_discoveryEndpoint);
QCOMPARE(discoverySpy.at(0).at(1).value<QOpcUa::UaStatusCode>(), QOpcUa::UaStatusCode::Good);
- QVector<QOpcUaApplicationDescription> servers = discoverySpy.at(0).at(0).value<QVector<QOpcUaApplicationDescription>>();
+ const auto servers = discoverySpy.at(0).at(0).value<QList<QOpcUaApplicationDescription>>();
QCOMPARE(servers.size(), 1);
QCOMPARE(servers.at(0).applicationName(), QOpcUaLocalizedText(QStringLiteral("en"), QStringLiteral("open62541-based OPC UA Application")));
@@ -751,7 +751,7 @@ void Tst_QOpcUaClient::requestEndpoints()
QCOMPARE(endpointSpy.size(), 1);
QCOMPARE(endpointSpy.at(0).at(2).value<QUrl>(), m_discoveryEndpoint);
- QVector<QOpcUaEndpointDescription> desc = endpointSpy.at(0).at(0).value<QVector<QOpcUaEndpointDescription>>();
+ auto desc = endpointSpy.at(0).at(0).value<QList<QOpcUaEndpointDescription>>();
QVERIFY(desc.size() > 0);
QCOMPARE(QUrl(desc[0].endpointUrl()).port(), 43344);
@@ -964,7 +964,7 @@ void Tst_QOpcUaClient::writeNodeAttributes()
QFETCH(QOpcUaClient *, opcuaClient);
OpcuaConnector connector(opcuaClient, m_endpoint);
- QVector<QOpcUaWriteItem> request;
+ QList<QOpcUaWriteItem> request;
request.append(QOpcUaWriteItem(QStringLiteral("ns=2;s=Demo.Static.Scalar.Double"), QOpcUa::NodeAttribute::Value,
23.0, QOpcUa::Types::Double));
@@ -990,7 +990,7 @@ void Tst_QOpcUaClient::writeNodeAttributes()
QCOMPARE(writeNodeAttributesSpy.size(), 1);
QCOMPARE(writeNodeAttributesSpy.at(0).at(1).value<QOpcUa::UaStatusCode>(), QOpcUa::UaStatusCode::Good);
- QVector<QOpcUaWriteResult> result = writeNodeAttributesSpy.at(0).at(0).value<QVector<QOpcUaWriteResult>>();
+ const auto result = writeNodeAttributesSpy.at(0).at(0).value<QList<QOpcUaWriteResult>>();
QCOMPARE(result.size(), 3);
@@ -1010,7 +1010,7 @@ void Tst_QOpcUaClient::readNodeAttributes()
QFETCH(QOpcUaClient *, opcuaClient);
OpcuaConnector connector(opcuaClient, m_endpoint);
- QVector<QOpcUaReadItem> request;
+ QList<QOpcUaReadItem> request;
QScopedPointer<QOpcUaNode> node(opcuaClient->node("ns=2;s=Demo.Static.Arrays.UInt32"));
QVERIFY (node != nullptr);
@@ -1031,7 +1031,7 @@ void Tst_QOpcUaClient::readNodeAttributes()
QCOMPARE(readNodeAttributesSpy.size(), 1);
QCOMPARE(readNodeAttributesSpy.at(0).at(1).value<QOpcUa::UaStatusCode>(), QOpcUa::UaStatusCode::Good);
- QVector<QOpcUaReadResult> result = readNodeAttributesSpy.at(0).at(0).value<QVector<QOpcUaReadResult>>();
+ const auto result = readNodeAttributesSpy.at(0).at(0).value<QList<QOpcUaReadResult>>();
QCOMPARE(result.size(), 3);
@@ -1080,7 +1080,7 @@ void Tst_QOpcUaClient::getChildren()
node->browseChildren(QOpcUa::ReferenceTypeId::HierarchicalReferences, QOpcUa::NodeClass::Object);
spy.wait(signalSpyTimeout);
QCOMPARE(spy.size(), 1);
- QVector<QOpcUaReferenceDescription> ref = spy.at(0).at(0).value<QVector<QOpcUaReferenceDescription>>();
+ const auto ref = spy.at(0).at(0).value<QList<QOpcUaReferenceDescription>>();
QCOMPARE(ref.size(), 100);
}
@@ -1095,7 +1095,7 @@ void Tst_QOpcUaClient::childrenIdsString()
node->browseChildren(QOpcUa::ReferenceTypeId::Organizes, QOpcUa::NodeClass::Variable);
spy.wait(signalSpyTimeout);
QCOMPARE(spy.size(), 1);
- QVector<QOpcUaReferenceDescription> ref = spy.at(0).at(0).value<QVector<QOpcUaReferenceDescription>>();
+ const auto ref = spy.at(0).at(0).value<QList<QOpcUaReferenceDescription>>();
QCOMPARE(ref.size(), 1);
QCOMPARE(ref.at(0).targetNodeId().nodeId(), QStringLiteral("ns=3;s=theStringId"));
}
@@ -1111,7 +1111,7 @@ void Tst_QOpcUaClient::childrenIdsGuidNodeId()
node->browseChildren(QOpcUa::ReferenceTypeId::Organizes, QOpcUa::NodeClass::Variable);
spy.wait(signalSpyTimeout);
QCOMPARE(spy.size(), 1);
- QVector<QOpcUaReferenceDescription> ref = spy.at(0).at(0).value<QVector<QOpcUaReferenceDescription>>();
+ const auto ref = spy.at(0).at(0).value<QList<QOpcUaReferenceDescription>>();
QCOMPARE(ref.size(), 1);
QCOMPARE(ref.at(0).targetNodeId().nodeId(), QStringLiteral("ns=3;g=08081e75-8e5e-319b-954f-f3a7613dc29b"));
}
@@ -1127,7 +1127,7 @@ void Tst_QOpcUaClient::childrenIdsOpaqueNodeId()
node->browseChildren(QOpcUa::ReferenceTypeId::Organizes, QOpcUa::NodeClass::Variable);
spy.wait(signalSpyTimeout);
QCOMPARE(spy.size(), 1);
- QVector<QOpcUaReferenceDescription> ref = spy.at(0).at(0).value<QVector<QOpcUaReferenceDescription>>();
+ const auto ref = spy.at(0).at(0).value<QList<QOpcUaReferenceDescription>>();
QCOMPARE(ref.size(), 1);
QCOMPARE(ref.at(0).targetNodeId().nodeId(), QStringLiteral("ns=3;b=UXQgZnR3IQ=="));
}
@@ -1145,7 +1145,7 @@ void Tst_QOpcUaClient::testSpecialCharStringNodeIds()
node->browseChildren(QOpcUa::ReferenceTypeId::Organizes, QOpcUa::NodeClass::Variable);
spy.wait(signalSpyTimeout);
QCOMPARE(spy.size(), 1);
- QVector<QOpcUaReferenceDescription> ref = spy.at(0).at(0).value<QVector<QOpcUaReferenceDescription>>();
+ QList<QOpcUaReferenceDescription> ref = spy.at(0).at(0).value<QList<QOpcUaReferenceDescription>>();
QCOMPARE(ref.size(), 1);
QCOMPARE(ref.at(0).targetNodeId().nodeId(), QStringLiteral("ns=3;s=ümläutVäriableNödeId"));
QCOMPARE(ref.at(0).browseName().namespaceIndex(), 3);
@@ -1187,7 +1187,7 @@ void Tst_QOpcUaClient::inverseBrowse()
node->browse(request);
spy.wait(signalSpyTimeout);
QCOMPARE(spy.size(), 1);
- QVector<QOpcUaReferenceDescription> ref = spy.at(0).at(0).value<QVector<QOpcUaReferenceDescription>>();
+ const auto ref = spy.at(0).at(0).value<QList<QOpcUaReferenceDescription>>();
QCOMPARE(ref.size(), 1);
QCOMPARE(ref.at(0).targetNodeId().nodeId(), QOpcUa::namespace0Id(QOpcUa::NodeIds::Namespace0::BaseDataType));
QCOMPARE(ref.at(0).isForwardReference(), false);
@@ -1399,7 +1399,7 @@ void Tst_QOpcUaClient::addAndRemoveReference()
browseSpy.wait(signalSpyTimeout);
QCOMPARE(browseSpy.size(), 1);
QCOMPARE(browseSpy.at(0).at(1).value<QOpcUa::UaStatusCode>(), QOpcUa::UaStatusCode::Good);
- QVector<QOpcUaReferenceDescription> results = browseSpy.at(0).at(0).value<QVector<QOpcUaReferenceDescription>>();
+ const auto results = browseSpy.at(0).at(0).value<QList<QOpcUaReferenceDescription>>();
QVERIFY(!results.isEmpty());
bool referenceExists = false;
for (auto item : results) {
@@ -1441,7 +1441,7 @@ void Tst_QOpcUaClient::addAndRemoveReference()
browseSpy.wait(signalSpyTimeout);
QCOMPARE(browseSpy.size(), 1);
QCOMPARE(browseSpy.at(0).at(1).value<QOpcUa::UaStatusCode>(), QOpcUa::UaStatusCode::Good);
- QVector<QOpcUaReferenceDescription> results = browseSpy.at(0).at(0).value<QVector<QOpcUaReferenceDescription>>();
+ const auto results = browseSpy.at(0).at(0).value<QList<QOpcUaReferenceDescription>>();
QVERIFY(!results.isEmpty());
for (auto item : results)
QVERIFY(item.targetNodeId().nodeId() != target.nodeId());
@@ -1527,7 +1527,7 @@ void Tst_QOpcUaClient::dataChangeSubscription()
QCOMPARE(dataChangeSpy.at(0).at(0).value<QOpcUa::NodeAttribute>(), QOpcUa::NodeAttribute::NodeId);
QCOMPARE(dataChangeSpy.at(0).at(1), QLatin1String("ns=3;s=TestNode.ReadWrite"));
- QVector<QOpcUa::NodeAttribute> attrs;
+ QList<QOpcUa::NodeAttribute> attrs;
QSignalSpy monitoringModifiedSpy(node.data(), &QOpcUaNode::monitoringStatusChanged);
node->modifyMonitoring(QOpcUa::NodeAttribute::Value, QOpcUaMonitoringParameters::Parameter::PublishingInterval, 200);
@@ -1652,7 +1652,7 @@ void Tst_QOpcUaClient::dataChangeSubscriptionSharing()
QCOMPARE(monitoringDisabledSpy.size(), 2);
- QVector<QOpcUa::NodeAttribute> attrs = {QOpcUa::NodeAttribute::Value, QOpcUa::NodeAttribute::DisplayName};
+ QList<QOpcUa::NodeAttribute> attrs = {QOpcUa::NodeAttribute::Value, QOpcUa::NodeAttribute::DisplayName};
for (auto it : qAsConst(monitoringDisabledSpy)) {
auto temp = it.at(0).value<QOpcUa::NodeAttribute>();
QVERIFY(attrs.contains(temp));
@@ -1668,8 +1668,8 @@ void Tst_QOpcUaClient::methodCall()
QFETCH(QOpcUaClient *, opcuaClient);
OpcuaConnector connector(opcuaClient, m_endpoint);
- QVector<QOpcUa::TypedVariant> args;
- QVector<QVariant> ret;
+ QList<QOpcUa::TypedVariant> args;
+ QList<QVariant> ret;
for (int i = 0; i < 2; i++)
args.push_back(QOpcUa::TypedVariant(double(4), QOpcUa::Double));
@@ -1694,8 +1694,8 @@ void Tst_QOpcUaClient::methodCallInvalid()
QFETCH(QOpcUaClient *, opcuaClient);
OpcuaConnector connector(opcuaClient, m_endpoint);
- QVector<QOpcUa::TypedVariant> args;
- QVector<QVariant> ret;
+ QList<QOpcUa::TypedVariant> args;
+ QList<QVariant> ret;
for (int i = 0; i < 3; i++)
args.push_back(QOpcUa::TypedVariant(double(4), QOpcUa::Double));
@@ -3195,7 +3195,7 @@ void Tst_QOpcUaClient::checkMonitoredItemCleanup()
QCOMPARE(subscriptionId, readWriteNode->monitoringStatus(QOpcUa::NodeAttribute::BrowseName).subscriptionId());
QSignalSpy methodSpy(serverNode.data(), &QOpcUaNode::methodCallFinished);
- QVector<QOpcUa::TypedVariant> parameter;
+ QList<QOpcUa::TypedVariant> parameter;
parameter.append(QOpcUa::TypedVariant(QVariant(quint32(subscriptionId)), QOpcUa::Types::UInt32));
serverNode->callMethod(QOpcUa::namespace0Id(QOpcUa::NodeIds::Namespace0::Server_GetMonitoredItems), parameter);
@@ -3336,7 +3336,7 @@ void Tst_QOpcUaClient::multiDimensionalArray()
QScopedPointer<QOpcUaNode> node(opcuaClient->node("ns=2;s=Demo.Static.Arrays.MultiDimensionalDouble"));
- QVector<quint32> arrayDimensions({2, 2, 3});
+ QList<quint32> arrayDimensions({2, 2, 3});
QVariantList value({0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0});
QOpcUaMultiDimensionalArray arr(value, arrayDimensions);
QVERIFY(arr.isValid());
@@ -3633,7 +3633,7 @@ void Tst_QOpcUaClient::resolveBrowsePath()
QSignalSpy spy(typesNode.data(), &QOpcUaNode::resolveBrowsePathFinished);
- QVector<QOpcUaRelativePathElement> path;
+ QList<QOpcUaRelativePathElement> path;
const QString referenceTypeId = QOpcUa::nodeIdFromReferenceType(QOpcUa::ReferenceTypeId::Organizes);
path.append(QOpcUaRelativePathElement(QOpcUaQualifiedName(0, "DataTypes"), referenceTypeId));
path.append(QOpcUaRelativePathElement(QOpcUaQualifiedName(0, "BaseDataType"), referenceTypeId));
@@ -3642,13 +3642,13 @@ void Tst_QOpcUaClient::resolveBrowsePath()
spy.wait(signalSpyTimeout);
QCOMPARE(spy.size(), 1);
- QVector<QOpcUaBrowsePathTarget> results = spy.at(0).at(0).value<QVector<QOpcUaBrowsePathTarget>>();
+ const auto results = spy.at(0).at(0).value<QList<QOpcUaBrowsePathTarget>>();
QCOMPARE(results.size(), 1);
QCOMPARE(results.at(0).remainingPathIndex(), (std::numeric_limits<quint32>::max)());
QCOMPARE(results.at(0).targetId().nodeId(), QOpcUa::namespace0Id(QOpcUa::NodeIds::Namespace0::BaseDataType));
QVERIFY(results.at(0).targetId().namespaceUri().isEmpty());
QCOMPARE(results.at(0).targetId().serverIndex(), 0U);
- QCOMPARE(spy.at(0).at(1).value<QVector<QOpcUaRelativePathElement>>(), path);
+ QCOMPARE(spy.at(0).at(1).value<QList<QOpcUaRelativePathElement>>(), path);
QCOMPARE(spy.at(0).at(2).value<QOpcUa::UaStatusCode>(), QOpcUa::UaStatusCode::Good);
}
@@ -3714,7 +3714,7 @@ void Tst_QOpcUaClient::addNamespace()
QVERIFY(!namespaceArray.isEmpty());
QVERIFY(!namespaceArray.contains(newNamespaceName));
- QVector<QOpcUa::TypedVariant> args;
+ QList<QOpcUa::TypedVariant> args;
args.push_back(QOpcUa::TypedVariant(newNamespaceName, QOpcUa::String));
QScopedPointer<QOpcUaNode> node(opcuaClient->node(QOpcUa::namespace0Id(QOpcUa::NodeIds::Namespace0::Server)));
diff --git a/tests/auto/security/tst_security.cpp b/tests/auto/security/tst_security.cpp
index 97436b9..1b6343c 100644
--- a/tests/auto/security/tst_security.cpp
+++ b/tests/auto/security/tst_security.cpp
@@ -162,7 +162,7 @@ private:
QString m_testServerPath;
QStringList m_backends;
QProcess m_serverProcess;
- QVector<QOpcUaEndpointDescription> m_endpoints;
+ QList<QOpcUaEndpointDescription> m_endpoints;
QString m_discoveryEndpoint;
QOpcUaProvider m_opcUa;
QSharedPointer<QTemporaryDir> m_pkiData;
@@ -239,7 +239,7 @@ void Tst_QOpcUaSecurity::initTestCase()
QCOMPARE(endpointSpy.size(), 1);
QCOMPARE(endpointSpy.at(0).at(2).value<QUrl>(), m_discoveryEndpoint);
- const QVector<QOpcUaEndpointDescription> desc = endpointSpy.at(0).at(0).value<QVector<QOpcUaEndpointDescription>>();
+ const auto desc = endpointSpy.at(0).at(0).value<QList<QOpcUaEndpointDescription>>();
QVERIFY(desc.size() > 0);
m_endpoints.clear();
diff --git a/tests/manual/gds/tst_gds.cpp b/tests/manual/gds/tst_gds.cpp
index 9e57238..c0ece32 100644
--- a/tests/manual/gds/tst_gds.cpp
+++ b/tests/manual/gds/tst_gds.cpp
@@ -119,11 +119,11 @@ static void commonGdsClientSetup(QOpcUaGdsClient &gc, const QString &backend, co
gc.setPkiConfiguration(getPkiConfig());
QOpcUaApplicationRecordDataType ar = gc.applicationRecord();
- ar.setApplicationNames(QVector<QOpcUaLocalizedText>{QOpcUaLocalizedText("en", gc.applicationIdentity().applicationName())});
+ ar.setApplicationNames(QList<QOpcUaLocalizedText>{QOpcUaLocalizedText("en", gc.applicationIdentity().applicationName())});
ar.setApplicationType(gc.applicationIdentity().applicationType());
ar.setApplicationUri(gc.applicationIdentity().applicationUri());
ar.setProductUri(gc.applicationIdentity().productUri());
- ar.setDiscoveryUrls(QVector<QString>{QLatin1String("opc.tcp://localhost")});
+ ar.setDiscoveryUrls(QList<QString>{QLatin1String("opc.tcp://localhost")});
gc.setApplicationRecord(ar);
QOpcUaX509DistinguishedName dn;
@@ -177,7 +177,7 @@ void Tst_QOpcUaGds::initTestCase()
endpointSpy.wait(2000);
QCOMPARE(endpointSpy.size(), 1);
- const QVector<QOpcUaEndpointDescription> desc = endpointSpy.at(0).at(0).value<QVector<QOpcUaEndpointDescription>>();
+ const auto desc = endpointSpy.at(0).at(0).value<QList<QOpcUaEndpointDescription>>();
QVERIFY(desc.size() > 0);
for (const auto &i : qAsConst(desc)) {
diff --git a/tests/open62541-testserver/main.cpp b/tests/open62541-testserver/main.cpp
index fb7ad33..53ec835 100644
--- a/tests/open62541-testserver/main.cpp
+++ b/tests/open62541-testserver/main.cpp
@@ -220,10 +220,10 @@ int main(int argc, char **argv)
server.addMultipleOutputArgumentsMethod(testFolder, "ns=3;s=Test.Method.MultipleOutputArguments", "MultipleOutputArguments");
server.addEmptyArrayVariable(testFolder, "ns=2;s=EmptyBoolArray", "EmptyBoolArrayTest");
- const QVector<quint32> arrayDimensions({2, 2, 3});
+ const QList<quint32> arrayDimensions({2, 2, 3});
const QVariantList value({0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0});
server.addVariable(testFolder, "ns=2;s=Demo.Static.Arrays.MultiDimensionalDouble", "MultiDimensionalDoubleTest",
- QOpcUaMultiDimensionalArray(value, arrayDimensions), QOpcUa::Types::Double, QVector<quint32>({2, 2, 3}), 3);
+ QOpcUaMultiDimensionalArray(value, arrayDimensions), QOpcUa::Types::Double, QList<quint32>({2, 2, 3}), 3);
// Add folders for relative nodes
const UA_NodeId testFolder2 = server.addFolder("ns=3;s=TestFolder2", "TestFolder2");
diff --git a/tests/open62541-testserver/testserver.cpp b/tests/open62541-testserver/testserver.cpp
index 6388fd5..d4d24ba 100644
--- a/tests/open62541-testserver/testserver.cpp
+++ b/tests/open62541-testserver/testserver.cpp
@@ -383,7 +383,7 @@ UA_NodeId TestServer::addVariableWithWriteMask(const UA_NodeId &folder, const QS
}
UA_NodeId TestServer::addVariable(const UA_NodeId &folder, const QString &variableNode, const QString &name, const QVariant &value,
- QOpcUa::Types type, QVector<quint32> arrayDimensions, int valueRank)
+ QOpcUa::Types type, QList<quint32> arrayDimensions, int valueRank)
{
UA_NodeId variableNodeId = Open62541Utils::nodeIdFromQString(variableNode);
@@ -417,7 +417,7 @@ UA_NodeId TestServer::addVariable(const UA_NodeId &folder, const QString &variab
nullptr,
&resultId);
- // Prevent deletion of the QVector's value by UA_VariableAttribute_deleteMembers
+ // Prevent deletion of the QList's value by UA_VariableAttribute_deleteMembers
attr.arrayDimensions = nullptr;
attr.arrayDimensionsSize = 0;
diff --git a/tests/open62541-testserver/testserver.h b/tests/open62541-testserver/testserver.h
index 4a99abb..7e70421 100644
--- a/tests/open62541-testserver/testserver.h
+++ b/tests/open62541-testserver/testserver.h
@@ -44,7 +44,7 @@
#include <QtCore/QObject>
#include <QtCore/QTimer>
#include <QtCore/QVariant>
-#include <QtCore/QVector>
+#include <QtCore/QList>
QT_BEGIN_NAMESPACE
@@ -65,7 +65,7 @@ public:
UA_NodeId addObject(const UA_NodeId &folderId, int namespaceIndex, const QString &objectName = QString());
UA_NodeId addVariable(const UA_NodeId &folder, const QString &variableNode, const QString &name, const QVariant &value,
- QOpcUa::Types type, QVector<quint32> arrayDimensions = QVector<quint32>(), int valueRank = UA_VALUERANK_ANY);
+ QOpcUa::Types type, QList<quint32> arrayDimensions = QList<quint32>(), int valueRank = UA_VALUERANK_ANY);
UA_NodeId addVariableWithWriteMask(const UA_NodeId &folder, const QString &variableNode, const QString &name, const QVariant &value,
QOpcUa::Types type, quint32 writeMask);
UA_NodeId addEmptyArrayVariable(const UA_NodeId &folder, const QString &variableNode, const QString &name);