Rename parameter to make it clear which handle is meant

Just 'handle' is unclear which handle is actually passed.

Change-Id: Icfeda12051d4b5415e79fad575549c0ade6cc194
Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com>

4 files changed, 50 insertions, 50 deletions

diff --git a/src/plugins/opcua/open62541/qopen62541subscription.cpp b/src/plugins/opcua/open62541/qopen62541subscription.cpp
index 038478e..c19f798 100644
--- a/src/plugins/opcua/open62541/qopen62541subscription.cpp
+++ b/src/plugins/opcua/open62541/qopen62541subscription.cpp
@@ -148,7 +148,7 @@ bool QOpen62541Subscription::removeOnServer()
     qDeleteAll(m_itemIdToItemMapping);
 
     m_itemIdToItemMapping.clear();
-    m_handleToItemMapping.clear();
+    m_nodeHandleToItemMapping.clear();
 
     return (res == UA_STATUSCODE_GOOD) ? true : false;
 }
@@ -294,7 +294,7 @@ bool QOpen62541Subscription::addAttributeMonitoredItem(quint64 handle, QOpcUa::N
     }
 
     MonitoredItem *temp = new MonitoredItem(handle, attr, res.monitoredItemId);
-    m_handleToItemMapping[handle][attr] = temp;
+    m_nodeHandleToItemMapping[handle][attr] = temp;
     m_itemIdToItemMapping[res.monitoredItemId] = temp;
 
     QOpcUaMonitoringParameters s = settings;
