author | zecke <zecke> | 2003-02-21 20:08:44 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-02-21 20:08:44 (UTC) |
commit | e09381c4b3d482c6b553a61c5fb0502a089dcc5f (patch) (side-by-side diff) | |
tree | c336a21f6b00e09989de5309ca8bb933c9494b09 /libopie/pim/oevent.cpp | |
parent | 3b37e71ad7dd41555763d15a16c691b503780de8 (diff) | |
download | opie-e09381c4b3d482c6b553a61c5fb0502a089dcc5f.zip opie-e09381c4b3d482c6b553a61c5fb0502a089dcc5f.tar.gz opie-e09381c4b3d482c6b553a61c5fb0502a089dcc5f.tar.bz2 |
-Fix hasRecurrence()
-Add the Access(Backend) of DateBook
-rw-r--r-- | libopie/pim/oevent.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libopie/pim/oevent.cpp b/libopie/pim/oevent.cpp index 71b9441..aaae3b2 100644 --- a/libopie/pim/oevent.cpp +++ b/libopie/pim/oevent.cpp @@ -9,8 +9,7 @@ #include "oevent.h" -namespace OCalendarHelper { - static int week( const QDate& date) { +int OCalendarHelper::week( const QDate& date) { // Calculates the week this date is in within that // month. Equals the "row" is is in in the month view int week = 1; @@ -22,12 +21,12 @@ namespace OCalendarHelper { return week; } - static int occurence( const QDate& date) { +int OCalendarHelper::ocurrence( const QDate& date) { // calculates the number of occurrances of this day of the // week till the given date (e.g 3rd Wednesday of the month) return ( date.day() - 1 ) / 7 + 1; } - static int dayOfWeek( char day ) { +int OCalendarHelper::dayOfWeek( char day ) { int dayOfWeek = 1; char i = ORecur::MON; while ( !( i & day ) && i <= ORecur::SUN ) { @@ -36,11 +35,10 @@ namespace OCalendarHelper { } return dayOfWeek; } - static int monthDiff( const QDate& first, const QDate& second ) { +int OCalendarHelper::monthDiff( const QDate& first, const QDate& second ) { return ( second.year() - first.year() ) * 12 + second.month() - first.month(); } -} struct OEvent::Data : public QShared { Data() : QShared() { @@ -130,7 +128,8 @@ void OEvent::setRecurrence( const ORecur& rec) { data->recur = new ORecur( rec ); } bool OEvent::hasRecurrence()const { - return data->recur; + if (!data->recur ) return false; + return data->recur->doesRecur(); } QString OEvent::note()const { return data->note; |