-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 | |||
@@ -30,4 +30,7 @@ | |||
30 | 30 | ||
31 | #include "recurrence.h" | 31 | #include "recurrence.h" |
32 | //Added by qt3to4: | ||
33 | #include <Q3ValueList> | ||
34 | #include <Q3PtrList> | ||
32 | 35 | ||
33 | using namespace KCal; | 36 | using namespace KCal; |
@@ -57,5 +60,5 @@ Recurrence::Recurrence(const Recurrence &r, Incidence *parent) | |||
57 | : recurs(r.recurs), | 60 | : recurs(r.recurs), |
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), |
61 | rDuration(r.rDuration), | 64 | rDuration(r.rDuration), |
@@ -71,17 +74,17 @@ Recurrence::Recurrence(const Recurrence &r, Incidence *parent) | |||
71 | mParent(parent) | 74 | mParent(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; |
75 | tmp->rPos = mp.current()->rPos; | 78 | tmp->rPos = mp.current()->rPos; |
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; |
82 | *tmp = *md.current(); | 85 | *tmp = *md.current(); |
83 | rMonthDays.append(tmp); | 86 | rMonthDays.append(tmp); |
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; |
87 | *tmp = *yn.current(); | 90 | *tmp = *yn.current(); |
@@ -125,6 +128,6 @@ bool Recurrence::operator==( const Recurrence& r2 ) const | |||
125 | && rWeekStart == r2.rWeekStart; | 128 | && rWeekStart == r2.rWeekStart; |
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() ) |
130 | return false; | 133 | return false; |
@@ -134,6 +137,6 @@ bool Recurrence::operator==( const Recurrence& r2 ) const | |||
134 | } | 137 | } |
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() ) |
139 | return false; | 142 | return false; |
@@ -144,10 +147,10 @@ bool Recurrence::operator==( const Recurrence& r2 ) const | |||
144 | case rYearlyPos: { | 147 | case rYearlyPos: { |
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() ) |
153 | return false; | 156 | return false; |
@@ -158,11 +161,11 @@ bool Recurrence::operator==( const Recurrence& r2 ) const | |||
158 | } | 161 | } |
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); |
163 | } | 166 | } |
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() ); |
168 | } | 171 | } |
@@ -358,5 +361,5 @@ QDateTime Recurrence::endDateTime() const | |||
358 | return mRecurStart.addSecs((rDuration-1+mRecurExDatesCount)*rFreq*3600); | 361 | return mRecurStart.addSecs((rDuration-1+mRecurExDatesCount)*rFreq*3600); |
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 | ||
362 | case rWeekly: | 365 | case rWeekly: |
@@ -507,15 +510,15 @@ const QBitArray &Recurrence::days() const | |||
507 | } | 510 | } |
508 | 511 | ||
509 | const QPtrList<Recurrence::rMonthPos> &Recurrence::monthPositions() const | 512 | const Q3PtrList<Recurrence::rMonthPos> &Recurrence::monthPositions() const |
510 | { | 513 | { |
511 | return rMonthPositions; | 514 | return rMonthPositions; |
512 | } | 515 | } |
513 | 516 | ||
514 | const QPtrList<Recurrence::rMonthPos> &Recurrence::yearMonthPositions() const | 517 | const Q3PtrList<Recurrence::rMonthPos> &Recurrence::yearMonthPositions() const |
515 | { | 518 | { |
516 | return rMonthPositions; | 519 | return rMonthPositions; |
517 | } | 520 | } |
518 | 521 | ||
519 | const QPtrList<int> &Recurrence::monthDays() const | 522 | const Q3PtrList<int> &Recurrence::monthDays() const |
520 | { | 523 | { |
521 | return rMonthDays; | 524 | return rMonthDays; |
@@ -760,5 +763,5 @@ void Recurrence::addYearlyMonthPos(short _rPos, const QBitArray &_rDays) | |||
760 | } | 763 | } |
761 | 764 | ||
762 | const QPtrList<int> &Recurrence::yearNums() const | 765 | const Q3PtrList<int> &Recurrence::yearNums() const |
763 | { | 766 | { |
764 | return rYearNums; | 767 | return rYearNums; |
@@ -1048,5 +1051,5 @@ bool Recurrence::recursMonthly(const QDate &qd) const | |||
1048 | rDuration == -1)) { | 1051 | rDuration == -1)) { |
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(); |
1052 | if (recurs == rMonthlyDay) | 1055 | if (recurs == rMonthlyDay) |
@@ -1054,5 +1057,5 @@ bool Recurrence::recursMonthly(const QDate &qd) const | |||
1054 | else if (recurs == rMonthlyPos) | 1057 | else if (recurs == rMonthlyPos) |
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) |
1058 | return true; | 1061 | return true; |
@@ -1102,5 +1105,5 @@ bool Recurrence::recursYearlyByMonth(const QDate &qd) const | |||
1102 | // The date queried falls within the range of the event. | 1105 | // The date queried falls within the range of the event. |
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()) |
1106 | return true; | 1109 | return true; |
@@ -1128,10 +1131,10 @@ bool Recurrence::recursYearlyByPos(const QDate &qd) const | |||
1128 | rDuration == -1)) { | 1131 | rDuration == -1)) { |
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) |
1137 | return true; | 1140 | return true; |
@@ -1158,5 +1161,5 @@ bool Recurrence::recursYearlyByDay(const QDate &qd) const | |||
1158 | // The date queried falls within the range of the event. | 1161 | // The date queried falls within the range of the event. |
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()) |
1162 | return true; | 1165 | return true; |
@@ -1550,5 +1553,5 @@ int Recurrence::recurCalc(PeriodFunc func, QDate &enddate) const | |||
1550 | case NEXT_AFTER_DATE: | 1553 | case NEXT_AFTER_DATE: |
1551 | if (count == 0) | 1554 | if (count == 0) |
1552 | endtime = QDate(); | 1555 | endtime = QDateTime(); |
1553 | else if (timed) | 1556 | else if (timed) |
1554 | enddate = endtime.date(); | 1557 | enddate = endtime.date(); |
@@ -1794,6 +1797,6 @@ struct Recurrence::MonthlyData { | |||
1794 | bool varies; // true if recurring days vary between different months | 1797 | bool varies; // true if recurring days vary between different months |
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: |
1799 | MonthlyData(const Recurrence* r, const QDate &date) | 1802 | MonthlyData(const Recurrence* r, const QDate &date) |
@@ -1806,10 +1809,10 @@ struct Recurrence::MonthlyData { | |||
1806 | ? true : recurrence->getMonthlyDayDays(days31, 31); | 1809 | ? true : recurrence->getMonthlyDayDays(days31, 31); |
1807 | } | 1810 | } |
1808 | const QValueList<int>* dayList() const { | 1811 | const Q3ValueList<int>* dayList() const { |
1809 | if (!varies) | 1812 | if (!varies) |
1810 | return &days31; | 1813 | return &days31; |
1811 | QDate startOfMonth(year, month + 1, 1); | 1814 | QDate startOfMonth(year, month + 1, 1); |
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) |
1815 | recurrence->getMonthlyPosDays(*days, daysInMonth, startOfMonth.dayOfWeek()); | 1818 | recurrence->getMonthlyPosDays(*days, daysInMonth, startOfMonth.dayOfWeek()); |
@@ -1845,6 +1848,6 @@ int Recurrence::monthlyCalcEndDate(QDate &enddate, MonthlyData &data) const | |||
1845 | uint countTogo = rDuration + mRecurExDatesCount; | 1848 | uint countTogo = rDuration + mRecurExDatesCount; |
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 | ||
1850 | if (data.day > 1) { | 1853 | if (data.day > 1) { |
@@ -1911,6 +1914,6 @@ int Recurrence::monthlyCalcToDate(const QDate &enddate, MonthlyData &data) const | |||
1911 | int endDay = enddate.day(); | 1914 | int endDay = enddate.day(); |
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 | ||
1916 | if (data.day > 1) { | 1919 | if (data.day > 1) { |
@@ -1970,6 +1973,6 @@ int Recurrence::monthlyCalcNextAfter(QDate &enddate, MonthlyData &data) const | |||
1970 | int endDay = enddate.day(); | 1973 | int endDay = enddate.day(); |
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 | ||
1975 | if (data.day > 1) { | 1978 | if (data.day > 1) { |
@@ -2053,6 +2056,6 @@ struct Recurrence::YearlyMonthData { | |||
2053 | bool feb29; // true if February 29th recurs | 2056 | bool feb29; // true if February 29th recurs |
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: |
2058 | YearlyMonthData(const Recurrence* r, const QDate &date) | 2061 | YearlyMonthData(const Recurrence* r, const QDate &date) |
@@ -2061,7 +2064,7 @@ struct Recurrence::YearlyMonthData { | |||
2061 | leapyear = feb29 && QDate::leapYear(year); | 2064 | leapyear = feb29 && QDate::leapYear(year); |
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); } |
2067 | }; | 2070 | }; |
@@ -2089,6 +2092,6 @@ int Recurrence::yearlyMonthCalcEndDate(QDate &enddate, YearlyMonthData &data) co | |||
2089 | uint countTogo = rDuration + mRecurExDatesCount; | 2092 | uint countTogo = rDuration + mRecurExDatesCount; |
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 | ||
2094 | if (data.month > 1) { | 2097 | if (data.month > 1) { |
@@ -2200,6 +2203,6 @@ int Recurrence::yearlyMonthCalcToDate(const QDate &enddate, YearlyMonthData &dat | |||
2200 | } | 2203 | } |
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 | ||
2205 | if (data.month > 1) { | 2208 | if (data.month > 1) { |
@@ -2271,6 +2274,6 @@ int Recurrence::yearlyMonthCalcNextAfter(QDate &enddate, YearlyMonthData &data) | |||
2271 | } | 2274 | } |
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 | ||
2276 | if (data.month > 1) { | 2279 | if (data.month > 1) { |
@@ -2391,5 +2394,5 @@ struct Recurrence::YearlyPosData { | |||
2391 | bool varies; // true if number of days varies from year to year | 2394 | bool varies; // true if number of days varies from year to year |
2392 | private: | 2395 | private: |
2393 | mutable QValueList<int> days; | 2396 | mutable Q3ValueList<int> days; |
2394 | public: | 2397 | public: |
2395 | YearlyPosData(const Recurrence* r, const QDate &date) | 2398 | YearlyPosData(const Recurrence* r, const QDate &date) |
@@ -2399,5 +2402,5 @@ struct Recurrence::YearlyPosData { | |||
2399 | varies = (daysPerMonth < 0); | 2402 | varies = (daysPerMonth < 0); |
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); |
2403 | recurrence->getMonthlyPosDays(days, startOfMonth.daysInMonth(), startOfMonth.dayOfWeek()); | 2406 | recurrence->getMonthlyPosDays(days, startOfMonth.daysInMonth(), startOfMonth.dayOfWeek()); |
@@ -2429,10 +2432,10 @@ int Recurrence::yearlyPosCalcEndDate(QDate &enddate, YearlyPosData &data) const | |||
2429 | uint countTogo = rDuration + mRecurExDatesCount; | 2432 | uint countTogo = rDuration + mRecurExDatesCount; |
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 | ||
2434 | if (data.month > 1 || data.day > 1) { | 2437 | if (data.month > 1 || data.day > 1) { |
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) { |
2438 | // Check what remains of the start month | 2441 | // Check what remains of the start month |
@@ -2467,5 +2470,5 @@ int Recurrence::yearlyPosCalcEndDate(QDate &enddate, YearlyPosData &data) const | |||
2467 | // The number of recurrences varies from year to year. | 2470 | // The number of recurrences varies from year to year. |
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(); |
2471 | days = data.dayList(); | 2474 | days = data.dayList(); |
@@ -2497,5 +2500,5 @@ int Recurrence::yearlyPosCalcEndDate(QDate &enddate, YearlyPosData &data) const | |||
2497 | 2500 | ||
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) { |
2501 | // Check the last month in the recurrence | 2504 | // Check the last month in the recurrence |
@@ -2532,10 +2535,10 @@ int Recurrence::yearlyPosCalcToDate(const QDate &enddate, YearlyPosData &data) c | |||
2532 | } | 2535 | } |
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 | ||
2537 | if (data.month > 1 || data.day > 1) { | 2540 | if (data.month > 1 || data.day > 1) { |
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) { |
2541 | data.month = *im.current(); | 2544 | data.month = *im.current(); |
@@ -2577,5 +2580,5 @@ int Recurrence::yearlyPosCalcToDate(const QDate &enddate, YearlyPosData &data) c | |||
2577 | // The number of recurrences varies from year to year. | 2580 | // The number of recurrences varies from year to year. |
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(); |
2581 | days = data.dayList(); | 2584 | days = data.dayList(); |
@@ -2612,5 +2615,5 @@ int Recurrence::yearlyPosCalcToDate(const QDate &enddate, YearlyPosData &data) c | |||
2612 | 2615 | ||
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(); |
2616 | if (data.month >= endMonth) { | 2619 | if (data.month >= endMonth) { |
@@ -2647,6 +2650,6 @@ int Recurrence::yearlyPosCalcNextAfter(QDate &enddate, YearlyPosData &data) cons | |||
2647 | } | 2650 | } |
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 | ||
2652 | if (data.varies) { | 2655 | if (data.varies) { |
@@ -2654,5 +2657,5 @@ int Recurrence::yearlyPosCalcNextAfter(QDate &enddate, YearlyPosData &data) cons | |||
2654 | for ( ; ; ) { | 2657 | for ( ; ; ) { |
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) { |
2658 | // Check the next month | 2661 | // Check the next month |
@@ -2690,5 +2693,5 @@ int Recurrence::yearlyPosCalcNextAfter(QDate &enddate, YearlyPosData &data) cons | |||
2690 | if (data.month > 1 || data.day > 1) { | 2693 | if (data.month > 1 || data.day > 1) { |
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) { |
2694 | // Check what remains of the start month | 2697 | // Check what remains of the start month |
@@ -2735,5 +2738,5 @@ int Recurrence::yearlyPosCalcNextAfter(QDate &enddate, YearlyPosData &data) cons | |||
2735 | 2738 | ||
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(); |
2739 | int ended = data.yearMonth() - endYearMonth; | 2742 | int ended = data.yearMonth() - endYearMonth; |
@@ -2809,5 +2812,5 @@ int Recurrence::yearlyDayCalcEndDate(QDate &enddate, YearlyDayData &data) const | |||
2809 | // Check what remains of the start year | 2812 | // Check what remains of the start year |
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(); |
2813 | if (d >= data.day && (leapOK || d < 366)) { | 2816 | if (d >= data.day && (leapOK || d < 366)) { |
@@ -2847,5 +2850,5 @@ int Recurrence::yearlyDayCalcEndDate(QDate &enddate, YearlyDayData &data) const | |||
2847 | if (countTogo) { | 2850 | if (countTogo) { |
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; |
2851 | if (--countTogo == 0) { | 2854 | if (--countTogo == 0) { |
@@ -2870,5 +2873,5 @@ int Recurrence::yearlyDayCalcToDate(const QDate &enddate, YearlyDayData &data) c | |||
2870 | // Check what remains of the start year | 2873 | // Check what remains of the start year |
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(); |
2874 | if (d >= data.day && (leapOK || d < 366)) { | 2877 | if (d >= data.day && (leapOK || d < 366)) { |
@@ -2909,5 +2912,5 @@ int Recurrence::yearlyDayCalcToDate(const QDate &enddate, YearlyDayData &data) c | |||
2909 | if (data.year <= endYear) { | 2912 | if (data.year <= endYear) { |
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) |
2913 | return countGone; | 2916 | return countGone; |
@@ -2929,5 +2932,5 @@ int Recurrence::yearlyDayCalcNextAfter(QDate &enddate, YearlyDayData &data) cons | |||
2929 | // Check what remains of the start year | 2932 | // Check what remains of the start year |
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(); |
2933 | if (d >= data.day && (leapOK || d < 366)) { | 2936 | if (d >= data.day && (leapOK || d < 366)) { |
@@ -2978,5 +2981,5 @@ int Recurrence::yearlyDayCalcNextAfter(QDate &enddate, YearlyDayData &data) cons | |||
2978 | 2981 | ||
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; |
2982 | int d = *it.current(); | 2985 | int d = *it.current(); |
@@ -2996,5 +2999,5 @@ ex: | |||
2996 | // Parameters: daysInMonth = number of days in this month | 2999 | // Parameters: daysInMonth = number of days in this month |
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 | { |
3000 | list.clear(); | 3003 | list.clear(); |
@@ -3002,5 +3005,5 @@ void Recurrence::getMonthlyPosDays(QValueList<int> &list, int daysInMonth, int s | |||
3002 | // Go through the list, compiling a bit list of actual day numbers | 3005 | // Go through the list, compiling a bit list of actual day numbers |
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 |
3006 | QBitArray &rdays = pos.current()->rDays; | 3009 | QBitArray &rdays = pos.current()->rDays; |
@@ -3040,5 +3043,5 @@ int Recurrence::countMonthlyPosDays() const | |||
3040 | Q_UINT8 positive[5] = { 0, 0, 0, 0, 0 }; | 3043 | Q_UINT8 positive[5] = { 0, 0, 0, 0, 0 }; |
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; |
3044 | Q_UINT8* wk; | 3047 | Q_UINT8* wk; |
@@ -3073,10 +3076,10 @@ int Recurrence::countMonthlyPosDays() const | |||
3073 | // Get the days in this month which recur, in numerical order. | 3076 | // Get the days in this month which recur, in numerical order. |
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 | { |
3077 | list.clear(); | 3080 | list.clear(); |
3078 | bool variable = false; | 3081 | bool variable = false; |
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(); |
3082 | if (day > 0) { | 3085 | if (day > 0) { |
@@ -3107,10 +3110,10 @@ bool Recurrence::getMonthlyDayDays(QValueList<int> &list, int daysInMonth) const | |||
3107 | // included in the non-leap year month list. | 3110 | // included in the non-leap year month list. |
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 | { |
3111 | list.clear(); | 3114 | list.clear(); |
3112 | leaplist.clear(); | 3115 | leaplist.clear(); |
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(); |
3116 | if (month == 2) { | 3119 | if (month == 2) { |
@@ -3188,5 +3191,5 @@ QDate Recurrence::getFirstDateInMonth(const QDate &earliestDate) const | |||
3188 | case rMonthlyDay: { | 3191 | case rMonthlyDay: { |
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(); |
3192 | if (day < 0) | 3195 | if (day < 0) |
@@ -3202,7 +3205,7 @@ QDate Recurrence::getFirstDateInMonth(const QDate &earliestDate) const | |||
3202 | case rYearlyPos: { | 3205 | case rYearlyPos: { |
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) |
3208 | return monthBegin.addDays(*id - 1); | 3211 | return monthBegin.addDays(*id - 1); |
@@ -3225,5 +3228,5 @@ QDate Recurrence::getLastDateInMonth(const QDate &latestDate) const | |||
3225 | case rMonthlyDay: { | 3228 | case rMonthlyDay: { |
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(); |
3229 | if (day < 0) | 3232 | if (day < 0) |
@@ -3239,7 +3242,7 @@ QDate Recurrence::getLastDateInMonth(const QDate &latestDate) const | |||
3239 | case rYearlyPos: { | 3242 | case rYearlyPos: { |
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) |
3245 | return monthBegin.addDays(*id - 1); | 3248 | return monthBegin.addDays(*id - 1); |
@@ -3257,5 +3260,5 @@ QDate Recurrence::getLastDateInMonth(const QDate &latestDate) const | |||
3257 | QDate Recurrence::getFirstDateInYear(const QDate &earliestDate) const | 3260 | 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) { |
3261 | case rYearlyMonth: { | 3264 | case rYearlyMonth: { |
@@ -3293,5 +3296,5 @@ QDate Recurrence::getFirstDateInYear(const QDate &earliestDate) const | |||
3293 | } | 3296 | } |
3294 | case rYearlyPos: { | 3297 | case rYearlyPos: { |
3295 | QValueList<int> dayList; | 3298 | Q3ValueList<int> dayList; |
3296 | int earliestYear = earliestDate.year(); | 3299 | int earliestYear = earliestDate.year(); |
3297 | int earliestMonth = earliestDate.month(); | 3300 | int earliestMonth = earliestDate.month(); |
@@ -3302,5 +3305,5 @@ QDate Recurrence::getFirstDateInYear(const QDate &earliestDate) const | |||
3302 | QDate monthBegin(earliestYear, month, 1); | 3305 | QDate monthBegin(earliestYear, month, 1); |
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) |
3306 | return monthBegin.addDays(*id - 1); | 3309 | return monthBegin.addDays(*id - 1); |
@@ -3330,5 +3333,5 @@ QDate Recurrence::getFirstDateInYear(const QDate &earliestDate) const | |||
3330 | QDate Recurrence::getLastDateInYear(const QDate &latestDate) const | 3333 | 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) { |
3334 | case rYearlyMonth: { | 3337 | case rYearlyMonth: { |
@@ -3365,5 +3368,5 @@ QDate Recurrence::getLastDateInYear(const QDate &latestDate) const | |||
3365 | } | 3368 | } |
3366 | case rYearlyPos: { | 3369 | case rYearlyPos: { |
3367 | QValueList<int> dayList; | 3370 | Q3ValueList<int> dayList; |
3368 | int latestYear = latestDate.year(); | 3371 | int latestYear = latestDate.year(); |
3369 | int latestMonth = latestDate.month(); | 3372 | int latestMonth = latestDate.month(); |
@@ -3374,5 +3377,5 @@ QDate Recurrence::getLastDateInYear(const QDate &latestDate) const | |||
3374 | QDate monthBegin(latestYear, month, 1); | 3377 | QDate monthBegin(latestYear, month, 1); |
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) |
3378 | return monthBegin.addDays(*id - 1); | 3381 | return monthBegin.addDays(*id - 1); |