[Pkg-owncloud-commits] [owncloud-client] 230/470: Remove explicit time spec specification as it is not needed.
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu May 12 16:25:07 UTC 2016
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit 69e8e158845292528d5492bc42c428ee09ddf25a
Author: Klaas Freitag <freitag at owncloud.com>
Date: Tue Mar 29 13:59:08 2016 +0200
Remove explicit time spec specification as it is not needed.
---
src/gui/activitylistmodel.cpp | 1 -
src/gui/servernotificationhandler.cpp | 1 -
src/libsync/utility.cpp | 2 --
3 files changed, 4 deletions(-)
diff --git a/src/gui/activitylistmodel.cpp b/src/gui/activitylistmodel.cpp
index a16eafe..07e0ba3 100644
--- a/src/gui/activitylistmodel.cpp
+++ b/src/gui/activitylistmodel.cpp
@@ -155,7 +155,6 @@ void ActivityListModel::slotActivitiesReceived(const QVariantMap& json, int stat
a._file = json.value("file").toString();
a._link = json.value("link").toUrl();
a._dateTime = json.value("date").toDateTime();
- a._dateTime.setTimeSpec(Qt::UTC);
list.append(a);
}
diff --git a/src/gui/servernotificationhandler.cpp b/src/gui/servernotificationhandler.cpp
index 14a9e07..5606520 100644
--- a/src/gui/servernotificationhandler.cpp
+++ b/src/gui/servernotificationhandler.cpp
@@ -81,7 +81,6 @@ void ServerNotificationHandler::slotNotificationsReceived(const QVariantMap& jso
a._link = QUrl(s);
}
a._dateTime = json.value("datetime").toDateTime();
- a._dateTime.setTimeSpec(Qt::UTC);
auto actions = json.value("actions").toList();
foreach( auto action, actions) {
diff --git a/src/libsync/utility.cpp b/src/libsync/utility.cpp
index b0325f5..7d6fcdc 100644
--- a/src/libsync/utility.cpp
+++ b/src/libsync/utility.cpp
@@ -440,8 +440,6 @@ QString Utility::timeAgoInWords(const QDateTime& dt, const QDateTime& from)
now = from;
}
- Q_ASSERT(dt.timeSpec() == Qt::UTC);
-
if( dt.daysTo(now)>0 ) {
int dtn = dt.daysTo(now);
return QObject::tr("%n day(s) ago", "", dtn);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list