Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
KAlarm
Commits
eeeb0d9d
Commit
eeeb0d9d
authored
Sep 12, 2017
by
Volker Krause
Browse files
Port shiftTimes() to QTimeZone
parent
7160b413
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/kaevent.cpp
View file @
eeeb0d9d
...
...
@@ -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
,
local
Zone
);
event
->
shiftTimes
(
QTimeZone
::
systemTimeZone
(),
QTimeZone
::
systemTime
Zone
()
);
converted
=
true
;
}
...
...
src/karecurrence.cpp
View file @
eeeb0d9d
...
...
@@ -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
);
}
...
...
src/karecurrence.h
View file @
eeeb0d9d
...
...
@@ -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. */
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment