-rw-r--r-- | libkcal/recurrence.cpp | 187 |
1 files changed, 95 insertions, 92 deletions
diff --git a/libkcal/recurrence.cpp b/libkcal/recurrence.cpp index 6ee5499..9a4e540 100644 --- a/libkcal/recurrence.cpp +++ b/libkcal/recurrence.cpp | |||
@@ -31,2 +31,5 @@ | |||
31 | #include "recurrence.h" | 31 | #include "recurrence.h" |
32 | //Added by qt3to4: | ||
33 | #include <Q3ValueList> | ||
34 | #include <Q3PtrList> | ||
32 | 35 | ||
@@ -58,3 +61,3 @@ Recurrence::Recurrence(const Recurrence &r, Incidence *parent) | |||
58 | rWeekStart(r.rWeekStart), | 61 | rWeekStart(r.rWeekStart), |
59 | rDays(r.rDays.copy()), | 62 | rDays(r.rDays), |
60 | rFreq(r.rFreq), | 63 | rFreq(r.rFreq), |
@@ -72,3 +75,3 @@ Recurrence::Recurrence(const Recurrence &r, Incidence *parent) | |||
72 | { | 75 | { |
73 | for (QPtrListIterator<rMonthPos> mp(r.rMonthPositions); mp.current(); ++mp) { | 76 | for (Q3PtrListIterator<rMonthPos> mp(r.rMonthPositions); mp.current(); ++mp) { |
74 | rMonthPos *tmp = new rMonthPos; | 77 | rMonthPos *tmp = new rMonthPos; |
@@ -76,6 +79,6 @@ Recurrence::Recurrence(const Recurrence &r, Incidence *parent) | |||
76 | tmp->negative = mp.current()->negative; | 79 | tmp->negative = mp.current()->negative; |
77 | tmp->rDays = mp.current()->rDays.copy(); | 80 | tmp->rDays = mp.current()->rDays; |
78 | rMonthPositions.append(tmp); | 81 | rMonthPositions.append(tmp); |
79 | } | 82 | } |
80 | for (QPtrListIterator<int> md(r.rMonthDays); md.current(); ++md) { | 83 | for (Q3PtrListIterator<int> md(r.rMonthDays); md.current(); ++md) { |
81 | int *tmp = new int; | 84 | int *tmp = new int; |
@@ -84,3 +87,3 @@ Recurrence::Recurrence(const Recurrence &r, Incidence *parent) | |||
84 | } | 87 | } |
85 | for (QPtrListIterator<int> yn(r.rYearNums); yn.current(); ++yn) { | 88 | for (Q3PtrListIterator<int> yn(r.rYearNums); yn.current(); ++yn) { |
86 | int *tmp = new int; | 89 | int *tmp = new int; |
@@ -126,4 +129,4 @@ bool Recurrence::operator==( const Recurrence& r2 ) const | |||
126 | case rMonthlyPos: { | 129 | case rMonthlyPos: { |
127 | QPtrList<rMonthPos> MonthPositions = rMonthPositions; | 130 | Q3PtrList<rMonthPos> MonthPositions = rMonthPositions; |
128 | QPtrList<rMonthPos> MonthPositions2 = r2.rMonthPositions; | 131 | Q3PtrList<rMonthPos> MonthPositions2 = r2.rMonthPositions; |
129 | if ( !MonthPositions.count() ) | 132 | if ( !MonthPositions.count() ) |
@@ -135,4 +138,4 @@ bool Recurrence::operator==( const Recurrence& r2 ) const | |||
135 | case rMonthlyDay: { | 138 | case rMonthlyDay: { |
136 | QPtrList<int> MonthDays = rMonthDays ; | 139 | Q3PtrList<int> MonthDays = rMonthDays ; |
137 | QPtrList<int> MonthDays2 = r2.rMonthDays ; | 140 | Q3PtrList<int> MonthDays2 = r2.rMonthDays ; |
138 | if ( !MonthDays.count() ) | 141 | if ( !MonthDays.count() ) |
@@ -145,8 +148,8 @@ bool Recurrence::operator==( const Recurrence& r2 ) const | |||
145 | 148 | ||
146 | QPtrList<int> YearNums = rYearNums; | 149 | Q3PtrList<int> YearNums = rYearNums; |
147 | QPtrList<int> YearNums2 = r2.rYearNums; | 150 | Q3PtrList<int> YearNums2 = r2.rYearNums; |
148 | if ( *YearNums.first() != *YearNums2.first() ) | 151 | if ( *YearNums.first() != *YearNums2.first() ) |
149 | return false; | 152 | return false; |
150 | QPtrList<rMonthPos> MonthPositions = rMonthPositions; | 153 | Q3PtrList<rMonthPos> MonthPositions = rMonthPositions; |
151 | QPtrList<rMonthPos> MonthPositions2 = r2.rMonthPositions; | 154 | Q3PtrList<rMonthPos> MonthPositions2 = r2.rMonthPositions; |
152 | if ( !MonthPositions.count() ) | 155 | if ( !MonthPositions.count() ) |
@@ -159,4 +162,4 @@ bool Recurrence::operator==( const Recurrence& r2 ) const | |||
159 | case rYearlyMonth: { | 162 | case rYearlyMonth: { |
160 | QPtrList<int> YearNums = rYearNums; | 163 | Q3PtrList<int> YearNums = rYearNums; |
161 | QPtrList<int> YearNums2 = r2.rYearNums; | 164 | Q3PtrList<int> YearNums2 = r2.rYearNums; |
162 | return ( *YearNums.first() == *YearNums2.first() && mFeb29YearlyType == r2.mFeb29YearlyType); | 165 | return ( *YearNums.first() == *YearNums2.first() && mFeb29YearlyType == r2.mFeb29YearlyType); |
@@ -164,4 +167,4 @@ bool Recurrence::operator==( const Recurrence& r2 ) const | |||
164 | case rYearlyDay: { | 167 | case rYearlyDay: { |
165 | QPtrList<int> YearNums = rYearNums; | 168 | Q3PtrList<int> YearNums = rYearNums; |
166 | QPtrList<int> YearNums2 = r2.rYearNums; | 169 | Q3PtrList<int> YearNums2 = r2.rYearNums; |
167 | return ( *YearNums.first() == *YearNums2.first() ); | 170 | return ( *YearNums.first() == *YearNums2.first() ); |
@@ -359,3 +362,3 @@ QDateTime Recurrence::endDateTime() const | |||
359 | case rDaily: | 362 | case rDaily: |
360 | return dStart.addDays((rDuration-1+mRecurExDatesCount)*rFreq); | 363 | return (QDateTime)dStart.addDays((rDuration-1+mRecurExDatesCount)*rFreq); |
361 | 364 | ||
@@ -508,3 +511,3 @@ const QBitArray &Recurrence::days() const | |||
508 | 511 | ||
509 | const QPtrList<Recurrence::rMonthPos> &Recurrence::monthPositions() const | 512 | const Q3PtrList<Recurrence::rMonthPos> &Recurrence::monthPositions() const |
510 | { | 513 | { |
@@ -513,3 +516,3 @@ const QPtrList<Recurrence::rMonthPos> &Recurrence::monthPositions() const | |||
513 | 516 | ||
514 | const QPtrList<Recurrence::rMonthPos> &Recurrence::yearMonthPositions() const | 517 | const Q3PtrList<Recurrence::rMonthPos> &Recurrence::yearMonthPositions() const |
515 | { | 518 | { |
@@ -518,3 +521,3 @@ const QPtrList<Recurrence::rMonthPos> &Recurrence::yearMonthPositions() const | |||
518 | 521 | ||
519 | const QPtrList<int> &Recurrence::monthDays() const | 522 | const Q3PtrList<int> &Recurrence::monthDays() const |
520 | { | 523 | { |
@@ -761,3 +764,3 @@ void Recurrence::addYearlyMonthPos(short _rPos, const QBitArray &_rDays) | |||
761 | 764 | ||
762 | const QPtrList<int> &Recurrence::yearNums() const | 765 | const Q3PtrList<int> &Recurrence::yearNums() const |
763 | { | 766 | { |
@@ -1049,3 +1052,3 @@ bool Recurrence::recursMonthly(const QDate &qd) const | |||
1049 | // The date queried falls within the range of the event. | 1052 | // The date queried falls within the range of the event. |
1050 | QValueList<int> days; | 1053 | Q3ValueList<int> days; |
1051 | int daysInMonth = qd.daysInMonth(); | 1054 | int daysInMonth = qd.daysInMonth(); |
@@ -1055,3 +1058,3 @@ bool Recurrence::recursMonthly(const QDate &qd) const | |||
1055 | getMonthlyPosDays(days, daysInMonth, QDate(year, month, 1).dayOfWeek()); | 1058 | getMonthlyPosDays(days, daysInMonth, QDate(year, month, 1).dayOfWeek()); |
1056 | for (QValueList<int>::Iterator it = days.begin(); it != days.end(); ++it) { | 1059 | for (Q3ValueList<int>::Iterator it = days.begin(); it != days.end(); ++it) { |
1057 | if (*it == day) | 1060 | if (*it == day) |
@@ -1103,3 +1106,3 @@ bool Recurrence::recursYearlyByMonth(const QDate &qd) const | |||
1103 | int i = qmonth; | 1106 | int i = qmonth; |
1104 | for (QPtrListIterator<int> qlin(rYearNums); qlin.current(); ++qlin) { | 1107 | for (Q3PtrListIterator<int> qlin(rYearNums); qlin.current(); ++qlin) { |
1105 | if (i == *qlin.current()) | 1108 | if (i == *qlin.current()) |
@@ -1129,8 +1132,8 @@ bool Recurrence::recursYearlyByPos(const QDate &qd) const | |||
1129 | // The date queried falls within the range of the event. | 1132 | // The date queried falls within the range of the event. |
1130 | for (QPtrListIterator<int> qlin(rYearNums); qlin.current(); ++qlin) { | 1133 | for (Q3PtrListIterator<int> qlin(rYearNums); qlin.current(); ++qlin) { |
1131 | if (month == *qlin.current()) { | 1134 | if (month == *qlin.current()) { |
1132 | // The month recurs | 1135 | // The month recurs |
1133 | QValueList<int> days; | 1136 | Q3ValueList<int> days; |
1134 | getMonthlyPosDays(days, qd.daysInMonth(), QDate(year, month, 1).dayOfWeek()); | 1137 | getMonthlyPosDays(days, qd.daysInMonth(), QDate(year, month, 1).dayOfWeek()); |
1135 | for (QValueList<int>::Iterator it = days.begin(); it != days.end(); ++it) { | 1138 | for (Q3ValueList<int>::Iterator it = days.begin(); it != days.end(); ++it) { |
1136 | if (*it == day) | 1139 | if (*it == day) |
@@ -1159,3 +1162,3 @@ bool Recurrence::recursYearlyByDay(const QDate &qd) const | |||
1159 | int i = qd.dayOfYear(); | 1162 | int i = qd.dayOfYear(); |
1160 | for (QPtrListIterator<int> qlin(rYearNums); qlin.current(); ++qlin) { | 1163 | for (Q3PtrListIterator<int> qlin(rYearNums); qlin.current(); ++qlin) { |
1161 | if (i == *qlin.current()) | 1164 | if (i == *qlin.current()) |
@@ -1551,3 +1554,3 @@ int Recurrence::recurCalc(PeriodFunc func, QDate &enddate) const | |||
1551 | if (count == 0) | 1554 | if (count == 0) |
1552 | endtime = QDate(); | 1555 | endtime = QDateTime(); |
1553 | else if (timed) | 1556 | else if (timed) |
@@ -1795,4 +1798,4 @@ struct Recurrence::MonthlyData { | |||
1795 | private: | 1798 | private: |
1796 | QValueList<int> days28, days29, days30, days31; // recurring days in months of each length | 1799 | Q3ValueList<int> days28, days29, days30, days31; // recurring days in months of each length |
1797 | QValueList<int> *recurDays[4]; | 1800 | Q3ValueList<int> *recurDays[4]; |
1798 | public: | 1801 | public: |
@@ -1807,3 +1810,3 @@ struct Recurrence::MonthlyData { | |||
1807 | } | 1810 | } |
1808 | const QValueList<int>* dayList() const { | 1811 | const Q3ValueList<int>* dayList() const { |
1809 | if (!varies) | 1812 | if (!varies) |
@@ -1812,3 +1815,3 @@ struct Recurrence::MonthlyData { | |||
1812 | int daysInMonth = startOfMonth.daysInMonth(); | 1815 | int daysInMonth = startOfMonth.daysInMonth(); |
1813 | QValueList<int>* days = recurDays[daysInMonth - 28]; | 1816 | Q3ValueList<int>* days = recurDays[daysInMonth - 28]; |
1814 | if (recurrence->recurs == rMonthlyPos) | 1817 | if (recurrence->recurs == rMonthlyPos) |
@@ -1846,4 +1849,4 @@ int Recurrence::monthlyCalcEndDate(QDate &enddate, MonthlyData &data) const | |||
1846 | int countGone = 0; | 1849 | int countGone = 0; |
1847 | QValueList<int>::ConstIterator it; | 1850 | Q3ValueList<int>::ConstIterator it; |
1848 | const QValueList<int>* days = data.dayList(); | 1851 | const Q3ValueList<int>* days = data.dayList(); |
1849 | 1852 | ||
@@ -1912,4 +1915,4 @@ int Recurrence::monthlyCalcToDate(const QDate &enddate, MonthlyData &data) const | |||
1912 | int endYearMonth = endYear*12 + endMonth; | 1915 | int endYearMonth = endYear*12 + endMonth; |
1913 | QValueList<int>::ConstIterator it; | 1916 | Q3ValueList<int>::ConstIterator it; |
1914 | const QValueList<int>* days = data.dayList(); | 1917 | const Q3ValueList<int>* days = data.dayList(); |
1915 | 1918 | ||
@@ -1971,4 +1974,4 @@ int Recurrence::monthlyCalcNextAfter(QDate &enddate, MonthlyData &data) const | |||
1971 | int endYearMonth = endYear*12 + enddate.month() - 1; | 1974 | int endYearMonth = endYear*12 + enddate.month() - 1; |
1972 | QValueList<int>::ConstIterator it; | 1975 | Q3ValueList<int>::ConstIterator it; |
1973 | const QValueList<int>* days = data.dayList(); | 1976 | const Q3ValueList<int>* days = data.dayList(); |
1974 | 1977 | ||
@@ -2054,4 +2057,4 @@ struct Recurrence::YearlyMonthData { | |||
2054 | private: | 2057 | private: |
2055 | QValueList<int> months; // recurring months in non-leap years 1..12 | 2058 | Q3ValueList<int> months; // recurring months in non-leap years 1..12 |
2056 | QValueList<int> leapMonths; // recurring months in leap years 1..12 | 2059 | Q3ValueList<int> leapMonths; // recurring months in leap years 1..12 |
2057 | public: | 2060 | public: |
@@ -2062,5 +2065,5 @@ struct Recurrence::YearlyMonthData { | |||
2062 | } | 2065 | } |
2063 | const QValueList<int>* monthList() const | 2066 | const Q3ValueList<int>* monthList() const |
2064 | { return leapyear ? &leapMonths : &months; } | 2067 | { return leapyear ? &leapMonths : &months; } |
2065 | const QValueList<int>* leapMonthList() const { return &leapMonths; } | 2068 | const Q3ValueList<int>* leapMonthList() const { return &leapMonths; } |
2066 | QDate date() const { return QDate(year, month, day); } | 2069 | QDate date() const { return QDate(year, month, day); } |
@@ -2090,4 +2093,4 @@ int Recurrence::yearlyMonthCalcEndDate(QDate &enddate, YearlyMonthData &data) co | |||
2090 | int countGone = 0; | 2093 | int countGone = 0; |
2091 | QValueList<int>::ConstIterator it; | 2094 | Q3ValueList<int>::ConstIterator it; |
2092 | const QValueList<int>* mons = data.monthList(); // get recurring months for this year | 2095 | const Q3ValueList<int>* mons = data.monthList(); // get recurring months for this year |
2093 | 2096 | ||
@@ -2201,4 +2204,4 @@ int Recurrence::yearlyMonthCalcToDate(const QDate &enddate, YearlyMonthData &dat | |||
2201 | } | 2204 | } |
2202 | QValueList<int>::ConstIterator it; | 2205 | Q3ValueList<int>::ConstIterator it; |
2203 | const QValueList<int>* mons = data.monthList(); | 2206 | const Q3ValueList<int>* mons = data.monthList(); |
2204 | 2207 | ||
@@ -2272,4 +2275,4 @@ int Recurrence::yearlyMonthCalcNextAfter(QDate &enddate, YearlyMonthData &data) | |||
2272 | } | 2275 | } |
2273 | QValueList<int>::ConstIterator it; | 2276 | Q3ValueList<int>::ConstIterator it; |
2274 | const QValueList<int>* mons = data.monthList(); | 2277 | const Q3ValueList<int>* mons = data.monthList(); |
2275 | 2278 | ||
@@ -2392,3 +2395,3 @@ struct Recurrence::YearlyPosData { | |||
2392 | private: | 2395 | private: |
2393 | mutable QValueList<int> days; | 2396 | mutable Q3ValueList<int> days; |
2394 | public: | 2397 | public: |
@@ -2400,3 +2403,3 @@ struct Recurrence::YearlyPosData { | |||
2400 | } | 2403 | } |
2401 | const QValueList<int>* dayList() const { | 2404 | const Q3ValueList<int>* dayList() const { |
2402 | QDate startOfMonth(year, month, 1); | 2405 | QDate startOfMonth(year, month, 1); |
@@ -2430,4 +2433,4 @@ int Recurrence::yearlyPosCalcEndDate(QDate &enddate, YearlyPosData &data) const | |||
2430 | int countGone = 0; | 2433 | int countGone = 0; |
2431 | QValueList<int>::ConstIterator id; | 2434 | Q3ValueList<int>::ConstIterator id; |
2432 | const QValueList<int>* days; | 2435 | const Q3ValueList<int>* days; |
2433 | 2436 | ||
@@ -2435,3 +2438,3 @@ int Recurrence::yearlyPosCalcEndDate(QDate &enddate, YearlyPosData &data) const | |||
2435 | // Check what remains of the start year | 2438 | // Check what remains of the start year |
2436 | for (QPtrListIterator<int> im(rYearNums); im.current(); ++im) { | 2439 | for (Q3PtrListIterator<int> im(rYearNums); im.current(); ++im) { |
2437 | if (*im.current() >= data.month) { | 2440 | if (*im.current() >= data.month) { |
@@ -2468,3 +2471,3 @@ int Recurrence::yearlyPosCalcEndDate(QDate &enddate, YearlyPosData &data) const | |||
2468 | for ( ; ; ) { | 2471 | for ( ; ; ) { |
2469 | for (QPtrListIterator<int> im(rYearNums); im.current(); ++im) { | 2472 | for (Q3PtrListIterator<int> im(rYearNums); im.current(); ++im) { |
2470 | data.month = *im.current(); | 2473 | data.month = *im.current(); |
@@ -2498,3 +2501,3 @@ int Recurrence::yearlyPosCalcEndDate(QDate &enddate, YearlyPosData &data) const | |||
2498 | // Check the last year in the recurrence. | 2501 | // Check the last year in the recurrence. |
2499 | for (QPtrListIterator<int> im(rYearNums); im.current(); ++im) { | 2502 | for (Q3PtrListIterator<int> im(rYearNums); im.current(); ++im) { |
2500 | if (static_cast<uint>(data.daysPerMonth) >= countTogo) { | 2503 | if (static_cast<uint>(data.daysPerMonth) >= countTogo) { |
@@ -2533,4 +2536,4 @@ int Recurrence::yearlyPosCalcToDate(const QDate &enddate, YearlyPosData &data) c | |||
2533 | int endYearMonth = endYear*12 + endMonth; | 2536 | int endYearMonth = endYear*12 + endMonth; |
2534 | QValueList<int>::ConstIterator id; | 2537 | Q3ValueList<int>::ConstIterator id; |
2535 | const QValueList<int>* days; | 2538 | const Q3ValueList<int>* days; |
2536 | 2539 | ||
@@ -2538,3 +2541,3 @@ int Recurrence::yearlyPosCalcToDate(const QDate &enddate, YearlyPosData &data) c | |||
2538 | // Check what remains of the start year | 2541 | // Check what remains of the start year |
2539 | for (QPtrListIterator<int> im(rYearNums); im.current(); ++im) { | 2542 | for (Q3PtrListIterator<int> im(rYearNums); im.current(); ++im) { |
2540 | if (*im.current() >= data.month) { | 2543 | if (*im.current() >= data.month) { |
@@ -2578,3 +2581,3 @@ int Recurrence::yearlyPosCalcToDate(const QDate &enddate, YearlyPosData &data) c | |||
2578 | for ( ; ; ) { | 2581 | for ( ; ; ) { |
2579 | for (QPtrListIterator<int> im(rYearNums); im.current(); ++im) { | 2582 | for (Q3PtrListIterator<int> im(rYearNums); im.current(); ++im) { |
2580 | data.month = *im.current(); | 2583 | data.month = *im.current(); |
@@ -2613,3 +2616,3 @@ int Recurrence::yearlyPosCalcToDate(const QDate &enddate, YearlyPosData &data) c | |||
2613 | // Check the last year in the recurrence. | 2616 | // Check the last year in the recurrence. |
2614 | for (QPtrListIterator<int> im(rYearNums); im.current(); ++im) { | 2617 | for (Q3PtrListIterator<int> im(rYearNums); im.current(); ++im) { |
2615 | data.month = *im.current(); | 2618 | data.month = *im.current(); |
@@ -2648,4 +2651,4 @@ int Recurrence::yearlyPosCalcNextAfter(QDate &enddate, YearlyPosData &data) cons | |||
2648 | int endYearMonth = endYear*12 + endMonth; | 2651 | int endYearMonth = endYear*12 + endMonth; |
2649 | QValueList<int>::ConstIterator id; | 2652 | Q3ValueList<int>::ConstIterator id; |
2650 | const QValueList<int>* days; | 2653 | const Q3ValueList<int>* days; |
2651 | 2654 | ||
@@ -2655,3 +2658,3 @@ int Recurrence::yearlyPosCalcNextAfter(QDate &enddate, YearlyPosData &data) cons | |||
2655 | // Check the next year | 2658 | // Check the next year |
2656 | for (QPtrListIterator<int> im(rYearNums); im.current(); ++im) { | 2659 | for (Q3PtrListIterator<int> im(rYearNums); im.current(); ++im) { |
2657 | if (*im.current() >= data.month) { | 2660 | if (*im.current() >= data.month) { |
@@ -2691,3 +2694,3 @@ int Recurrence::yearlyPosCalcNextAfter(QDate &enddate, YearlyPosData &data) cons | |||
2691 | // Check what remains of the start year | 2694 | // Check what remains of the start year |
2692 | for (QPtrListIterator<int> im(rYearNums); im.current(); ++im) { | 2695 | for (Q3PtrListIterator<int> im(rYearNums); im.current(); ++im) { |
2693 | if (*im.current() >= data.month) { | 2696 | if (*im.current() >= data.month) { |
@@ -2736,3 +2739,3 @@ int Recurrence::yearlyPosCalcNextAfter(QDate &enddate, YearlyPosData &data) cons | |||
2736 | // Check the last year in the recurrence | 2739 | // Check the last year in the recurrence |
2737 | for (QPtrListIterator<int> im(rYearNums); im.current(); ++im) { | 2740 | for (Q3PtrListIterator<int> im(rYearNums); im.current(); ++im) { |
2738 | data.month = *im.current(); | 2741 | data.month = *im.current(); |
@@ -2810,3 +2813,3 @@ int Recurrence::yearlyDayCalcEndDate(QDate &enddate, YearlyDayData &data) const | |||
2810 | bool leapOK = data.isMaxDayCount(); | 2813 | bool leapOK = data.isMaxDayCount(); |
2811 | for (QPtrListIterator<int> it(rYearNums); it.current(); ++it) { | 2814 | for (Q3PtrListIterator<int> it(rYearNums); it.current(); ++it) { |
2812 | int d = *it.current(); | 2815 | int d = *it.current(); |
@@ -2848,3 +2851,3 @@ int Recurrence::yearlyDayCalcEndDate(QDate &enddate, YearlyDayData &data) const | |||
2848 | // Check the last year in the recurrence | 2851 | // Check the last year in the recurrence |
2849 | for (QPtrListIterator<int> it(rYearNums); it.current(); ++it) { | 2852 | for (Q3PtrListIterator<int> it(rYearNums); it.current(); ++it) { |
2850 | ++countGone; | 2853 | ++countGone; |
@@ -2871,3 +2874,3 @@ int Recurrence::yearlyDayCalcToDate(const QDate &enddate, YearlyDayData &data) c | |||
2871 | bool leapOK = data.isMaxDayCount(); | 2874 | bool leapOK = data.isMaxDayCount(); |
2872 | for (QPtrListIterator<int> it(rYearNums); it.current(); ++it) { | 2875 | for (Q3PtrListIterator<int> it(rYearNums); it.current(); ++it) { |
2873 | int d = *it.current(); | 2876 | int d = *it.current(); |
@@ -2910,3 +2913,3 @@ int Recurrence::yearlyDayCalcToDate(const QDate &enddate, YearlyDayData &data) c | |||
2910 | // Check the last year in the recurrence | 2913 | // Check the last year in the recurrence |
2911 | for (QPtrListIterator<int> it(rYearNums); it.current(); ++it) { | 2914 | for (Q3PtrListIterator<int> it(rYearNums); it.current(); ++it) { |
2912 | if (*it.current() > endDay) | 2915 | if (*it.current() > endDay) |
@@ -2930,3 +2933,3 @@ int Recurrence::yearlyDayCalcNextAfter(QDate &enddate, YearlyDayData &data) cons | |||
2930 | bool leapOK = data.isMaxDayCount(); | 2933 | bool leapOK = data.isMaxDayCount(); |
2931 | for (QPtrListIterator<int> it(rYearNums); it.current(); ++it) { | 2934 | for (Q3PtrListIterator<int> it(rYearNums); it.current(); ++it) { |
2932 | int d = *it.current(); | 2935 | int d = *it.current(); |
@@ -2979,3 +2982,3 @@ int Recurrence::yearlyDayCalcNextAfter(QDate &enddate, YearlyDayData &data) cons | |||
2979 | // Check the last year in the recurrence | 2982 | // Check the last year in the recurrence |
2980 | for (QPtrListIterator<int> it(rYearNums); it.current(); ++it) { | 2983 | for (Q3PtrListIterator<int> it(rYearNums); it.current(); ++it) { |
2981 | ++countGone; | 2984 | ++countGone; |
@@ -2997,3 +3000,3 @@ ex: | |||
2997 | // startDayOfWeek = day of week for first day of month. | 3000 | // startDayOfWeek = day of week for first day of month. |
2998 | void Recurrence::getMonthlyPosDays(QValueList<int> &list, int daysInMonth, int startDayOfWeek) const | 3001 | void Recurrence::getMonthlyPosDays(Q3ValueList<int> &list, int daysInMonth, int startDayOfWeek) const |
2999 | { | 3002 | { |
@@ -3003,3 +3006,3 @@ void Recurrence::getMonthlyPosDays(QValueList<int> &list, int daysInMonth, int s | |||
3003 | Q_UINT32 days = 0; | 3006 | Q_UINT32 days = 0; |
3004 | for (QPtrListIterator<rMonthPos> pos(rMonthPositions); pos.current(); ++pos) { | 3007 | for (Q3PtrListIterator<rMonthPos> pos(rMonthPositions); pos.current(); ++pos) { |
3005 | int weeknum = pos.current()->rPos - 1; // get 0-based week number | 3008 | int weeknum = pos.current()->rPos - 1; // get 0-based week number |
@@ -3041,3 +3044,3 @@ int Recurrence::countMonthlyPosDays() const | |||
3041 | Q_UINT8 negative[4] = { 0, 0, 0, 0 }; | 3044 | Q_UINT8 negative[4] = { 0, 0, 0, 0 }; |
3042 | for (QPtrListIterator<rMonthPos> pos(rMonthPositions); pos.current(); ++pos) { | 3045 | for (Q3PtrListIterator<rMonthPos> pos(rMonthPositions); pos.current(); ++pos) { |
3043 | int weeknum = pos.current()->rPos; | 3046 | int weeknum = pos.current()->rPos; |
@@ -3074,3 +3077,3 @@ int Recurrence::countMonthlyPosDays() const | |||
3074 | // Reply = true if day numbers varies from month to month. | 3077 | // Reply = true if day numbers varies from month to month. |
3075 | bool Recurrence::getMonthlyDayDays(QValueList<int> &list, int daysInMonth) const | 3078 | bool Recurrence::getMonthlyDayDays(Q3ValueList<int> &list, int daysInMonth) const |
3076 | { | 3079 | { |
@@ -3079,3 +3082,3 @@ bool Recurrence::getMonthlyDayDays(QValueList<int> &list, int daysInMonth) const | |||
3079 | Q_UINT32 days = 0; | 3082 | Q_UINT32 days = 0; |
3080 | for (QPtrListIterator<int> it(rMonthDays); it.current(); ++it) { | 3083 | for (Q3PtrListIterator<int> it(rMonthDays); it.current(); ++it) { |
3081 | int day = *it.current(); | 3084 | int day = *it.current(); |
@@ -3108,3 +3111,3 @@ bool Recurrence::getMonthlyDayDays(QValueList<int> &list, int daysInMonth) const | |||
3108 | // Reply = true if February 29th also recurs. | 3111 | // Reply = true if February 29th also recurs. |
3109 | bool Recurrence::getYearlyMonthMonths(int day, QValueList<int> &list, QValueList<int> &leaplist) const | 3112 | bool Recurrence::getYearlyMonthMonths(int day, Q3ValueList<int> &list, Q3ValueList<int> &leaplist) const |
3110 | { | 3113 | { |
@@ -3113,3 +3116,3 @@ bool Recurrence::getYearlyMonthMonths(int day, QValueList<int> &list, QValueList | |||
3113 | bool feb29 = false; | 3116 | bool feb29 = false; |
3114 | for (QPtrListIterator<int> it(rYearNums); it.current(); ++it) { | 3117 | for (Q3PtrListIterator<int> it(rYearNums); it.current(); ++it) { |
3115 | int month = *it.current(); | 3118 | int month = *it.current(); |
@@ -3189,3 +3192,3 @@ QDate Recurrence::getFirstDateInMonth(const QDate &earliestDate) const | |||
3189 | int minday = daysInMonth + 1; | 3192 | int minday = daysInMonth + 1; |
3190 | for (QPtrListIterator<int> it(rMonthDays); it.current(); ++it) { | 3193 | for (Q3PtrListIterator<int> it(rMonthDays); it.current(); ++it) { |
3191 | int day = *it.current(); | 3194 | int day = *it.current(); |
@@ -3203,5 +3206,5 @@ QDate Recurrence::getFirstDateInMonth(const QDate &earliestDate) const | |||
3203 | QDate monthBegin(earliestDate.addDays(1 - earliestDay)); | 3206 | QDate monthBegin(earliestDate.addDays(1 - earliestDay)); |
3204 | QValueList<int> dayList; | 3207 | Q3ValueList<int> dayList; |
3205 | getMonthlyPosDays(dayList, daysInMonth, monthBegin.dayOfWeek()); | 3208 | getMonthlyPosDays(dayList, daysInMonth, monthBegin.dayOfWeek()); |
3206 | for (QValueList<int>::ConstIterator id = dayList.begin(); id != dayList.end(); ++id) { | 3209 | for (Q3ValueList<int>::ConstIterator id = dayList.begin(); id != dayList.end(); ++id) { |
3207 | if (*id >= earliestDay) | 3210 | if (*id >= earliestDay) |
@@ -3226,3 +3229,3 @@ QDate Recurrence::getLastDateInMonth(const QDate &latestDate) const | |||
3226 | int maxday = -1; | 3229 | int maxday = -1; |
3227 | for (QPtrListIterator<int> it(rMonthDays); it.current(); ++it) { | 3230 | for (Q3PtrListIterator<int> it(rMonthDays); it.current(); ++it) { |
3228 | int day = *it.current(); | 3231 | int day = *it.current(); |
@@ -3240,5 +3243,5 @@ QDate Recurrence::getLastDateInMonth(const QDate &latestDate) const | |||
3240 | QDate monthBegin(latestDate.addDays(1 - latestDay)); | 3243 | QDate monthBegin(latestDate.addDays(1 - latestDay)); |
3241 | QValueList<int> dayList; | 3244 | Q3ValueList<int> dayList; |
3242 | getMonthlyPosDays(dayList, daysInMonth, monthBegin.dayOfWeek()); | 3245 | getMonthlyPosDays(dayList, daysInMonth, monthBegin.dayOfWeek()); |
3243 | for (QValueList<int>::ConstIterator id = dayList.fromLast(); id != dayList.end(); --id) { | 3246 | for (Q3ValueList<int>::ConstIterator id = dayList.fromLast(); id != dayList.end(); --id) { |
3244 | if (*id <= latestDay) | 3247 | if (*id <= latestDay) |
@@ -3258,3 +3261,3 @@ QDate Recurrence::getFirstDateInYear(const QDate &earliestDate) const | |||
3258 | { | 3261 | { |
3259 | QPtrListIterator<int> it(rYearNums); | 3262 | Q3PtrListIterator<int> it(rYearNums); |
3260 | switch (recurs) { | 3263 | switch (recurs) { |
@@ -3294,3 +3297,3 @@ QDate Recurrence::getFirstDateInYear(const QDate &earliestDate) const | |||
3294 | case rYearlyPos: { | 3297 | case rYearlyPos: { |
3295 | QValueList<int> dayList; | 3298 | Q3ValueList<int> dayList; |
3296 | int earliestYear = earliestDate.year(); | 3299 | int earliestYear = earliestDate.year(); |
@@ -3303,3 +3306,3 @@ QDate Recurrence::getFirstDateInYear(const QDate &earliestDate) const | |||
3303 | getMonthlyPosDays(dayList, monthBegin.daysInMonth(), monthBegin.dayOfWeek()); | 3306 | getMonthlyPosDays(dayList, monthBegin.daysInMonth(), monthBegin.dayOfWeek()); |
3304 | for (QValueList<int>::ConstIterator id = dayList.begin(); id != dayList.end(); ++id) { | 3307 | for (Q3ValueList<int>::ConstIterator id = dayList.begin(); id != dayList.end(); ++id) { |
3305 | if (*id >= earliestDay) | 3308 | if (*id >= earliestDay) |
@@ -3331,3 +3334,3 @@ QDate Recurrence::getLastDateInYear(const QDate &latestDate) const | |||
3331 | { | 3334 | { |
3332 | QPtrListIterator<int> it(rYearNums); | 3335 | Q3PtrListIterator<int> it(rYearNums); |
3333 | switch (recurs) { | 3336 | switch (recurs) { |
@@ -3366,3 +3369,3 @@ QDate Recurrence::getLastDateInYear(const QDate &latestDate) const | |||
3366 | case rYearlyPos: { | 3369 | case rYearlyPos: { |
3367 | QValueList<int> dayList; | 3370 | Q3ValueList<int> dayList; |
3368 | int latestYear = latestDate.year(); | 3371 | int latestYear = latestDate.year(); |
@@ -3375,3 +3378,3 @@ QDate Recurrence::getLastDateInYear(const QDate &latestDate) const | |||
3375 | getMonthlyPosDays(dayList, monthBegin.daysInMonth(), monthBegin.dayOfWeek()); | 3378 | getMonthlyPosDays(dayList, monthBegin.daysInMonth(), monthBegin.dayOfWeek()); |
3376 | for (QValueList<int>::ConstIterator id = dayList.fromLast(); id != dayList.end(); --id) { | 3379 | for (Q3ValueList<int>::ConstIterator id = dayList.fromLast(); id != dayList.end(); --id) { |
3377 | if (*id <= latestDay) | 3380 | if (*id <= latestDay) |