Swap type and value arguments for QOpcUaVariant

Pick-to: 6.7
Change-Id: I28b720d97e21dbf441f699a1ee716e11ef05281b
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>

4 files changed, 11 insertions, 11 deletions

diff --git a/src/opcua/client/qopcuabinarydataencoding.h b/src/opcua/client/qopcuabinarydataencoding.h
index d785e6c..f1aac30 100644
--- a/src/opcua/client/qopcuabinarydataencoding.h
+++ b/src/opcua/client/qopcuabinarydataencoding.h
@@ -883,7 +883,7 @@ inline QOpcUaVariant QOpcUaBinaryDataEncoding::decode<QOpcUaVariant>(bool &succe
     if (hasArrayDimensions)
         arrayDimensions = decodeArray<qint32>(success);
 
-    temp.setValue(value, resultType, isArray, arrayDimensions);
+    temp.setValue(resultType, value, isArray, arrayDimensions);
 
     return temp;
 }
diff --git a/src/opcua/client/qopcuavariant.cpp b/src/opcua/client/qopcuavariant.cpp
index 135cbae..c532ef4 100644
--- a/src/opcua/client/qopcuavariant.cpp
+++ b/src/opcua/client/qopcuavariant.cpp
@@ -111,12 +111,12 @@ QOpcUaVariant::QOpcUaVariant()
 }
 
 /*!
-    Constructs a new OPC UA variant and sets \a value, \a type, \a isArray and \a arrayDimensions
+    Constructs a new OPC UA variant and sets \a type, \a value, \a isArray and \a arrayDimensions
 */
-QOpcUaVariant::QOpcUaVariant(const QVariant &value, ValueType type, bool isArray, const QList<qint32> &arrayDimensions)
+QOpcUaVariant::QOpcUaVariant(ValueType type, const QVariant &value, bool isArray, const QList<qint32> &arrayDimensions)
     : data(new QOpcUaVariantData)
 {
-    setValue(value, type, isArray, arrayDimensions);
+    setValue(type, value, isArray, arrayDimensions);
 }
 
 /*!
@@ -167,13 +167,13 @@ QVariant QOpcUaVariant::value() const
 
     Array values must be passed as a \l QList of \a type.
 */
-void QOpcUaVariant::setValue(const QVariant &value, ValueType type, bool isArray, const QList<qint32> &arrayDimensions)
+void QOpcUaVariant::setValue(ValueType type, const QVariant &value, bool isArray, const QList<qint32> &arrayDimensions)
 {
-    if (value != data->value || type != data->valueType || isArray != data->isArray ||
+    if (type != data->valueType || value != data->value || isArray != data->isArray ||
         arrayDimensions != data->arrayDimensions) {
         data.detach();
-        data->value = value;
         data->valueType = type;
+        data->value = value;
         data->isArray = isArray;
         data->arrayDimensions = arrayDimensions;
     }
diff --git a/src/opcua/client/qopcuavariant.h b/src/opcua/client/qopcuavariant.h
index d6746bc..0ea52a9 100644
--- a/src/opcua/client/qopcuavariant.h
+++ b/src/opcua/client/qopcuavariant.h
@@ -49,7 +49,7 @@ public:
     };
 
     Q_OPCUA_EXPORT QOpcUaVariant();
-    Q_OPCUA_EXPORT QOpcUaVariant(const QVariant &value, ValueType type, bool isArray = false,
+    Q_OPCUA_EXPORT QOpcUaVariant(ValueType type, const QVariant &value, bool isArray = false,
                                  const QList<qint32> &arrayDimensions = {});
     Q_OPCUA_EXPORT QOpcUaVariant(const QOpcUaVariant &other);
     Q_OPCUA_EXPORT ~QOpcUaVariant();
@@ -65,7 +65,7 @@ public:
     }
 
     Q_OPCUA_EXPORT QVariant value() const;
-    Q_OPCUA_EXPORT void setValue(const QVariant &value, ValueType type, bool isArray = false,
+    Q_OPCUA_EXPORT void setValue(ValueType type, const QVariant &value, bool isArray = false,
                                  const QList<qint32> &arrayDimensions = {});
 
     Q_OPCUA_EXPORT ValueType type() const;
diff --git a/tests/auto/qopcuaclient/tst_client.cpp b/tests/auto/qopcuaclient/tst_client.cpp
index aa612ac..16504c6 100644
--- a/tests/auto/qopcuaclient/tst_client.cpp
+++ b/tests/auto/qopcuaclient/tst_client.cpp
@@ -268,10 +268,10 @@ void populateDiagnosticInfoTestData()
 void populateVariantTestData()
 {
     QOpcUaVariant v1;
-    v1.setValue(QList<QString>{ "Test1", "Test2", "Test3", "Test4"}, QOpcUaVariant::ValueType::String, true, { 2, 2 });
+    v1.setValue(QOpcUaVariant::ValueType::String, QList<QString>{ "Test1", "Test2", "Test3", "Test4"}, true, { 2, 2 });
 
     QOpcUaVariant v2;
-    v2.setValue(23, QOpcUaVariant::ValueType::Int16);
+    v2.setValue(QOpcUaVariant::ValueType::Int16, 23);
 
     testVariants = { v1, v2 };
 }