Attachment #510774 for bug #641378

View | Details | Raw Unified | Return to bug 641378
Collapse All | Expand All




#   include <kcalcore/icalformat.h>
#   include <kcalcore/filestorage.h>
#   include <kcalcore/memorycalendar.h>
#   include <QDateTime>
#endif // HAVE_KCALENDAR

namespace Digikam

        return;
    }

    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();

        qLast  = calSys.date(params.year + 1, 1, 1);
        qLast  = qLast.addDays(-1);

        QDateTime dtFirst(qFirst);
        QDateTime dtLast(qLast);
        QDateTime dtCurrent;

        int counter                = 0;
        KCalCore::Event::List list = memCal->rawEvents(qFirst, qLast);

Return to bug 641378

Lines 37-42 Link Here

(-)digikam-5.7.0.old/digikam-5.7.0/core/utilities/assistants/calendar/print/calsettings.cpp (-4 / +5 lines)
37	# include <kcalcore/icalformat.h>	37	# include <kcalcore/icalformat.h>
38	# include <kcalcore/filestorage.h>	38	# include <kcalcore/filestorage.h>
39	# include <kcalcore/memorycalendar.h>	39	# include <kcalcore/memorycalendar.h>
		40	# include <QDateTime>
40	#endif // HAVE_KCALENDAR	41	#endif // HAVE_KCALENDAR
41		42
42	namespace Digikam	43	namespace Digikam
Lines 290-296 Link Here
290	return;	291	return;
291	}	292	}
292		293
293	KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QString::fromLatin1("UTC")));	294	KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QByteArray("UTC")));
294	KCalCore::FileStorage::Ptr fileStorage(new KCalCore::FileStorage(memCal, url.toLocalFile(), new KCalCore::ICalFormat));	295	KCalCore::FileStorage::Ptr fileStorage(new KCalCore::FileStorage(memCal, url.toLocalFile(), new KCalCore::ICalFormat));
295		296
296	qCDebug(DIGIKAM_GENERAL_LOG) << "Loading calendar from file " << url.toLocalFile();	297	qCDebug(DIGIKAM_GENERAL_LOG) << "Loading calendar from file " << url.toLocalFile();
Lines 308-316 Link Here
308	qLast = calSys.date(params.year + 1, 1, 1);	309	qLast = calSys.date(params.year + 1, 1, 1);
309	qLast = qLast.addDays(-1);	310	qLast = qLast.addDays(-1);
310		311
311	KDateTime dtFirst(qFirst);	312	QDateTime dtFirst(qFirst);
312	KDateTime dtLast(qLast);	313	QDateTime dtLast(qLast);
313	KDateTime dtCurrent;	314	QDateTime dtCurrent;
314		315
315	int counter = 0;	316	int counter = 0;
316	KCalCore::Event::List list = memCal->rawEvents(qFirst, qLast);	317	KCalCore::Event::List list = memCal->rawEvents(qFirst, qLast);