11 files changed, 108 insertions, 99 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index a76f2ed..a9d42f0 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -3761,3 +3761,3 @@ void CalendarView::deleteEvent(Event *anEvent)
 
-    if (anEvent->recurrence()->doesRecur()) {
+    if (anEvent->doesRecur()) {
         QDate itemDate = mViewManager->currentSelectionDate();
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 0dd5ef5..c738f7e 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -581,3 +581,3 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
                     Incidence *incidence = mActionItem->incidence();
-                    if ( incidence->isReadOnly() /*|| incidence->recurrence()->doesRecur() */) {
+                    if ( incidence->isReadOnly() /*|| incidence->doesRecur() */) {
                         mActionItem = 0;
@@ -1001,3 +1001,3 @@ void KOAgenda::endItemAction()
         }
-        if ( placeItem->incidence()->recurrence()->doesRecur() ) {
+        if ( placeItem->incidence()->doesRecur() ) {
             Incidence* oldInc =  placeItem->incidence();
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 303a92a..49ad9b8 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -236,3 +236,3 @@ bool KOAgendaItem::updateIcons(QPainter * p, bool horLayout)
     }
-    if (mIncidence->recurrence()->doesRecur()) {
+    if (mIncidence->doesRecur()) {
         p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, blue );
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index a01323a..04f30bb 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -1203,3 +1203,3 @@ void KOAgendaView::fillAgenda()
             if (event->doesFloat()) {
-                if (event->recurrence()->doesRecur()) {
+                if (event->doesRecur()) {
                     if (event->isMultiDay() ) {
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index ec1154a..057df0d 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -455,3 +455,3 @@ void KODayMatrix::updateViewTimed()
     for( event = events.first(); event; event = events.next() ) { // for event
-        ushort recurType = event->recurrence()->doesRecur();
+        ushort recurType = event->doesRecur();
         if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) ||
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index de4e4f7..89504db 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -899,6 +899,5 @@ void KOEditorRecurrence::readEvent(Incidence *event)
 
-  Recurrence *r = event->recurrence();
-  int f = r->frequency();
+ 
 
-  int recurs = r->doesRecur();
+  int recurs = event->doesRecur();
 
@@ -908,81 +907,83 @@ void KOEditorRecurrence::readEvent(Incidence *event)
   int recurrenceType = RecurrenceChooser::Weekly;
-
-  switch ( recurs ) {
-    case Recurrence::rNone:
-        setDefaults( event->dtStart(), dtEnd );
-      break;
-    case Recurrence::rDaily:
-      recurrenceType = RecurrenceChooser::Daily;
-      mDaily->setFrequency( f );
-      break;
-    case Recurrence::rWeekly:
-      recurrenceType = RecurrenceChooser::Weekly;
-      mWeekly->setFrequency( f );
-      mWeekly->setDays( r->days() );
-      break;
-    case Recurrence::rMonthlyPos:
-      // we only handle one possibility in the list right now,
-      // so I have hardcoded calls with first().  If we make the GUI
-      // more extended, this can be changed.
-      recurrenceType = RecurrenceChooser::Monthly;
-
-      rmp = r->monthPositions();
-      if ( rmp.first()->negative )
-        count = 5 - rmp.first()->rPos - 1;
-      else
-        count = rmp.first()->rPos - 1;
-      day = 0;
-      while ( !rmp.first()->rDays.testBit( day ) ) ++day;
-      mMonthly->setByPos( count, day );
-
-      mMonthly->setFrequency( f );
-
-      break;
-    case Recurrence::rMonthlyDay:
-      recurrenceType = RecurrenceChooser::Monthly;
-
-      rmd = r->monthDays();
-      day = *rmd.first() - 1;
-      mMonthly->setByDay( day );
-
-      mMonthly->setFrequency( f );
-
-      break;
-    case Recurrence::rYearlyMonth:
-        {
-        recurrenceType = RecurrenceChooser::Yearly;
-        //qDebug("Recurrence::rYearlyMonth: ");
-            day = event->dtStart().date().day(); 
-            rmd = r->yearNums();
-            if ( rmd.count() > 0 )
-                month = *rmd.first();
-            else
-                month = event->dtStart().date().month() ;
-            mYearly->setByMonth( month, day );
+  if ( recurs ) {
+      Recurrence *r = event->recurrence();
+      int f = r->frequency();
+      switch ( recurs ) {
+      case Recurrence::rNone:
+          setDefaults( event->dtStart(), dtEnd );
+          break;
+      case Recurrence::rDaily:
+          recurrenceType = RecurrenceChooser::Daily;
+          mDaily->setFrequency( f );
+          break;
+      case Recurrence::rWeekly:
+          recurrenceType = RecurrenceChooser::Weekly;
+          mWeekly->setFrequency( f );
+          mWeekly->setDays( r->days() );
+          break;
+      case Recurrence::rMonthlyPos:
+          // we only handle one possibility in the list right now,
+          // so I have hardcoded calls with first().  If we make the GUI
+          // more extended, this can be changed.
+          recurrenceType = RecurrenceChooser::Monthly;
+
+          rmp = r->monthPositions();
+          if ( rmp.first()->negative )
+              count = 5 - rmp.first()->rPos - 1;
+          else
+              count = rmp.first()->rPos - 1;
+          day = 0;
+          while ( !rmp.first()->rDays.testBit( day ) ) ++day;
+          mMonthly->setByPos( count, day );
+
+          mMonthly->setFrequency( f );
+
+          break;
+      case Recurrence::rMonthlyDay:
+          recurrenceType = RecurrenceChooser::Monthly;
+
+          rmd = r->monthDays();
+          day = *rmd.first() - 1;
+          mMonthly->setByDay( day );
+
+          mMonthly->setFrequency( f );
+
+          break;
+      case Recurrence::rYearlyMonth:
+          {
+              recurrenceType = RecurrenceChooser::Yearly;
+              //qDebug("Recurrence::rYearlyMonth: ");
+              day = event->dtStart().date().day(); 
+              rmd = r->yearNums();
+              if ( rmd.count() > 0 )
+                  month = *rmd.first();
+              else
+                  month = event->dtStart().date().month() ;
+              mYearly->setByMonth( month, day );
 #if 0
-            //qDebug("2day = %d ",day );
-            QPtrList<Recurrence::rMonthPos> monthlist = r->yearMonthPositions();
-            int month;
-            if ( !monthlist.isEmpty() ) {
-                month =  monthlist.first()->rPos ;
-            } else {
-                month = event->dtStart().date().month() ;
-            }
-            mYearly->setByMonth( day, month );
+              //qDebug("2day = %d ",day );
+              QPtrList<Recurrence::rMonthPos> monthlist = r->yearMonthPositions();
+              int month;
+              if ( !monthlist.isEmpty() ) {
+                  month =  monthlist.first()->rPos ;
+              } else {
+                  month = event->dtStart().date().month() ;
+              }
+              mYearly->setByMonth( day, month );
 #endif
-            mYearly->setFrequency( f );
-        }
+              mYearly->setFrequency( f );
+          }
 
-      break;
-    case Recurrence::rYearlyDay:
-        //qDebug("Recurrence::rYearlyDay: ");
-        recurrenceType = RecurrenceChooser::Yearly;
-        mYearly->setByDay( event->dtStart().date().dayOfYear() );
-        mYearly->setFrequency( f );
-        break;
-    default:
-        setDefaults( event->dtStart(), dtEnd );
-      break;
+          break;
+      case Recurrence::rYearlyDay:
+          //qDebug("Recurrence::rYearlyDay: ");
+          recurrenceType = RecurrenceChooser::Yearly;
+          mYearly->setByDay( event->dtStart().date().dayOfYear() );
+          mYearly->setFrequency( f );
+          break;
+      default:
+          setDefaults( event->dtStart(), dtEnd );
+          break;
+      }
   }
-
   mRecurrenceChooser->setType( recurrenceType );
@@ -992,3 +993,4 @@ void KOEditorRecurrence::readEvent(Incidence *event)
 
-  if ( r->doesRecur() ) {
+  if ( event->doesRecur() ) {
+      Recurrence *r = event->recurrence();
     mRecurrenceRange->setDuration( r->duration() );
@@ -1009,8 +1011,12 @@ void KOEditorRecurrence::writeEvent( Incidence *event )
 {
-  Recurrence *r = event->recurrence();
+  
 
-  // clear out any old settings;
-  r->unsetRecurs();
+  if ( !mEnabledCheck->isChecked() ) {
+      if ( event->doesRecur() )
+          event->recurrence()->unsetRecurs();
+  } else {
+      Recurrence *r = event->recurrence();
 
-  if ( mEnabledCheck->isChecked() ) {
+      // clear out any old settings;
+      r->unsetRecurs();
     int duration = mRecurrenceRange->duration();
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index a690ab1..db695f5 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -349,5 +349,5 @@ void KOEventViewer::appendEvent(Event *event, int mode )
     }
-    if (event->recurrence()->doesRecur()) {
+    if (event->doesRecur()) {
 
-        QString recurText = event->recurrence()->recurrenceText();
+        QString recurText = event->recurrenceText();
         addTag("p","<em>" + i18n("This is a %1 recurring event.").arg(recurText ) + "</em>");
@@ -483,3 +483,3 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
 
-    if (event->recurrence()->doesRecur()) {
+    if (event->doesRecur()) {
 
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index d25f671..e7a5e0e 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -135,3 +135,3 @@ bool ListItemVisitor::visit(Event *e)
     }
-    mItem->setText(6, e->recurrence()->recurrenceText());
+    mItem->setText(6, e->recurrenceText());
     if( ! e->doesRecur() )
@@ -186,3 +186,3 @@ bool ListItemVisitor::visit(Todo *t)
     }
-    mItem->setText(6, t->recurrence()->recurrenceText());
+    mItem->setText(6, t->recurrenceText());
     if( ! t->doesRecur() )
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 498d9b0..eea9a4d 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -789,3 +789,3 @@ int MonthViewCell::insertEvent(Event *event)
         item->setPalette( pal );
-        item->setRecur( event->recurrence()->doesRecur() );
+        item->setRecur( event->doesRecur() );
         item->setAlarm( event->isAlarmEnabled() && multiday < 2 && event->alarmEnabled() );
@@ -880,3 +880,3 @@ void MonthViewCell::insertTodo(Todo *todo)
         item->setPalette( pal );
-        item->setRecur( todo->recurrence()->doesRecur() );
+        item->setRecur( todo->doesRecur() );
         item->setAlarm( todo->isAlarmEnabled() && todo->alarmEnabled() );
@@ -1107,2 +1107,4 @@ void MonthViewCell::contextMenu( QListBoxItem *item )
     }
+    //selection( item );
+    //qApp->processEvents();
     MonthViewItem *eventItem = static_cast<MonthViewItem *>( item );
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp
index 100a81b..682f83b 100644
--- a/korganizer/kotodoeditor.cpp
+++ b/korganizer/kotodoeditor.cpp
@@ -379,3 +379,4 @@ void KOTodoEditor::writeTodo(Todo *event)
         event->setHasRecurrenceID( false );
-        event->recurrence()->unsetRecurs();
+        if ( event->doesRecur() )
+            event->recurrence()->unsetRecurs();
     }
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index fafcb58..f88403c 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -509,3 +509,3 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a
                 QDateTime st,end;
-                if ( event->recurrence()->doesRecur() ) {
+                if ( event->doesRecur() ) {
                     QDate  recDate= mEventDate;
@@ -624,3 +624,3 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a
     }
-    if ( ev->recurrence()->doesRecur() ) {
+    if ( ev->doesRecur() ) {
         if ( !needClose)