summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Krause <[email protected]>2017-09-12 09:46:10 +0000
committerVolker Krause <[email protected]>2017-09-12 09:46:10 +0000
commiteeeb0d9dfc703fd5fe5969c1374061c93400408d (patch)
tree15b8365983de1f9dfc3aba4cfd34b967c611eed9
parent7160b4132ca6c9a49a8f6037efc8eed905359038 (diff)
Port shiftTimes() to QTimeZone
-rw-r--r--src/kaevent.cpp2
-rw-r--r--src/karecurrence.cpp2
-rw-r--r--src/karecurrence.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/kaevent.cpp b/src/kaevent.cpp
index 4cd47c6..33379e2 100644
--- a/src/kaevent.cpp
+++ b/src/kaevent.cpp
@@ -5220,7 +5220,7 @@ bool KAEvent::convertKCalEvents(const Calendar::Ptr &calendar, int calendarVersi
* It's a KAlarm pre-1.9.2 calendar file.
* Convert from clock time to the local system time zone.
*/
- event->shiftTimes(KDateTime::ClockTime, localZone);
+ event->shiftTimes(QTimeZone::systemTimeZone(), QTimeZone::systemTimeZone());
converted = true;
}
diff --git a/src/karecurrence.cpp b/src/karecurrence.cpp
index 2329cbb..79f9af0 100644
--- a/src/karecurrence.cpp
+++ b/src/karecurrence.cpp
@@ -1216,7 +1216,7 @@ void KARecurrence::addExDate(const QDate &exdate)
d->mRecurrence.addExDate(exdate);
}
-void KARecurrence::shiftTimes(const KDateTime::Spec &oldSpec, const KDateTime::Spec &newSpec)
+void KARecurrence::shiftTimes(const QTimeZone &oldSpec, const QTimeZone &newSpec)
{
d->mRecurrence.shiftTimes(oldSpec, newSpec);
}
diff --git a/src/karecurrence.h b/src/karecurrence.h
index 4644820..b0b6e74 100644
--- a/src/karecurrence.h
+++ b/src/karecurrence.h
@@ -421,7 +421,7 @@ public:
* @param oldSpec the time specification which provides the clock times
* @param newSpec the new time specification
*/
- void shiftTimes(const KDateTime::Spec &oldSpec, const KDateTime::Spec &newSpec);
+ void shiftTimes(const QTimeZone &oldSpec, const QTimeZone &newSpec);
KCalCore::RecurrenceRule *defaultRRuleConst() const;
/** Return the recurrence's period type. */