Skip to content

Commit

Permalink
fix deprecated QDateTime warning ctor with Qt 6.8 (#210)
Browse files Browse the repository at this point in the history 
Since Qt 6.8 constructor of QDateTime, which accepts TimeSpec enum,
is marked as deprecated. To compile at this version without warnings it is necessary to
explicitly pass QTimeZone instead.

To save work with lower version of Qt, version check macro was added.

issue: #207
  • Loading branch information
@pradlol
pradlol authored Oct 24, 2024
1 parent 9ed79a1 commit 8aeb3f7
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 13 deletions.
24 changes: 22 additions & 2 deletions quazip/quazip_qt_compat.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,16 +103,36 @@ inline QString quazip_symlink_target(const QFileInfo &fi) {
}
#endif

// deprecation
#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
#include <QtCore/QTimeZone>
inline QDateTime quazip_since_epoch() {
return QDateTime(QDate(1970, 1, 1), QTime(0, 0), QTimeZone::utc());
}

inline QDateTime quazip_since_epoch_ntfs() {
return QDateTime(QDate(1601, 1, 1), QTime(0, 0), QTimeZone::utc());
}
#else
inline QDateTime quazip_since_epoch() {
return QDateTime(QDate(1970, 1, 1), QTime(0, 0), Qt::UTC);
}

inline QDateTime quazip_since_epoch_ntfs() {
return QDateTime(QDate(1601, 1, 1), QTime(0, 0), Qt::UTC);
}
#endif

// this is not a deprecation but an improvement, for a change
#include <QtCore/QDateTime>
#if (QT_VERSION >= 0x040700)
inline quint64 quazip_ntfs_ticks(const QDateTime &time, int fineTicks) {
QDateTime base(QDate(1601, 1, 1), QTime(0, 0), Qt::UTC);
QDateTime base = quazip_since_epoch_ntfs();
return base.msecsTo(time) * 10000 + fineTicks;
}
#else
inline quint64 quazip_ntfs_ticks(const QDateTime &time, int fineTicks) {
QDateTime base(QDate(1601, 1, 1), QTime(0, 0), Qt::UTC);
QDateTime base = quazip_since_epoch_ntfs();
QDateTime utc = time.toUTC();
return (static_cast<qint64>(base.date().daysTo(utc.date()))
* Q_INT64_C(86400000)
Expand Down
6 changes: 4 additions & 2 deletions quazip/quazipfileinfo.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ see quazip/(un)zip.h files for details. Basically it's the zlib license.

#include "quazipfileinfo.h"

#include "quazip_qt_compat.h"

#include <QtCore/QDataStream>

static QFile::Permissions permissionsFromExternalAttr(quint32 externalAttr) {
Expand Down Expand Up @@ -123,7 +125,7 @@ static QDateTime getNTFSTime(const QByteArray &extra, int position,
timeReader >> time;
if (time == 0)
return dateTime;
QDateTime base(QDate(1601, 1, 1), QTime(0, 0), Qt::UTC);
QDateTime base = quazip_since_epoch_ntfs();
dateTime = base.addMSecs(time / 10000);
if (fineTicks != nullptr) {
*fineTicks = static_cast<int>(time % 10000);
Expand Down Expand Up @@ -167,7 +169,7 @@ QDateTime QuaZipFileInfo64::getExtTime(const QByteArray &extra, int flag)
qint32 time;
input >> time;
if (nextFlag == flag) {
QDateTime base(QDate(1970, 1, 1), QTime(0, 0), Qt::UTC);
QDateTime base = quazip_since_epoch();
dateTime = base.addSecs(time);
return dateTime;
}
Expand Down
16 changes: 8 additions & 8 deletions qztest/testquazipfileinfo.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void TestQuaZipFileInfo::getNTFSTime()
if (!createTestFiles(testFiles)) {
QFAIL("Can't create test file");
}
QDateTime base(QDate(1601, 1, 1), QTime(0, 0), Qt::UTC);
QDateTime base(QDate(1601, 1, 1), QTime(0, 0), QTimeZone::utc());
quint64 mTicks, aTicks, cTicks;
QFileInfo fileInfo("tmp/test.txt");
{
Expand Down Expand Up @@ -149,25 +149,25 @@ void TestQuaZipFileInfo::getExtTime_data()
<< (QList<qint32>() << 1 << 2 << 3)
<< static_cast<quint16>(5)
<< (QList<qint32>() << 1)
<< QDateTime(QDate(1970, 1, 1), QTime(0, 0, 1), Qt::UTC)
<< QDateTime(QDate(1970, 1, 1), QTime(0, 0, 2), Qt::UTC)
<< QDateTime(QDate(1970, 1, 1), QTime(0, 0, 3), Qt::UTC);
<< QDateTime(QDate(1970, 1, 1), QTime(0, 0, 1), QTimeZone::utc())
<< QDateTime(QDate(1970, 1, 1), QTime(0, 0, 2), QTimeZone::utc())
<< QDateTime(QDate(1970, 1, 1), QTime(0, 0, 3), QTimeZone::utc());
QTest::newRow("no ac time") << QString::fromUtf8("noAcTime")
<< static_cast<quint8>(5)
<< static_cast<quint16>(9)
<< (QList<qint32>() << 1 << 3)
<< static_cast<quint16>(5)
<< (QList<qint32>() << 1)
<< QDateTime(QDate(1970, 1, 1), QTime(0, 0, 1), Qt::UTC)
<< QDateTime(QDate(1970, 1, 1), QTime(0, 0, 1), QTimeZone::utc())
<< QDateTime()
<< QDateTime(QDate(1970, 1, 1), QTime(0, 0, 3), Qt::UTC);
<< QDateTime(QDate(1970, 1, 1), QTime(0, 0, 3), QTimeZone::utc());
QTest::newRow("negativeTime") << QString::fromUtf8("negativeTime")
<< static_cast<quint8>(1)
<< static_cast<quint16>(5)
<< (QList<qint32>() << -1)
<< static_cast<quint16>(5)
<< (QList<qint32>() << -1)
<< QDateTime(QDate(1969, 12, 31), QTime(23, 59, 59), Qt::UTC)
<< QDateTime(QDate(1969, 12, 31), QTime(23, 59, 59), QTimeZone::utc())
<< QDateTime()
<< QDateTime();
}
Expand Down Expand Up @@ -254,7 +254,7 @@ void TestQuaZipFileInfo::getExtTime_issue43()
QDateTime actualLocalAcTime = zipFile.getExtAcTime();
QDateTime actualLocalCrTime = zipFile.getExtCrTime();
zip.close();
QDateTime extModTime(QDate(2019, 7, 2), QTime(15, 43, 47), Qt::UTC);
QDateTime extModTime(QDate(2019, 7, 2), QTime(15, 43, 47), QTimeZone::utc());
QDateTime extAcTime = extModTime;
QDateTime extCrTime = extModTime;
QCOMPARE(actualGlobalModTime, extModTime);
Expand Down
2 changes: 1 addition & 1 deletion qztest/testquazipnewinfo.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ void TestQuaZipNewInfo::setFileNTFSTimes()
if (!createTestFiles(testFiles)) {
QFAIL("Can't create test file");
}
QDateTime base(QDate(1601, 1, 1), QTime(0, 0), Qt::UTC);
QDateTime base(QDate(1601, 1, 1), QTime(0, 0), QTimeZone::utc());
quint64 mTicks, aTicks, cTicks;
{
// create
Expand Down

0 comments on commit 8aeb3f7

Please sign in to comment.