From f9c0948343efdaf04be7a97546964ea4987b74d0 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Fri, 30 Aug 2013 16:28:47 -0700
Subject: [PATCH] Use the new, non-deprecated QDateTime functions for UTC
offset
Change-Id: Ia7f8c08bba44fbb01d3babeed7a430dcb9660b99
Reviewed-by: John Layt <jlayt@kde.org>
---
src/xmlpatterns/data/qabstractdatetime.cpp | 6 +++---
src/xmlpatterns/functions/qdatetimefns_tpl_p.h | 2 +-
src/xmlpatterns/functions/qtimezonefns.cpp | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/xmlpatterns/data/qabstractdatetime.cpp b/src/xmlpatterns/data/qabstractdatetime.cpp
index 80d5bdaa..2b14fd95 100644
--- a/src/xmlpatterns/data/qabstractdatetime.cpp
+++ b/src/xmlpatterns/data/qabstractdatetime.cpp
@@ -284,7 +284,7 @@ void AbstractDateTime::setUtcOffset(QDateTime &result,
else
{
Q_ASSERT(zoResult == Offset);
- result.setUtcOffset(zoOffset);
+ result.setOffsetFromUtc(zoOffset);
}
}
@@ -350,7 +350,7 @@ QString AbstractDateTime::zoneOffsetToString() const
{
Q_ASSERT(m_dateTime.timeSpec() == Qt::OffsetFromUTC);
- const int zoneOffset = m_dateTime.utcOffset();
+ const int zoneOffset = m_dateTime.offsetFromUtc();
Q_ASSERT(zoneOffset != 0);
const int posZoneOffset = qAbs(zoneOffset);
@@ -384,7 +384,7 @@ void AbstractDateTime::copyTimeSpec(const QDateTime &from,
}
case Qt::OffsetFromUTC:
{
- to.setUtcOffset(from.utcOffset());
+ to.setOffsetFromUtc(from.offsetFromUtc());
Q_ASSERT(to.timeSpec() == Qt::OffsetFromUTC);
return;
}
diff --git a/src/xmlpatterns/functions/qdatetimefns_tpl_p.h b/src/xmlpatterns/functions/qdatetimefns_tpl_p.h
index eb717c59..239d87ac 100644
--- a/src/xmlpatterns/functions/qdatetimefns_tpl_p.h
+++ b/src/xmlpatterns/functions/qdatetimefns_tpl_p.h
@@ -128,7 +128,7 @@ Item TimezoneFromAbstractDateTimeFN::extract(const QDateTime &dt) const
if(dt.timeSpec() == Qt::UTC)
return toItem(CommonValues::DayTimeDurationZero);
else if(dt.timeSpec() == Qt::OffsetFromUTC)
- return toItem(DayTimeDuration::fromSeconds(dt.utcOffset()));
+ return toItem(DayTimeDuration::fromSeconds(dt.offsetFromUtc()));
else
return Item();
}
diff --git a/src/xmlpatterns/functions/qtimezonefns.cpp b/src/xmlpatterns/functions/qtimezonefns.cpp
index 1e7a4cf3..61452179 100644
--- a/src/xmlpatterns/functions/qtimezonefns.cpp
+++ b/src/xmlpatterns/functions/qtimezonefns.cpp
@@ -110,7 +110,7 @@ Item AdjustTimezone::evaluateSingleton(const DynamicContext::Ptr &context) const
* the empty sequence, then the result is $arg with $timezone as
* the timezone component." */
//dt.setTimeSpec(QDateTime::Spec(QDateTime::OffsetFromUTC, tzSecs));
- dt.setUtcOffset(tzSecs);
+ dt.setOffsetFromUtc(tzSecs);
Q_ASSERT(dt.isValid());
return createValue(dt);
}
@@ -122,7 +122,7 @@ Item AdjustTimezone::evaluateSingleton(const DynamicContext::Ptr &context) const
dt = dt.toUTC();
dt = dt.addSecs(tzSecs);
//dt.setTimeSpec(QDateTime::Spec(QDateTime::OffsetFromUTC, tzSecs));
- dt.setUtcOffset(tzSecs);
+ dt.setOffsetFromUtc(tzSecs);
Q_ASSERT(dt.isValid());
return createValue(dt);
}
--
GitLab