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
@@ -1,55 +1,53 @@
 #include <qshared.h>
 
 #include <qpe/palmtopuidgen.h>
 #include <qpe/categories.h>
 
 #include "orecur.h"
 #include "opimresolver.h"
 #include "opimnotifymanager.h"
 
 #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;
         QDate tmp( date.year(), date.month(), 1 );
         if ( date.dayOfWeek() < tmp.dayOfWeek() )
             ++week;
 
         week += ( date.day() - 1 ) / 7;
 
         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 ) {
             i <<= 1;
             ++dayOfWeek;
         }
         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() {
         recur = 0;
         manager = 0;
         isAllDay = false;
     }
     ~Data() {
         delete manager;
         delete recur;
     }
     QString description;
@@ -121,25 +119,26 @@ ORecur OEvent::recurrence()const {
         data->recur = new ORecur;
 
     return *data->recur;
 }
 void OEvent::setRecurrence( const ORecur& rec) {
     changeOrModify();
     if (data->recur )
         (*data->recur) = rec;
     else
         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;
 }
 void OEvent::setNote( const QString& note ) {
     changeOrModify();
     data->note = note;
 }
 QDateTime OEvent::createdDateTime()const {
     return data->created;
 }
 void OEvent::setCreatedDateTime( const QDateTime& time ) {