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
Kalendar
Commits
0578af0c
Commit
0578af0c
authored
Dec 06, 2021
by
Volker Krause
Browse files
Use Alarm::parentUid instead of the ETM specific custom property hack
Made possible and neccessary by
akonadi-calendar!10
.
parent
075975c1
Pipeline
#108396
passed with stage
in 6 minutes and 3 seconds
Changes
1
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
kalendarac/kalendaralarmclient.cpp
View file @
0578af0c
...
...
@@ -5,6 +5,8 @@
#include
"alarmnotification.h"
#include
"notificationhandler.h"
#include
<akonadi-calendar_version.h>
#include
<KCheckableProxyModel>
#include
<KConfigGroup>
#include
<KLocalizedString>
...
...
@@ -172,7 +174,11 @@ void KalendarAlarmClient::checkAlarms()
const
Alarm
::
List
alarms
=
mCalendar
->
alarms
(
from
,
mLastChecked
,
true
/* exclude blocked alarms */
);
for
(
const
Alarm
::
Ptr
&
alarm
:
alarms
)
{
#if AKONADICALENDAR_VERSION < QT_VERSION_CHECK(5, 19, 41)
const
QString
uid
=
alarm
->
customProperty
(
"ETMCalendar"
,
"parentUid"
);
#else
const
QString
uid
=
alarm
->
parentUid
();
#endif
const
KCalendarCore
::
Incidence
::
Ptr
incidence
=
mCalendar
->
incidence
(
uid
);
QString
timeText
;
...
...
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