commit 4b8cfaaf2a9fe02319f482ebd74c147fa22e8e46
author Qiuhan Ding <dingqiuhan@gmail.com> Tue Mar 10 17:03:48 2015 -0700
committer Yingdi Yu <yuyingdi@gmail.com> Thu Mar 12 21:39:44 2015 -0700
tree e67f9d41da5197e1f1786e48eef953922724bf58
parent 56c0be57354a8b538068851dd0aaf8125c0f0ae1

chat-dialog: using 24-hour clock in message timestamp

Change-Id: Ieb0fc29fd38260a3d44f19f31440e1a56d2545e6
Refs: #2481

src/chat-dialog.cpp

diff --git a/src/chat-dialog.cpp b/src/chat-dialog.cpp
index ad04d09..4d50054 100644
--- a/src/chat-dialog.cpp
+++ b/src/chat-dialog.cpp
@@ -262,24 +262,12 @@
 QString
 ChatDialog::formatTime(time_t timestamp)
 {
-  struct tm *tm_time = localtime(&timestamp);
-  int hour = tm_time->tm_hour;
-  QString amOrPM;
-  if (hour > 12) {
-    hour -= 12;
-    amOrPM = "PM";
-  }
-  else {
-    amOrPM = "AM";
-    if (hour == 0) {
-      hour = 12;
-    }
-  }
+  struct tm* localTime = localtime(&timestamp);
 
-  char textTime[12];
-  sprintf(textTime, "%d:%02d:%02d %s",
-          hour, tm_time->tm_min, tm_time->tm_sec, amOrPM.toStdString().c_str());
-  return QString(textTime);
+  return QString("%1:%2:%3")
+           .arg(localTime->tm_hour, 2, 10, QChar('0'))
+           .arg(localTime->tm_min, 2, 10, QChar('0'))
+           .arg(localTime->tm_sec, 2, 10, QChar('0'));
 }
 
 void