flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-26 18:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use QDateTime::setOffsetFromUtc instead of QDateTime::setUtcOffset

Browse Source
This commit is contained in:
Roland Rossgotterer
2019-02-25 11:15:11 +01:00
committed by Mat Sutcliffe
parent 80cfb0e701
commit 3f9042848f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackmisc/stringutils.cpp
View File

@@ -258,7 +258,7 @@ namespace BlackMisc
if (dateTimeString.isEmpty() || format.isEmpty()) { return QDateTime(); } if (dateTimeString.isEmpty() || format.isEmpty()) { return QDateTime(); }
QDateTime dt = QDateTime::fromString(dateTimeString, format); QDateTime dt = QDateTime::fromString(dateTimeString, format);
if (!dt.isValid()) { return dt; } if (!dt.isValid()) { return dt; }
dt.setUtcOffset(0); // must only be applied to valid timestamps dt.setOffsetFromUtc(0); // must only be applied to valid timestamps
return dt; return dt;
} }
@@ -267,7 +267,7 @@ namespace BlackMisc
if (dateTimeString.isEmpty()) { return QDateTime(); } if (dateTimeString.isEmpty()) { return QDateTime(); }
QDateTime dt = QDateTime::fromString(dateTimeString, format); QDateTime dt = QDateTime::fromString(dateTimeString, format);
if (!dt.isValid()) { return dt; } if (!dt.isValid()) { return dt; }
dt.setUtcOffset(0); // must only be applied to valid timestamps dt.setOffsetFromUtc(0); // must only be applied to valid timestamps
return dt; return dt;
} }

2
tests/blackmisc/teststringutils/teststringutils.cpp
View File

@@ -95,7 +95,7 @@ namespace BlackMiscTest
QDateTime dt3 = (c.length() == size) ? QDateTime dt3 = (c.length() == size) ?
QDateTime::fromString(c, "yyyyMMddHHmmss") : QDateTime::fromString(c, "yyyyMMddHHmmss") :
QDateTime::fromString(c, "yyyyMMddHHmmsszzz"); QDateTime::fromString(c, "yyyyMMddHHmmsszzz");
dt3.setUtcOffset(0); dt3.setOffsetFromUtc(0);
const qint64 ms1 = dt1.toMSecsSinceEpoch(); const qint64 ms1 = dt1.toMSecsSinceEpoch();
const qint64 ms2 = dt2.toMSecsSinceEpoch(); const qint64 ms2 = dt2.toMSecsSinceEpoch();