blob: 9a9574fc982bc0d778f4360060e18efe5e21e552 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
From 12ab7af4618f10d39d4a977e00a0e68a3aac9bd2 Mon Sep 17 00:00:00 2001
From: Simon Frei <freisim93@gmail.com>
Date: Wed, 13 Sep 2017 15:43:49 +0200
Subject: calendar: Adjust to new KCalCore API (fixes CI)
---
utilities/assistants/calendar/print/calsettings.cpp | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/utilities/assistants/calendar/print/calsettings.cpp b/utilities/assistants/calendar/print/calsettings.cpp
index b0bed5a..46e995d 100644
--- a/utilities/assistants/calendar/print/calsettings.cpp
+++ b/utilities/assistants/calendar/print/calsettings.cpp
@@ -31,12 +31,17 @@
#include "digikam_debug.h"
#include "calsystem.h"
-// KCalCore includes
#ifdef HAVE_KCALENDAR
+ // KCalCore includes
+
# include <kcalcore/icalformat.h>
# include <kcalcore/filestorage.h>
# include <kcalcore/memorycalendar.h>
+
+ // Qt includes
+
+# include <QTimeZone>
#endif // HAVE_KCALENDAR
namespace Digikam
@@ -290,7 +295,7 @@ void CalSettings::loadSpecial(const QUrl& url, const QColor& color)
return;
}
- KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QString::fromLatin1("UTC")));
+ KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QTimeZone(0)));
KCalCore::FileStorage::Ptr fileStorage(new KCalCore::FileStorage(memCal, url.toLocalFile(), new KCalCore::ICalFormat));
qCDebug(DIGIKAM_GENERAL_LOG) << "Loading calendar from file " << url.toLocalFile();
--
cgit v0.11.2
|