-rw-r--r-- | libkcal/incidence.cpp | 4 |
1 files changed, 4 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 | |||
@@ -287,192 +287,196 @@ void Incidence::setCreated(QDateTime created) | |||
287 | if (mReadOnly) return; | 287 | if (mReadOnly) return; |
288 | mCreated = getEvenTime(created); | 288 | mCreated = getEvenTime(created); |
289 | } | 289 | } |
290 | 290 | ||
291 | QDateTime Incidence::created() const | 291 | QDateTime Incidence::created() const |
292 | { | 292 | { |
293 | return mCreated; | 293 | return mCreated; |
294 | } | 294 | } |
295 | 295 | ||
296 | void Incidence::setRevision(int rev) | 296 | void Incidence::setRevision(int rev) |
297 | { | 297 | { |
298 | if (mReadOnly) return; | 298 | if (mReadOnly) return; |
299 | mRevision = rev; | 299 | mRevision = rev; |
300 | 300 | ||
301 | updated(); | 301 | updated(); |
302 | } | 302 | } |
303 | 303 | ||
304 | int Incidence::revision() const | 304 | int Incidence::revision() const |
305 | { | 305 | { |
306 | return mRevision; | 306 | return mRevision; |
307 | } | 307 | } |
308 | 308 | ||
309 | void Incidence::setDtStart(const QDateTime &dtStart) | 309 | void Incidence::setDtStart(const QDateTime &dtStart) |
310 | { | 310 | { |
311 | 311 | ||
312 | QDateTime dt = getEvenTime(dtStart); | 312 | QDateTime dt = getEvenTime(dtStart); |
313 | recurrence()->setRecurStart( dt); | 313 | recurrence()->setRecurStart( dt); |
314 | IncidenceBase::setDtStart( dt ); | 314 | IncidenceBase::setDtStart( dt ); |
315 | } | 315 | } |
316 | 316 | ||
317 | void Incidence::setDescription(const QString &description) | 317 | void Incidence::setDescription(const QString &description) |
318 | { | 318 | { |
319 | if (mReadOnly) return; | 319 | if (mReadOnly) return; |
320 | mDescription = description; | 320 | mDescription = description; |
321 | updated(); | 321 | updated(); |
322 | } | 322 | } |
323 | 323 | ||
324 | QString Incidence::description() const | 324 | QString Incidence::description() const |
325 | { | 325 | { |
326 | return mDescription; | 326 | return mDescription; |
327 | } | 327 | } |
328 | 328 | ||
329 | 329 | ||
330 | void Incidence::setSummary(const QString &summary) | 330 | void Incidence::setSummary(const QString &summary) |
331 | { | 331 | { |
332 | if (mReadOnly) return; | 332 | if (mReadOnly) return; |
333 | mSummary = summary; | 333 | mSummary = summary; |
334 | updated(); | 334 | updated(); |
335 | } | 335 | } |
336 | 336 | ||
337 | QString Incidence::summary() const | 337 | QString Incidence::summary() const |
338 | { | 338 | { |
339 | return mSummary; | 339 | return mSummary; |
340 | } | 340 | } |
341 | void Incidence::checkCategories() | 341 | void Incidence::checkCategories() |
342 | { | 342 | { |
343 | mHoliday = mCategories.contains("Holiday") || mCategories.contains(i18n("Holiday")); | 343 | mHoliday = mCategories.contains("Holiday") || mCategories.contains(i18n("Holiday")); |
344 | mBirthday = mCategories.contains("Birthday") || mCategories.contains(i18n("Birthday")); | 344 | mBirthday = mCategories.contains("Birthday") || mCategories.contains(i18n("Birthday")); |
345 | mAnniversary = mCategories.contains("Anniversary") || mCategories.contains(i18n("Anniversary")); | 345 | mAnniversary = mCategories.contains("Anniversary") || mCategories.contains(i18n("Anniversary")); |
346 | } | 346 | } |
347 | 347 | ||
348 | void Incidence::setCategories(const QStringList &categories) | 348 | void Incidence::setCategories(const QStringList &categories) |
349 | { | 349 | { |
350 | if (mReadOnly) return; | 350 | if (mReadOnly) return; |
351 | mCategories = categories; | 351 | mCategories = categories; |
352 | checkCategories(); | 352 | checkCategories(); |
353 | updated(); | 353 | updated(); |
354 | } | 354 | } |
355 | 355 | ||
356 | // TODO: remove setCategories(QString) function | 356 | // TODO: remove setCategories(QString) function |
357 | void Incidence::setCategories(const QString &catStr) | 357 | void Incidence::setCategories(const QString &catStr) |
358 | { | 358 | { |
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); |
407 | mRelatedToUid = mRelatedTo->uid(); | 411 | mRelatedToUid = mRelatedTo->uid(); |
408 | } else { | 412 | } else { |
409 | mRelatedToUid = ""; | 413 | mRelatedToUid = ""; |
410 | } | 414 | } |
411 | } | 415 | } |
412 | 416 | ||
413 | Incidence *Incidence::relatedTo() const | 417 | Incidence *Incidence::relatedTo() const |
414 | { | 418 | { |
415 | return mRelatedTo; | 419 | return mRelatedTo; |
416 | } | 420 | } |
417 | 421 | ||
418 | QPtrList<Incidence> Incidence::relations() const | 422 | QPtrList<Incidence> Incidence::relations() const |
419 | { | 423 | { |
420 | return mRelations; | 424 | return mRelations; |
421 | } | 425 | } |
422 | 426 | ||
423 | void Incidence::addRelation(Incidence *event) | 427 | void Incidence::addRelation(Incidence *event) |
424 | { | 428 | { |
425 | if( mRelations.findRef( event ) == -1 ) { | 429 | if( mRelations.findRef( event ) == -1 ) { |
426 | mRelations.append(event); | 430 | mRelations.append(event); |
427 | //updated(); | 431 | //updated(); |
428 | } | 432 | } |
429 | } | 433 | } |
430 | 434 | ||
431 | void Incidence::removeRelation(Incidence *event) | 435 | void Incidence::removeRelation(Incidence *event) |
432 | { | 436 | { |
433 | 437 | ||
434 | mRelations.removeRef(event); | 438 | mRelations.removeRef(event); |
435 | 439 | ||
436 | // if (event->getRelatedTo() == this) event->setRelatedTo(0); | 440 | // if (event->getRelatedTo() == this) event->setRelatedTo(0); |
437 | } | 441 | } |
438 | 442 | ||
439 | bool Incidence::recursOn(const QDate &qd) const | 443 | bool Incidence::recursOn(const QDate &qd) const |
440 | { | 444 | { |
441 | if (recurrence()->recursOnPure(qd) && !isException(qd)) return true; | 445 | if (recurrence()->recursOnPure(qd) && !isException(qd)) return true; |
442 | else return false; | 446 | else return false; |
443 | } | 447 | } |
444 | 448 | ||
445 | void Incidence::setExDates(const DateList &exDates) | 449 | void Incidence::setExDates(const DateList &exDates) |
446 | { | 450 | { |
447 | if (mReadOnly) return; | 451 | if (mReadOnly) return; |
448 | mExDates = exDates; | 452 | mExDates = exDates; |
449 | 453 | ||
450 | recurrence()->setRecurExDatesCount(mExDates.count()); | 454 | recurrence()->setRecurExDatesCount(mExDates.count()); |
451 | 455 | ||
452 | updated(); | 456 | updated(); |
453 | } | 457 | } |
454 | 458 | ||
455 | void Incidence::addExDate(const QDate &date) | 459 | void Incidence::addExDate(const QDate &date) |
456 | { | 460 | { |
457 | if (mReadOnly) return; | 461 | if (mReadOnly) return; |
458 | mExDates.append(date); | 462 | mExDates.append(date); |
459 | 463 | ||
460 | recurrence()->setRecurExDatesCount(mExDates.count()); | 464 | recurrence()->setRecurExDatesCount(mExDates.count()); |
461 | 465 | ||
462 | updated(); | 466 | updated(); |
463 | } | 467 | } |
464 | 468 | ||
465 | DateList Incidence::exDates() const | 469 | DateList Incidence::exDates() const |
466 | { | 470 | { |
467 | return mExDates; | 471 | return mExDates; |
468 | } | 472 | } |
469 | 473 | ||
470 | bool Incidence::isException(const QDate &date) const | 474 | bool Incidence::isException(const QDate &date) const |
471 | { | 475 | { |
472 | DateList::ConstIterator it; | 476 | DateList::ConstIterator it; |
473 | for( it = mExDates.begin(); it != mExDates.end(); ++it ) { | 477 | for( it = mExDates.begin(); it != mExDates.end(); ++it ) { |
474 | if ( (*it) == date ) { | 478 | if ( (*it) == date ) { |
475 | return true; | 479 | return true; |
476 | } | 480 | } |
477 | } | 481 | } |
478 | 482 | ||