-rw-r--r-- | libkcal/icalformatimpl.cpp | 10 | ||||
-rw-r--r-- | libkcal/incidence.cpp | 35 | ||||
-rw-r--r-- | libkcal/incidence.h | 9 |
3 files changed, 52 insertions, 2 deletions
diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp index bd13132..bb9cb29 100644 --- a/libkcal/icalformatimpl.cpp +++ b/libkcal/icalformatimpl.cpp | |||
@@ -402,3 +402,6 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence) | |||
402 | } | 402 | } |
403 | 403 | if( incidence->hasRecurrenceID() ) { | |
404 | icalcomponent_add_property(parent, | ||
405 | icalproperty_new_recurrenceid( writeICalDateTime( incidence->recurrenceID()))); | ||
406 | } | ||
404 | // duration | 407 | // duration |
@@ -1206,2 +1209,7 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent,Incidence *incidence) | |||
1206 | 1209 | ||
1210 | case ICAL_RECURRENCEID_PROPERTY: | ||
1211 | icaltime = icalproperty_get_recurrenceid(p); | ||
1212 | incidence->setRecurrenceID( readICalDateTime(icaltime) ); | ||
1213 | qDebug(" RecurrenceID %s",incidence->recurrenceID().toString().latin1() ); | ||
1214 | break; | ||
1207 | #if 0 | 1215 | #if 0 |
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp index f9e1e9e..dbc159c 100644 --- a/libkcal/incidence.cpp +++ b/libkcal/incidence.cpp | |||
@@ -41,2 +41,3 @@ Incidence::Incidence() : | |||
41 | mAttachments.setAutoDelete(true); | 41 | mAttachments.setAutoDelete(true); |
42 | mHasRecurrenceID = false; | ||
42 | } | 43 | } |
@@ -73,3 +74,4 @@ Incidence::Incidence( const Incidence &i ) : IncidenceBase( i ) | |||
73 | mAlarms.setAutoDelete(true); | 74 | mAlarms.setAutoDelete(true); |
74 | 75 | mHasRecurrenceID = i.mHasRecurrenceID; | |
76 | mRecurrenceID = i.mRecurrenceID; | ||
75 | mRecurrence = new Recurrence( *(i.mRecurrence), this ); | 77 | mRecurrence = new Recurrence( *(i.mRecurrence), this ); |
@@ -89,2 +91,22 @@ Incidence::~Incidence() | |||
89 | } | 91 | } |
92 | bool Incidence::hasRecurrenceID() const | ||
93 | { | ||
94 | return mHasRecurrenceID; | ||
95 | } | ||
96 | |||
97 | void Incidence::setHasRecurrenceID( bool b ) | ||
98 | { | ||
99 | mHasRecurrenceID = b; | ||
100 | } | ||
101 | |||
102 | void Incidence::setRecurrenceID(QDateTime d) | ||
103 | { | ||
104 | mRecurrenceID = d; | ||
105 | mHasRecurrenceID = true; | ||
106 | updated(); | ||
107 | } | ||
108 | QDateTime Incidence::recurrenceID () const | ||
109 | { | ||
110 | return mRecurrenceID; | ||
111 | } | ||
90 | 112 | ||
@@ -145,2 +167,12 @@ bool KCal::operator==( const Incidence& i1, const Incidence& i2 ) | |||
145 | 167 | ||
168 | if ( i1.hasRecurrenceID() == i2.hasRecurrenceID() ) { | ||
169 | if ( i1.hasRecurrenceID() ) { | ||
170 | if ( i1.recurrenceID() != i2.recurrenceID() ) | ||
171 | return false; | ||
172 | } | ||
173 | |||
174 | } else { | ||
175 | return false; | ||
176 | } | ||
177 | |||
146 | if ( ! operator==( (const IncidenceBase&)i1, (const IncidenceBase&)i2 ) ) | 178 | if ( ! operator==( (const IncidenceBase&)i1, (const IncidenceBase&)i2 ) ) |
@@ -172,2 +204,3 @@ bool KCal::operator==( const Incidence& i1, const Incidence& i2 ) | |||
172 | i1.priority() == i2.priority() && | 204 | i1.priority() == i2.priority() && |
205 | i1.cancelled() == i2.cancelled() && | ||
173 | stringCompare( i1.location(), i2.location() ); | 206 | 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 | |||
@@ -266,2 +266,9 @@ class Incidence : public IncidenceBase | |||
266 | 266 | ||
267 | bool hasRecurrenceID() const; | ||
268 | void setHasRecurrenceID( bool b ); | ||
269 | |||
270 | void setRecurrenceID(QDateTime); | ||
271 | QDateTime recurrenceID () const; | ||
272 | |||
273 | |||
267 | protected: | 274 | protected: |
@@ -274,2 +281,4 @@ protected: | |||
274 | // base components of jounal, event and todo | 281 | // base components of jounal, event and todo |
282 | QDateTime mRecurrenceID; | ||
283 | bool mHasRecurrenceID; | ||
275 | QDateTime mCreated; | 284 | QDateTime mCreated; |