From 3f9042848fbd3c89024a1bb487ad08c597920fa3 Mon Sep 17 00:00:00 2001 From: Roland Rossgotterer Date: Mon, 25 Feb 2019 11:15:11 +0100 Subject: [PATCH] Use QDateTime::setOffsetFromUtc instead of QDateTime::setUtcOffset --- src/blackmisc/stringutils.cpp | 4 ++-- tests/blackmisc/teststringutils/teststringutils.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/blackmisc/stringutils.cpp b/src/blackmisc/stringutils.cpp index 7e9489ef2..e735aa6e6 100644 --- a/src/blackmisc/stringutils.cpp +++ b/src/blackmisc/stringutils.cpp @@ -258,7 +258,7 @@ namespace BlackMisc if (dateTimeString.isEmpty() || format.isEmpty()) { return QDateTime(); } QDateTime dt = QDateTime::fromString(dateTimeString, format); 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; } @@ -267,7 +267,7 @@ namespace BlackMisc if (dateTimeString.isEmpty()) { return QDateTime(); } QDateTime dt = QDateTime::fromString(dateTimeString, format); 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; } diff --git a/tests/blackmisc/teststringutils/teststringutils.cpp b/tests/blackmisc/teststringutils/teststringutils.cpp index 0c801d45e..0b6ef6a93 100644 --- a/tests/blackmisc/teststringutils/teststringutils.cpp +++ b/tests/blackmisc/teststringutils/teststringutils.cpp @@ -95,7 +95,7 @@ namespace BlackMiscTest QDateTime dt3 = (c.length() == size) ? QDateTime::fromString(c, "yyyyMMddHHmmss") : QDateTime::fromString(c, "yyyyMMddHHmmsszzz"); - dt3.setUtcOffset(0); + dt3.setOffsetFromUtc(0); const qint64 ms1 = dt1.toMSecsSinceEpoch(); const qint64 ms2 = dt2.toMSecsSinceEpoch();