author | zecke <zecke> | 2003-05-13 19:44:24 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-05-13 19:44:24 (UTC) |
commit | 00df920dfbe915b300171ae459fe27cf453dc130 (patch) (unidiff) | |
tree | 9bc78ab217dad286a975db8f70877d444233f979 /library | |
parent | fa68b5c42a115b8c95195295e3af8d74bb520e04 (diff) | |
download | opie-00df920dfbe915b300171ae459fe27cf453dc130.zip opie-00df920dfbe915b300171ae459fe27cf453dc130.tar.gz opie-00df920dfbe915b300171ae459fe27cf453dc130.tar.bz2 |
Allow AllDay Events to span multiple days... again Revert to 1.9
-rw-r--r-- | library/backend/event.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/library/backend/event.cpp b/library/backend/event.cpp index 4c24ab3..90860e8 100644 --- a/library/backend/event.cpp +++ b/library/backend/event.cpp | |||
@@ -553,133 +553,133 @@ void Event::setRepeat( bool b, const RepeatPattern &p ) | |||
553 | Sets the notes for the event to \a n. | 553 | Sets the notes for the event to \a n. |
554 | */ | 554 | */ |
555 | void Event::setNotes( const QString &n ) | 555 | void Event::setNotes( const QString &n ) |
556 | { | 556 | { |
557 | note = n; | 557 | note = n; |
558 | } | 558 | } |
559 | 559 | ||
560 | /*! | 560 | /*! |
561 | Returns the description of the event. | 561 | Returns the description of the event. |
562 | */ | 562 | */ |
563 | const QString &Event::description() const | 563 | const QString &Event::description() const |
564 | { | 564 | { |
565 | return descript; | 565 | return descript; |
566 | } | 566 | } |
567 | 567 | ||
568 | /*! | 568 | /*! |
569 | Returns the location of the event. | 569 | Returns the location of the event. |
570 | */ | 570 | */ |
571 | const QString &Event::location() const | 571 | const QString &Event::location() const |
572 | { | 572 | { |
573 | return locat; | 573 | return locat; |
574 | } | 574 | } |
575 | 575 | ||
576 | // QString Event::category() const | 576 | // QString Event::category() const |
577 | // { | 577 | // { |
578 | // return categ; | 578 | // return categ; |
579 | // } | 579 | // } |
580 | 580 | ||
581 | /*! | 581 | /*! |
582 | \internal | 582 | \internal |
583 | */ | 583 | */ |
584 | Event::Type Event::type() const | 584 | Event::Type Event::type() const |
585 | { | 585 | { |
586 | return typ; | 586 | return typ; |
587 | } | 587 | } |
588 | /* | 588 | /* |
589 | QDateTime Event::start() const { | 589 | QDateTime Event::start() const { |
590 | return start( TRUE ); | 590 | return start( TRUE ); |
591 | } | 591 | } |
592 | */ | 592 | */ |
593 | /*! | 593 | /*! |
594 | \internal | 594 | \internal |
595 | */ | 595 | */ |
596 | QDateTime Event::start( bool actual ) const | 596 | QDateTime Event::start( bool actual ) const |
597 | { | 597 | { |
598 | QDateTime dt = TimeConversion::fromUTC( startUTC ); | 598 | QDateTime dt = TimeConversion::fromUTC( startUTC ); |
599 | 599 | ||
600 | if ( actual && typ == AllDay ) { | 600 | if ( actual && typ == AllDay ) { |
601 | QTime t = dt.time(); | 601 | QTime t = dt.time(); |
602 | t.setHMS( 0, 0, 0 ); | 602 | t.setHMS( 0, 0, 0 ); |
603 | dt.setTime( t ); | 603 | dt.setTime( t ); |
604 | } | 604 | } |
605 | return dt; | 605 | return dt; |
606 | } | 606 | } |
607 | /* | 607 | /* |
608 | QDateTime Event::end() const { | 608 | QDateTime Event::end() const { |
609 | return end( TRUE ); | 609 | return end( TRUE ); |
610 | } | 610 | } |
611 | */ | 611 | */ |
612 | /*! | 612 | /*! |
613 | \internal | 613 | \internal |
614 | */ | 614 | */ |
615 | QDateTime Event::end( bool actual ) const | 615 | QDateTime Event::end( bool actual ) const |
616 | { | 616 | { |
617 | /* small work around... */ | 617 | QDateTime dt = TimeConversion::fromUTC( endUTC ); |
618 | if ( actual && typ == AllDay ) { | 618 | if ( actual && typ == AllDay ) { |
619 | return QDateTime( TimeConversion::fromUTC( startUTC ).date(), QTime(23, 59, 59 ) ); | 619 | dt.setTime( QTime(23,59,59) ); |
620 | } | 620 | } |
621 | return TimeConversion::fromUTC( endUTC ); | 621 | return dt; |
622 | } | 622 | } |
623 | 623 | ||
624 | /*! | 624 | /*! |
625 | \internal | 625 | \internal |
626 | */ | 626 | */ |
627 | const QString &Event::timeZone() const | 627 | const QString &Event::timeZone() const |
628 | { | 628 | { |
629 | return tz; | 629 | return tz; |
630 | } | 630 | } |
631 | 631 | ||
632 | /*! | 632 | /*! |
633 | \internal | 633 | \internal |
634 | */ | 634 | */ |
635 | bool Event::hasAlarm() const | 635 | bool Event::hasAlarm() const |
636 | { | 636 | { |
637 | return hAlarm; | 637 | return hAlarm; |
638 | } | 638 | } |
639 | 639 | ||
640 | /*! | 640 | /*! |
641 | \internal | 641 | \internal |
642 | */ | 642 | */ |
643 | int Event::alarmTime() const | 643 | int Event::alarmTime() const |
644 | { | 644 | { |
645 | return aMinutes; | 645 | return aMinutes; |
646 | } | 646 | } |
647 | 647 | ||
648 | /*! | 648 | /*! |
649 | Returns the sound type for the alarm of this event. | 649 | Returns the sound type for the alarm of this event. |
650 | */ | 650 | */ |
651 | Event::SoundTypeChoice Event::alarmSound() const | 651 | Event::SoundTypeChoice Event::alarmSound() const |
652 | { | 652 | { |
653 | return aSound; | 653 | return aSound; |
654 | } | 654 | } |
655 | 655 | ||
656 | /*! | 656 | /*! |
657 | \internal | 657 | \internal |
658 | */ | 658 | */ |
659 | bool Event::hasRepeat() const | 659 | bool Event::hasRepeat() const |
660 | { | 660 | { |
661 | return doRepeat(); | 661 | return doRepeat(); |
662 | } | 662 | } |
663 | 663 | ||
664 | /*! | 664 | /*! |
665 | \internal | 665 | \internal |
666 | */ | 666 | */ |
667 | const Event::RepeatPattern &Event::repeatPattern() const | 667 | const Event::RepeatPattern &Event::repeatPattern() const |
668 | { | 668 | { |
669 | return pattern; | 669 | return pattern; |
670 | } | 670 | } |
671 | 671 | ||
672 | /*! | 672 | /*! |
673 | \internal | 673 | \internal |
674 | */ | 674 | */ |
675 | Event::RepeatPattern &Event::repeatPattern() | 675 | Event::RepeatPattern &Event::repeatPattern() |
676 | { | 676 | { |
677 | return pattern; | 677 | return pattern; |
678 | } | 678 | } |
679 | 679 | ||
680 | /*! | 680 | /*! |
681 | Returns the notes for the event. | 681 | Returns the notes for the event. |
682 | */ | 682 | */ |
683 | const QString &Event::notes() const | 683 | const QString &Event::notes() const |
684 | { | 684 | { |
685 | return note; | 685 | return note; |