-rw-r--r-- | libkcal/recurrence.h | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/libkcal/recurrence.h b/libkcal/recurrence.h index b13d14f..5b5aab1 100644 --- a/libkcal/recurrence.h +++ b/libkcal/recurrence.h | |||
@@ -24,7 +24,9 @@ | |||
24 | 24 | ||
25 | #include <qstring.h> | 25 | #include <qstring.h> |
26 | #include <qbitarray.h> | 26 | #include <qbitarray.h> |
27 | #include <qptrlist.h> | 27 | #include <q3ptrlist.h> |
28 | //Added by qt3to4: | ||
29 | #include <Q3ValueList> | ||
28 | 30 | ||
29 | namespace KCal { | 31 | namespace KCal { |
30 | 32 | ||
@@ -248,9 +250,9 @@ class Recurrence | |||
248 | */ | 250 | */ |
249 | void addMonthlyDay(short _rDay); | 251 | void addMonthlyDay(short _rDay); |
250 | /** Returns list of day positions in months. */ | 252 | /** Returns list of day positions in months. */ |
251 | const QPtrList<rMonthPos> &monthPositions() const; | 253 | const Q3PtrList<rMonthPos> &monthPositions() const; |
252 | /** Returns list of day numbers of a month. */ | 254 | /** Returns list of day numbers of a month. */ |
253 | const QPtrList<int> &monthDays() const; | 255 | const Q3PtrList<int> &monthDays() const; |
254 | 256 | ||
255 | /** Sets an event to recur yearly. | 257 | /** Sets an event to recur yearly. |
256 | * @var type rYearlyMonth, rYearlyPos or rYearlyDay | 258 | * @var type rYearlyMonth, rYearlyPos or rYearlyDay |
@@ -279,9 +281,9 @@ class Recurrence | |||
279 | */ | 281 | */ |
280 | void addYearlyMonthPos(short _rPos, const QBitArray &_rDays); | 282 | void addYearlyMonthPos(short _rPos, const QBitArray &_rDays); |
281 | /** Returns positions of days or months in year. */ | 283 | /** Returns positions of days or months in year. */ |
282 | const QPtrList<int> &yearNums() const; | 284 | const Q3PtrList<int> &yearNums() const; |
283 | /** Returns list of day positions in months, for a recursYearlyPos recurrence rule. */ | 285 | /** Returns list of day positions in months, for a recursYearlyPos recurrence rule. */ |
284 | const QPtrList<rMonthPos> &yearMonthPositions() const; | 286 | const Q3PtrList<rMonthPos> &yearMonthPositions() const; |
285 | /** Returns how yearly recurrences of February 29th are handled. */ | 287 | /** Returns how yearly recurrences of February 29th are handled. */ |
286 | Feb29Type feb29YearlyType() const { return mFeb29YearlyType; } | 288 | Feb29Type feb29YearlyType() const { return mFeb29YearlyType; } |
287 | /** Sets the default method for handling yearly recurrences of February 29th. */ | 289 | /** Sets the default method for handling yearly recurrences of February 29th. */ |
@@ -294,8 +296,8 @@ class Recurrence | |||
294 | */ | 296 | */ |
295 | void dump() const; | 297 | void dump() const; |
296 | QString recurrenceText() const; | 298 | QString recurrenceText() const; |
297 | bool getYearlyMonthMonths(int day, QValueList<int>&, | 299 | bool getYearlyMonthMonths(int day, Q3ValueList<int>&, |
298 | QValueList<int> &leaplist) const; | 300 | Q3ValueList<int> &leaplist) const; |
299 | 301 | ||
300 | protected: | 302 | protected: |
301 | enum PeriodFunc { END_DATE_AND_COUNT, COUNT_TO_DATE, NEXT_AFTER_DATE }; | 303 | enum PeriodFunc { END_DATE_AND_COUNT, COUNT_TO_DATE, NEXT_AFTER_DATE }; |
@@ -345,9 +347,9 @@ class Recurrence | |||
345 | int yearlyDayCalcNextAfter(QDate& enddate, YearlyDayData&) const; | 347 | int yearlyDayCalcNextAfter(QDate& enddate, YearlyDayData&) const; |
346 | 348 | ||
347 | int countMonthlyPosDays() const; | 349 | int countMonthlyPosDays() const; |
348 | void getMonthlyPosDays(QValueList<int>&, int daysInMonth, | 350 | void getMonthlyPosDays(Q3ValueList<int>&, int daysInMonth, |
349 | int startDayOfWeek) const; | 351 | int startDayOfWeek) const; |
350 | bool getMonthlyDayDays(QValueList<int>&, int daysInMonth) const; | 352 | bool getMonthlyDayDays(Q3ValueList<int>&, int daysInMonth) const; |
351 | 353 | ||
352 | int getFirstDayInWeek(int startDay, bool useWeekStart = true) const; | 354 | int getFirstDayInWeek(int startDay, bool useWeekStart = true) const; |
353 | int getLastDayInWeek(int endDay, bool useWeekStart = true) const; | 355 | int getLastDayInWeek(int endDay, bool useWeekStart = true) const; |
@@ -366,13 +368,13 @@ class Recurrence | |||
366 | int rWeekStart; // day which starts the week, Monday=1 .. Sunday=7 | 368 | int rWeekStart; // day which starts the week, Monday=1 .. Sunday=7 |
367 | QBitArray rDays; // array of days during week it recurs | 369 | QBitArray rDays; // array of days during week it recurs |
368 | 370 | ||
369 | QPtrList<rMonthPos> rMonthPositions; // list of positions during a month | 371 | Q3PtrList<rMonthPos> rMonthPositions; // list of positions during a month |
370 | // on which an event recurs | 372 | // on which an event recurs |
371 | 373 | ||
372 | QPtrList<int> rMonthDays; // list of days during a month on | 374 | Q3PtrList<int> rMonthDays; // list of days during a month on |
373 | // which the event recurs | 375 | // which the event recurs |
374 | 376 | ||
375 | QPtrList<int> rYearNums; // either months/days to recur on for rYearly, | 377 | Q3PtrList<int> rYearNums; // either months/days to recur on for rYearly, |
376 | // sorted in numerical order | 378 | // sorted in numerical order |
377 | 379 | ||
378 | int rFreq; // frequency of period | 380 | int rFreq; // frequency of period |