-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 | |||
@@ -391,25 +391,28 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence) | |||
391 | for (Attachment *at = attachments.first(); at; at = attachments.next()) | 391 | for (Attachment *at = attachments.first(); at; at = attachments.next()) |
392 | icalcomponent_add_property(parent,writeAttachment(at)); | 392 | icalcomponent_add_property(parent,writeAttachment(at)); |
393 | 393 | ||
394 | // alarms | 394 | // alarms |
395 | QPtrList<Alarm> alarms = incidence->alarms(); | 395 | QPtrList<Alarm> alarms = incidence->alarms(); |
396 | Alarm* alarm; | 396 | Alarm* alarm; |
397 | for (alarm = alarms.first(); alarm; alarm = alarms.next()) { | 397 | for (alarm = alarms.first(); alarm; alarm = alarms.next()) { |
398 | if (alarm->enabled()) { | 398 | if (alarm->enabled()) { |
399 | kdDebug(5800) << "Write alarm for " << incidence->summary() << endl; | 399 | kdDebug(5800) << "Write alarm for " << incidence->summary() << endl; |
400 | icalcomponent_add_component(parent,writeAlarm(alarm)); | 400 | icalcomponent_add_component(parent,writeAlarm(alarm)); |
401 | } | 401 | } |
402 | } | 402 | } |
403 | 403 | if( incidence->hasRecurrenceID() ) { | |
404 | icalcomponent_add_property(parent, | ||
405 | icalproperty_new_recurrenceid( writeICalDateTime( incidence->recurrenceID()))); | ||
406 | } | ||
404 | // duration | 407 | // duration |
405 | 408 | ||
406 | // turned off as it always is set to PTS0 (and must not occur together with DTEND | 409 | // turned off as it always is set to PTS0 (and must not occur together with DTEND |
407 | 410 | ||
408 | // if (incidence->hasDuration()) { | 411 | // if (incidence->hasDuration()) { |
409 | // icaldurationtype duration; | 412 | // icaldurationtype duration; |
410 | // duration = writeICalDuration(incidence->duration()); | 413 | // duration = writeICalDuration(incidence->duration()); |
411 | // icalcomponent_add_property(parent,icalproperty_new_duration(duration)); | 414 | // icalcomponent_add_property(parent,icalproperty_new_duration(duration)); |
412 | // } | 415 | // } |
413 | } | 416 | } |
414 | 417 | ||
415 | void ICalFormatImpl::writeIncidenceBase(icalcomponent *parent,IncidenceBase *incidenceBase) | 418 | void ICalFormatImpl::writeIncidenceBase(icalcomponent *parent,IncidenceBase *incidenceBase) |
@@ -1195,24 +1198,29 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent,Incidence *incidence) | |||
1195 | case ICAL_STATUS_PROPERTY: // summary | 1198 | case ICAL_STATUS_PROPERTY: // summary |
1196 | { | 1199 | { |
1197 | if ( ICAL_STATUS_CANCELLED == icalproperty_get_status(p) ) | 1200 | if ( ICAL_STATUS_CANCELLED == icalproperty_get_status(p) ) |
1198 | incidence->setCancelled( true ); | 1201 | incidence->setCancelled( true ); |
1199 | } | 1202 | } |
1200 | break; | 1203 | break; |
1201 | 1204 | ||
1202 | case ICAL_LOCATION_PROPERTY: // location | 1205 | case ICAL_LOCATION_PROPERTY: // location |
1203 | text = icalproperty_get_location(p); | 1206 | text = icalproperty_get_location(p); |
1204 | incidence->setLocation(QString::fromUtf8(text)); | 1207 | incidence->setLocation(QString::fromUtf8(text)); |
1205 | break; | 1208 | break; |
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 |
1208 | // status | 1216 | // status |
1209 | if ((vo = isAPropertyOf(vincidence, VCStatusProp)) != 0) { | 1217 | if ((vo = isAPropertyOf(vincidence, VCStatusProp)) != 0) { |
1210 | incidence->setStatus(s = fakeCString(vObjectUStringZValue(vo))); | 1218 | incidence->setStatus(s = fakeCString(vObjectUStringZValue(vo))); |
1211 | deleteStr(s); | 1219 | deleteStr(s); |
1212 | } | 1220 | } |
1213 | else | 1221 | else |
1214 | incidence->setStatus("NEEDS ACTION"); | 1222 | incidence->setStatus("NEEDS ACTION"); |
1215 | #endif | 1223 | #endif |
1216 | 1224 | ||
1217 | case ICAL_PRIORITY_PROPERTY: // priority | 1225 | case ICAL_PRIORITY_PROPERTY: // priority |
1218 | intvalue = icalproperty_get_priority(p); | 1226 | intvalue = icalproperty_get_priority(p); |
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp index f9e1e9e..dbc159c 100644 --- a/libkcal/incidence.cpp +++ b/libkcal/incidence.cpp | |||
@@ -30,24 +30,25 @@ | |||
30 | using namespace KCal; | 30 | using namespace KCal; |
31 | 31 | ||
32 | Incidence::Incidence() : | 32 | Incidence::Incidence() : |
33 | IncidenceBase(), | 33 | IncidenceBase(), |
34 | mRelatedTo(0), mSecrecy(SecrecyPublic), mPriority(3) | 34 | mRelatedTo(0), mSecrecy(SecrecyPublic), mPriority(3) |
35 | { | 35 | { |
36 | mRecurrence = new Recurrence(this); | 36 | mRecurrence = new Recurrence(this); |
37 | mCancelled = false; | 37 | mCancelled = false; |
38 | recreate(); | 38 | recreate(); |
39 | mHasStartDate = true; | 39 | mHasStartDate = true; |
40 | mAlarms.setAutoDelete(true); | 40 | mAlarms.setAutoDelete(true); |
41 | mAttachments.setAutoDelete(true); | 41 | mAttachments.setAutoDelete(true); |
42 | mHasRecurrenceID = false; | ||
42 | } | 43 | } |
43 | 44 | ||
44 | Incidence::Incidence( const Incidence &i ) : IncidenceBase( i ) | 45 | Incidence::Incidence( const Incidence &i ) : IncidenceBase( i ) |
45 | { | 46 | { |
46 | // TODO: reenable attributes currently commented out. | 47 | // TODO: reenable attributes currently commented out. |
47 | mRevision = i.mRevision; | 48 | mRevision = i.mRevision; |
48 | mCreated = i.mCreated; | 49 | mCreated = i.mCreated; |
49 | mDescription = i.mDescription; | 50 | mDescription = i.mDescription; |
50 | mSummary = i.mSummary; | 51 | mSummary = i.mSummary; |
51 | mCategories = i.mCategories; | 52 | mCategories = i.mCategories; |
52 | // Incidence *mRelatedTo; Incidence *mRelatedTo; | 53 | // Incidence *mRelatedTo; Incidence *mRelatedTo; |
53 | mRelatedTo = 0; | 54 | mRelatedTo = 0; |
@@ -62,40 +63,61 @@ Incidence::Incidence( const Incidence &i ) : IncidenceBase( i ) | |||
62 | mCancelled = i.mCancelled; | 63 | mCancelled = i.mCancelled; |
63 | mHasStartDate = i.mHasStartDate; | 64 | mHasStartDate = i.mHasStartDate; |
64 | QPtrListIterator<Alarm> it( i.mAlarms ); | 65 | QPtrListIterator<Alarm> it( i.mAlarms ); |
65 | const Alarm *a; | 66 | const Alarm *a; |
66 | while( (a = it.current()) ) { | 67 | while( (a = it.current()) ) { |
67 | Alarm *b = new Alarm( *a ); | 68 | Alarm *b = new Alarm( *a ); |
68 | b->setParent( this ); | 69 | b->setParent( this ); |
69 | mAlarms.append( b ); | 70 | mAlarms.append( b ); |
70 | 71 | ||
71 | ++it; | 72 | ++it; |
72 | } | 73 | } |
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 ); |
76 | } | 78 | } |
77 | 79 | ||
78 | Incidence::~Incidence() | 80 | Incidence::~Incidence() |
79 | { | 81 | { |
80 | 82 | ||
81 | Incidence *ev; | 83 | Incidence *ev; |
82 | QPtrList<Incidence> Relations = relations(); | 84 | QPtrList<Incidence> Relations = relations(); |
83 | for (ev=Relations.first();ev;ev=Relations.next()) { | 85 | for (ev=Relations.first();ev;ev=Relations.next()) { |
84 | if (ev->relatedTo() == this) ev->setRelatedTo(0); | 86 | if (ev->relatedTo() == this) ev->setRelatedTo(0); |
85 | } | 87 | } |
86 | if (relatedTo()) relatedTo()->removeRelation(this); | 88 | if (relatedTo()) relatedTo()->removeRelation(this); |
87 | delete mRecurrence; | 89 | delete mRecurrence; |
88 | 90 | ||
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 | ||
91 | bool Incidence::cancelled() const | 113 | bool Incidence::cancelled() const |
92 | { | 114 | { |
93 | return mCancelled; | 115 | return mCancelled; |
94 | } | 116 | } |
95 | void Incidence::setCancelled( bool b ) | 117 | void Incidence::setCancelled( bool b ) |
96 | { | 118 | { |
97 | mCancelled = b; | 119 | mCancelled = b; |
98 | updated(); | 120 | updated(); |
99 | } | 121 | } |
100 | bool Incidence::hasStartDate() const | 122 | bool Incidence::hasStartDate() const |
101 | { | 123 | { |
@@ -134,24 +156,34 @@ bool KCal::operator==( const Incidence& i1, const Incidence& i2 ) | |||
134 | QPtrListIterator<Alarm> a1( i1.alarms() ); | 156 | QPtrListIterator<Alarm> a1( i1.alarms() ); |
135 | QPtrListIterator<Alarm> a2( i2.alarms() ); | 157 | QPtrListIterator<Alarm> a2( i2.alarms() ); |
136 | for( ; a1.current() && a2.current(); ++a1, ++a2 ) { | 158 | for( ; a1.current() && a2.current(); ++a1, ++a2 ) { |
137 | if( *a1.current() == *a2.current() ) { | 159 | if( *a1.current() == *a2.current() ) { |
138 | continue; | 160 | continue; |
139 | } | 161 | } |
140 | else { | 162 | else { |
141 | return false; | 163 | return false; |
142 | } | 164 | } |
143 | } | 165 | } |
144 | #endif | 166 | #endif |
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 ) ) |
147 | return false; | 179 | return false; |
148 | if ( i1.hasStartDate() == i2.hasStartDate() ) { | 180 | if ( i1.hasStartDate() == i2.hasStartDate() ) { |
149 | if ( i1.hasStartDate() ) { | 181 | if ( i1.hasStartDate() ) { |
150 | if ( i1.dtStart() != i2.dtStart() ) | 182 | if ( i1.dtStart() != i2.dtStart() ) |
151 | return false; | 183 | return false; |
152 | } | 184 | } |
153 | } else { | 185 | } else { |
154 | return false; | 186 | return false; |
155 | } | 187 | } |
156 | if (!( *i1.recurrence() == *i2.recurrence()) ) { | 188 | if (!( *i1.recurrence() == *i2.recurrence()) ) { |
157 | qDebug("recurrence is NOT equal "); | 189 | qDebug("recurrence is NOT equal "); |
@@ -161,24 +193,25 @@ bool KCal::operator==( const Incidence& i1, const Incidence& i2 ) | |||
161 | // i1.created() == i2.created() && | 193 | // i1.created() == i2.created() && |
162 | stringCompare( i1.description(), i2.description() ) && | 194 | stringCompare( i1.description(), i2.description() ) && |
163 | stringCompare( i1.summary(), i2.summary() ) && | 195 | stringCompare( i1.summary(), i2.summary() ) && |
164 | i1.categories() == i2.categories() && | 196 | i1.categories() == i2.categories() && |
165 | // no need to compare mRelatedTo | 197 | // no need to compare mRelatedTo |
166 | stringCompare( i1.relatedToUid(), i2.relatedToUid() ) && | 198 | stringCompare( i1.relatedToUid(), i2.relatedToUid() ) && |
167 | // i1.relations() == i2.relations() && | 199 | // i1.relations() == i2.relations() && |
168 | i1.exDates() == i2.exDates() && | 200 | i1.exDates() == i2.exDates() && |
169 | i1.attachments() == i2.attachments() && | 201 | i1.attachments() == i2.attachments() && |
170 | i1.resources() == i2.resources() && | 202 | i1.resources() == i2.resources() && |
171 | i1.secrecy() == i2.secrecy() && | 203 | i1.secrecy() == i2.secrecy() && |
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() ); |
174 | } | 207 | } |
175 | 208 | ||
176 | Incidence* Incidence::recreateCloneException( QDate d ) | 209 | Incidence* Incidence::recreateCloneException( QDate d ) |
177 | { | 210 | { |
178 | Incidence* newInc = clone(); | 211 | Incidence* newInc = clone(); |
179 | newInc->recreate(); | 212 | newInc->recreate(); |
180 | if ( doesRecur() ) { | 213 | if ( doesRecur() ) { |
181 | addExDate( d ); | 214 | addExDate( d ); |
182 | newInc->recurrence()->unsetRecurs(); | 215 | newInc->recurrence()->unsetRecurs(); |
183 | int len = dtStart().secsTo( ((Event*)this)->dtEnd()); | 216 | int len = dtStart().secsTo( ((Event*)this)->dtEnd()); |
184 | QTime tim = dtStart().time(); | 217 | QTime tim = dtStart().time(); |
diff --git a/libkcal/incidence.h b/libkcal/incidence.h index de2a381..38d2aaa 100644 --- a/libkcal/incidence.h +++ b/libkcal/incidence.h | |||
@@ -255,32 +255,41 @@ class Incidence : public IncidenceBase | |||
255 | /** set the event's/todo's location. Do _not_ use it with journal */ | 255 | /** set the event's/todo's location. Do _not_ use it with journal */ |
256 | void setLocation(const QString &location); | 256 | void setLocation(const QString &location); |
257 | /** return the event's/todo's location. Do _not_ use it with journal */ | 257 | /** return the event's/todo's location. Do _not_ use it with journal */ |
258 | QString location() const; | 258 | QString location() const; |
259 | /** returns TRUE or FALSE depending on whether the todo has a start date */ | 259 | /** returns TRUE or FALSE depending on whether the todo has a start date */ |
260 | bool hasStartDate() const; | 260 | bool hasStartDate() const; |
261 | /** sets the event's hasStartDate value. */ | 261 | /** sets the event's hasStartDate value. */ |
262 | void setHasStartDate(bool f); | 262 | void setHasStartDate(bool f); |
263 | QDateTime getNextOccurence( const QDateTime& dt, bool* yes ) const; | 263 | QDateTime getNextOccurence( const QDateTime& dt, bool* yes ) const; |
264 | bool cancelled() const; | 264 | bool cancelled() const; |
265 | void setCancelled( bool b ); | 265 | void setCancelled( bool b ); |
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: |
268 | QPtrList<Alarm> mAlarms; | 275 | QPtrList<Alarm> mAlarms; |
269 | QPtrList<Incidence> mRelations; | 276 | QPtrList<Incidence> mRelations; |
270 | private: | 277 | private: |
271 | int mRevision; | 278 | int mRevision; |
272 | bool mCancelled; | 279 | bool mCancelled; |
273 | 280 | ||
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; |
276 | QString mDescription; | 285 | QString mDescription; |
277 | QString mSummary; | 286 | QString mSummary; |
278 | QStringList mCategories; | 287 | QStringList mCategories; |
279 | Incidence *mRelatedTo; | 288 | Incidence *mRelatedTo; |
280 | QString mRelatedToUid; | 289 | QString mRelatedToUid; |
281 | DateList mExDates; | 290 | DateList mExDates; |
282 | QPtrList<Attachment> mAttachments; | 291 | QPtrList<Attachment> mAttachments; |
283 | QStringList mResources; | 292 | QStringList mResources; |
284 | bool mHasStartDate; // if todo has associated start date | 293 | bool mHasStartDate; // if todo has associated start date |
285 | 294 | ||
286 | int mSecrecy; | 295 | int mSecrecy; |