diff options
| author | Stefan Brüns <stefan.bruens@rwth-aachen.de> | 2024-12-16 20:45:17 +0100 |
|---|---|---|
| committer | Albert Astals Cid <aacid@kde.org> | 2024-12-18 22:34:12 +0000 |
| commit | 8b078fbf696d8838cf89ccabc67f2fdbca86af5c (patch) | |
| tree | feeb36d7fd794a744941c3ca4c1a5ec82ead0e8c | |
| parent | afcfac2fd0838448b3fa0bf90c1c22c142fa90e1 (diff) | |
qt: Fix QDateTime TimeSpec deprecations
| -rw-r--r-- | qt5/src/poppler-document.cc | 9 | ||||
| -rw-r--r-- | qt5/src/poppler-form.cc | 5 | ||||
| -rw-r--r-- | qt6/src/poppler-document.cc | 9 | ||||
| -rw-r--r-- | qt6/src/poppler-form.cc | 5 |
4 files changed, 16 insertions, 12 deletions
diff --git a/qt5/src/poppler-document.cc b/qt5/src/poppler-document.cc index ee936f76..cfdaafdb 100644 --- a/qt5/src/poppler-document.cc +++ b/qt5/src/poppler-document.cc @@ -54,6 +54,7 @@ #include <QtCore/QDebug> #include <QtCore/QFile> #include <QtCore/QByteArray> +#include <QTimeZone> #include "poppler-form.h" #include "poppler-private.h" @@ -920,22 +921,22 @@ QDateTime convertDate(const char *dateString) QDate d(year, mon, day); QTime t(hour, min, sec); if (d.isValid() && t.isValid()) { - QDateTime dt(d, t, Qt::UTC); + int tzSecs = 0; if (tz) { // then we have some form of timezone if ('Z' == tz) { // We are already at UTC } else if ('+' == tz) { // local time is ahead of UTC - dt = dt.addSecs(-1 * ((tzHours * 60) + tzMins) * 60); + tzSecs = (tzHours * 3600) + (tzMins * 60); } else if ('-' == tz) { // local time is behind UTC - dt = dt.addSecs(((tzHours * 60) + tzMins) * 60); + tzSecs = (tzHours * -3600) + (tzMins * -60); } else { qWarning("unexpected tz val"); } } - return dt; + return QDateTime(d, t, QTimeZone(tzSecs)); } } return QDateTime(); diff --git a/qt5/src/poppler-form.cc b/qt5/src/poppler-form.cc index 64716715..2fa3256c 100644 --- a/qt5/src/poppler-form.cc +++ b/qt5/src/poppler-form.cc @@ -39,6 +39,7 @@ #include <config.h> #include <QtCore/QSizeF> +#include <QTimeZone> #include <QUrl> #include <Form.h> @@ -1030,8 +1031,8 @@ static CertificateInfoPrivate *createCertificateInfoPrivate(const X509Certificat certPriv->nick_name = ci->getNickName().c_str(); X509CertificateInfo::Validity certValidity = ci->getValidity(); - certPriv->validity_start = QDateTime::fromSecsSinceEpoch(certValidity.notBefore, Qt::UTC); - certPriv->validity_end = QDateTime::fromSecsSinceEpoch(certValidity.notAfter, Qt::UTC); + certPriv->validity_start = QDateTime::fromSecsSinceEpoch(certValidity.notBefore, QTimeZone::utc()); + certPriv->validity_end = QDateTime::fromSecsSinceEpoch(certValidity.notAfter, QTimeZone::utc()); const X509CertificateInfo::PublicKeyInfo &pkInfo = ci->getPublicKeyInfo(); certPriv->public_key = QByteArray(pkInfo.publicKey.c_str(), pkInfo.publicKey.getLength()); diff --git a/qt6/src/poppler-document.cc b/qt6/src/poppler-document.cc index fca047bf..6e5be0dc 100644 --- a/qt6/src/poppler-document.cc +++ b/qt6/src/poppler-document.cc @@ -54,6 +54,7 @@ #include <QtCore/QDebug> #include <QtCore/QFile> #include <QtCore/QByteArray> +#include <QTimeZone> #include "poppler-form.h" #include "poppler-private.h" @@ -892,22 +893,22 @@ QDateTime convertDate(const char *dateString) QDate d(year, mon, day); QTime t(hour, min, sec); if (d.isValid() && t.isValid()) { - QDateTime dt(d, t, Qt::UTC); + int tzSecs = 0; if (tz) { // then we have some form of timezone if ('Z' == tz) { // We are already at UTC } else if ('+' == tz) { // local time is ahead of UTC - dt = dt.addSecs(-1 * ((tzHours * 60) + tzMins) * 60); + tzSecs = (tzHours * 3600) + (tzMins * 60); } else if ('-' == tz) { // local time is behind UTC - dt = dt.addSecs(((tzHours * 60) + tzMins) * 60); + tzSecs = (tzHours * -3600) + (tzMins * -60); } else { qWarning("unexpected tz val"); } } - return dt; + return QDateTime(d, t, QTimeZone(tzSecs)); } } return QDateTime(); diff --git a/qt6/src/poppler-form.cc b/qt6/src/poppler-form.cc index b0524907..a2d16951 100644 --- a/qt6/src/poppler-form.cc +++ b/qt6/src/poppler-form.cc @@ -39,6 +39,7 @@ #include <config.h> #include <QtCore/QSizeF> +#include <QTimeZone> #include <QUrl> #include <Form.h> @@ -1037,8 +1038,8 @@ static CertificateInfoPrivate *createCertificateInfoPrivate(const X509Certificat certPriv->nick_name = ci->getNickName().c_str(); X509CertificateInfo::Validity certValidity = ci->getValidity(); - certPriv->validity_start = QDateTime::fromSecsSinceEpoch(certValidity.notBefore, Qt::UTC); - certPriv->validity_end = QDateTime::fromSecsSinceEpoch(certValidity.notAfter, Qt::UTC); + certPriv->validity_start = QDateTime::fromSecsSinceEpoch(certValidity.notBefore, QTimeZone::utc()); + certPriv->validity_end = QDateTime::fromSecsSinceEpoch(certValidity.notAfter, QTimeZone::utc()); const X509CertificateInfo::PublicKeyInfo &pkInfo = ci->getPublicKeyInfo(); certPriv->public_key = QByteArray(pkInfo.publicKey.c_str(), pkInfo.publicKey.getLength()); |