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

List:       kde-commits
Subject:    proko2: kdepim/kresources/kolab/kcal
From:       Till Adam <adam () kde ! org>
Date:       2005-03-22 19:02:37
Message-ID: 20050322190237.DFE4E3C3 () office ! kde ! org
[Download RAW message or body]

CVS commit by tilladam: 

Fix yearly recurrences some more.


  M +4 -4      incidence.cpp   1.1.2.30


--- kdepim/kresources/kolab/kcal/incidence.cpp  #1.1.2.29:1.1.2.30
@@ -557,5 +557,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)
     }
@@ -744,5 +744,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 );
@@ -752,5 +752,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]