Hello community, here is the log from the commit of package kmymoney for openSUSE:Factory checked in at 2019-05-13 14:52:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmymoney (Old) and /work/SRC/openSUSE:Factory/.kmymoney.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmymoney" Mon May 13 14:52:07 2019 rev:64 rq:702487 version:5.0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/kmymoney/kmymoney.changes 2019-04-23 14:35:59.777470382 +0200 +++ /work/SRC/openSUSE:Factory/.kmymoney.new.5148/kmymoney.changes 2019-05-13 14:52:10.183035029 +0200 @@ -1,0 +2,6 @@ +Fri May 10 06:40:57 UTC 2019 - wba...@tmo.at + +- Add Fix-storage-of-schedules.patch to fix incompatibilites in how + schedules are saved compared to previous versions (kde#406082) + +------------------------------------------------------------------- New: ---- Fix-storage-of-schedules.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmymoney.spec ++++++ --- /var/tmp/diff_new_pack.x1cllr/_old 2019-05-13 14:52:12.043039712 +0200 +++ /var/tmp/diff_new_pack.x1cllr/_new 2019-05-13 14:52:12.047039722 +0200 @@ -35,6 +35,8 @@ Group: Productivity/Office/Finance URL: https://www.kmymoney.org/ Source0: https://download.kde.org/stable/kmymoney/%{version}/src/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch0: Fix-storage-of-schedules.patch BuildRequires: aqbanking-devel BuildRequires: doxygen BuildRequires: extra-cmake-modules @@ -117,6 +119,7 @@ %prep %setup -q +%autopatch -p1 %build %if %{with qtwebengine} ++++++ Fix-storage-of-schedules.patch ++++++ >From f9a1d6eec37eb24f0725dadf30d46d159473e282 Mon Sep 17 00:00:00 2001 From: Thomas Baumgart <t...@net-bembel.de> Date: Thu, 9 May 2019 22:17:01 +0200 Subject: Fix storage of schedules Fix code to provide prior behavior BUG: 406082 FIXED-IN: 5.0.4 --- kmymoney/dialogs/keditscheduledlg.cpp | 2 +- kmymoney/mymoney/mymoneyforecast.cpp | 4 +- kmymoney/mymoney/mymoneyschedule.cpp | 6 +- kmymoney/mymoney/mymoneyschedule.h | 9 +- kmymoney/mymoney/storage/mymoneystoragemgr.cpp | 4 +- kmymoney/mymoney/tests/mymoneyschedule-test.cpp | 140 ++++++++++----------- .../icalendar/export/schedulestoicalendar.cpp | 4 +- kmymoney/plugins/sql/mymoneystoragesql.cpp | 2 +- kmymoney/plugins/sql/mymoneystoragesql_p.h | 2 +- .../xml/tests/mymoneyxmlcontenthandler-test.cpp | 6 +- kmymoney/widgets/kmymoneybriefschedule.cpp | 2 +- kmymoney/wizards/newloanwizard/keditloanwizard.cpp | 2 +- 12 files changed, 92 insertions(+), 91 deletions(-) diff --git a/kmymoney/dialogs/keditscheduledlg.cpp b/kmymoney/dialogs/keditscheduledlg.cpp index 60274f9..984351b 100644 --- a/kmymoney/dialogs/keditscheduledlg.cpp +++ b/kmymoney/dialogs/keditscheduledlg.cpp @@ -125,7 +125,7 @@ public: // setup widget contents ui->m_nameEdit->setText(m_schedule.name()); - ui->m_frequencyEdit->setCurrentItem((int)m_schedule.occurrencePeriod()); + ui->m_frequencyEdit->setCurrentItem((int)m_schedule.occurrence()); if (ui->m_frequencyEdit->currentItem() == Schedule::Occurrence::Any) ui->m_frequencyEdit->setCurrentItem((int)Schedule::Occurrence::Monthly); q->slotFrequencyChanged((int)ui->m_frequencyEdit->currentItem()); diff --git a/kmymoney/mymoney/mymoneyforecast.cpp b/kmymoney/mymoney/mymoneyforecast.cpp index a291a5b..ced2e2d 100644 --- a/kmymoney/mymoney/mymoneyforecast.cpp +++ b/kmymoney/mymoney/mymoneyforecast.cpp @@ -1651,10 +1651,10 @@ void MyMoneyForecast::calculateAutoLoan(const MyMoneySchedule& schedule, MyMoney // FIXME: for now, we only support periodic compounding calc.setDisc(); - calc.setPF(MyMoneySchedule::eventsPerYear(schedule.occurrence())); + calc.setPF(MyMoneySchedule::eventsPerYear(schedule.baseOccurrence())); eMyMoney::Schedule::Occurrence compoundingOccurrence = static_cast<eMyMoney::Schedule::Occurrence>(acc.interestCompounding()); if (compoundingOccurrence == eMyMoney::Schedule::Occurrence::Any) - compoundingOccurrence = schedule.occurrence(); + compoundingOccurrence = schedule.baseOccurrence(); calc.setCF(MyMoneySchedule::eventsPerYear(compoundingOccurrence)); diff --git a/kmymoney/mymoney/mymoneyschedule.cpp b/kmymoney/mymoney/mymoneyschedule.cpp index 359e233..6fff4f8 100644 --- a/kmymoney/mymoney/mymoneyschedule.cpp +++ b/kmymoney/mymoney/mymoneyschedule.cpp @@ -93,7 +93,7 @@ MyMoneySchedule::~MyMoneySchedule() { } -Schedule::Occurrence MyMoneySchedule::occurrence() const +Schedule::Occurrence MyMoneySchedule::baseOccurrence() const { Q_D(const MyMoneySchedule); Schedule::Occurrence occ = d->m_occurrence; @@ -114,7 +114,7 @@ eMyMoney::Schedule::Type MyMoneySchedule::type() const return d->m_type; } -eMyMoney::Schedule::Occurrence MyMoneySchedule::occurrencePeriod() const +eMyMoney::Schedule::Occurrence MyMoneySchedule::occurrence() const { Q_D(const MyMoneySchedule); return d->m_occurrence; @@ -873,7 +873,7 @@ bool MyMoneySchedule::hasReferenceTo(const QString& id) const QString MyMoneySchedule::occurrenceToString() const { - return occurrenceToString(occurrenceMultiplier(), occurrencePeriod()); + return occurrenceToString(occurrenceMultiplier(), occurrence()); } QString MyMoneySchedule::occurrenceToString(Schedule::Occurrence occurrence) diff --git a/kmymoney/mymoney/mymoneyschedule.h b/kmymoney/mymoney/mymoneyschedule.h index 25f0d04..2e5fc18 100644 --- a/kmymoney/mymoney/mymoneyschedule.h +++ b/kmymoney/mymoney/mymoneyschedule.h @@ -104,11 +104,12 @@ public: ~MyMoneySchedule(); /** - * Simple get method that returns the occurrence frequency. + * Simple get method that returns the base occurrence frequency. * - * @return eMyMoney::Schedule::Occurrence The instance frequency. + * @return eMyMoney::Schedule::Occurrence The instance frequency + * reduced to the simple units. */ - eMyMoney::Schedule::Occurrence occurrence() const; + eMyMoney::Schedule::Occurrence baseOccurrence() const; /** * Simple get method that returns the occurrence period @@ -117,7 +118,7 @@ public: * @return eMyMoney::Schedule::Occurrence The instance period * */ - eMyMoney::Schedule::Occurrence occurrencePeriod() const; + eMyMoney::Schedule::Occurrence occurrence() const; /** * Simple get method that returns the occurrence period multiplier. diff --git a/kmymoney/mymoney/storage/mymoneystoragemgr.cpp b/kmymoney/mymoney/storage/mymoneystoragemgr.cpp index 763f496..b35dbb5 100644 --- a/kmymoney/mymoney/storage/mymoneystoragemgr.cpp +++ b/kmymoney/mymoney/storage/mymoneystoragemgr.cpp @@ -1252,7 +1252,7 @@ QList<MyMoneySchedule> MyMoneyStorageMgr::scheduleList(const QString& accountId, } if (occurrence != eMyMoney::Schedule::Occurrence::Any) { - if (occurrence != (*pos).occurrence()) { + if (occurrence != (*pos).baseOccurrence()) { continue; } } @@ -1342,7 +1342,7 @@ QList<MyMoneySchedule> MyMoneyStorageMgr::scheduleListEx(int scheduleTypes, if (scheduleTypes && !(scheduleTypes & (int)(*pos).type())) continue; - if (scheduleOcurrences && !(scheduleOcurrences & (int)(*pos).occurrence())) + if (scheduleOcurrences && !(scheduleOcurrences & (int)(*pos).baseOccurrence())) continue; if (schedulePaymentTypes && !(schedulePaymentTypes & (int)(*pos).paymentType())) diff --git a/kmymoney/mymoney/tests/mymoneyschedule-test.cpp b/kmymoney/mymoney/tests/mymoneyschedule-test.cpp index 45e5042..f691517 100644 --- a/kmymoney/mymoney/tests/mymoneyschedule-test.cpp +++ b/kmymoney/mymoney/tests/mymoneyschedule-test.cpp @@ -44,7 +44,7 @@ void MyMoneyScheduleTest::testEmptyConstructor() MyMoneySchedule s; QCOMPARE(s.id().isEmpty(), true); - QCOMPARE(s.occurrence(), Schedule::Occurrence::Any); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::Any); QCOMPARE(s.type(), Schedule::Type::Any); QCOMPARE(s.paymentType(), Schedule::PaymentType::Any); QCOMPARE(s.isFinished(), false); @@ -69,7 +69,7 @@ void MyMoneyScheduleTest::testConstructor() true); QCOMPARE(s.type(), Schedule::Type::Bill); - QCOMPARE(s.occurrence(), Schedule::Occurrence::Weekly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::Weekly); QCOMPARE(s.occurrenceMultiplier(), 1); QCOMPARE(s.paymentType(), Schedule::PaymentType::DirectDebit); QCOMPARE(s.startDate(), QDate()); @@ -540,190 +540,190 @@ void MyMoneyScheduleTest::testOccurrencePeriod() s.setLastPayment(s.startDate()); // Set all base occurrences s.setOccurrencePeriod(Schedule::Occurrence::Once); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Once); + QCOMPARE(s.occurrence(), Schedule::Occurrence::Once); s.setOccurrenceMultiplier(1); QCOMPARE(s.occurrenceMultiplier(), 1); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Once); QCOMPARE(s.occurrence(), Schedule::Occurrence::Once); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::Once); s.setOccurrenceMultiplier(2); QCOMPARE(s.occurrenceMultiplier(), 2); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Once); QCOMPARE(s.occurrence(), Schedule::Occurrence::Once); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::Once); s.setOccurrencePeriod(Schedule::Occurrence::Daily); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Daily); + QCOMPARE(s.occurrence(), Schedule::Occurrence::Daily); s.setOccurrenceMultiplier(1); QCOMPARE(s.occurrenceMultiplier(), 1); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Daily); QCOMPARE(s.occurrence(), Schedule::Occurrence::Daily); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::Daily); s.setOccurrenceMultiplier(30); QCOMPARE(s.occurrenceMultiplier(), 30); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Daily); - QCOMPARE(s.occurrence(), Schedule::Occurrence::EveryThirtyDays); + QCOMPARE(s.occurrence(), Schedule::Occurrence::Daily); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::EveryThirtyDays); s.setOccurrenceMultiplier(2); QCOMPARE(s.occurrenceMultiplier(), 2); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Daily); QCOMPARE(s.occurrence(), Schedule::Occurrence::Daily); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::Daily); s.setOccurrencePeriod(Schedule::Occurrence::Weekly); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Weekly); + QCOMPARE(s.occurrence(), Schedule::Occurrence::Weekly); s.setOccurrenceMultiplier(1); QCOMPARE(s.occurrenceMultiplier(), 1); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Weekly); QCOMPARE(s.occurrence(), Schedule::Occurrence::Weekly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::Weekly); s.setOccurrenceMultiplier(2); QCOMPARE(s.occurrenceMultiplier(), 2); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Weekly); - QCOMPARE(s.occurrence(), Schedule::Occurrence::EveryOtherWeek); + QCOMPARE(s.occurrence(), Schedule::Occurrence::Weekly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::EveryOtherWeek); s.setOccurrenceMultiplier(3); QCOMPARE(s.occurrenceMultiplier(), 3); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Weekly); - QCOMPARE(s.occurrence(), Schedule::Occurrence::EveryThreeWeeks); + QCOMPARE(s.occurrence(), Schedule::Occurrence::Weekly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::EveryThreeWeeks); s.setOccurrenceMultiplier(4); QCOMPARE(s.occurrenceMultiplier(), 4); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Weekly); - QCOMPARE(s.occurrence(), Schedule::Occurrence::EveryFourWeeks); + QCOMPARE(s.occurrence(), Schedule::Occurrence::Weekly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::EveryFourWeeks); s.setOccurrenceMultiplier(5); QCOMPARE(s.occurrenceMultiplier(), 5); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Weekly); QCOMPARE(s.occurrence(), Schedule::Occurrence::Weekly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::Weekly); s.setOccurrenceMultiplier(8); QCOMPARE(s.occurrenceMultiplier(), 8); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Weekly); - QCOMPARE(s.occurrence(), Schedule::Occurrence::EveryEightWeeks); + QCOMPARE(s.occurrence(), Schedule::Occurrence::Weekly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::EveryEightWeeks); s.setOccurrencePeriod(Schedule::Occurrence::EveryHalfMonth); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::EveryHalfMonth); + QCOMPARE(s.occurrence(), Schedule::Occurrence::EveryHalfMonth); s.setOccurrenceMultiplier(1); QCOMPARE(s.occurrenceMultiplier(), 1); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::EveryHalfMonth); QCOMPARE(s.occurrence(), Schedule::Occurrence::EveryHalfMonth); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::EveryHalfMonth); s.setOccurrenceMultiplier(2); QCOMPARE(s.occurrenceMultiplier(), 2); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::EveryHalfMonth); QCOMPARE(s.occurrence(), Schedule::Occurrence::EveryHalfMonth); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::EveryHalfMonth); s.setOccurrencePeriod(Schedule::Occurrence::Monthly); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Monthly); + QCOMPARE(s.occurrence(), Schedule::Occurrence::Monthly); s.setOccurrenceMultiplier(1); QCOMPARE(s.occurrenceMultiplier(), 1); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Monthly); QCOMPARE(s.occurrence(), Schedule::Occurrence::Monthly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::Monthly); s.setOccurrenceMultiplier(2); QCOMPARE(s.occurrenceMultiplier(), 2); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Monthly); - QCOMPARE(s.occurrence(), Schedule::Occurrence::EveryOtherMonth); + QCOMPARE(s.occurrence(), Schedule::Occurrence::Monthly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::EveryOtherMonth); s.setOccurrenceMultiplier(3); QCOMPARE(s.occurrenceMultiplier(), 3); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Monthly); - QCOMPARE(s.occurrence(), Schedule::Occurrence::EveryThreeMonths); + QCOMPARE(s.occurrence(), Schedule::Occurrence::Monthly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::EveryThreeMonths); s.setOccurrenceMultiplier(4); QCOMPARE(s.occurrenceMultiplier(), 4); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Monthly); - QCOMPARE(s.occurrence(), Schedule::Occurrence::EveryFourMonths); + QCOMPARE(s.occurrence(), Schedule::Occurrence::Monthly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::EveryFourMonths); s.setOccurrenceMultiplier(5); QCOMPARE(s.occurrenceMultiplier(), 5); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Monthly); QCOMPARE(s.occurrence(), Schedule::Occurrence::Monthly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::Monthly); s.setOccurrenceMultiplier(6); QCOMPARE(s.occurrenceMultiplier(), 6); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Monthly); - QCOMPARE(s.occurrence(), Schedule::Occurrence::TwiceYearly); + QCOMPARE(s.occurrence(), Schedule::Occurrence::Monthly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::TwiceYearly); s.setOccurrencePeriod(Schedule::Occurrence::Yearly); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Yearly); + QCOMPARE(s.occurrence(), Schedule::Occurrence::Yearly); s.setOccurrenceMultiplier(1); QCOMPARE(s.occurrenceMultiplier(), 1); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Yearly); QCOMPARE(s.occurrence(), Schedule::Occurrence::Yearly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::Yearly); s.setOccurrenceMultiplier(2); QCOMPARE(s.occurrenceMultiplier(), 2); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Yearly); - QCOMPARE(s.occurrence(), Schedule::Occurrence::EveryOtherYear); + QCOMPARE(s.occurrence(), Schedule::Occurrence::Yearly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::EveryOtherYear); s.setOccurrenceMultiplier(3); QCOMPARE(s.occurrenceMultiplier(), 3); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Yearly); QCOMPARE(s.occurrence(), Schedule::Occurrence::Yearly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::Yearly); // Set occurrence: check occurrence, Period and Multiplier s.setOccurrence(Schedule::Occurrence::Once); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::Once); QCOMPARE(s.occurrence(), Schedule::Occurrence::Once); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Once); QCOMPARE(s.occurrenceMultiplier(), 1); s.setOccurrence(Schedule::Occurrence::Daily); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::Daily); QCOMPARE(s.occurrence(), Schedule::Occurrence::Daily); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Daily); QCOMPARE(s.occurrenceMultiplier(), 1); s.setOccurrence(Schedule::Occurrence::EveryThirtyDays); - QCOMPARE(s.occurrence(), Schedule::Occurrence::EveryThirtyDays); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Daily); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::EveryThirtyDays); + QCOMPARE(s.occurrence(), Schedule::Occurrence::Daily); QCOMPARE(s.occurrenceMultiplier(), 30); s.setOccurrence(Schedule::Occurrence::Weekly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::Weekly); QCOMPARE(s.occurrence(), Schedule::Occurrence::Weekly); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Weekly); QCOMPARE(s.occurrenceMultiplier(), 1); s.setOccurrence(Schedule::Occurrence::EveryOtherWeek); - QCOMPARE(s.occurrence(), Schedule::Occurrence::EveryOtherWeek); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Weekly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::EveryOtherWeek); + QCOMPARE(s.occurrence(), Schedule::Occurrence::Weekly); QCOMPARE(s.occurrenceMultiplier(), 2); // Fortnightly no longer used: Every other week used instead s.setOccurrence(Schedule::Occurrence::Fortnightly); - QCOMPARE(s.occurrence(), Schedule::Occurrence::EveryOtherWeek); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Weekly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::EveryOtherWeek); + QCOMPARE(s.occurrence(), Schedule::Occurrence::Weekly); QCOMPARE(s.occurrenceMultiplier(), 2); s.setOccurrence(Schedule::Occurrence::EveryThreeWeeks); - QCOMPARE(s.occurrence(), Schedule::Occurrence::EveryThreeWeeks); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Weekly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::EveryThreeWeeks); + QCOMPARE(s.occurrence(), Schedule::Occurrence::Weekly); QCOMPARE(s.occurrenceMultiplier(), 3); s.setOccurrence(Schedule::Occurrence::EveryFourWeeks); - QCOMPARE(s.occurrence(), Schedule::Occurrence::EveryFourWeeks); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Weekly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::EveryFourWeeks); + QCOMPARE(s.occurrence(), Schedule::Occurrence::Weekly); QCOMPARE(s.occurrenceMultiplier(), 4); s.setOccurrence(Schedule::Occurrence::EveryEightWeeks); - QCOMPARE(s.occurrence(), Schedule::Occurrence::EveryEightWeeks); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Weekly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::EveryEightWeeks); + QCOMPARE(s.occurrence(), Schedule::Occurrence::Weekly); QCOMPARE(s.occurrenceMultiplier(), 8); s.setOccurrence(Schedule::Occurrence::EveryHalfMonth); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::EveryHalfMonth); QCOMPARE(s.occurrence(), Schedule::Occurrence::EveryHalfMonth); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::EveryHalfMonth); QCOMPARE(s.occurrenceMultiplier(), 1); s.setOccurrence(Schedule::Occurrence::Monthly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::Monthly); QCOMPARE(s.occurrence(), Schedule::Occurrence::Monthly); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Monthly); QCOMPARE(s.occurrenceMultiplier(), 1); s.setOccurrence(Schedule::Occurrence::EveryOtherMonth); - QCOMPARE(s.occurrence(), Schedule::Occurrence::EveryOtherMonth); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Monthly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::EveryOtherMonth); + QCOMPARE(s.occurrence(), Schedule::Occurrence::Monthly); QCOMPARE(s.occurrenceMultiplier(), 2); s.setOccurrence(Schedule::Occurrence::EveryThreeMonths); - QCOMPARE(s.occurrence(), Schedule::Occurrence::EveryThreeMonths); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Monthly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::EveryThreeMonths); + QCOMPARE(s.occurrence(), Schedule::Occurrence::Monthly); QCOMPARE(s.occurrenceMultiplier(), 3); // Quarterly no longer used. Every three months used instead s.setOccurrence(Schedule::Occurrence::Quarterly); - QCOMPARE(s.occurrence(), Schedule::Occurrence::EveryThreeMonths); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Monthly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::EveryThreeMonths); + QCOMPARE(s.occurrence(), Schedule::Occurrence::Monthly); QCOMPARE(s.occurrenceMultiplier(), 3); s.setOccurrence(Schedule::Occurrence::EveryFourMonths); - QCOMPARE(s.occurrence(), Schedule::Occurrence::EveryFourMonths); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Monthly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::EveryFourMonths); + QCOMPARE(s.occurrence(), Schedule::Occurrence::Monthly); QCOMPARE(s.occurrenceMultiplier(), 4); s.setOccurrence(Schedule::Occurrence::TwiceYearly); - QCOMPARE(s.occurrence(), Schedule::Occurrence::TwiceYearly); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Monthly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::TwiceYearly); + QCOMPARE(s.occurrence(), Schedule::Occurrence::Monthly); QCOMPARE(s.occurrenceMultiplier(), 6); s.setOccurrence(Schedule::Occurrence::Yearly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::Yearly); QCOMPARE(s.occurrence(), Schedule::Occurrence::Yearly); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Yearly); QCOMPARE(s.occurrenceMultiplier(), 1); s.setOccurrence(Schedule::Occurrence::EveryOtherYear); - QCOMPARE(s.occurrence(), Schedule::Occurrence::EveryOtherYear); - QCOMPARE(s.occurrencePeriod(), Schedule::Occurrence::Yearly); + QCOMPARE(s.baseOccurrence(), Schedule::Occurrence::EveryOtherYear); + QCOMPARE(s.occurrence(), Schedule::Occurrence::Yearly); QCOMPARE(s.occurrenceMultiplier(), 2); } diff --git a/kmymoney/plugins/icalendar/export/schedulestoicalendar.cpp b/kmymoney/plugins/icalendar/export/schedulestoicalendar.cpp index c0853f9..ba522c3 100644 --- a/kmymoney/plugins/icalendar/export/schedulestoicalendar.cpp +++ b/kmymoney/plugins/icalendar/export/schedulestoicalendar.cpp @@ -113,7 +113,7 @@ struct icalrecurrencetype scheduleToRecurenceRule(const MyMoneySchedule& schedul recurrence.week_start = icalrecurrencetype_day_day_of_week(QLocale().firstDayOfWeek()); int frequencyFactor = 1; // used to translate kmymoney frequency to icalendar frequency - switch (schedule.occurrence()) { + switch (schedule.baseOccurrence()) { case Schedule::Occurrence::Daily: recurrence.freq = ICAL_DAILY_RECURRENCE; break; @@ -342,7 +342,7 @@ void KMMSchedulesToiCalendar::exportToFile(const QString& filePath, bool setting if (pRRule != 0) { icalcomponent_remove_property(schedule, pRRule); } - if (myMoneySchedule.occurrence() != Schedule::Occurrence::Once && myMoneySchedule.occurrence() != Schedule::Occurrence::Any) + if (myMoneySchedule.occurrence() != Schedule::Occurrence::Once && myMoneySchedule.baseOccurrence() != Schedule::Occurrence::Any) icalcomponent_add_property(schedule, icalproperty_new_rrule(scheduleToRecurenceRule(myMoneySchedule))); icalcomponent* oldAlarm = icalcomponent_get_first_component(schedule, ICAL_VALARM_COMPONENT); diff --git a/kmymoney/plugins/sql/mymoneystoragesql.cpp b/kmymoney/plugins/sql/mymoneystoragesql.cpp index 2844901..c5e9d00 100644 --- a/kmymoney/plugins/sql/mymoneystoragesql.cpp +++ b/kmymoney/plugins/sql/mymoneystoragesql.cpp @@ -2184,7 +2184,7 @@ QMap<QString, MyMoneySchedule> MyMoneyStorageSql::fetchSchedules(const QStringLi // convert simple occurrence to compound occurrence int mult = s.occurrenceMultiplier(); - Schedule::Occurrence occ = s.occurrencePeriod(); + Schedule::Occurrence occ = s.occurrence(); MyMoneySchedule::simpleToCompoundOccurrence(mult, occ); s.setOccurrencePeriod(occ); s.setOccurrenceMultiplier(mult); diff --git a/kmymoney/plugins/sql/mymoneystoragesql_p.h b/kmymoney/plugins/sql/mymoneystoragesql_p.h index 09e27ca..563bad6 100644 --- a/kmymoney/plugins/sql/mymoneystoragesql_p.h +++ b/kmymoney/plugins/sql/mymoneystoragesql_p.h @@ -1339,7 +1339,7 @@ public: query.bindValue(":name", sch.name()); query.bindValue(":type", (int)sch.type()); query.bindValue(":typeString", MyMoneySchedule::scheduleTypeToString(sch.type())); - query.bindValue(":occurence", (int)sch.occurrencePeriod()); // krazy:exclude=spelling + query.bindValue(":occurence", (int)sch.occurrence()); // krazy:exclude=spelling query.bindValue(":occurenceMultiplier", sch.occurrenceMultiplier()); // krazy:exclude=spelling query.bindValue(":occurenceString", sch.occurrenceToString()); // krazy:exclude=spelling query.bindValue(":paymentType", (int)sch.paymentType()); diff --git a/kmymoney/plugins/xml/tests/mymoneyxmlcontenthandler-test.cpp b/kmymoney/plugins/xml/tests/mymoneyxmlcontenthandler-test.cpp index d81b863..9695bea 100644 --- a/kmymoney/plugins/xml/tests/mymoneyxmlcontenthandler-test.cpp +++ b/kmymoney/plugins/xml/tests/mymoneyxmlcontenthandler-test.cpp @@ -1106,7 +1106,7 @@ void MyMoneyXmlContentHandlerTest::readSchedule() QCOMPARE(sch.paymentType(), Schedule::PaymentType::DirectDebit); QCOMPARE(sch.type(), Schedule::Type::Bill); QCOMPARE(sch.name(), QLatin1String("A Name")); - QCOMPARE(sch.occurrence(), Schedule::Occurrence::Weekly); + QCOMPARE(sch.baseOccurrence(), Schedule::Occurrence::Weekly); QCOMPARE(sch.occurrenceMultiplier(), 1); QCOMPARE(sch.nextDueDate(), sch.lastPayment().addDays(7)); QCOMPARE(sch.recordedPayments().count(), 1); @@ -1132,7 +1132,7 @@ void MyMoneyXmlContentHandlerTest::readSchedule() QCOMPARE(sch.paymentType(), Schedule::PaymentType::DirectDebit); QCOMPARE(sch.type(), Schedule::Type::Bill); QCOMPARE(sch.name(), QLatin1String("A Name")); - QCOMPARE(sch.occurrence(), Schedule::Occurrence::Weekly); + QCOMPARE(sch.baseOccurrence(), Schedule::Occurrence::Weekly); QCOMPARE(sch.occurrenceMultiplier(), 1); QCOMPARE(sch.nextDueDate(), sch.lastPayment().addDays(7)); QCOMPARE(sch.recordedPayments().count(), 1); @@ -1785,7 +1785,7 @@ void MyMoneyXmlContentHandlerTest::testPaidEarlyOneTime() try { sch = MyMoneyXmlContentHandler::readSchedule(node); QCOMPARE(sch.isFinished(), true); - QCOMPARE(sch.occurrencePeriod(), Schedule::Occurrence::Monthly); + QCOMPARE(sch.occurrence(), Schedule::Occurrence::Monthly); QCOMPARE(sch.paymentDates(QDate::currentDate(), QDate::currentDate().addDays(21)).count(), 0); } catch (const MyMoneyException &) { QFAIL("Unexpected exception"); diff --git a/kmymoney/widgets/kmymoneybriefschedule.cpp b/kmymoney/widgets/kmymoneybriefschedule.cpp index c080762..e3a32e9 100644 --- a/kmymoney/widgets/kmymoneybriefschedule.cpp +++ b/kmymoney/widgets/kmymoneybriefschedule.cpp @@ -120,7 +120,7 @@ public: ui->m_prevButton->setEnabled(true); ui->m_nextButton->setEnabled(true); - ui->m_skipButton->setEnabled(sched.occurrencePeriod() != eMyMoney::Schedule::Occurrence::Once); + ui->m_skipButton->setEnabled(sched.occurrence() != eMyMoney::Schedule::Occurrence::Once); if (m_index == 0) ui->m_prevButton->setEnabled(false); diff --git a/kmymoney/wizards/newloanwizard/keditloanwizard.cpp b/kmymoney/wizards/newloanwizard/keditloanwizard.cpp index 379f0b3..dda9074 100644 --- a/kmymoney/wizards/newloanwizard/keditloanwizard.cpp +++ b/kmymoney/wizards/newloanwizard/keditloanwizard.cpp @@ -163,7 +163,7 @@ void KEditLoanWizard::loadWidgets(const MyMoneyAccount& /* account */) d->ui->m_interestEditPage->ui->m_newInterestRateEdit->setPrecision(3); d->ui->m_interestEditPage->ui->m_interestRateLabel->setText(QString(" ") + ir.formatMoney(QString(), 3) + QString("%")); - d->ui->m_paymentFrequencyPage->ui->m_paymentFrequencyUnitEdit->setCurrentIndex(d->ui->m_paymentFrequencyPage->ui->m_paymentFrequencyUnitEdit->findData(QVariant((int)d->m_schedule.occurrencePeriod()), Qt::UserRole, Qt::MatchExactly)); + d->ui->m_paymentFrequencyPage->ui->m_paymentFrequencyUnitEdit->setCurrentIndex(d->ui->m_paymentFrequencyPage->ui->m_paymentFrequencyUnitEdit->findData(QVariant((int)d->m_schedule.occurrence()), Qt::UserRole, Qt::MatchExactly)); d->ui->m_durationPage->updateTermWidgets(d->m_account.term()); // the base payment (amortization and interest) is determined -- cgit v1.1
