-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 | |||
@@ -11,4 +11,3 @@ | |||
11 | 11 | ||
12 | namespace OCalendarHelper { | 12 | int OCalendarHelper::week( const QDate& date) { |
13 | static int week( const QDate& date) { | ||
14 | // Calculates the week this date is in within that | 13 | // Calculates the week this date is in within that |
@@ -24,3 +23,3 @@ namespace OCalendarHelper { | |||
24 | } | 23 | } |
25 | static int occurence( const QDate& date) { | 24 | int OCalendarHelper::ocurrence( const QDate& date) { |
26 | // calculates the number of occurrances of this day of the | 25 | // calculates the number of occurrances of this day of the |
@@ -29,3 +28,3 @@ namespace OCalendarHelper { | |||
29 | } | 28 | } |
30 | static int dayOfWeek( char day ) { | 29 | int OCalendarHelper::dayOfWeek( char day ) { |
31 | int dayOfWeek = 1; | 30 | int dayOfWeek = 1; |
@@ -38,3 +37,3 @@ namespace OCalendarHelper { | |||
38 | } | 37 | } |
39 | static int monthDiff( const QDate& first, const QDate& second ) { | 38 | int OCalendarHelper::monthDiff( const QDate& first, const QDate& second ) { |
40 | return ( second.year() - first.year() ) * 12 + | 39 | return ( second.year() - first.year() ) * 12 + |
@@ -42,3 +41,2 @@ namespace OCalendarHelper { | |||
42 | } | 41 | } |
43 | } | ||
44 | 42 | ||
@@ -132,3 +130,4 @@ void OEvent::setRecurrence( const ORecur& rec) { | |||
132 | bool OEvent::hasRecurrence()const { | 130 | bool OEvent::hasRecurrence()const { |
133 | return data->recur; | 131 | if (!data->recur ) return false; |
132 | return data->recur->doesRecur(); | ||
134 | } | 133 | } |