summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJannis Voelker <jannis.voelker@basyskom.com>2022-02-08 10:55:41 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-02-10 11:24:45 +0000
commit5d2133031d6611d93e5cde9c4f4caba071d9fea3 (patch)
tree5488470d9c5e3dfa908a85dffc5c8f138d5f6c84
parente6d651839ac1543dc5fd0169d0dc1fa1aebf6a44 (diff)
Rename parameter of operator= to other
Change-Id: I3a2fbdf98c4b3dfa511dda4e8f0d3776aa05d53c Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit c9cef3fdb1c66ab8b11989d4cbbfa1ac03b8e0cf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/opcua/client/qopcuadatavalue.cpp8
-rw-r--r--src/opcua/client/qopcuadatavalue.h2
-rw-r--r--src/opcua/client/qopcuahistorydata.cpp8
-rw-r--r--src/opcua/client/qopcuahistorydata.h2
-rw-r--r--src/opcua/client/qopcuahistoryreadrawrequest.cpp8
-rw-r--r--src/opcua/client/qopcuahistoryreadrawrequest.h2
6 files changed, 15 insertions, 15 deletions
diff --git a/src/opcua/client/qopcuadatavalue.cpp b/src/opcua/client/qopcuadatavalue.cpp
index 49add15..cbaa65e 100644
--- a/src/opcua/client/qopcuadatavalue.cpp
+++ b/src/opcua/client/qopcuadatavalue.cpp
@@ -75,12 +75,12 @@ QOpcUaDataValue::QOpcUaDataValue(const QOpcUaDataValue &other)
}
/*!
- Sets the values from \a rhs in this data value.
+ Sets the values from \a other in this data value.
*/
-QOpcUaDataValue &QOpcUaDataValue::operator=(const QOpcUaDataValue &rhs)
+QOpcUaDataValue &QOpcUaDataValue::operator=(const QOpcUaDataValue &other)
{
- if (this != &rhs)
- data.operator=(rhs.data);
+ if (this != &other)
+ data.operator=(other.data);
return *this;
}
diff --git a/src/opcua/client/qopcuadatavalue.h b/src/opcua/client/qopcuadatavalue.h
index 2092fa2..f082256 100644
--- a/src/opcua/client/qopcuadatavalue.h
+++ b/src/opcua/client/qopcuadatavalue.h
@@ -52,7 +52,7 @@ class Q_OPCUA_EXPORT QOpcUaDataValue
public:
QOpcUaDataValue();
QOpcUaDataValue(const QOpcUaDataValue &other);
- QOpcUaDataValue &operator=(const QOpcUaDataValue &rhs);
+ QOpcUaDataValue &operator=(const QOpcUaDataValue &other);
~QOpcUaDataValue();
QDateTime serverTimestamp() const;
diff --git a/src/opcua/client/qopcuahistorydata.cpp b/src/opcua/client/qopcuahistorydata.cpp
index 498382b..9e0f11e 100644
--- a/src/opcua/client/qopcuahistorydata.cpp
+++ b/src/opcua/client/qopcuahistorydata.cpp
@@ -156,12 +156,12 @@ void QOpcUaHistoryData::setNodeId(const QString &nodeId)
}
/*!
- Sets the values from \a rhs in this history data item.
+ Sets the values from \a other in this history data item.
*/
-QOpcUaHistoryData &QOpcUaHistoryData::operator=(const QOpcUaHistoryData &rhs)
+QOpcUaHistoryData &QOpcUaHistoryData::operator=(const QOpcUaHistoryData &other)
{
- if (this != &rhs)
- data.operator=(rhs.data);
+ if (this != &other)
+ data.operator=(other.data);
return *this;
}
diff --git a/src/opcua/client/qopcuahistorydata.h b/src/opcua/client/qopcuahistorydata.h
index e381667..daf3285 100644
--- a/src/opcua/client/qopcuahistorydata.h
+++ b/src/opcua/client/qopcuahistorydata.h
@@ -64,7 +64,7 @@ public:
QString nodeId() const;
void setNodeId(const QString &nodeId);
- QOpcUaHistoryData &operator=(const QOpcUaHistoryData &rhs);
+ QOpcUaHistoryData &operator=(const QOpcUaHistoryData &other);
private:
QExplicitlySharedDataPointer<QOpcUaHistoryDataData> data;
};
diff --git a/src/opcua/client/qopcuahistoryreadrawrequest.cpp b/src/opcua/client/qopcuahistoryreadrawrequest.cpp
index ee8af14..f16e0a9 100644
--- a/src/opcua/client/qopcuahistoryreadrawrequest.cpp
+++ b/src/opcua/client/qopcuahistoryreadrawrequest.cpp
@@ -206,12 +206,12 @@ void QOpcUaHistoryReadRawRequest::addNodeToRead(QOpcUaReadItem nodeToRead)
}
/*!
- Sets the values from \a rhs in this QOpcUaHistoryReadRawRequest item.
+ Sets the values from \a other in this QOpcUaHistoryReadRawRequest item.
*/
-QOpcUaHistoryReadRawRequest &QOpcUaHistoryReadRawRequest::operator=(const QOpcUaHistoryReadRawRequest &rhs)
+QOpcUaHistoryReadRawRequest &QOpcUaHistoryReadRawRequest::operator=(const QOpcUaHistoryReadRawRequest &other)
{
- if (this != &rhs)
- data.operator=(rhs.data);
+ if (this != &other)
+ data.operator=(other.data);
return *this;
}
diff --git a/src/opcua/client/qopcuahistoryreadrawrequest.h b/src/opcua/client/qopcuahistoryreadrawrequest.h
index 4dba3c4..93ca0bd 100644
--- a/src/opcua/client/qopcuahistoryreadrawrequest.h
+++ b/src/opcua/client/qopcuahistoryreadrawrequest.h
@@ -82,7 +82,7 @@ public:
void addNodeToRead(QOpcUaReadItem nodeToRead);
- QOpcUaHistoryReadRawRequest &operator=(const QOpcUaHistoryReadRawRequest &rhs);
+ QOpcUaHistoryReadRawRequest &operator=(const QOpcUaHistoryReadRawRequest &other);
bool operator==(const QOpcUaHistoryReadRawRequest& other) const;
bool operator!=(const QOpcUaHistoryReadRawRequest& other) const;