-rw-r--r-- | libkcal/incidence.cpp | 4 | ||||
-rw-r--r-- | libkcal/incidence.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp index 78fa24f..9c35b1d 100644 --- a/libkcal/incidence.cpp +++ b/libkcal/incidence.cpp | |||
@@ -359,48 +359,52 @@ void Incidence::setCategories(const QString &catStr) | |||
359 | if (mReadOnly) return; | 359 | if (mReadOnly) return; |
360 | mCategories.clear(); | 360 | mCategories.clear(); |
361 | 361 | ||
362 | if (catStr.isEmpty()) return; | 362 | if (catStr.isEmpty()) return; |
363 | 363 | ||
364 | mCategories = QStringList::split(",",catStr); | 364 | mCategories = QStringList::split(",",catStr); |
365 | 365 | ||
366 | QStringList::Iterator it; | 366 | QStringList::Iterator it; |
367 | for(it = mCategories.begin();it != mCategories.end(); ++it) { | 367 | for(it = mCategories.begin();it != mCategories.end(); ++it) { |
368 | *it = (*it).stripWhiteSpace(); | 368 | *it = (*it).stripWhiteSpace(); |
369 | } | 369 | } |
370 | checkCategories(); | 370 | checkCategories(); |
371 | updated(); | 371 | updated(); |
372 | } | 372 | } |
373 | 373 | ||
374 | QStringList Incidence::categories() const | 374 | QStringList Incidence::categories() const |
375 | { | 375 | { |
376 | return mCategories; | 376 | return mCategories; |
377 | } | 377 | } |
378 | 378 | ||
379 | QString Incidence::categoriesStr() | 379 | QString Incidence::categoriesStr() |
380 | { | 380 | { |
381 | return mCategories.join(","); | 381 | return mCategories.join(","); |
382 | } | 382 | } |
383 | QString Incidence::categoriesStrWithSpace() | ||
384 | { | ||
385 | return mCategories.join(", "); | ||
386 | } | ||
383 | 387 | ||
384 | void Incidence::setRelatedToUid(const QString &relatedToUid) | 388 | void Incidence::setRelatedToUid(const QString &relatedToUid) |
385 | { | 389 | { |
386 | if (mReadOnly) return; | 390 | if (mReadOnly) return; |
387 | mRelatedToUid = relatedToUid; | 391 | mRelatedToUid = relatedToUid; |
388 | } | 392 | } |
389 | 393 | ||
390 | QString Incidence::relatedToUid() const | 394 | QString Incidence::relatedToUid() const |
391 | { | 395 | { |
392 | return mRelatedToUid; | 396 | return mRelatedToUid; |
393 | } | 397 | } |
394 | 398 | ||
395 | void Incidence::setRelatedTo(Incidence *relatedTo) | 399 | void Incidence::setRelatedTo(Incidence *relatedTo) |
396 | { | 400 | { |
397 | //qDebug("Incidence::setRelatedTo %d ", relatedTo); | 401 | //qDebug("Incidence::setRelatedTo %d ", relatedTo); |
398 | //qDebug("setRelatedTo(Incidence *relatedTo) %s %s", summary().latin1(), relatedTo->summary().latin1() ); | 402 | //qDebug("setRelatedTo(Incidence *relatedTo) %s %s", summary().latin1(), relatedTo->summary().latin1() ); |
399 | if (mReadOnly || mRelatedTo == relatedTo) return; | 403 | if (mReadOnly || mRelatedTo == relatedTo) return; |
400 | if(mRelatedTo) { | 404 | if(mRelatedTo) { |
401 | // updated(); | 405 | // updated(); |
402 | mRelatedTo->removeRelation(this); | 406 | mRelatedTo->removeRelation(this); |
403 | } | 407 | } |
404 | mRelatedTo = relatedTo; | 408 | mRelatedTo = relatedTo; |
405 | if (mRelatedTo) { | 409 | if (mRelatedTo) { |
406 | mRelatedTo->addRelation(this); | 410 | mRelatedTo->addRelation(this); |
diff --git a/libkcal/incidence.h b/libkcal/incidence.h index 60070a2..327e7dd 100644 --- a/libkcal/incidence.h +++ b/libkcal/incidence.h | |||
@@ -137,48 +137,49 @@ class Incidence : public IncidenceBase | |||
137 | 137 | ||
138 | /** Set starting date/time. */ | 138 | /** Set starting date/time. */ |
139 | virtual void setDtStart(const QDateTime &dtStart); | 139 | virtual void setDtStart(const QDateTime &dtStart); |
140 | /** Return the incidence's ending date/time as a QDateTime. */ | 140 | /** Return the incidence's ending date/time as a QDateTime. */ |
141 | virtual QDateTime dtEnd() const { return QDateTime(); } | 141 | virtual QDateTime dtEnd() const { return QDateTime(); } |
142 | 142 | ||
143 | /** sets the event's lengthy description. */ | 143 | /** sets the event's lengthy description. */ |
144 | void setDescription(const QString &description); | 144 | void setDescription(const QString &description); |
145 | /** returns a reference to the event's description. */ | 145 | /** returns a reference to the event's description. */ |
146 | QString description() const; | 146 | QString description() const; |
147 | 147 | ||
148 | /** sets the event's short summary. */ | 148 | /** sets the event's short summary. */ |
149 | void setSummary(const QString &summary); | 149 | void setSummary(const QString &summary); |
150 | /** returns a reference to the event's summary. */ | 150 | /** returns a reference to the event's summary. */ |
151 | QString summary() const; | 151 | QString summary() const; |
152 | 152 | ||
153 | /** set event's applicable categories */ | 153 | /** set event's applicable categories */ |
154 | void setCategories(const QStringList &categories); | 154 | void setCategories(const QStringList &categories); |
155 | /** set event's categories based on a comma delimited string */ | 155 | /** set event's categories based on a comma delimited string */ |
156 | void setCategories(const QString &catStr); | 156 | void setCategories(const QString &catStr); |
157 | /** return categories in a list */ | 157 | /** return categories in a list */ |
158 | QStringList categories() const; | 158 | QStringList categories() const; |
159 | /** return categories as a comma separated string */ | 159 | /** return categories as a comma separated string */ |
160 | QString categoriesStr(); | 160 | QString categoriesStr(); |
161 | QString categoriesStrWithSpace(); | ||
161 | 162 | ||
162 | /** point at some other event to which the event relates. This function should | 163 | /** point at some other event to which the event relates. This function should |
163 | * only be used when constructing a calendar before the related Event | 164 | * only be used when constructing a calendar before the related Event |
164 | * exists. */ | 165 | * exists. */ |
165 | void setRelatedToUid(const QString &); | 166 | void setRelatedToUid(const QString &); |
166 | /** what event does this one relate to? This function should | 167 | /** what event does this one relate to? This function should |
167 | * only be used when constructing a calendar before the related Event | 168 | * only be used when constructing a calendar before the related Event |
168 | * exists. */ | 169 | * exists. */ |
169 | QString relatedToUid() const; | 170 | QString relatedToUid() const; |
170 | /** point at some other event to which the event relates */ | 171 | /** point at some other event to which the event relates */ |
171 | void setRelatedTo(Incidence *relatedTo); | 172 | void setRelatedTo(Incidence *relatedTo); |
172 | /** what event does this one relate to? */ | 173 | /** what event does this one relate to? */ |
173 | Incidence *relatedTo() const; | 174 | Incidence *relatedTo() const; |
174 | /** All events that are related to this event */ | 175 | /** All events that are related to this event */ |
175 | QPtrList<Incidence> relations() const; | 176 | QPtrList<Incidence> relations() const; |
176 | /** Add an event which is related to this event */ | 177 | /** Add an event which is related to this event */ |
177 | void addRelation(Incidence *); | 178 | void addRelation(Incidence *); |
178 | /** Remove event that is related to this event */ | 179 | /** Remove event that is related to this event */ |
179 | void removeRelation(Incidence *); | 180 | void removeRelation(Incidence *); |
180 | 181 | ||
181 | /** returns the list of dates which are exceptions to the recurrence rule */ | 182 | /** returns the list of dates which are exceptions to the recurrence rule */ |
182 | DateList exDates() const; | 183 | DateList exDates() const; |
183 | /** sets the list of dates which are exceptions to the recurrence rule */ | 184 | /** sets the list of dates which are exceptions to the recurrence rule */ |
184 | void setExDates(const DateList &_exDates); | 185 | void setExDates(const DateList &_exDates); |