summaryrefslogtreecommitdiff
authorzecke <zecke>2003-02-21 11:35:52 (UTC)
committer zecke <zecke>2003-02-21 11:35:52 (UTC)
commit6917879c47d406b6f4ee234f84b89e17265dd0a5 (patch) (unidiff)
tree8d30ebd64d302cf3e7237154dff7939f2f2aa425
parent2d77abb5ff37abf61e04657431d7e0e1f5138d94 (diff)
downloadopie-6917879c47d406b6f4ee234f84b89e17265dd0a5.zip
opie-6917879c47d406b6f4ee234f84b89e17265dd0a5.tar.gz
opie-6917879c47d406b6f4ee234f84b89e17265dd0a5.tar.bz2
make allday events all bit less fscked up...
Basicly an AllDay Event should be pinned to a day but Qtopia suffers from a problem when changing timezones an AllDay event can span two days... This patch make it at least not span two days..
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/backend/event.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/library/backend/event.cpp b/library/backend/event.cpp
index 0003fe9..d906f19 100644
--- a/library/backend/event.cpp
+++ b/library/backend/event.cpp
@@ -585,72 +585,69 @@ Event::Type Event::type() const
585{ 585{
586 return typ; 586 return typ;
587} 587}
588/* 588/*
589QDateTime Event::start() const { 589QDateTime Event::start() const {
590 return start( TRUE ); 590 return start( TRUE );
591} 591}
592*/ 592*/
593/*! 593/*!
594 \internal 594 \internal
595*/ 595*/
596QDateTime Event::start( bool actual ) const 596QDateTime 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/*
608QDateTime Event::end() const { 608QDateTime Event::end() const {
609 return end( TRUE ); 609 return end( TRUE );
610} 610}
611*/ 611*/
612/*! 612/*!
613 \internal 613 \internal
614*/ 614*/
615QDateTime Event::end( bool actual ) const 615QDateTime Event::end( bool actual ) const
616{ 616{
617 QDateTime dt = TimeConversion::fromUTC( endUTC ); 617 /* small work around... */
618
619 if ( actual && typ == AllDay ) { 618 if ( actual && typ == AllDay ) {
620 QTime t = dt.time(); 619 return QDateTime( TimeConversion::fromUTC( startUTC ).date(), QTime(23, 59, 59 ) );
621 t.setHMS( 23, 59, 59 );
622 dt.setTime( t );
623 } 620 }
624 return dt; 621 return TimeConversion::fromUTC( endUTC );
625} 622}
626 623
627/*! 624/*!
628 \internal 625 \internal
629*/ 626*/
630const QString &Event::timeZone() const 627const QString &Event::timeZone() const
631{ 628{
632 return tz; 629 return tz;
633} 630}
634 631
635/*! 632/*!
636 \internal 633 \internal
637*/ 634*/
638bool Event::hasAlarm() const 635bool Event::hasAlarm() const
639{ 636{
640 return hAlarm; 637 return hAlarm;
641} 638}
642 639
643/*! 640/*!
644 \internal 641 \internal
645*/ 642*/
646int Event::alarmTime() const 643int Event::alarmTime() const
647{ 644{
648 return aMinutes; 645 return aMinutes;
649} 646}
650 647
651/*! 648/*!
652 Returns the sound type for the alarm of this event. 649 Returns the sound type for the alarm of this event.
653*/ 650*/
654Event::SoundTypeChoice Event::alarmSound() const 651Event::SoundTypeChoice Event::alarmSound() const
655{ 652{
656 return aSound; 653 return aSound;