From ea985a85af61ddd59303e792aee8ded4db74d981 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Fri, 27 Mar 2015 09:07:21 +0100 Subject: [PATCH] ProtocolWidget: Always add seconds to the DateTime locale. #2535 --- src/gui/protocolwidget.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/gui/protocolwidget.cpp b/src/gui/protocolwidget.cpp index 5c8a55f527..d4b6c2bfaa 100644 --- a/src/gui/protocolwidget.cpp +++ b/src/gui/protocolwidget.cpp @@ -167,16 +167,11 @@ void ProtocolWidget::cleanIgnoreItems(const QString& folder) QString ProtocolWidget::timeString(QDateTime dt, QLocale::FormatType format) const { - QLocale loc = QLocale::system(); - QString timeStr; - - if( format == QLocale::NarrowFormat ) { - timeStr = loc.toString(dt, QLocale::NarrowFormat); - } else { - timeStr = loc.toString(dt, format); - } - - return timeStr; + const QLocale loc = QLocale::system(); + QString dtFormat = loc.dateTimeFormat(format); + static const QRegExp re("HH:mm(?!:ss)"); + dtFormat.replace(re, "HH:mm:ss"); + return loc.toString(dt, dtFormat); } void ProtocolWidget::slotOpenFile( QTreeWidgetItem *item, int )