[Pkg-owncloud-commits] [owncloud-client] 176/470: Revert "Utility: Make sure to use UTC timestamp to compare in timeAgoInWords"

[Sandro Knauß]

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 0febe9b0df23f90eb96a6d7c1c207fd1f9ff812d
Author: Christian Kamm <mail at ckamm.de>
Date:   Fri Mar 18 13:15:35 2016 +0100

    Revert "Utility: Make sure to use UTC timestamp to compare in timeAgoInWords"
    
    This reverts commit 41b43bf961bf933f53099ca09142bdc4f143c3e4.
    
    Using now in UTC should make no difference, but that assert might
    trigger...
---
 src/libsync/utility.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/libsync/utility.cpp b/src/libsync/utility.cpp
index bb3f563..b535386 100644
--- a/src/libsync/utility.cpp
+++ b/src/libsync/utility.cpp
@@ -434,14 +434,12 @@ QByteArray Utility::versionOfInstalledBinary( const QString& command )
 
 QString Utility::timeAgoInWords(const QDateTime& dt, const QDateTime& from)
 {
-    QDateTime now = QDateTime::currentDateTimeUtc();
+    QDateTime now = QDateTime::currentDateTime();
 
     if( from.isValid() ) {
         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).arg(dtn);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git