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

List:       kde-commits
Subject:    kdepim/kresources/kolab/kcal
From:       David Faure <faure () kde ! org>
Date:       2004-10-11 12:13:06
Message-ID: 20041011121306.4322916BFC () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

<date> -> <daynumber>


  M +4 -8      incidence.cpp   1.6
  M +0 -1      incidence.h   1.6


--- kdepim/kresources/kolab/kcal/incidence.cpp  #1.5:1.6
@@ -229,6 +229,4 @@ void Incidence::saveRecurrence( QDomElem
   if ( !mRecurrence.dayNumber.isEmpty() )
     writeString( e, "daynumber", mRecurrence.dayNumber );
-  if ( !mRecurrence.date.isEmpty() )
-    writeString( e, "date", mRecurrence.date );
   if ( !mRecurrence.month.isEmpty() )
     writeString( e, "month", mRecurrence.month );
@@ -264,6 +262,4 @@ void Incidence::loadRecurrence( const QD
       else if ( tagName == "daynumber" )
         mRecurrence.dayNumber = e.text();
-      else if ( tagName == "date" )
-        mRecurrence.date = e.text();
       else if ( tagName == "month" )
         mRecurrence.month = e.text();
@@ -499,5 +495,5 @@ void Incidence::setRecurrence( KCal::Rec
     // ####### Kolab XML limitation: only the first month day is used
     if ( !monthDays.isEmpty() )
-      mRecurrence.date = QString::number( *monthDays.getFirst() );
+      mRecurrence.dayNumber = QString::number( *monthDays.getFirst() );
     break;
   }
@@ -508,5 +504,5 @@ void Incidence::setRecurrence( KCal::Rec
     QPtrList<int> rmd = recur->monthDays();
     int day = !rmd.isEmpty() ? day = *rmd.first() : day = recur->parent()->dtStart().date().day();
-    mRecurrence.date = QString::number( day );
+    mRecurrence.dayNumber = QString::number( day );
     QPtrList<int> months = recur->yearNums();
     if ( !months.isEmpty() )
@@ -690,10 +686,10 @@ void Incidence::saveTo( KCal::Incidence*
       } else if ( mRecurrence.type == "daynumber" ) {
         recur->setMonthly( KCal::Recurrence::rMonthlyDay, mRecurrence.interval, -1 );
-        recur->addMonthlyDay( mRecurrence.date.toInt() );
+        recur->addMonthlyDay( mRecurrence.dayNumber.toInt() );
       } else kdWarning() << "Unhandled monthly recurrence type " << mRecurrence.type << endl;
     } else if ( mRecurrence.cycle == "yearly" ) {
       if ( mRecurrence.type == "monthday" ) {
         recur->setYearly( KCal::Recurrence::rYearlyMonth, mRecurrence.interval, -1 );
-        recur->setYearlyByDate( mRecurrence.date.toInt(),
+        recur->setYearlyByDate( mRecurrence.dayNumber.toInt(),
                                 KCal::Recurrence::rMar1, // whichever
                                 mRecurrence.interval,

--- kdepim/kresources/kolab/kcal/incidence.h  #1.5:1.6
@@ -60,5 +60,4 @@ public:
     QStringList days; // list of days-of-the-week
     QString dayNumber;
-    QString date;
     QString month;
     QString rangeType;


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