Merge lp:~renatofilho/qtorganizer5-eds/fix-all-day-with-tz into lp:qtorganizer5-eds

[Renato Araujo Oliveira Filho]

Save all days events in UTC time format to avoid problems with while converting it to QML.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:101
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/253/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-amd64-ci/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/60
        deb: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/60/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-i386-ci/60

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/253/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/qtorganizer5-eds/fix-all-day-with-tz]

102. By Renato Araujo Oliveira Filho on 2016-04-20

Fixed all day events time save.

=== modified file 'organizer/qorganizer-eds-engine.cpp'
--- organizer/qorganizer-eds-engine.cpp	2016-03-04 13:57:10 +0000
+++ organizer/qorganizer-eds-engine.cpp	2016-04-20 23:47:41 +0000
@@ -1314,12 +1314,12 @@
         return QDateTime::fromTime_t(tmTime, qTz);
     } else {
         tmTime = icaltime_as_timet(value);
-        QDateTime t = QDateTime::fromTime_t(tmTime).toUTC();
-        // all day or floating time events will be saved with invalid timezone
+        QDateTime t = QDateTime::fromTime_t(tmTime, Qt::UTC);
+        // all day events will set as local time
+        // floating time events will be set with invalid time zone
         return QDateTime(t.date(),
-                         // if the event is all day event save with emtpy time
-                         (allDayEvent ? QTime() : t.time()),
-                         QTimeZone());
+                         (allDayEvent ? QTime(0,0,0) : t.time()),
+                         (allDayEvent ? QTimeZone(QTimeZone::systemTimeZoneId()) : QTimeZone()));
     }
 }
 
@@ -1360,10 +1360,11 @@
         *tzId = QByteArray(icaltimezone_get_tzid(timezone));
         return icaltime_from_timet_with_zone(finalDate.toTime_t(), allDay, timezone);
     } else {
-        if (!finalDate.isValid()) {
-            finalDate = QDateTime(finalDate.date(),
-                                  allDay || !finalDate.time().isValid() ? QTime(0, 0, 0) : finalDate.time());
-        }
+        bool invalidTime = allDay || !finalDate.time().isValid();
+        finalDate = QDateTime(finalDate.date(),
+                              invalidTime ? QTime(0, 0, 0) : finalDate.time(),
+                              Qt::UTC);
+
         *tzId = "";
         return icaltime_from_timet(finalDate.toTime_t(), allDay);
     }