From e83a8393a4d89a270b6a75d6fe2cd5988bde5d56 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sun, 14 Jun 2015 19:33:54 +0800 Subject: [PATCH] Add a parameter to QString(time_t t) --- src/core/misc.cpp | 6 +++--- src/core/misc.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/misc.cpp b/src/core/misc.cpp index 42414d8f6..d8cf4a287 100644 --- a/src/core/misc.cpp +++ b/src/core/misc.cpp @@ -1,4 +1,4 @@ -/* +/* * Bittorrent Client using Qt4 and libtorrent. * Copyright (C) 2006 Christophe Dumez * @@ -528,9 +528,9 @@ QString misc::parseHtmlLinks(const QString &raw_text) return result; } -QString misc::toQString(time_t t) +QString misc::toQString(time_t t, Qt::DateFormat f) { - return QDateTime::fromTime_t(t).toString(Qt::DefaultLocaleLongDate); + return QDateTime::fromTime_t(t).toString(f); } #ifndef DISABLE_GUI diff --git a/src/core/misc.h b/src/core/misc.h index b99d58ae7..37430561b 100644 --- a/src/core/misc.h +++ b/src/core/misc.h @@ -64,6 +64,7 @@ namespace misc { QString toQString(const std::string &str); QString toQString(const char* str); + QString toQString(time_t t, Qt::DateFormat f = Qt::DefaultLocaleLongDate); QString toQStringU(const std::string &str); QString toQStringU(const char* str); QString toQString(const libtorrent::sha1_hash &hash); @@ -100,7 +101,6 @@ namespace misc QList intListfromStringList(const QStringList &l); QList boolListfromStringList(const QStringList &l); - QString toQString(time_t t); QString accurateDoubleToString(const double &n, const int &precision); #ifndef DISABLE_GUI