[patch] Patch to fix compile against kcalcore-17.12.0

kcalcore-17.12.0.patch (text/plain), 1.47 KB, created by Jaak Ristioja on 2017-12-18 18:17:02 UTC

diff -r -U3 digikam-5.7.0.old/digikam-5.7.0/core/utilities/assistants/calendar/print/calsettings.cpp digikam-5.7.0/core/utilities/assistants/calendar/print/calsettings.cpp
--- digikam-5.7.0.old/digikam-5.7.0/core/utilities/assistants/calendar/print/calsettings.cpp	2017-09-05 11:51:22.000000000 +0300
+++ digikam-5.7.0/core/utilities/assistants/calendar/print/calsettings.cpp	2017-12-18 19:58:49.131758155 +0200
@@ -37,6 +37,7 @@
 #   include <kcalcore/icalformat.h>
 #   include <kcalcore/filestorage.h>
 #   include <kcalcore/memorycalendar.h>
+#   include <QDateTime>
 #endif // HAVE_KCALENDAR
 
 namespace Digikam
@@ -290,7 +291,7 @@
         return;
     }
 
-    KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QString::fromLatin1("UTC")));
+    KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QByteArray("UTC")));
     KCalCore::FileStorage::Ptr fileStorage(new KCalCore::FileStorage(memCal, url.toLocalFile(), new KCalCore::ICalFormat));
 
     qCDebug(DIGIKAM_GENERAL_LOG) << "Loading calendar from file " << url.toLocalFile();
@@ -308,9 +309,9 @@
         qLast  = calSys.date(params.year + 1, 1, 1);
         qLast  = qLast.addDays(-1);
 
-        KDateTime dtFirst(qFirst);
-        KDateTime dtLast(qLast);
-        KDateTime dtCurrent;
+        QDateTime dtFirst(qFirst);
+        QDateTime dtLast(qLast);
+        QDateTime dtCurrent;
 
         int counter                = 0;
         KCalCore::Event::List list = memCal->rawEvents(qFirst, qLast);