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 | |||
@@ -585,69 +585,69 @@ 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; |