@@ -336,10 +336,10 @@ bool QOpen62541Subscription::removeAttributeMonitoredItem(quint64 handle, QOpcUa
         qCWarning(QT_OPCUA_PLUGINS_OPEN62541) << "Could not remove monitored item" << item->monitoredItemId << "from subscription" << m_subscriptionId << ":" << UA_StatusCode_name(res);
 
     m_itemIdToItemMapping.remove(item->monitoredItemId);
-    auto it = m_handleToItemMapping.find(handle);
+    auto it = m_nodeHandleToItemMapping.find(handle);
     it->remove(attr);
     if (it->empty())
-        m_handleToItemMapping.erase(it);
+        m_nodeHandleToItemMapping.erase(it);
 
     delete item;
 
@@ -376,7 +376,7 @@ void QOpen62541Subscription::monitoredValueUpdated(UA_UInt32 monId, UA_DataValue
 void QOpen62541Subscription::sendTimeoutNotification()
 {
     QVector<QPair<quint64, QOpcUa::NodeAttribute>> items;
-    for (auto it : qAsConst(m_handleToItemMapping)) {
+    for (auto it : qAsConst(m_nodeHandleToItemMapping)) {
         for (auto item : it) {
             items.push_back({item->handle, item->attr});
         }
@@ -413,11 +413,11 @@ QOpcUaMonitoringParameters::SubscriptionType QOpen62541Subscription::shared() co
     return m_shared;
 }
 
-QOpen62541Subscription::MonitoredItem *QOpen62541Subscription::getItemForAttribute(quint64 handle, QOpcUa::NodeAttribute attr)
+QOpen62541Subscription::MonitoredItem *QOpen62541Subscription::getItemForAttribute(quint64 nodeHandle, QOpcUa::NodeAttribute attr)
 {
-    auto nodeEntry = m_handleToItemMapping.constFind(handle);
+    auto nodeEntry = m_nodeHandleToItemMapping.constFind(nodeHandle);
 
-    if (nodeEntry == m_handleToItemMapping.constEnd())
+    if (nodeEntry == m_nodeHandleToItemMapping.constEnd())
         return nullptr;
 
     auto item = nodeEntry->constFind(attr);
@@ -616,7 +616,7 @@ QOpcUaEventFilterResult QOpen62541Subscription::convertEventFilterResult(UA_Exte
     return result;
 }
 
-bool QOpen62541Subscription::modifySubscriptionParameters(quint64 handle, QOpcUa::NodeAttribute attr, const QOpcUaMonitoringParameters::Parameter &item, const QVariant &value)
+bool QOpen62541Subscription::modifySubscriptionParameters(quint64 nodeHandle, QOpcUa::NodeAttribute attr, const QOpcUaMonitoringParameters::Parameter &item, const QVariant &value)
 {
     QOpcUaMonitoringParameters p;
 
@@ -637,7 +637,7 @@ bool QOpen62541Subscription::modifySubscriptionParameters(quint64 handle, QOpcUa
         if (!ok) {
             qCWarning(QT_OPCUA_PLUGINS_OPEN62541) << "Could not modify PublishingInterval, value is not a double";
             p.setStatusCode(QOpcUa::UaStatusCode::BadTypeMismatch);
-            emit m_backend->monitoringStatusChanged(handle, attr, item, p);
+            emit m_backend->monitoringStatusChanged(nodeHandle, attr, item, p);
             return true;
         }
         break;
@@ -648,7 +648,7 @@ bool QOpen62541Subscription::modifySubscriptionParameters(quint64 handle, QOpcUa
         if (!ok) {
             qCWarning(QT_OPCUA_PLUGINS_OPEN62541) << "Could not modify LifetimeCount, value is not an integer";
             p.setStatusCode(QOpcUa::UaStatusCode::BadTypeMismatch);
-            emit m_backend->monitoringStatusChanged(handle, attr, item, p);
+            emit m_backend->monitoringStatusChanged(nodeHandle, attr, item, p);
             return true;
         }
         break;
@@ -659,7 +659,7 @@ bool QOpen62541Subscription::modifySubscriptionParameters(quint64 handle, QOpcUa
         if (!ok) {
             qCWarning(QT_OPCUA_PLUGINS_OPEN62541) << "Could not modify MaxKeepAliveCount, value is not an integer";
             p.setStatusCode(QOpcUa::UaStatusCode::BadTypeMismatch);
-            emit m_backend->monitoringStatusChanged(handle, attr, item, p);
+            emit m_backend->monitoringStatusChanged(nodeHandle, attr, item, p);
             return true;
         }
         break;
@@ -670,7 +670,7 @@ bool QOpen62541Subscription::modifySubscriptionParameters(quint64 handle, QOpcUa
         if (!ok) {
             qCWarning(QT_OPCUA_PLUGINS_OPEN62541) << "Could not modify Priority, value is not an integer";
             p.setStatusCode(QOpcUa::UaStatusCode::BadTypeMismatch);
-            emit m_backend->monitoringStatusChanged(handle, attr, item, p);
+            emit m_backend->monitoringStatusChanged(nodeHandle, attr, item, p);
             return true;
         }
         break;
@@ -681,7 +681,7 @@ bool QOpen62541Subscription::modifySubscriptionParameters(quint64 handle, QOpcUa
         if (!ok) {
             qCWarning(QT_OPCUA_PLUGINS_OPEN62541) << "Could not modify MaxNotificationsPerPublish, value is not an integer";
             p.setStatusCode(QOpcUa::UaStatusCode::BadTypeMismatch);
-            emit m_backend->monitoringStatusChanged(handle, attr, item, p);
+            emit m_backend->monitoringStatusChanged(nodeHandle, attr, item, p);
             return true;
         }
         break;
@@ -696,7 +696,7 @@ bool QOpen62541Subscription::modifySubscriptionParameters(quint64 handle, QOpcUa
 
         if (res.responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
             p.setStatusCode(static_cast<QOpcUa::UaStatusCode>(res.responseHeader.serviceResult));
-            emit m_backend->monitoringStatusChanged(handle, attr, item, p);
+            emit m_backend->monitoringStatusChanged(nodeHandle, attr, item, p);
         } else {
             QOpcUaMonitoringParameters::Parameters changed = item;
             if (!qFuzzyCompare(p.publishingInterval(), m_interval))
@@ -729,9 +729,9 @@ bool QOpen62541Subscription::modifySubscriptionParameters(quint64 handle, QOpcUa
     return false;
 }
 
-bool QOpen62541Subscription::modifyMonitoredItemParameters(quint64 handle, QOpcUa::NodeAttribute attr, const QOpcUaMonitoringParameters::Parameter &item, const QVariant &value)
+bool QOpen62541Subscription::modifyMonitoredItemParameters(quint64 nodeHandle, QOpcUa::NodeAttribute attr, const QOpcUaMonitoringParameters::Parameter &item, const QVariant &value)
 {
-    MonitoredItem *monItem = getItemForAttribute(handle, attr);
+    MonitoredItem *monItem = getItemForAttribute(nodeHandle, attr);
     QOpcUaMonitoringParameters p = monItem->parameters;
 
     UA_ModifyMonitoredItemsRequest req;
@@ -755,7 +755,7 @@ bool QOpen62541Subscription::modifyMonitoredItemParameters(quint64 handle, QOpcU
         if (value.type() != QVariant::Bool) {
             qCWarning(QT_OPCUA_PLUGINS_OPEN62541) << "Could not modify DiscardOldest, value is not a bool";
             p.setStatusCode(QOpcUa::UaStatusCode::BadTypeMismatch);
-            emit m_backend->monitoringStatusChanged(handle, attr, item, p);
+            emit m_backend->monitoringStatusChanged(nodeHandle, attr, item, p);
             return true;
         }
         req.itemsToModify->requestedParameters.discardOldest = value.toBool();
@@ -765,7 +765,7 @@ bool QOpen62541Subscription::modifyMonitoredItemParameters(quint64 handle, QOpcU
         if (value.type() != QVariant::UInt) {
             qCWarning(QT_OPCUA_PLUGINS_OPEN62541) << "Could not modify QueueSize, value is not an integer";
             p.setStatusCode(QOpcUa::UaStatusCode::BadTypeMismatch);
-            emit m_backend->monitoringStatusChanged(handle, attr, item, p);
+            emit m_backend->monitoringStatusChanged(nodeHandle, attr, item, p);
             return true;
         }
         req.itemsToModify->requestedParameters.queueSize = value.toUInt();
@@ -775,7 +775,7 @@ bool QOpen62541Subscription::modifyMonitoredItemParameters(quint64 handle, QOpcU
         if (value.type() != QVariant::Double) {
             qCWarning(QT_OPCUA_PLUGINS_OPEN62541) << "Could not modify SamplingInterval, value is not a double";
             p.setStatusCode(QOpcUa::UaStatusCode::BadTypeMismatch);
-            emit m_backend->monitoringStatusChanged(handle, attr, item, p);
+            emit m_backend->monitoringStatusChanged(nodeHandle, attr, item, p);
             return true;
         }
         req.itemsToModify->requestedParameters.samplingInterval = value.toDouble();
@@ -788,7 +788,7 @@ bool QOpen62541Subscription::modifyMonitoredItemParameters(quint64 handle, QOpcU
         else {
             qCDebug(QT_OPCUA_PLUGINS_OPEN62541) << "Unable to modify filter, filter creation failed";
             p.setStatusCode(QOpcUa::UaStatusCode::BadInternalError);
-            emit m_backend->monitoringStatusChanged(handle, attr, item, p);
+            emit m_backend->monitoringStatusChanged(nodeHandle, attr, item, p);
             return true;
         }
         break;
@@ -806,7 +806,7 @@ bool QOpen62541Subscription::modifyMonitoredItemParameters(quint64 handle, QOpcU
             else {
                 qCWarning(QT_OPCUA_PLUGINS_OPEN62541) << "Could not modify monitored item, filter creation failed";
                 p.setStatusCode(QOpcUa::UaStatusCode::BadInternalError);
-                emit m_backend->monitoringStatusChanged(handle, attr, item, p);
+                emit m_backend->monitoringStatusChanged(nodeHandle, attr, item, p);
                 return true;
             }
         }
@@ -817,7 +817,7 @@ bool QOpen62541Subscription::modifyMonitoredItemParameters(quint64 handle, QOpcU
 
         if (res.responseHeader.serviceResult != UA_STATUSCODE_GOOD || res.results[0].statusCode != UA_STATUSCODE_GOOD) {
             p.setStatusCode(static_cast<QOpcUa::UaStatusCode>(res.responseHeader.serviceResult == UA_STATUSCODE_GOOD ? res.results[0].statusCode : res.responseHeader.serviceResult));
-            emit m_backend->monitoringStatusChanged(handle, attr, item, p);
+            emit m_backend->monitoringStatusChanged(nodeHandle, attr, item, p);
             return true;
         } else {
             p.setStatusCode(QOpcUa::UaStatusCode::Good);
@@ -846,7 +846,7 @@ bool QOpen62541Subscription::modifyMonitoredItemParameters(quint64 handle, QOpcU
                     p.setFilterResult(convertEventFilterResult(&res.results[0].filterResult));
             }
 
-            emit m_backend->monitoringStatusChanged(handle, attr, changed, p);
+            emit m_backend->monitoringStatusChanged(nodeHandle, attr, changed, p);
 
             monItem->parameters = p;
         }
diff --git a/src/plugins/opcua/open62541/qopen62541subscription.h b/src/plugins/opcua/open62541/qopen62541subscription.h
index 52c7116..5214599 100644
--- a/src/plugins/opcua/open62541/qopen62541subscription.h
+++ b/src/plugins/opcua/open62541/qopen62541subscription.h
@@ -92,7 +92,7 @@ signals:
     void timeout(QOpen62541Subscription *sub, QVector<QPair<quint64, QOpcUa::NodeAttribute>> items);
 
 private:
-    MonitoredItem *getItemForAttribute(quint64 handle, QOpcUa::NodeAttribute attr);
+    MonitoredItem *getItemForAttribute(quint64 nodeHandle, QOpcUa::NodeAttribute attr);
     UA_ExtensionObject createFilter(const QVariant &filterData);
     void createDataChangeFilter(const QOpcUaMonitoringParameters::DataChangeFilter &filter, UA_ExtensionObject *out);
     void createEventFilter(const QOpcUaMonitoringParameters::EventFilter &filter, UA_ExtensionObject *out);
@@ -100,8 +100,8 @@ private:
                              UA_SimpleAttributeOperand **selectClauses, size_t *size);
     bool convertWhereClause(const QOpcUaMonitoringParameters::EventFilter &filter, UA_ContentFilter *result);
 
-    bool modifySubscriptionParameters(quint64 handle, QOpcUa::NodeAttribute attr, const QOpcUaMonitoringParameters::Parameter &item, const QVariant &value);
-    bool modifyMonitoredItemParameters(quint64 handle, QOpcUa::NodeAttribute attr, const QOpcUaMonitoringParameters::Parameter &item, const QVariant &value);
+    bool modifySubscriptionParameters(quint64 nodeHandle, QOpcUa::NodeAttribute attr, const QOpcUaMonitoringParameters::Parameter &item, const QVariant &value);
+    bool modifyMonitoredItemParameters(quint64 nodeHandle, QOpcUa::NodeAttribute attr, const QOpcUaMonitoringParameters::Parameter &item, const QVariant &value);
     QOpcUaEventFilterResult convertEventFilterResult(UA_ExtensionObject *obj);
 
     Open62541AsyncBackend *m_backend;
@@ -113,7 +113,7 @@ private:
     quint8 m_priority;
     quint32 m_maxNotificationsPerPublish;
 
-    QHash<quint64, QHash<QOpcUa::NodeAttribute, MonitoredItem *>> m_handleToItemMapping; // Handle -> Attribute -> MonitoredItem
+    QHash<quint64, QHash<QOpcUa::NodeAttribute, MonitoredItem *>> m_nodeHandleToItemMapping; // Handle -> Attribute -> MonitoredItem
     QHash<UA_UInt32, MonitoredItem *> m_itemIdToItemMapping; // ItemId -> Item for fast lookup on data change
 
     quint32 m_clientHandle;
diff --git a/src/plugins/opcua/uacpp/quacppsubscription.cpp b/src/plugins/opcua/uacpp/quacppsubscription.cpp
index 76fcd48..3c520c3 100644
--- a/src/plugins/opcua/uacpp/quacppsubscription.cpp
+++ b/src/plugins/opcua/uacpp/quacppsubscription.cpp
@@ -256,11 +256,11 @@ void QUACppSubscription::modifyMonitoring(quint64 handle, QOpcUa::NodeAttribute
     emit m_backend->monitoringStatusChanged(handle, attr, item, p);
 }
 
-bool QUACppSubscription::removeAttributeMonitoredItem(quint64 handle, QOpcUa::NodeAttribute attr)
+bool QUACppSubscription::removeAttributeMonitoredItem(quint64 nodeHandle, QOpcUa::NodeAttribute attr)
 {
     qCDebug(QT_OPCUA_PLUGINS_UACPP) << "Removing monitored Item for" << attr;
 
-    const QPair<quint64, QOpcUa::NodeAttribute> pair(handle, attr);
+    const QPair<quint64, QOpcUa::NodeAttribute> pair(nodeHandle, attr);
     if (!m_monitoredItems.contains(pair)) {
         qCWarning(QT_OPCUA_PLUGINS_UACPP) << "Trying to remove unknown monitored item for" << attr;
         return false;
@@ -286,7 +286,7 @@ bool QUACppSubscription::removeAttributeMonitoredItem(quint64 handle, QOpcUa::No
     s.setMaxKeepAliveCount(m_nativeSubscription->maxKeepAliveCount());
     s.setLifetimeCount(m_nativeSubscription->lifetimeCount());
     s.setStatusCode(static_cast<QOpcUa::UaStatusCode>(result.statusCode()));
-    emit m_backend->monitoringEnableDisable(handle, attr, false, s);
+    emit m_backend->monitoringEnableDisable(nodeHandle, attr, false, s);
 
     return true;
 }
@@ -555,7 +555,7 @@ QOpcUaEventFilterResult QUACppSubscription::convertEventFilterResult(const OpcUa
     return result;
 }
 
-bool QUACppSubscription::modifySubscriptionParameters(quint64 handle, QOpcUa::NodeAttribute attr, const QOpcUaMonitoringParameters::Parameter &item, const QVariant &value)
+bool QUACppSubscription::modifySubscriptionParameters(quint64 nodeHandle, QOpcUa::NodeAttribute attr, const QOpcUaMonitoringParameters::Parameter &item, const QVariant &value)
 {
     QOpcUaMonitoringParameters p;
     SubscriptionSettings settings;
@@ -574,7 +574,7 @@ bool QUACppSubscription::modifySubscriptionParameters(quint64 handle, QOpcUa::No
         if (!ok) {
             qCWarning(QT_OPCUA_PLUGINS_UACPP, "Could not modify PublishingInterval, value is not a double");
             p.setStatusCode(QOpcUa::UaStatusCode::BadTypeMismatch);
-            emit m_backend->monitoringStatusChanged(handle, attr, item, p);
+            emit m_backend->monitoringStatusChanged(nodeHandle, attr, item, p);
             return true;
         }
         break;
@@ -586,7 +586,7 @@ bool QUACppSubscription::modifySubscriptionParameters(quint64 handle, QOpcUa::No
         if (!ok) {
             qCWarning(QT_OPCUA_PLUGINS_UACPP, "Could not modify LifetimeCount, value is not an integer");
             p.setStatusCode(QOpcUa::UaStatusCode::BadTypeMismatch);
-            emit m_backend->monitoringStatusChanged(handle, attr, item, p);
+            emit m_backend->monitoringStatusChanged(nodeHandle, attr, item, p);
             return true;
         }
         break;
@@ -598,7 +598,7 @@ bool QUACppSubscription::modifySubscriptionParameters(quint64 handle, QOpcUa::No
         if (!ok) {
             qCWarning(QT_OPCUA_PLUGINS_UACPP, "Could not modify MaxKeepAliveCount, value is not an integer");
             p.setStatusCode(QOpcUa::UaStatusCode::BadTypeMismatch);
-            emit m_backend->monitoringStatusChanged(handle, attr, item, p);
+            emit m_backend->monitoringStatusChanged(nodeHandle, attr, item, p);
             return true;
         }
         break;
@@ -617,7 +617,7 @@ bool QUACppSubscription::modifySubscriptionParameters(quint64 handle, QOpcUa::No
 
         if (result.isBad()) {
             p.setStatusCode(static_cast<QOpcUa::UaStatusCode>(result.statusCode()));
-            emit m_backend->monitoringStatusChanged(handle, attr, item, p);
+            emit m_backend->monitoringStatusChanged(nodeHandle, attr, item, p);
         } else {
             p.setStatusCode(QOpcUa::UaStatusCode::Good);
             p.setPublishingInterval(settings.publishingInterval);
@@ -644,10 +644,10 @@ bool QUACppSubscription::modifySubscriptionParameters(quint64 handle, QOpcUa::No
     return false;
 }
 
-bool QUACppSubscription::modifyMonitoredItemParameters(quint64 handle, QOpcUa::NodeAttribute attr, const QOpcUaMonitoringParameters::Parameter &item, const QVariant &value)
+bool QUACppSubscription::modifyMonitoredItemParameters(quint64 nodeHandle, QOpcUa::NodeAttribute attr, const QOpcUaMonitoringParameters::Parameter &item, const QVariant &value)
 {
     // Get hold of OpcUa_MonitoredItemCreateResult
-    const QPair<quint64, QOpcUa::NodeAttribute> key(handle, attr);
+    const QPair<quint64, QOpcUa::NodeAttribute> key(nodeHandle, attr);
     if (!m_monitoredItems.contains(key)) {
         qCWarning(QT_OPCUA_PLUGINS_UACPP) << "Did not find monitored item";
         return false;
@@ -669,7 +669,7 @@ bool QUACppSubscription::modifyMonitoredItemParameters(quint64 handle, QOpcUa::N
         if (value.type() != QVariant::Bool) {
             qCWarning(QT_OPCUA_PLUGINS_UACPP) << "Could not modify DiscardOldest, value is not a bool";
             p.setStatusCode(QOpcUa::UaStatusCode::BadTypeMismatch);
-            emit m_backend->monitoringStatusChanged(handle, attr, item, p);
+            emit m_backend->monitoringStatusChanged(nodeHandle, attr, item, p);
             return true;
         }
         modifyRequest.RequestedParameters.DiscardOldest = value.toBool();
@@ -679,7 +679,7 @@ bool QUACppSubscription::modifyMonitoredItemParameters(quint64 handle, QOpcUa::N
         if (value.type() != QVariant::UInt) {
             qCWarning(QT_OPCUA_PLUGINS_UACPP) << "Could not modify QueueSize, value is not an integer";
             p.setStatusCode(QOpcUa::UaStatusCode::BadTypeMismatch);
-            emit m_backend->monitoringStatusChanged(handle, attr, item, p);
+            emit m_backend->monitoringStatusChanged(nodeHandle, attr, item, p);
             return true;
         }
         modifyRequest.RequestedParameters.QueueSize = value.toUInt();
@@ -689,7 +689,7 @@ bool QUACppSubscription::modifyMonitoredItemParameters(quint64 handle, QOpcUa::N
         if (value.type() != QVariant::Double) {
             qCWarning(QT_OPCUA_PLUGINS_UACPP) << "Could not modify SamplingInterval, value is not a double";
             p.setStatusCode(QOpcUa::UaStatusCode::BadTypeMismatch);
-            emit m_backend->monitoringStatusChanged(handle, attr, item, p);
+            emit m_backend->monitoringStatusChanged(nodeHandle, attr, item, p);
             return true;
         }
         modifyRequest.RequestedParameters.SamplingInterval = value.toDouble();
@@ -700,7 +700,7 @@ bool QUACppSubscription::modifyMonitoredItemParameters(quint64 handle, QOpcUa::N
         if (!modifyRequest.RequestedParameters.Filter.Body.EncodeableObject.Object) {
             qCWarning(QT_OPCUA_PLUGINS_UACPP) << "Could not modify the filter, filter creation failed";
             p.setStatusCode(QOpcUa::UaStatusCode::BadInternalError);
-            emit m_backend->monitoringStatusChanged(handle, attr, item, p);
+            emit m_backend->monitoringStatusChanged(nodeHandle, attr, item, p);
             return true;
         }
         break;
@@ -716,7 +716,7 @@ bool QUACppSubscription::modifyMonitoredItemParameters(quint64 handle, QOpcUa::N
             if (!modifyRequest.RequestedParameters.Filter.Body.EncodeableObject.Object) {
                 qCWarning(QT_OPCUA_PLUGINS_UACPP) << "Unable to modify the monitored item, filter creation failed";
                 p.setStatusCode(QOpcUa::UaStatusCode::BadInternalError);
-                emit m_backend->monitoringStatusChanged(handle, attr, item, p);
+                emit m_backend->monitoringStatusChanged(nodeHandle, attr, item, p);
                 return true;
             }
         }
@@ -732,7 +732,7 @@ bool QUACppSubscription::modifyMonitoredItemParameters(quint64 handle, QOpcUa::N
             p.setStatusCode(static_cast<QOpcUa::UaStatusCode>(result.isGood() ?
                                                                   results[0].StatusCode :
                                                                   result.statusCode()));
-            emit m_backend->monitoringStatusChanged(handle, attr, item, p);
+            emit m_backend->monitoringStatusChanged(nodeHandle, attr, item, p);
         } else {
             p.setStatusCode(QOpcUa::UaStatusCode::Good);
             QOpcUaMonitoringParameters::Parameters changed = item;
@@ -759,7 +759,7 @@ bool QUACppSubscription::modifyMonitoredItemParameters(quint64 handle, QOpcUa::N
                     p.setFilterResult(convertEventFilterResult(results[0].FilterResult));
             }
 
-            emit m_backend->monitoringStatusChanged(handle, attr, changed, p);
+            emit m_backend->monitoringStatusChanged(nodeHandle, attr, changed, p);
 
             m_monitoredItems[key].second = p;
         }
diff --git a/src/plugins/opcua/uacpp/quacppsubscription.h b/src/plugins/opcua/uacpp/quacppsubscription.h
index 0955a24..4010c24 100644
--- a/src/plugins/opcua/uacpp/quacppsubscription.h
+++ b/src/plugins/opcua/uacpp/quacppsubscription.h
@@ -47,9 +47,9 @@ public:
     bool removeOnServer();
 
 
-    bool addAttributeMonitoredItem(quint64 handle, QOpcUa::NodeAttribute attr, const UaNodeId &id, QOpcUaMonitoringParameters parameters);
-    void modifyMonitoring(quint64 handle, QOpcUa::NodeAttribute attr, QOpcUaMonitoringParameters::Parameter item, QVariant value);
-    bool removeAttributeMonitoredItem(quint64 handle, QOpcUa::NodeAttribute attr);
+    bool addAttributeMonitoredItem(quint64 nodeHandle, QOpcUa::NodeAttribute attr, const UaNodeId &id, QOpcUaMonitoringParameters parameters);
+    void modifyMonitoring(quint64 nodeHandle, QOpcUa::NodeAttribute attr, QOpcUaMonitoringParameters::Parameter item, QVariant value);
+    bool removeAttributeMonitoredItem(quint64 nodeHandle, QOpcUa::NodeAttribute attr);
 
     double interval() const;
     quint32 subscriptionId() const;
@@ -67,8 +67,8 @@ private:
     void createEventFilter(const QOpcUaMonitoringParameters::EventFilter &filter, OpcUa_ExtensionObject *out);
     QOpcUaEventFilterResult convertEventFilterResult(const OpcUa_ExtensionObject &obj);
 
-    bool modifySubscriptionParameters(quint64 handle, QOpcUa::NodeAttribute attr, const QOpcUaMonitoringParameters::Parameter &item, const QVariant &value);
-    bool modifyMonitoredItemParameters(quint64 handle, QOpcUa::NodeAttribute attr, const QOpcUaMonitoringParameters::Parameter &item, const QVariant &value);
+    bool modifySubscriptionParameters(quint64 nodeHandle, QOpcUa::NodeAttribute attr, const QOpcUaMonitoringParameters::Parameter &item, const QVariant &value);
+    bool modifyMonitoredItemParameters(quint64 nodeHandle, QOpcUa::NodeAttribute attr, const QOpcUaMonitoringParameters::Parameter &item, const QVariant &value);
 
     UACppAsyncBackend *m_backend;
     QOpcUaMonitoringParameters m_subscriptionParameters;