minor fix

diff --git a/src/model/conference.h b/src/model/conference.h
index c904b51c084077eb5d724f049484a239f589ef88..c6c8e017746b1384dd6b5cf4e64638ece0a6e289 100644 (file)
--- a/src/model/conference.h
+++ b/src/model/conference.h
@@ -23,11 +23,8 @@ public:
     QString subtitle() const { return value("subtitle").toString(); }
     QString venue() const { return value("venue").toString(); }
     QString city() const { return value("city").toString(); }
-    // TODO: there is some problem with converting "Time_t" to QDateTime: had to manually add 1 day
-    // NEEDS TO BE FIXED
-    QDate start() const { return value("start").toDateTime().addDays(1).date(); }
-    QDate end() const { return value("end").toDateTime().addDays(1).date(); }
-    //
+    QDate start() const { return value("start").toDate(); }
+    QDate end() const { return value("end").toDate(); }
     int days() const { return value("days").toInt(); }
     int dayChange() const { return value("day_change").toInt(); } // in seconds from 00:00
     int timeslotDuration() const { return value("timeslot_duration").toInt(); } // in seconds

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index 48db577446227ea68c5f819aec5f63b23db8fb49..a7cd62657488b725d0b7645e6ac25a12382de463 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -67,8 +67,8 @@ void SqlEngine::addConferenceToDB(QHash<QString,QString> &aConference)
                          .arg(aConference["subtitle"]) \
                          .arg(aConference["venue"]) \
                          .arg(aConference["city"]) \
-                         .arg(QDateTime(QDate::fromString(aConference["start"],DATE_FORMAT)).toTime_t()) \
-                         .arg(QDateTime(QDate::fromString(aConference["end"],DATE_FORMAT)).toTime_t()) \
+                         .arg(QDateTime(QDate::fromString(aConference["start"],DATE_FORMAT),QTime(0,0),Qt::UTC).toTime_t()) \
+                         .arg(QDateTime(QDate::fromString(aConference["end"],DATE_FORMAT),QTime(0,0),Qt::UTC).toTime_t()) \
                          .arg(aConference["days"]) \
                          .arg(-QTime::fromString(aConference["day_change"],TIME_FORMAT).secsTo(QTime(0,0))) \
                          .arg(-QTime::fromString(aConference["timeslot_duration"],TIME_FORMAT).secsTo(QTime(0,0)));