From 8f80129bac29227a03c35940af9d197ef0fa6398 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Fri, 22 May 2020 18:53:25 +0200 Subject: cleanup: create common QDateTime -> timestamp conversion function In analogy to the timestamp -> QDateTime conversion, create a common function. 1) For symmetry with the opposite conversion. 2) To remove numerous inconsistencies. 3) To remove use of the deprecated QDateTime::toTime_t() function. Signed-off-by: Berthold Stoeger --- core/metadata.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core/metadata.cpp') diff --git a/core/metadata.cpp b/core/metadata.cpp index 8692ea30f..e7cc0a08b 100644 --- a/core/metadata.cpp +++ b/core/metadata.cpp @@ -271,7 +271,7 @@ static bool parseDate(const QString &s_in, timestamp_t ×tamp) if (datetime.isValid()) { // Not knowing any better, we suppose that time is give in UTC datetime.setTimeSpec(Qt::UTC); - timestamp = datetime.toMSecsSinceEpoch() / 1000; + timestamp = dateTimeToTimestamp(datetime); return true; } @@ -312,7 +312,7 @@ static bool parseDate(const QString &s_in, timestamp_t ×tamp) // Not knowing any better, we suppose that time is give in UTC datetime = QDateTime(date, time, Qt::UTC); if (datetime.isValid()) { - timestamp = datetime.toMSecsSinceEpoch() / 1000; + timestamp = dateTimeToTimestamp(datetime); return true; } @@ -542,9 +542,9 @@ extern "C" mediatype_t get_metadata(const char *filename_in, metadata *data) // have a standard way of storing this datum), use the file creation date of the file. if (data->timestamp == 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) - data->timestamp = QFileInfo(filename).birthTime().toMSecsSinceEpoch() / 1000; + data->timestamp = dateTimeToTimestamp(QFileInfo(filename).birthTime()); #else - data->timestamp = QFileInfo(filename).created().toMSecsSinceEpoch() / 1000; + data->timestamp = dateTimeToTimestamp(QFileInfo(filename).created()); #endif return res; } -- cgit v1.2.3-70-g09d2