From 0a33f91e166747406ca2ccb5819881feeecfdb40 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Sun, 13 Feb 2005 11:55:52 +0000
Subject: todo recurchanges

---
(limited to 'libkcal')

diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp
index bd13132..bb9cb29 100644
--- a/libkcal/icalformatimpl.cpp
+++ b/libkcal/icalformatimpl.cpp
@@ -400,7 +400,10 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence)
       icalcomponent_add_component(parent,writeAlarm(alarm));
     }
   }
-
+  if( incidence->hasRecurrenceID() ) {
+      icalcomponent_add_property(parent,
+                                 icalproperty_new_recurrenceid( writeICalDateTime( incidence->recurrenceID())));
+  }
   // duration
 
 // turned off as it always is set to PTS0 (and must not occur together with DTEND
@@ -1204,6 +1207,11 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent,Incidence *incidence)
         incidence->setLocation(QString::fromUtf8(text));
         break;
 
+      case ICAL_RECURRENCEID_PROPERTY:
+        icaltime = icalproperty_get_recurrenceid(p);
+        incidence->setRecurrenceID( readICalDateTime(icaltime) );
+        qDebug(" RecurrenceID %s",incidence->recurrenceID().toString().latin1() );
+        break;
 #if 0
   // status
   if ((vo = isAPropertyOf(vincidence, VCStatusProp)) != 0) {
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp
index f9e1e9e..dbc159c 100644
--- a/libkcal/incidence.cpp
+++ b/libkcal/incidence.cpp
@@ -39,6 +39,7 @@ Incidence::Incidence() :
   mHasStartDate = true;
   mAlarms.setAutoDelete(true);
   mAttachments.setAutoDelete(true);
+  mHasRecurrenceID = false;
 }
 
 Incidence::Incidence( const Incidence &i ) : IncidenceBase( i )
@@ -71,7 +72,8 @@ Incidence::Incidence( const Incidence &i ) : IncidenceBase( i )
     ++it;
   }
   mAlarms.setAutoDelete(true);
-
+  mHasRecurrenceID = i.mHasRecurrenceID;
+  mRecurrenceID = i.mRecurrenceID;
   mRecurrence = new Recurrence( *(i.mRecurrence), this );
 }
 
@@ -87,6 +89,26 @@ Incidence::~Incidence()
   delete mRecurrence; 
  
 }
+bool Incidence::hasRecurrenceID() const
+{
+    return mHasRecurrenceID;
+}
+
+void Incidence::setHasRecurrenceID( bool b )
+{
+    mHasRecurrenceID = b;
+}
+   
+void Incidence::setRecurrenceID(QDateTime d)
+{
+    mRecurrenceID = d;
+    mHasRecurrenceID = true;
+    updated(); 
+}
+QDateTime Incidence::recurrenceID () const
+{
+    return mRecurrenceID;
+}
 
 bool Incidence::cancelled() const
 {
@@ -143,6 +165,16 @@ bool KCal::operator==( const Incidence& i1, const Incidence& i2 )
     }
 #endif
   
+    if ( i1.hasRecurrenceID() == i2.hasRecurrenceID() ) {
+        if ( i1.hasRecurrenceID() ) {
+            if ( i1.recurrenceID() != i2.recurrenceID() )
+                return false;
+        }
+
+    } else {
+        return false;
+    }
+
     if ( ! operator==( (const IncidenceBase&)i1, (const IncidenceBase&)i2 ) )
         return false;
     if ( i1.hasStartDate() == i2.hasStartDate() ) {
@@ -170,6 +202,7 @@ bool KCal::operator==( const Incidence& i1, const Incidence& i2 )
         i1.resources() == i2.resources() &&
         i1.secrecy() == i2.secrecy() &&
         i1.priority() == i2.priority() &&
+        i1.cancelled() == i2.cancelled() &&
         stringCompare( i1.location(), i2.location() );
 }
 
diff --git a/libkcal/incidence.h b/libkcal/incidence.h
index de2a381..38d2aaa 100644
--- a/libkcal/incidence.h
+++ b/libkcal/incidence.h
@@ -263,6 +263,13 @@ class Incidence : public IncidenceBase
     QDateTime getNextOccurence( const QDateTime& dt, bool* yes ) const;
     bool cancelled() const;
     void setCancelled( bool b );
+    
+    bool hasRecurrenceID() const;
+    void setHasRecurrenceID( bool b );
+    
+    void setRecurrenceID(QDateTime);
+    QDateTime recurrenceID () const;
+    
 
 protected:
     QPtrList<Alarm> mAlarms;
@@ -272,6 +279,8 @@ protected:
     bool mCancelled;
 
     // base components of jounal, event and todo
+    QDateTime mRecurrenceID;
+    bool mHasRecurrenceID;
     QDateTime mCreated;
     QString mDescription;
     QString mSummary;
--
cgit v0.9.0.2