diff options
author | Jannis Voelker <jannis.voelker@basyskom.com> | 2018-09-17 07:51:23 +0200 |
---|---|---|
committer | Jannis Völker <jannis.voelker@basyskom.com> | 2018-09-17 06:41:03 +0000 |
commit | 80d9c8df82236d5651366e8f581e8e8acaa85432 (patch) | |
tree | 5b31dea348d534e56e225171fa285297d8db2a74 /src | |
parent | 5e41664d043327b08ecd48f54b9b7deaa1166196 (diff) |
Rename QOpcUaMonitoringParameters::shared() to subscriptionType()
The name shared() implies a boolean while the value is an enum.
Change-Id: If68198038214611f463b8881bb1357a26de0fa36
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/opcua/client/qopcuaclientprivate.cpp | 2 | ||||
-rw-r--r-- | src/opcua/client/qopcuamonitoringparameters.cpp | 4 | ||||
-rw-r--r-- | src/opcua/client/qopcuamonitoringparameters.h | 6 | ||||
-rw-r--r-- | src/plugins/opcua/open62541/qopen62541backend.cpp | 2 | ||||
-rw-r--r-- | src/plugins/opcua/open62541/qopen62541subscription.cpp | 2 | ||||
-rw-r--r-- | src/plugins/opcua/uacpp/quacppbackend.cpp | 2 | ||||
-rw-r--r-- | src/plugins/opcua/uacpp/quacppsubscription.cpp | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/src/opcua/client/qopcuaclientprivate.cpp b/src/opcua/client/qopcuaclientprivate.cpp index 6e30a0b..1cbfca9 100644 --- a/src/opcua/client/qopcuaclientprivate.cpp +++ b/src/opcua/client/qopcuaclientprivate.cpp @@ -236,7 +236,7 @@ void QOpcUaClientPrivate::setupNamespaceArrayMonitoring() if (m_enableNamespaceArrayAutoupdate && !m_namespaceArrayAutoupdateEnabled) { QOpcUaMonitoringParameters options; - options.setShared(QOpcUaMonitoringParameters::SubscriptionType::Exclusive); + options.setSubscriptionType(QOpcUaMonitoringParameters::SubscriptionType::Exclusive); options.setMaxKeepAliveCount((std::numeric_limits<quint32>::max)() - 1); options.setPublishingInterval(m_namespaceArrayUpdateInterval); m_namespaceArrayAutoupdateEnabled = true; diff --git a/src/opcua/client/qopcuamonitoringparameters.cpp b/src/opcua/client/qopcuamonitoringparameters.cpp index 6d969b2..fd6add1 100644 --- a/src/opcua/client/qopcuamonitoringparameters.cpp +++ b/src/opcua/client/qopcuamonitoringparameters.cpp @@ -222,7 +222,7 @@ QOpcUaMonitoringParameters &QOpcUaMonitoringParameters::operator=(const QOpcUaMo /*! Returns the subscription type. */ -QOpcUaMonitoringParameters::SubscriptionType QOpcUaMonitoringParameters::shared() const +QOpcUaMonitoringParameters::SubscriptionType QOpcUaMonitoringParameters::subscriptionType() const { return d_ptr->shared; } @@ -230,7 +230,7 @@ QOpcUaMonitoringParameters::SubscriptionType QOpcUaMonitoringParameters::shared( /*! Request \a shared as subscription type for the subscription. */ -void QOpcUaMonitoringParameters::setShared(SubscriptionType shared) +void QOpcUaMonitoringParameters::setSubscriptionType(SubscriptionType shared) { d_ptr->shared = shared; } diff --git a/src/opcua/client/qopcuamonitoringparameters.h b/src/opcua/client/qopcuamonitoringparameters.h index 8c3b9f4..55c36dc 100644 --- a/src/opcua/client/qopcuamonitoringparameters.h +++ b/src/opcua/client/qopcuamonitoringparameters.h @@ -142,7 +142,7 @@ public: QOpcUaMonitoringParameters(); ~QOpcUaMonitoringParameters(); - QOpcUaMonitoringParameters(double publishingInterval, SubscriptionType shared = SubscriptionType::Shared, quint32 subscriptionId = 0); + QOpcUaMonitoringParameters(double publishingInterval, SubscriptionType subscriptionType = SubscriptionType::Shared, quint32 subscriptionId = 0); QOpcUaMonitoringParameters(const QOpcUaMonitoringParameters &other); QOpcUaMonitoringParameters &operator=(const QOpcUaMonitoringParameters &other); @@ -176,8 +176,8 @@ public: void setPublishingEnabled(bool publishingEnabled); QOpcUa::UaStatusCode statusCode() const; void setStatusCode(QOpcUa::UaStatusCode statusCode); - QOpcUaMonitoringParameters::SubscriptionType shared() const; - void setShared(SubscriptionType subscriptionType); + QOpcUaMonitoringParameters::SubscriptionType subscriptionType() const; + void setSubscriptionType(SubscriptionType subscriptionType); QString indexRange() const; void setIndexRange(const QString &indexRange); diff --git a/src/plugins/opcua/open62541/qopen62541backend.cpp b/src/plugins/opcua/open62541/qopen62541backend.cpp index 44a675e..d201879 100644 --- a/src/plugins/opcua/open62541/qopen62541backend.cpp +++ b/src/plugins/opcua/open62541/qopen62541backend.cpp @@ -270,7 +270,7 @@ void Open62541AsyncBackend::modifyMonitoring(quint64 handle, QOpcUa::NodeAttribu QOpen62541Subscription *Open62541AsyncBackend::getSubscription(const QOpcUaMonitoringParameters &settings) { - if (settings.shared() == QOpcUaMonitoringParameters::SubscriptionType::Shared) { + if (settings.subscriptionType() == QOpcUaMonitoringParameters::SubscriptionType::Shared) { // Requesting multiple subscriptions with publishing interval < minimum publishing interval breaks subscription sharing double interval = revisePublishingInterval(settings.publishingInterval(), m_minPublishingInterval); for (auto entry : qAsConst(m_subscriptions)) { diff --git a/src/plugins/opcua/open62541/qopen62541subscription.cpp b/src/plugins/opcua/open62541/qopen62541subscription.cpp index 3f16d20..8ab7512 100644 --- a/src/plugins/opcua/open62541/qopen62541subscription.cpp +++ b/src/plugins/opcua/open62541/qopen62541subscription.cpp @@ -91,7 +91,7 @@ QOpen62541Subscription::QOpen62541Subscription(Open62541AsyncBackend *backend, c , m_subscriptionId(0) , m_lifetimeCount(settings.lifetimeCount() ? settings.lifetimeCount() : UA_SubscriptionSettings_default.requestedLifetimeCount) , m_maxKeepaliveCount(settings.maxKeepAliveCount() ? settings.maxKeepAliveCount() : UA_SubscriptionSettings_default.requestedMaxKeepAliveCount) - , m_shared(settings.shared()) + , m_shared(settings.subscriptionType()) , m_priority(settings.priority()) , m_maxNotificationsPerPublish(settings.maxNotificationsPerPublish()) , m_clientHandle(0) diff --git a/src/plugins/opcua/uacpp/quacppbackend.cpp b/src/plugins/opcua/uacpp/quacppbackend.cpp index 061cafd..7e4d689 100644 --- a/src/plugins/opcua/uacpp/quacppbackend.cpp +++ b/src/plugins/opcua/uacpp/quacppbackend.cpp @@ -556,7 +556,7 @@ void UACppAsyncBackend::resolveBrowsePath(quint64 handle, const UaNodeId &startN QUACppSubscription *UACppAsyncBackend::getSubscription(const QOpcUaMonitoringParameters &settings) { - if (settings.shared() == QOpcUaMonitoringParameters::SubscriptionType::Shared) { + if (settings.subscriptionType() == QOpcUaMonitoringParameters::SubscriptionType::Shared) { // Requesting multiple subscriptions with publishing interval < minimum publishing interval breaks subscription sharing double interval = revisePublishingInterval(settings.publishingInterval(), m_minPublishingInterval); for (auto entry : qAsConst(m_subscriptions)) { diff --git a/src/plugins/opcua/uacpp/quacppsubscription.cpp b/src/plugins/opcua/uacpp/quacppsubscription.cpp index f90cbc2..b02c53b 100644 --- a/src/plugins/opcua/uacpp/quacppsubscription.cpp +++ b/src/plugins/opcua/uacpp/quacppsubscription.cpp @@ -294,7 +294,7 @@ int QUACppSubscription::monitoredItemsCount() const QOpcUaMonitoringParameters::SubscriptionType QUACppSubscription::shared() const { - return m_subscriptionParameters.shared(); + return m_subscriptionParameters.subscriptionType(); } void QUACppSubscription::subscriptionStatusChanged(OpcUa_UInt32 clientSubscriptionHandle, const UaStatus &status) |