summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCatalin Badea <catalin.badea392@gmail.com>2012-07-27 19:59:24 (GMT)
committerCătălin Badea <catalin.badea392@gmail.com>2012-08-11 15:59:13 (GMT)
commitc0f0ab471345fe3f3a3517bb302c7da1549c8f25 (patch)
treee215dd6564e1d8dbb4740319b4cd4c71d6c4813b /Swift/QtUI/QtHistoryWindow.cpp
parent22d4e0bfe7d78beba9fb24ef71513702340993b5 (diff)
downloadswift-contrib-c0f0ab471345fe3f3a3517bb302c7da1549c8f25.zip
swift-contrib-c0f0ab471345fe3f3a3517bb302c7da1549c8f25.tar.bz2
fix localtime utc conversion issues
Diffstat (limited to 'Swift/QtUI/QtHistoryWindow.cpp')
-rw-r--r--Swift/QtUI/QtHistoryWindow.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/Swift/QtUI/QtHistoryWindow.cpp b/Swift/QtUI/QtHistoryWindow.cpp
index 0a7c5b5..a0ccbf9 100644
--- a/Swift/QtUI/QtHistoryWindow.cpp
+++ b/Swift/QtUI/QtHistoryWindow.cpp
@@ -106,8 +106,11 @@ void QtHistoryWindow::addMessage(const std::string &message, const std::string &
QString messageHTML(P2QSTRING(message));
messageHTML = Qt::escape(messageHTML);
- QDateTime qTime = B2QDATE(time);
- QDate date = qTime.date();
+
+ // note: time uses localtime
+ QDate date = QDate(time.date().year(), time.date().month(), time.date().day());
+ QTime dayTime = QTime(time.time_of_day().hours(), time.time_of_day().minutes(), time.time_of_day().seconds());
+ QDateTime qTime = QDateTime(date, dayTime);
std::string id = "id" + boost::lexical_cast<std::string>(idCounter_++);