Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kcalendarcore for openSUSE:Factory checked in at 2021-07-15 23:59:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcalendarcore (Old) and /work/SRC/openSUSE:Factory/.kcalendarcore.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcalendarcore" Thu Jul 15 23:59:20 2021 rev:21 rq:905476 version:5.84.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kcalendarcore/kcalendarcore.changes 2021-06-16 20:35:05.659146125 +0200 +++ /work/SRC/openSUSE:Factory/.kcalendarcore.new.2625/kcalendarcore.changes 2021-07-16 00:00:59.645269022 +0200 @@ -1,0 +2,15 @@ +Sun Jul 4 07:45:11 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.84.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.84.0 +- Changes since 5.83.0: + * Assign and compare more Incidence::Private members (kde#437670) + * When sorting to-dos, treat undefined dtDues as later than defined dtDues + * Generate pkgconfig file + * Remove unused includes + * Return start datetimes for non-recurring incidences (kde#396570) +- Only install the license files once + +------------------------------------------------------------------- Old: ---- kcalendarcore-5.83.0.tar.xz kcalendarcore-5.83.0.tar.xz.sig New: ---- kcalendarcore-5.84.0.tar.xz kcalendarcore-5.84.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcalendarcore.spec ++++++ --- /var/tmp/diff_new_pack.ewpqu2/_old 2021-07-16 00:01:00.145265402 +0200 +++ /var/tmp/diff_new_pack.ewpqu2/_new 2021-07-16 00:01:00.149265373 +0200 @@ -16,14 +16,14 @@ # -%define _tar_path 5.83 +%define _tar_path 5.84 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kcalendarcore -Version: 5.83.0 +Version: 5.84.0 Release: 0 Summary: Library to access and handle calendar data License: LGPL-2.0-or-later @@ -92,12 +92,12 @@ %{_kf5_libdir}/libKF5CalendarCore.so.* %files devel -%license LICENSES/* %{_kf5_cmakedir}/KF5CalendarCore/ %{_kf5_includedir}/KCalendarCore/ %{_kf5_includedir}/kcalcore_version.h %{_kf5_includedir}/kcalendarcore_version.h %{_kf5_libdir}/libKF5CalendarCore.so +%{_kf5_libdir}/pkgconfig/KF5CalendarCore.pc %{_kf5_mkspecsdir}/qt_KCalendarCore.pri %changelog ++++++ kcalendarcore-5.83.0.tar.xz -> kcalendarcore-5.84.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.83.0/CMakeLists.txt new/kcalendarcore-5.84.0/CMakeLists.txt --- old/kcalendarcore-5.83.0/CMakeLists.txt 2021-06-05 10:50:49.000000000 +0200 +++ new/kcalendarcore-5.84.0/CMakeLists.txt 2021-06-26 17:11:22.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.83.0") # handled by release scripts +set(KF_VERSION "5.84.0") # handled by release scripts project(KCalendarCore VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.83.0 NO_MODULE) +find_package(ECM 5.84.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -21,6 +21,7 @@ include(ECMGenerateExportHeader) include(ECMGenerateHeaders) include(ECMGeneratePriFile) +include(ECMGeneratePkgConfigFile) include(ECMSetupVersion) include(ECMQtDeclareLoggingCategory) @@ -116,6 +117,13 @@ ) endif() +if (NOT WIN32) + ecm_generate_pkgconfig_file(BASE_NAME KF5CalendarCore + INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR}/KCalendarCore/ + DEPS Qt5Core + INSTALL) +endif() + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.83.0/autotests/CMakeLists.txt new/kcalendarcore-5.84.0/autotests/CMakeLists.txt --- old/kcalendarcore-5.83.0/autotests/CMakeLists.txt 2021-06-05 10:50:49.000000000 +0200 +++ new/kcalendarcore-5.84.0/autotests/CMakeLists.txt 2021-06-26 17:11:22.000000000 +0200 @@ -36,6 +36,7 @@ testfreebusyperiod testperson testrecurtodo + teststartdatetimesfordate testtodo testtimesininterval testcreateddatecompat diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.83.0/autotests/testdateserialization.cpp new/kcalendarcore-5.84.0/autotests/testdateserialization.cpp --- old/kcalendarcore-5.83.0/autotests/testdateserialization.cpp 2021-06-05 10:50:49.000000000 +0200 +++ new/kcalendarcore-5.84.0/autotests/testdateserialization.cpp 2021-06-26 17:11:22.000000000 +0200 @@ -8,7 +8,6 @@ #include "icalformat.h" #include "memorycalendar.h" -#include <QDebug> #include <QTest> QTEST_MAIN(TestDateSerialization) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.83.0/autotests/testicalformat.cpp new/kcalendarcore-5.84.0/autotests/testicalformat.cpp --- old/kcalendarcore-5.83.0/autotests/testicalformat.cpp 2021-06-05 10:50:49.000000000 +0200 +++ new/kcalendarcore-5.84.0/autotests/testicalformat.cpp 2021-06-26 17:11:22.000000000 +0200 @@ -12,7 +12,6 @@ #include "icalformat.h" #include "memorycalendar.h" -#include <QDebug> #include <QTest> #include <QTimeZone> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.83.0/autotests/testjournal.cpp new/kcalendarcore-5.84.0/autotests/testjournal.cpp --- old/kcalendarcore-5.83.0/autotests/testjournal.cpp 2021-06-05 10:50:49.000000000 +0200 +++ new/kcalendarcore-5.84.0/autotests/testjournal.cpp 2021-06-26 17:11:22.000000000 +0200 @@ -87,10 +87,14 @@ journal1.setDtStart(QDateTime(dt, {})); journal1.setAllDay(true); journal1.setSummary(QStringLiteral("Journal1 Summary")); - journal1.setDescription(QStringLiteral("This is a description of the first journal")); + journal1.setDescription(QStringLiteral("This is a description of the first journal"), true); journal1.setLocation(QStringLiteral("the place")); - Journal journal2 = journal1; + Journal journal2; + IncidenceBase *ib1 = & journal1; + IncidenceBase *ib2 = & journal2; + *ib2 = *ib1; + QVERIFY(journal2.descriptionIsRich()); QVERIFY(journal1 == journal2); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.83.0/autotests/teststartdatetimesfordate.cpp new/kcalendarcore-5.84.0/autotests/teststartdatetimesfordate.cpp --- old/kcalendarcore-5.83.0/autotests/teststartdatetimesfordate.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kcalendarcore-5.84.0/autotests/teststartdatetimesfordate.cpp 2021-06-26 17:11:22.000000000 +0200 @@ -0,0 +1,68 @@ +/* + SPDX-FileCopyrightText: 2021 Glen Ditchfield <[email protected]> + SPDX-License-Identifier: LGPL-2.0-or-later +*/ + +#include "event.h" + +#include <QTest> + +using namespace KCalendarCore; + +class TestStartDateTimesForDate: public QObject +{ + Q_OBJECT + + const QDate testDate { 2021, 01, 31}; + const QTimeZone tz = QTimeZone::systemTimeZone(); +private Q_SLOTS: + void testNonRecurringEvents_data(); + void testNonRecurringEvents(); +}; + +Event::Ptr mkEvent(bool allDay, QDateTime dtStart, QDateTime dtEnd) +{ + Event::Ptr event = Event::Ptr(new Event()); + event->setDtStart(dtStart); + event->setDtEnd(dtEnd); + event->setAllDay(allDay); + return event; +} + +void TestStartDateTimesForDate::testNonRecurringEvents_data() +{ + QTest::addColumn<bool>("allDay"); + QTest::addColumn<QDateTime>("dtStart"); + QTest::addColumn<QDateTime>("dtEnd"); + QTest::addColumn<bool>("expected"); + + QTest::newRow("all day, before") << true << QDateTime{testDate.addDays(-2), {}, tz} << QDateTime(testDate.addDays(-1), {}, tz) << false; + QTest::newRow("all day, up to") << true << QDateTime{testDate.addDays(-1), {}, tz} << QDateTime(testDate, {}, tz) << true; + QTest::newRow("all day, around") << true << QDateTime{testDate.addDays(-2), {}, tz} << QDateTime(testDate.addDays(+1), {}, tz) << true; + QTest::newRow("all day, on") << true << QDateTime{testDate, {}, tz} << QDateTime(testDate, {}, tz) << true; + QTest::newRow("all day, from") << true << QDateTime{testDate, {}, tz} << QDateTime(testDate.addDays(+1), {}, tz) << true; + QTest::newRow("all day, after") << true << QDateTime{testDate.addDays(+1), {}, tz} << QDateTime(testDate.addDays(+2), {}, tz) << false; + + QTest::newRow("before") << false << QDateTime{testDate.addDays(-2), {}, tz} << QDateTime(testDate, {}, tz).addMSecs(-1) << false; + QTest::newRow("up to") << false << QDateTime{testDate.addDays(-1), {}, tz} << QDateTime(testDate, {00,00,01}, tz) << true; + QTest::newRow("around") << false << QDateTime{testDate.addDays(-2), {}, tz} << QDateTime(testDate.addDays(+1), {}, tz) << true; + QTest::newRow("on") << false << QDateTime{testDate, {}, tz} << QDateTime(testDate.addDays(+1), {}, tz).addMSecs(-1) << true; + QTest::newRow("during") << false << QDateTime{testDate, {01,00,00}, tz} << QDateTime(testDate, {21,00,00}, tz) << true; + QTest::newRow("from") << false << QDateTime{testDate, {}, tz} << QDateTime(testDate.addDays(+2), {}, tz) << true; + QTest::newRow("after") << false << QDateTime{testDate.addDays(+1), {}, tz} << QDateTime(testDate.addDays(+2), {}, tz) << false; +} + +void TestStartDateTimesForDate::testNonRecurringEvents() +{ + QFETCH(bool, allDay); + QFETCH(QDateTime, dtStart); + QFETCH(QDateTime, dtEnd); + QFETCH(bool, expected); + + auto event = mkEvent(allDay, dtStart, dtEnd); + auto result = event->startDateTimesForDate(testDate, tz); + QVERIFY(expected == (result == QList<QDateTime> {dtStart})); +} + +QTEST_MAIN(TestStartDateTimesForDate) +#include "teststartdatetimesfordate.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.83.0/autotests/testtodo.cpp new/kcalendarcore-5.84.0/autotests/testtodo.cpp --- old/kcalendarcore-5.83.0/autotests/testtodo.cpp 2021-06-05 10:50:49.000000000 +0200 +++ new/kcalendarcore-5.84.0/autotests/testtodo.cpp 2021-06-26 17:11:22.000000000 +0200 @@ -339,3 +339,48 @@ QVERIFY(Incidences::categoriesMoreThan(large, medium)); QVERIFY(!Incidences::categoriesMoreThan(small, small)); } + +void TodoTest::testDtDueComparison() +{ + auto now = QDateTime::currentDateTime(); + auto later = now.addSecs(1); + + QSharedPointer<Todo> small(new Todo); + small->setDtDue(now); + small->setAllDay(false); + small->setSummary(QStringLiteral("now")); + + QSharedPointer<Todo> medium(new Todo); + medium->setDtDue(later); + medium->setAllDay(false); + medium->setSummary(QStringLiteral("later 1")); + + QSharedPointer<Todo> large(new Todo); + large->setDtDue(later); + large->setAllDay(false); + large->setSummary(QStringLiteral("later 2")); + + QSharedPointer<Todo> never(new Todo); + never->setDtDue(QDateTime()); + never->setAllDay(false); + never->setSummary(QStringLiteral("never")); + + QVERIFY(Todos::dueDateLessThan(small, medium)); + QVERIFY(!Todos::dueDateLessThan(medium, small)); + QVERIFY(Todos::dueDateLessThan(medium, large)); + QVERIFY(!Todos::dueDateLessThan(large, medium)); + QVERIFY(Todos::dueDateLessThan(large, never)); + QVERIFY(!Todos::dueDateLessThan(never, large)); + QVERIFY(!Todos::dueDateLessThan(small, small)); + QVERIFY(!Todos::dueDateLessThan(never, never)); + + QVERIFY(!Todos::dueDateMoreThan(small, medium)); + QVERIFY(Todos::dueDateMoreThan(medium, small)); + QVERIFY(!Todos::dueDateMoreThan(medium, large)); + QVERIFY(Todos::dueDateMoreThan(large, medium)); + QVERIFY(!Todos::dueDateMoreThan(large, never)); + QVERIFY(Todos::dueDateMoreThan(never, large)); + QVERIFY(!Todos::dueDateMoreThan(small, small)); + QVERIFY(!Todos::dueDateLessThan(never, never)); +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.83.0/autotests/testtodo.h new/kcalendarcore-5.84.0/autotests/testtodo.h --- old/kcalendarcore-5.83.0/autotests/testtodo.h 2021-06-05 10:50:49.000000000 +0200 +++ new/kcalendarcore-5.84.0/autotests/testtodo.h 2021-06-26 17:11:22.000000000 +0200 @@ -31,6 +31,7 @@ void testIconNameRecurringNeverDue(); void testIconNameRecurringDue(); void testCategoriesComparison(); + void testDtDueComparison(); }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.83.0/src/CMakeLists.txt new/kcalendarcore-5.84.0/src/CMakeLists.txt --- old/kcalendarcore-5.83.0/src/CMakeLists.txt 2021-06-05 10:50:49.000000000 +0200 +++ new/kcalendarcore-5.84.0/src/CMakeLists.txt 2021-06-26 17:11:22.000000000 +0200 @@ -1,7 +1,13 @@ +add_library(KF5CalendarCore) +add_library(KF5::CalendarCore ALIAS KF5CalendarCore) -########### next target ############### +set_target_properties(KF5CalendarCore PROPERTIES + VERSION ${KCALENDARCORE_VERSION} + SOVERSION ${KCALENDARCORE_SOVERSION} + EXPORT_NAME CalendarCore +) -set(kcalcore_LIB_SRCS +target_sources(KF5CalendarCore PRIVATE alarm.cpp attachment.cpp attendee.cpp @@ -38,7 +44,7 @@ vcalformat.cpp visitor.cpp ) -ecm_qt_declare_logging_category(kcalcore_LIB_SRCS +ecm_qt_declare_logging_category(KF5CalendarCore HEADER kcalendarcore_debug.h IDENTIFIER KCALCORE_LOG CATEGORY_NAME kf.calendarcore @@ -47,9 +53,6 @@ EXPORT KCALENDARCORE ) -add_library(KF5CalendarCore ${kcalcore_LIB_SRCS}) -add_library(KF5::CalendarCore ALIAS KF5CalendarCore) - ecm_generate_export_header(KF5CalendarCore BASE_NAME kcalendarcore GROUP_BASE_NAME KF @@ -76,12 +79,6 @@ LibIcal ) -set_target_properties(KF5CalendarCore PROPERTIES - VERSION ${KCALENDARCORE_VERSION} - SOVERSION ${KCALENDARCORE_SOVERSION} - EXPORT_NAME CalendarCore -) - install(TARGETS KF5CalendarCore EXPORT KF5CalendarCoreTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) ########### Generate Headers ############### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.83.0/src/alarm.cpp new/kcalendarcore-5.84.0/src/alarm.cpp --- old/kcalendarcore-5.83.0/src/alarm.cpp 2021-06-05 10:50:49.000000000 +0200 +++ new/kcalendarcore-5.84.0/src/alarm.cpp 2021-06-26 17:11:22.000000000 +0200 @@ -18,7 +18,6 @@ @author Cornelius Schumacher \<[email protected]\> */ #include "alarm.h" -#include "duration.h" #include "incidence.h" #include "utils_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.83.0/src/calendar.cpp new/kcalendarcore-5.84.0/src/calendar.cpp --- old/kcalendarcore-5.83.0/src/calendar.cpp 2021-06-05 10:50:49.000000000 +0200 +++ new/kcalendarcore-5.84.0/src/calendar.cpp 2021-06-26 17:11:22.000000000 +0200 @@ -30,7 +30,6 @@ #include "kcalendarcore_debug.h" -#include <QTimeZone> extern "C" { #include <icaltimezone.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.83.0/src/conference.cpp new/kcalendarcore-5.84.0/src/conference.cpp --- old/kcalendarcore-5.83.0/src/conference.cpp 2021-06-05 10:50:49.000000000 +0200 +++ new/kcalendarcore-5.84.0/src/conference.cpp 2021-06-26 17:11:22.000000000 +0200 @@ -9,7 +9,6 @@ #include "conference.h" #include <QDataStream> -#include <QDebug> using namespace KCalendarCore; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.83.0/src/icalformat.cpp new/kcalendarcore-5.84.0/src/icalformat.cpp --- old/kcalendarcore-5.83.0/src/icalformat.cpp 2021-06-05 10:50:49.000000000 +0200 +++ new/kcalendarcore-5.84.0/src/icalformat.cpp 2021-06-26 17:11:22.000000000 +0200 @@ -17,7 +17,6 @@ */ #include "icalformat.h" #include "calendar_p.h" -#include "freebusy.h" #include "icalformat_p.h" #include "icaltimezones_p.h" #include "kcalendarcore_debug.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.83.0/src/icalformat_p.cpp new/kcalendarcore-5.84.0/src/icalformat_p.cpp --- old/kcalendarcore-5.83.0/src/icalformat_p.cpp 2021-06-05 10:50:49.000000000 +0200 +++ new/kcalendarcore-5.84.0/src/icalformat_p.cpp 2021-06-26 17:11:22.000000000 +0200 @@ -23,14 +23,10 @@ #include "icalformat_p.h" #include "compat_p.h" -#include "event.h" -#include "freebusy.h" #include "icalformat.h" #include "icaltimezones_p.h" #include "incidencebase.h" -#include "journal.h" #include "memorycalendar.h" -#include "todo.h" #include "visitor.h" #include "kcalendarcore_debug.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.83.0/src/incidence.cpp new/kcalendarcore-5.84.0/src/incidence.cpp --- old/kcalendarcore-5.83.0/src/incidence.cpp 2021-06-05 10:50:49.000000000 +0200 +++ new/kcalendarcore-5.84.0/src/incidence.cpp 2021-06-26 17:11:22.000000000 +0200 @@ -97,7 +97,9 @@ mRevision = src.d->mRevision; mCreated = src.d->mCreated; mDescription = src.d->mDescription; + mDescriptionIsRich = src.d->mDescriptionIsRich; mSummary = src.d->mSummary; + mSummaryIsRich = src.d->mSummaryIsRich; mCategories = src.d->mCategories; mRelatedToUid = src.d->mRelatedToUid; mResources = src.d->mResources; @@ -106,6 +108,7 @@ mSecrecy = src.d->mSecrecy; mPriority = src.d->mPriority; mLocation = src.d->mLocation; + mLocationIsRich = src.d->mLocationIsRich; mGeoLatitude = src.d->mGeoLatitude; mGeoLongitude = src.d->mGeoLongitude; mHasGeo = src.d->mHasGeo; @@ -113,6 +116,7 @@ mConferences = src.d->mConferences; mThisAndFuture = src.d->mThisAndFuture; mLocalOnly = src.d->mLocalOnly; + mColor = src.d->mColor; // Alarms and Attachments are stored in ListBase<...>, which is a QValueList<...*>. // We need to really duplicate the objects stored therein, otherwise deleting @@ -277,7 +281,9 @@ recurrenceEqual && created() == i2->created() && stringCompare(description(), i2->description()) + && descriptionIsRich() == i2->descriptionIsRich() && stringCompare(summary(), i2->summary()) + && summaryIsRich() == i2->summaryIsRich() && categories() == i2->categories() && stringCompare(relatedTo(), i2->relatedTo()) && resources() == i2->resources() @@ -286,6 +292,7 @@ && secrecy() == i2->secrecy() && priority() == i2->priority() && stringCompare(location(), i2->location()) + && locationIsRich() == i2->locationIsRich() && stringCompare(color(), i2->color()) && stringCompare(schedulingID(), i2->schedulingID()) && recurrenceId() == i2->recurrenceId() @@ -629,7 +636,7 @@ // if the incidence doesn't recur, QDateTime kdate(date, {}, timeZone); if (!recurs()) { - if (!(start > kdate || end < kdate)) { + if (start.date() <= date && end.date() >= date) { result << start; } return result; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.83.0/src/incidencebase.cpp new/kcalendarcore-5.84.0/src/incidencebase.cpp --- old/kcalendarcore-5.83.0/src/incidencebase.cpp 2021-06-05 10:50:49.000000000 +0200 +++ new/kcalendarcore-5.84.0/src/incidencebase.cpp 2021-06-26 17:11:22.000000000 +0200 @@ -28,7 +28,6 @@ #include "kcalendarcore_debug.h" #include <QTime> -#include <QUrl> #include <QStringList> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.83.0/src/recurrencerule.cpp new/kcalendarcore-5.84.0/src/recurrencerule.cpp --- old/kcalendarcore-5.83.0/src/recurrencerule.cpp 2021-06-05 10:50:49.000000000 +0200 +++ new/kcalendarcore-5.84.0/src/recurrencerule.cpp 2021-06-26 17:11:22.000000000 +0200 @@ -14,7 +14,6 @@ #include <QDataStream> #include <QStringList> #include <QTime> -#include <QTimeZone> #include <QVector> using namespace KCalendarCore; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.83.0/src/schedulemessage.cpp new/kcalendarcore-5.84.0/src/schedulemessage.cpp --- old/kcalendarcore-5.83.0/src/schedulemessage.cpp 2021-06-05 10:50:49.000000000 +0200 +++ new/kcalendarcore-5.84.0/src/schedulemessage.cpp 2021-06-26 17:11:22.000000000 +0200 @@ -8,7 +8,6 @@ */ #include "schedulemessage.h" -#include "incidencebase.h" #include <QString> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.83.0/src/sorting.cpp new/kcalendarcore-5.84.0/src/sorting.cpp --- old/kcalendarcore-5.83.0/src/sorting.cpp 2021-06-05 10:50:49.000000000 +0200 +++ new/kcalendarcore-5.84.0/src/sorting.cpp 2021-06-26 17:11:22.000000000 +0200 @@ -7,9 +7,6 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ #include "sorting.h" -#include "event.h" -#include "journal.h" -#include "todo.h" // PENDING(kdab) Review // The QString::compare() need to be replace by a DUI string comparisons. @@ -271,6 +268,12 @@ bool KCalendarCore::Todos::dueDateLessThan(const Todo::Ptr &t1, const Todo::Ptr &t2) { + if (!t1->hasDueDate() ) { + return false; + } + if (!t2->hasDueDate()) { + return true; + } DateTimeComparison res = compare(t1->dtDue(), t1->allDay(), t2->dtDue(), t2->allDay()); if (res == Equal) { return Todos::summaryLessThan(t1, t2); @@ -281,6 +284,12 @@ bool KCalendarCore::Todos::dueDateMoreThan(const Todo::Ptr &t1, const Todo::Ptr &t2) { + if (!t2->hasDueDate()) { + return false; + } + if (!t1->hasDueDate()) { + return true; + } DateTimeComparison res = compare(t1->dtDue(), t1->allDay(), t2->dtDue(), t2->allDay()); if (res == Equal) { return Todos::summaryMoreThan(t1, t2); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.83.0/src/vcalformat.cpp new/kcalendarcore-5.84.0/src/vcalformat.cpp --- old/kcalendarcore-5.83.0/src/vcalformat.cpp 2021-06-05 10:50:49.000000000 +0200 +++ new/kcalendarcore-5.84.0/src/vcalformat.cpp 2021-06-26 17:11:22.000000000 +0200 @@ -23,9 +23,7 @@ */ #include "vcalformat.h" #include "calendar.h" -#include "event.h" #include "exceptions.h" -#include "todo.h" #include "kcalendarcore_debug.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.83.0/src/visitor.cpp new/kcalendarcore-5.84.0/src/visitor.cpp --- old/kcalendarcore-5.83.0/src/visitor.cpp 2021-06-05 10:50:49.000000000 +0200 +++ new/kcalendarcore-5.84.0/src/visitor.cpp 2021-06-26 17:11:22.000000000 +0200 @@ -11,10 +11,6 @@ */ #include "visitor.h" -#include "event.h" -#include "freebusy.h" -#include "journal.h" -#include "todo.h" using namespace KCalendarCore;
