Allow AllDay Events to span multiple days... again Revert to 1.9

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
 {
     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
 {
-    /* small work around... */
+    QDateTime dt = TimeConversion::fromUTC( endUTC );
     if ( actual && typ == AllDay ) {
-	return QDateTime( TimeConversion::fromUTC( startUTC ).date(), QTime(23, 59, 59 ) );
+	dt.setTime( QTime(23,59,59) );
     }
-    return TimeConversion::fromUTC( endUTC );
+    return dt;
 }
 
 /*!
   \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;