-rw-r--r-- | libopie2/opiepim/oevent.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libopie2/opiepim/oevent.cpp b/libopie2/opiepim/oevent.cpp index 71b9441..aaae3b2 100644 --- a/libopie2/opiepim/oevent.cpp +++ b/libopie2/opiepim/oevent.cpp @@ -11,4 +11,3 @@ -namespace OCalendarHelper { - static int week( const QDate& date) { +int OCalendarHelper::week( const QDate& date) { // Calculates the week this date is in within that @@ -24,3 +23,3 @@ namespace OCalendarHelper { } - static int occurence( const QDate& date) { +int OCalendarHelper::ocurrence( const QDate& date) { // calculates the number of occurrances of this day of the @@ -29,3 +28,3 @@ namespace OCalendarHelper { } - static int dayOfWeek( char day ) { +int OCalendarHelper::dayOfWeek( char day ) { int dayOfWeek = 1; @@ -38,3 +37,3 @@ namespace OCalendarHelper { } - static int monthDiff( const QDate& first, const QDate& second ) { +int OCalendarHelper::monthDiff( const QDate& first, const QDate& second ) { return ( second.year() - first.year() ) * 12 + @@ -42,3 +41,2 @@ namespace OCalendarHelper { } -} @@ -132,3 +130,4 @@ void OEvent::setRecurrence( const ORecur& rec) { bool OEvent::hasRecurrence()const { - return data->recur; + if (!data->recur ) return false; + return data->recur->doesRecur(); } |