| -rw-r--r-- | library/backend/event.cpp | 9 |
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 { return typ; } /* QDateTime Event::start() const { return start( TRUE ); } */ /*! \internal */ QDateTime Event::start( bool actual ) const { QDateTime dt = TimeConversion::fromUTC( startUTC ); if ( actual && typ == AllDay ) { QTime t = dt.time(); t.setHMS( 0, 0, 0 ); dt.setTime( t ); } return dt; } /* QDateTime Event::end() const { return end( TRUE ); } */ /*! \internal */ QDateTime Event::end( bool actual ) const { - QDateTime dt = TimeConversion::fromUTC( endUTC ); - + /* small work around... */ if ( actual && typ == AllDay ) { - QTime t = dt.time(); - t.setHMS( 23, 59, 59 ); - dt.setTime( t ); + return QDateTime( TimeConversion::fromUTC( startUTC ).date(), QTime(23, 59, 59 ) ); } - return dt; + return TimeConversion::fromUTC( endUTC ); } /*! \internal */ const QString &Event::timeZone() const { return tz; } /*! \internal */ bool Event::hasAlarm() const { return hAlarm; } /*! \internal */ int Event::alarmTime() const { return aMinutes; } /*! Returns the sound type for the alarm of this event. */ Event::SoundTypeChoice Event::alarmSound() const { return aSound; |