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-09-16 23:13:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcalendarcore (Old) and /work/SRC/openSUSE:Factory/.kcalendarcore.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcalendarcore" Thu Sep 16 23:13:32 2021 rev:24 rq:918548 version:5.86.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kcalendarcore/kcalendarcore.changes 2021-08-31 19:55:22.789938457 +0200 +++ /work/SRC/openSUSE:Factory/.kcalendarcore.new.1899/kcalendarcore.changes 2021-09-16 23:14:55.323813874 +0200 @@ -1,0 +2,9 @@ +Mon Sep 6 06:21:54 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.86.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.86.0 +- No code change since 5.85.0 + +------------------------------------------------------------------- Old: ---- kcalendarcore-5.85.0.tar.xz kcalendarcore-5.85.0.tar.xz.sig New: ---- kcalendarcore-5.86.0.tar.xz kcalendarcore-5.86.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcalendarcore.spec ++++++ --- /var/tmp/diff_new_pack.hsZ78R/_old 2021-09-16 23:14:55.807814374 +0200 +++ /var/tmp/diff_new_pack.hsZ78R/_new 2021-09-16 23:14:55.807814374 +0200 @@ -16,14 +16,14 @@ # -%define _tar_path 5.85 +%define _tar_path 5.86 # 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.85.0 +Version: 5.86.0 Release: 0 Summary: Library to access and handle calendar data License: LGPL-2.0-or-later ++++++ kcalendarcore-5.85.0.tar.xz -> kcalendarcore-5.86.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.85.0/.git-blame-ignore-revs new/kcalendarcore-5.86.0/.git-blame-ignore-revs --- old/kcalendarcore-5.85.0/.git-blame-ignore-revs 1970-01-01 01:00:00.000000000 +0100 +++ new/kcalendarcore-5.86.0/.git-blame-ignore-revs 2021-09-04 17:41:34.000000000 +0200 @@ -0,0 +1,2 @@ +#clang-tidy +de0e1cce67123f7597654969156c38ac051c9ff4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.85.0/CMakeLists.txt new/kcalendarcore-5.86.0/CMakeLists.txt --- old/kcalendarcore-5.85.0/CMakeLists.txt 2021-08-05 14:42:11.000000000 +0200 +++ new/kcalendarcore-5.86.0/CMakeLists.txt 2021-09-04 17:41:34.000000000 +0200 @@ -1,17 +1,17 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.85.0") # handled by release scripts +set(KF_VERSION "5.86.0") # handled by release scripts project(KCalendarCore VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.85.0 NO_MODULE) +find_package(ECM 5.86.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) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) -set(REQUIRED_QT_VERSION 5.15.0) +set(REQUIRED_QT_VERSION 5.15.2) include(KDEInstallDirs) include(KDECMakeSettings) @@ -67,7 +67,7 @@ ) -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) ########### Targets ########### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.85.0/autotests/testalarm.cpp new/kcalendarcore-5.86.0/autotests/testalarm.cpp --- old/kcalendarcore-5.85.0/autotests/testalarm.cpp 2021-08-05 14:42:11.000000000 +0200 +++ new/kcalendarcore-5.86.0/autotests/testalarm.cpp 2021-09-04 17:41:34.000000000 +0200 @@ -24,8 +24,10 @@ void AlarmTest::testCompare() { - Event inc1, inc2; - Alarm alarm1(&inc1), alarm2(&inc2); + Event inc1; + Event inc2; + Alarm alarm1(&inc1); + Alarm alarm2(&inc2); alarm1.setType(Alarm::Email); alarm2.setType(Alarm::Email); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.85.0/autotests/testattendee.cpp new/kcalendarcore-5.86.0/autotests/testattendee.cpp --- old/kcalendarcore-5.85.0/autotests/testattendee.cpp 2021-08-05 14:42:11.000000000 +0200 +++ new/kcalendarcore-5.86.0/autotests/testattendee.cpp 2021-09-04 17:41:34.000000000 +0200 @@ -137,11 +137,15 @@ Person person; bool rsvp; - QString delegate, delegator, cuType, uid; + QString delegate; + QString delegator; + QString cuType; + QString uid; CustomProperties customProperties; Attendee::Role role; Attendee::PartStat status; - uint role_int, status_int; + uint role_int; + uint status_int; in_stream >> person; QVERIFY(person.name() == attendee1.name()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.85.0/autotests/testcalfilter.cpp new/kcalendarcore-5.86.0/autotests/testcalfilter.cpp --- old/kcalendarcore-5.85.0/autotests/testcalfilter.cpp 2021-08-05 14:42:11.000000000 +0200 +++ new/kcalendarcore-5.86.0/autotests/testcalfilter.cpp 2021-09-04 17:41:34.000000000 +0200 @@ -21,13 +21,15 @@ QVERIFY(f.name() == QLatin1String("testfilter")); CalFilter g(QStringLiteral("fredfilter")); QVERIFY(g.name() == QLatin1String("fredfilter")); - CalFilter f1, f2; + CalFilter f1; + CalFilter f2; QVERIFY(f1 == f2); } void CalFilterTest::testCats() { - CalFilter f1, f2; + CalFilter f1; + CalFilter f2; QStringList cats; cats << QStringLiteral("a") << QStringLiteral("b") << QStringLiteral("c"); f1.setCategoryList(cats); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.85.0/autotests/testcustomproperties.cpp new/kcalendarcore-5.86.0/autotests/testcustomproperties.cpp --- old/kcalendarcore-5.85.0/autotests/testcustomproperties.cpp 2021-08-05 14:42:11.000000000 +0200 +++ new/kcalendarcore-5.86.0/autotests/testcustomproperties.cpp 2021-09-04 17:41:34.000000000 +0200 @@ -47,7 +47,8 @@ void CustomPropertiesTest::testCompare() { - CustomProperties cp1, cp2; + CustomProperties cp1; + CustomProperties cp2; QByteArray app("KORG"); QByteArray key("TEXT"); @@ -111,7 +112,8 @@ cpmap.insert("X-key4", QStringLiteral("val4")); cpmap.insert("X-key5", QStringLiteral("val5")); - CustomProperties cp1, cp2; + CustomProperties cp1; + CustomProperties cp2; cp1.setCustomProperties(cpmap); cp1 = cp2; QVERIFY(cp1 == cp2); @@ -212,7 +214,8 @@ cpmap.insert("X-key4", QStringLiteral("val4")); cpmap.insert("X-key5", QStringLiteral("val5")); - CustomProperties cp, cp2; + CustomProperties cp; + CustomProperties cp2; cp.setCustomProperties(cpmap); QByteArray byteArray; QDataStream out_stream(&byteArray, QIODevice::WriteOnly); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.85.0/autotests/testperson.cpp new/kcalendarcore-5.86.0/autotests/testperson.cpp --- old/kcalendarcore-5.85.0/autotests/testperson.cpp 2021-08-05 14:42:11.000000000 +0200 +++ new/kcalendarcore-5.86.0/autotests/testperson.cpp 2021-09-04 17:41:34.000000000 +0200 @@ -66,7 +66,8 @@ QDataStream in_stream(&byteArray, QIODevice::ReadOnly); - QString name, email; + QString name; + QString email; int count; in_stream >> name; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.85.0/src/calendar.cpp new/kcalendarcore-5.86.0/src/calendar.cpp --- old/kcalendarcore-5.85.0/src/calendar.cpp 2021-08-05 14:42:11.000000000 +0200 +++ new/kcalendarcore-5.86.0/src/calendar.cpp 2021-09-04 17:41:34.000000000 +0200 @@ -219,7 +219,8 @@ { setTimeZone(newZone); - int i, end; + int i; + int end; Event::List ev = events(); for (i = 0, end = ev.count(); i < end; ++i) { ev[i]->shiftTimes(oldZone, newZone); @@ -254,7 +255,8 @@ QStringList Calendar::categories() const { Incidence::List rawInc(rawIncidences()); - QStringList cats, thisCats; + QStringList cats; + QStringList thisCats; // @TODO: For now just iterate over all incidences. In the future, // the list of categories should be built when reading the file. for (Incidence::List::ConstIterator i = rawInc.constBegin(); i != rawInc.constEnd(); ++i) { @@ -340,8 +342,9 @@ const QList<Incidence::Ptr> incidences = d->mNotebookIncidences.values(notebook); for (Incidence::Ptr incidence : incidences) { QHash<Incidence::Ptr, bool>::Iterator it = d->mIncidenceVisibility.find(incidence); - if (it != d->mIncidenceVisibility.end()) + if (it != d->mIncidenceVisibility.end()) { *it = isVisible; + } } return true; } @@ -1171,7 +1174,8 @@ Incidence::List incidences; incidences.reserve(events.count() + todos.count() + journals.count()); - int i, end; + int i; + int end; for (i = 0, end = events.count(); i < end; ++i) { incidences.append(events[i]); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.85.0/src/event.cpp new/kcalendarcore-5.86.0/src/event.cpp --- old/kcalendarcore-5.85.0/src/event.cpp 2021-08-05 14:42:11.000000000 +0200 +++ new/kcalendarcore-5.86.0/src/event.cpp 2021-09-04 17:41:34.000000000 +0200 @@ -164,7 +164,8 @@ } // Not in cache -> do it the hard way - QDateTime start, end; + QDateTime start; + QDateTime end; if (!zone.isValid()) { start = dtStart(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.85.0/src/freebusyperiod.cpp new/kcalendarcore-5.86.0/src/freebusyperiod.cpp --- old/kcalendarcore-5.85.0/src/freebusyperiod.cpp 2021-08-05 14:42:11.000000000 +0200 +++ new/kcalendarcore-5.86.0/src/freebusyperiod.cpp 2021-09-04 17:41:34.000000000 +0200 @@ -124,7 +124,8 @@ QDataStream &KCalendarCore::operator>>(QDataStream &stream, FreeBusyPeriod &period) { KCalendarCore::Period periodParent; - QString summary, location; + QString summary; + QString location; int type; stream >> periodParent >> summary >> location >> type; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.85.0/src/icalformat_p.cpp new/kcalendarcore-5.86.0/src/icalformat_p.cpp --- old/kcalendarcore-5.85.0/src/icalformat_p.cpp 2021-08-05 14:42:11.000000000 +0200 +++ new/kcalendarcore-5.86.0/src/icalformat_p.cpp 2021-09-04 17:41:34.000000000 +0200 @@ -1578,7 +1578,8 @@ icalproperty *p = icalcomponent_get_first_property(parent, ICAL_ANY_PROPERTY); const char *text; - int intvalue, inttext; + int intvalue; + int inttext; icaldurationtype icalduration; QDateTime kdt; QDateTime dtstamp; @@ -1917,7 +1918,8 @@ void ICalFormatImpl::Private::readCustomProperties(icalcomponent *parent, CustomProperties *properties) { QByteArray property; - QString value, parameters; + QString value; + QString parameters; icalproperty *p = icalcomponent_get_first_property(parent, ICAL_X_PROPERTY); icalparameter *param = nullptr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.85.0/src/icaltimezones.cpp new/kcalendarcore-5.86.0/src/icaltimezones.cpp --- old/kcalendarcore-5.85.0/src/icaltimezones.cpp 2021-08-05 14:42:11.000000000 +0200 +++ new/kcalendarcore-5.86.0/src/icaltimezones.cpp 2021-09-04 17:41:34.000000000 +0200 @@ -250,7 +250,10 @@ // if the list can be reduced to an RRULE instead of multiple RDATEs. QTime time; QDate date; - int year = 0, month = 0, daysInMonth = 0, dayOfMonth = 0; // avoid compiler warnings + int year = 0; + int month = 0; + int daysInMonth = 0; + int dayOfMonth = 0; // avoid compiler warnings int dayOfWeek = 0; // Monday = 1 int nthFromStart = 0; // nth (weekday) of month int nthFromEnd = 0; // nth last (weekday) of month diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.85.0/src/incidence.cpp new/kcalendarcore-5.86.0/src/incidence.cpp --- old/kcalendarcore-5.85.0/src/incidence.cpp 2021-08-05 14:42:11.000000000 +0200 +++ new/kcalendarcore-5.86.0/src/incidence.cpp 2021-09-04 17:41:34.000000000 +0200 @@ -1153,9 +1153,12 @@ void Incidence::deserialize(QDataStream &in) { - quint32 status, secrecy; + quint32 status; + quint32 secrecy; bool hasRecurrence; - int attachmentCount, alarmCount, conferencesCount; + int attachmentCount; + int alarmCount; + int conferencesCount; QMap<int, QString> relatedToUid; deserializeKDateTimeAsQDateTime(in, d->mCreated); in >> d->mRevision >> d->mDescription >> d->mDescriptionIsRich >> d->mSummary >> d->mSummaryIsRich >> d->mLocation >> d->mLocationIsRich >> d->mCategories @@ -1199,7 +1202,8 @@ d->mRelatedToUid.clear(); - auto it = relatedToUid.cbegin(), end = relatedToUid.cend(); + auto it = relatedToUid.cbegin(); + auto end = relatedToUid.cend(); for (; it != end; ++it) { d->mRelatedToUid.insert(static_cast<Incidence::RelType>(it.key()), it.value()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.85.0/src/incidencebase.cpp new/kcalendarcore-5.86.0/src/incidencebase.cpp --- old/kcalendarcore-5.85.0/src/incidencebase.cpp 2021-08-05 14:42:11.000000000 +0200 +++ new/kcalendarcore-5.86.0/src/incidencebase.cpp 2021-09-04 17:41:34.000000000 +0200 @@ -684,8 +684,10 @@ return in; } - qint32 attendeeCount, type; - quint32 magic, version; + qint32 attendeeCount; + qint32 type; + quint32 magic; + quint32 version; in >> magic; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.85.0/src/occurrenceiterator.cpp new/kcalendarcore-5.86.0/src/occurrenceiterator.cpp --- old/kcalendarcore-5.85.0/src/occurrenceiterator.cpp 2021-08-05 14:42:11.000000000 +0200 +++ new/kcalendarcore-5.86.0/src/occurrenceiterator.cpp 2021-09-04 17:41:34.000000000 +0200 @@ -102,8 +102,10 @@ } } const auto occurrences = inc->recurrence()->timesInInterval(start, end); - Incidence::Ptr incidence(inc), lastInc(inc); - qint64 offset(0), lastOffset(0); + Incidence::Ptr incidence(inc); + Incidence::Ptr lastInc(inc); + qint64 offset(0); + qint64 lastOffset(0); QDateTime occurrenceStartDate; for (const auto &recurrenceId : qAsConst(occurrences)) { occurrenceStartDate = recurrenceId; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.85.0/src/person.cpp new/kcalendarcore-5.86.0/src/person.cpp --- old/kcalendarcore-5.85.0/src/person.cpp 2021-08-05 14:42:11.000000000 +0200 +++ new/kcalendarcore-5.86.0/src/person.cpp 2021-09-04 17:41:34.000000000 +0200 @@ -174,7 +174,10 @@ bool bInComment = false; bool bInQuotesOutsideOfEmail = false; - int i = 0, iAd = 0, iMailStart = 0, iMailEnd = 0; + int i = 0; + int iAd = 0; + int iMailStart = 0; + int iMailEnd = 0; QChar c; unsigned int commentstack = 0; @@ -358,7 +361,8 @@ Person Person::fromFullName(const QString &fullName) { - QString email, name; + QString email; + QString name; extractEmailAddressAndName(fullName, email, name); return Person(name, email); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.85.0/src/recurrence.cpp new/kcalendarcore-5.86.0/src/recurrence.cpp --- old/kcalendarcore-5.85.0/src/recurrence.cpp 2021-08-05 14:42:11.000000000 +0200 +++ new/kcalendarcore-5.86.0/src/recurrence.cpp 2021-09-04 17:41:34.000000000 +0200 @@ -105,7 +105,8 @@ : RecurrenceRule::RuleObserver() , d(new KCalendarCore::Recurrence::Private(*r.d)) { - int i, end; + int i; + int end; d->mRRules.reserve(r.d->mRRules.count()); for (i = 0, end = r.d->mRRules.count(); i < end; ++i) { RecurrenceRule *rule = new RecurrenceRule(*r.d->mRRules[i]); @@ -324,7 +325,8 @@ return false; } - int i, end; + int i; + int end; // For all-day events a matching exrule excludes the whole day // since exclusions take precedence over inclusions, we know it can't occur on that day. if (allDay()) { @@ -386,7 +388,8 @@ || std::binary_search(d->mExDates.constBegin(), d->mExDates.constEnd(), dtrecur.date())) { return false; } - int i, end; + int i; + int end; for (i = 0, end = d->mExRules.count(); i < end; ++i) { if (d->mExRules[i]->recursAt(dtrecur)) { return false; @@ -519,7 +522,8 @@ d->mStartDateTime = d->mStartDateTime.toTimeZone(oldTz); d->mStartDateTime.setTimeZone(newTz); - int i, end; + int i; + int end; for (i = 0, end = d->mRDateTimes.count(); i < end; ++i) { d->mRDateTimes[i] = d->mRDateTimes[i].toTimeZone(oldTz); d->mRDateTimes[i].setTimeZone(newTz); @@ -586,7 +590,8 @@ d->mStartDateTime = start; setAllDay(isAllDay); // set all RRULEs and EXRULEs - int i, end; + int i; + int end; for (i = 0, end = d->mRRules.count(); i < end; ++i) { d->mRRules[i]->setStartDt(start); } @@ -977,7 +982,8 @@ TimeList Recurrence::recurTimesOn(const QDate &date, const QTimeZone &timeZone) const { // qCDebug(KCALCORE_LOG) << "recurTimesOn(" << date << ")"; - int i, end; + int i; + int end; TimeList times; // The whole day is excepted @@ -1038,7 +1044,8 @@ QList<QDateTime> Recurrence::timesInInterval(const QDateTime &start, const QDateTime &end) const { - int i, count; + int i; + int count; QList<QDateTime> times; for (i = 0, count = d->mRRules.count(); i < count; ++i) { times += d->mRRules[i]->timesInInterval(start, end); @@ -1502,7 +1509,8 @@ return in; } - int rruleCount, exruleCount; + int rruleCount; + int exruleCount; deserializeQDateTimeList(in, r->d->mRDateTimes); deserializeQDateTimeList(in, r->d->mExDateTimes); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.85.0/src/recurrencerule.cpp new/kcalendarcore-5.86.0/src/recurrencerule.cpp --- old/kcalendarcore-5.85.0/src/recurrencerule.cpp 2021-08-05 14:42:11.000000000 +0200 +++ new/kcalendarcore-5.86.0/src/recurrencerule.cpp 2021-09-04 17:41:34.000000000 +0200 @@ -498,7 +498,8 @@ uint mstart = (month > 0) ? month : 1; uint mend = (month <= 0) ? 12 : month; for (uint m = mstart; m <= mend; ++m) { - uint dstart, dend; + uint dstart; + uint dend; if (day > 0) { dstart = dend = day; } else if (day < 0) { @@ -1168,8 +1169,10 @@ } mConstraints.append(con); - int c, cend; - int i, iend; + int c; + int cend; + int i; + int iend; Constraint::List tmp; // clang-format off @@ -1358,7 +1361,8 @@ bool RecurrenceRule::recursOn(const QDate &qd, const QTimeZone &timeZone) const { - int i, iend; + int i; + int iend; if (!qd.isValid() || !d->mDateStart.isValid()) { // There can't be recurrences on invalid dates diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.85.0/src/sorting.cpp new/kcalendarcore-5.86.0/src/sorting.cpp --- old/kcalendarcore-5.85.0/src/sorting.cpp 2021-08-05 14:42:11.000000000 +0200 +++ new/kcalendarcore-5.86.0/src/sorting.cpp 2021-09-04 17:41:34.000000000 +0200 @@ -103,7 +103,8 @@ DateTimeComparison compare(const QDateTime &dt1, bool isAllDay1, const QDateTime &dt2, bool isAllDay2) { - QDateTime start1, start2; + QDateTime start1; + QDateTime start2; // FIXME When secondOccurrence is available in QDateTime // const bool conv = (!d->equalSpec(*other.d) || d->secondOccurrence() != other.d->secondOccurrence()); const bool conv = dt1.timeSpec() != dt2.timeSpec() || (dt1.timeSpec() == Qt::OffsetFromUTC && dt1.offsetFromUtc() != dt2.offsetFromUtc()) @@ -121,7 +122,8 @@ if (isAllDay1 || isAllDay2) { // At least one of the instances is date-only, so we need to compare // time periods rather than just times. - QDateTime end1, end2; + QDateTime end1; + QDateTime end2; if (conv) { if (isAllDay1) { QDateTime dt(dt1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.85.0/src/utils.cpp new/kcalendarcore-5.86.0/src/utils.cpp --- old/kcalendarcore-5.85.0/src/utils.cpp 2021-08-05 14:42:11.000000000 +0200 +++ new/kcalendarcore-5.86.0/src/utils.cpp 2021-09-04 17:41:34.000000000 +0200 @@ -38,7 +38,8 @@ { QDate date; QTime time; - quint8 ts, flags; + quint8 ts; + quint8 flags; in >> date >> time >> ts; switch (static_cast<uchar>(ts)) { @@ -71,7 +72,8 @@ QDateTime dt; QDate date; QTime time; - quint8 ts, flags; + quint8 ts; + quint8 flags; in >> date >> time >> ts; switch (static_cast<uchar>(ts)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.85.0/src/vcalformat.cpp new/kcalendarcore-5.86.0/src/vcalformat.cpp --- old/kcalendarcore-5.85.0/src/vcalformat.cpp 2021-08-05 14:42:11.000000000 +0200 +++ new/kcalendarcore-5.86.0/src/vcalformat.cpp 2021-09-04 17:41:34.000000000 +0200 @@ -1212,7 +1212,12 @@ QDate tmpDate; QTime tmpTime; QString tmpStr; - int year, month, day, hour, minute, second; + int year; + int month; + int day; + int hour; + int minute; + int second; tmpStr = dtStr; year = tmpStr.leftRef(4).toInt(); @@ -1238,7 +1243,9 @@ QDate VCalFormat::ISOToQDate(const QString &dateStr) { - int year, month, day; + int year; + int month; + int day; year = dateStr.leftRef(4).toInt(); month = dateStr.midRef(4, 2).toInt();
