Route Qt::TimeSpec usage via QTimeZone

QTimeZone now packages Qt::TimeSpec details, unifying QDateTime APIs.

Task-number: QTBUG-108199
Change-Id: I3f8d14a3fd9a6ba04bf072bb6af2249c2e007ec7
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>

4 files changed, 15 insertions, 10 deletions

diff --git a/src/opcua/client/qopcuabinarydataencoding.h b/src/opcua/client/qopcuabinarydataencoding.h
index bd40c18..787e98f 100644
--- a/src/opcua/client/qopcuabinarydataencoding.h
+++ b/src/opcua/client/qopcuabinarydataencoding.h
@@ -19,10 +19,11 @@
 #include <QtOpcUa/qopcuaxvalue.h>
 
 #include <QtCore/qdatetime.h>
-#include <QtCore/qmetatype.h>
-#include <QtCore/quuid.h>
 #include <QtCore/qendian.h>
 #include <QtCore/qlist.h>
+#include <QtCore/qmetatype.h>
+#include <QtCore/qtimezone.h>
+#include <QtCore/quuid.h>
 
 #include <limits>
 
@@ -476,7 +477,7 @@ inline QDateTime QOpcUaBinaryDataEncoding::decode<QDateTime>(bool &success)
         return QDateTime();
 
     // OPC-UA part 6, 5.2.2.5
-    const QDateTime epochStart(QDate(1601, 1, 1), QTime(0, 0), Qt::UTC);
+    const QDateTime epochStart(QDate(1601, 1, 1), QTime(0, 0), QTimeZone::UTC);
     return epochStart.addMSecs(timestamp / 10000);
 }
 
@@ -868,7 +869,7 @@ inline bool QOpcUaBinaryDataEncoding::encode<QDateTime>(const QDateTime &src)
         return true;
     }
 
-    const QDateTime uaEpochStart(QDate(1601, 1, 1), QTime(0, 0), Qt::UTC);
+    const QDateTime uaEpochStart(QDate(1601, 1, 1), QTime(0, 0), QTimeZone::UTC);
 
     if (src <= uaEpochStart) {
         if (!encode<qint64>(0))
diff --git a/src/opcua/x509/openssl_symbols.cpp b/src/opcua/x509/openssl_symbols.cpp
index b7c1482..f6373a3 100644
--- a/src/opcua/x509/openssl_symbols.cpp
+++ b/src/opcua/x509/openssl_symbols.cpp
@@ -29,6 +29,7 @@
 #endif
 #include <QtCore/qmutex.h>
 #include <QtCore/qdatetime.h>
+#include <QtCore/qtimezone.h>
 #if defined(Q_OS_UNIX)
 #include <QtCore/qdir.h>
 #endif
@@ -1270,7 +1271,7 @@ QDateTime q_getTimeFromASN1(const ASN1_TIME *aTime)
         QDate resDate(lTime.tm_year + 1900, lTime.tm_mon + 1, lTime.tm_mday);
         QTime resTime(lTime.tm_hour, lTime.tm_min, lTime.tm_sec);
 
-        QDateTime result(resDate, resTime, Qt::UTC);
+        QDateTime result(resDate, resTime, QTimeZone::UTC);
         result = result.addSecs(lSecondsFromUCT);
         return result;
 
@@ -1292,7 +1293,7 @@ QDateTime q_getTimeFromASN1(const ASN1_TIME *aTime)
         QDate resDate(lTime.tm_year, lTime.tm_mon, lTime.tm_mday);
         QTime resTime(lTime.tm_hour, lTime.tm_min, lTime.tm_sec);
 
-        QDateTime result(resDate, resTime, Qt::UTC);
+        QDateTime result(resDate, resTime, QTimeZone::UTC);
         return result;
 
     } else {
diff --git a/src/plugins/opcua/open62541/qopen62541valueconverter.cpp b/src/plugins/opcua/open62541/qopen62541valueconverter.cpp
index 61a504a..f964d77 100644
--- a/src/plugins/opcua/open62541/qopen62541valueconverter.cpp
+++ b/src/plugins/opcua/open62541/qopen62541valueconverter.cpp
@@ -10,7 +10,9 @@
 
 #include <QtCore/qdatetime.h>
 #include <QtCore/qloggingcategory.h>
+#include <QtCore/qtimezone.h>
 #include <QtCore/quuid.h>
+
 #include <cstring>
 
 QT_BEGIN_NAMESPACE
@@ -294,7 +296,7 @@ QDateTime scalarToQt<QDateTime, UA_DateTime>(const UA_DateTime *data)
     if (*data == (std::numeric_limits<qint64>::min)() || *data == (std::numeric_limits<qint64>::max)())
         return QDateTime();
 
-    const QDateTime epochStart(QDate(1601, 1, 1), QTime(0, 0), Qt::UTC);
+    const QDateTime epochStart(QDate(1601, 1, 1), QTime(0, 0), QTimeZone::UTC);
     return epochStart.addMSecs(*data / UA_DATETIME_MSEC).toLocalTime();
 }
 
@@ -557,7 +559,7 @@ void scalarFromQt<UA_DateTime, QDateTime>(const QDateTime &value, UA_DateTime *p
     }
 
     // OPC-UA part 3, Table C.9
-    const QDateTime uaEpochStart(QDate(1601, 1, 1), QTime(0, 0), Qt::UTC);
+    const QDateTime uaEpochStart(QDate(1601, 1, 1), QTime(0, 0), QTimeZone::UTC);
 
     *ptr = UA_DATETIME_MSEC * (value.toMSecsSinceEpoch() - uaEpochStart.toMSecsSinceEpoch());
 }
diff --git a/src/plugins/opcua/uacpp/quacppvalueconverter.cpp b/src/plugins/opcua/uacpp/quacppvalueconverter.cpp
index e126c6b..32fb402 100644
--- a/src/plugins/opcua/uacpp/quacppvalueconverter.cpp
+++ b/src/plugins/opcua/uacpp/quacppvalueconverter.cpp
@@ -9,6 +9,7 @@
 
 #include <QtCore/QDateTime>
 #include <QtCore/QLoggingCategory>
+#include <QtCore/QTimeZone>
 #include <QtCore/QUuid>
 
 #include <uastring.h>
@@ -955,7 +956,7 @@ QDateTime toQDateTime(const OpcUa_DateTime *dt)
         return QDateTime();
 
     // OPC-UA part 3, Table C.9
-    const QDateTime uaEpochStart(QDate(1601, 1, 1), QTime(0, 0), Qt::UTC);
+    const QDateTime uaEpochStart(QDate(1601, 1, 1), QTime(0, 0), QTimeZone::UTC);
     const UaDateTime temp(*dt);
 
     // OpcUa time is defined in part 6, 5.2.2.5 in 100ns which need to be converted to milliseconds.
@@ -965,7 +966,7 @@ QDateTime toQDateTime(const OpcUa_DateTime *dt)
 OpcUa_DateTime toUACppDateTime(const QDateTime &qtDateTime)
 {
     // OPC-UA part 3, Table C.9
-    const QDateTime uaEpochStart(QDate(1601, 1, 1), QTime(0, 0), Qt::UTC);
+    const QDateTime uaEpochStart(QDate(1601, 1, 1), QTime(0, 0), QTimeZone::UTC);
     // OpcUa time is defined in part 6, 5.2.2.5 in 100ns which need to be converted to milliseconds.
     UaDateTime tmp((qtDateTime.toMSecsSinceEpoch() - uaEpochStart.toMSecsSinceEpoch()) * 10000);
     OpcUa_DateTime returnValue;