From a08aff328d4393031d5ba7d622c2b05705a89d73 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Wed, 04 Jul 2007 11:23:42 +0000 Subject: initial public commit of qt4 port --- (limited to 'libkcal/recurrence.h') 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 @@ #include #include -#include +#include +//Added by qt3to4: +#include namespace KCal { @@ -248,9 +250,9 @@ class Recurrence */ void addMonthlyDay(short _rDay); /** Returns list of day positions in months. */ - const QPtrList &monthPositions() const; + const Q3PtrList &monthPositions() const; /** Returns list of day numbers of a month. */ - const QPtrList &monthDays() const; + const Q3PtrList &monthDays() const; /** Sets an event to recur yearly. * @var type rYearlyMonth, rYearlyPos or rYearlyDay @@ -279,9 +281,9 @@ class Recurrence */ void addYearlyMonthPos(short _rPos, const QBitArray &_rDays); /** Returns positions of days or months in year. */ - const QPtrList &yearNums() const; + const Q3PtrList &yearNums() const; /** Returns list of day positions in months, for a recursYearlyPos recurrence rule. */ - const QPtrList &yearMonthPositions() const; + const Q3PtrList &yearMonthPositions() const; /** Returns how yearly recurrences of February 29th are handled. */ Feb29Type feb29YearlyType() const { return mFeb29YearlyType; } /** Sets the default method for handling yearly recurrences of February 29th. */ @@ -294,8 +296,8 @@ class Recurrence */ void dump() const; QString recurrenceText() const; - bool getYearlyMonthMonths(int day, QValueList&, - QValueList &leaplist) const; + bool getYearlyMonthMonths(int day, Q3ValueList&, + Q3ValueList &leaplist) const; protected: enum PeriodFunc { END_DATE_AND_COUNT, COUNT_TO_DATE, NEXT_AFTER_DATE }; @@ -345,9 +347,9 @@ class Recurrence int yearlyDayCalcNextAfter(QDate& enddate, YearlyDayData&) const; int countMonthlyPosDays() const; - void getMonthlyPosDays(QValueList&, int daysInMonth, + void getMonthlyPosDays(Q3ValueList&, int daysInMonth, int startDayOfWeek) const; - bool getMonthlyDayDays(QValueList&, int daysInMonth) const; + bool getMonthlyDayDays(Q3ValueList&, int daysInMonth) const; int getFirstDayInWeek(int startDay, bool useWeekStart = true) const; int getLastDayInWeek(int endDay, bool useWeekStart = true) const; @@ -366,13 +368,13 @@ class Recurrence int rWeekStart; // day which starts the week, Monday=1 .. Sunday=7 QBitArray rDays; // array of days during week it recurs - QPtrList rMonthPositions; // list of positions during a month + Q3PtrList rMonthPositions; // list of positions during a month // on which an event recurs - QPtrList rMonthDays; // list of days during a month on + Q3PtrList rMonthDays; // list of days during a month on // which the event recurs - QPtrList rYearNums; // either months/days to recur on for rYearly, + Q3PtrList rYearNums; // either months/days to recur on for rYearly, // sorted in numerical order int rFreq; // frequency of period -- cgit v0.9.0.2