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
PIM EventViews
Commits
1d17fab3
Commit
1d17fab3
authored
Sep 24, 2022
by
Laurent Montel
Browse files
We depend against kf5.98
parent
31754785
Pipeline
#236307
passed with stage
in 4 minutes and 11 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/month/monthview.cpp
View file @
1d17fab3
...
...
@@ -16,7 +16,6 @@
#include
<CalendarSupport/CollectionSelection>
#include
<CalendarSupport/KCalPrefs>
#include
<CalendarSupport/Utils>
#include
<kholidays_version.h>
#include
"calendarview_debug.h"
#include
<KCalendarCore/OccurrenceIterator>
...
...
@@ -441,11 +440,7 @@ KHolidays::Holiday::List MonthView::holidays(QDate startDate, QDate endDate)
for
(
auto
const
&
r
:
regions
)
{
KHolidays
::
HolidayRegion
region
(
r
);
if
(
region
.
isValid
())
{
#if KHOLIDAYS_VERSION < QT_VERSION_CHECK(5, 95, 0)
holidays
+=
region
.
holidays
(
startDate
,
endDate
);
#else
holidays
+=
region
.
rawHolidaysWithAstroSeasons
(
startDate
,
endDate
);
#endif
}
}
return
holidays
;
...
...
src/whatsnext/whatsnextview.cpp
View file @
1d17fab3
...
...
@@ -8,8 +8,6 @@
#include
"whatsnextview.h"
#include
<kcalendarcore_version.h>
#include
<Akonadi/CalendarUtils>
#include
<Akonadi/ETMCalendar>
#include
<CalendarSupport/KCalPrefs>
...
...
@@ -94,11 +92,7 @@ void WhatsNextView::updateView()
KCalendarCore
::
Event
::
List
events
;
events
=
calendar
()
->
events
(
mStartDate
,
mEndDate
,
QTimeZone
::
systemTimeZone
(),
false
);
#if KCALENDARCORE_VERSION < QT_VERSION_CHECK(5, 95, 0)
events
=
calendar
()
->
sortEvents
(
events
,
KCalendarCore
::
EventSortStartDate
,
KCalendarCore
::
SortDirectionAscending
);
#else
events
=
calendar
()
->
sortEvents
(
std
::
move
(
events
),
KCalendarCore
::
EventSortStartDate
,
KCalendarCore
::
SortDirectionAscending
);
#endif
if
(
!
events
.
isEmpty
())
{
mText
+=
QLatin1String
(
"<p></p>"
);
kil
->
loadIcon
(
QStringLiteral
(
"view-calendar-day"
),
KIconLoader
::
NoGroup
,
22
,
KIconLoader
::
DefaultState
,
QStringList
(),
&
ipath
);
...
...
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