[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/kresources/kolab/kcal
From:       Till Adam <adam () kde ! org>
Date:       2005-03-22 19:13:28
Message-ID: 20050322191328.51A153C3 () office ! kde ! org
[Download RAW message or body]

CVS commit by tilladam: 

Yearly recurrence fixes.


  M +5 -5      incidence.cpp   1.15


--- kdepim/kresources/kolab/kcal/incidence.cpp  #1.14:1.15
@@ -533,5 +533,5 @@ void Incidence::setRecurrence( KCal::Rec
     mRecurrence.type = "monthday";
     QPtrList<int> rmd = recur->monthDays();
-    int day = !rmd.isEmpty() ? *rmd.first() : recur->parent()->dtStart().date().day();
+    int day = !rmd.isEmpty() ? day = *rmd.first() : day = recur->parent()->dtStart().date().day();
     mRecurrence.dayNumber = QString::number( day );
     QPtrList<int> months = recur->yearNums();
@@ -559,5 +559,5 @@ void Incidence::setRecurrence( KCal::Rec
           mRecurrence.days.append( s_weekDayName[idx] );
       mRecurrence.dayNumber = QString::number( monthPos.rPos );
-    mRecurrence.dayNumber = QString::number( *recur->yearNums().getFirst() );
+      //mRecurrence.dayNumber = QString::number( *recur->yearNums().getFirst() );
       // Not handled: monthPos.negative (nth days before end of month)
     }
@@ -749,5 +749,5 @@ void Incidence::saveTo( KCal::Incidence*
         for ( int i = 0; i < 12; ++i )
           if ( s_monthName[ i ] == mRecurrence.month )
-            recur->addYearlyNum( i );
+            recur->addYearlyNum( i+1 );
       } else if ( mRecurrence.type == "yearday" ) {
         recur->setYearly( KCal::Recurrence::rYearlyDay, mRecurrence.interval, -1 );
@@ -757,5 +757,5 @@ void Incidence::saveTo( KCal::Incidence*
         for ( int i = 0; i < 12; ++i )
           if ( s_monthName[ i ] == mRecurrence.month )
-            recur->addYearlyNum( i );
+            recur->addYearlyNum( i+1 );
         recur->addMonthlyPos( mRecurrence.dayNumber.toInt(), daysListToBitArray( mRecurrence.days ) );
       } else kdWarning() << "Unhandled yearly recurrence type " << mRecurrence.type << endl;


[prev in list] [next in list] [prev in thread] [next in thread]