[Pkg-owncloud-commits] [owncloud-client] 38/498: Revert "AccountSettings: Update progress only twice per second. #3014"

[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 68bf22f469d3649a5bd93e4ec95621caf56c8e6f
Author: Christian Kamm <kamm at incasoftware.de>
Date:   Wed Apr 22 11:46:00 2015 +0200

    Revert "AccountSettings: Update progress only twice per second. #3014"
    
    This reverts commit 0f33e266cede90f56824cd92a19a8fd8b3c2801a.
    
    The change was not meant to be merged, see discussion in #3014.
---
 src/gui/accountsettings.cpp | 11 -----------
 src/gui/accountsettings.h   |  1 -
 2 files changed, 12 deletions(-)

diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
index 4a7baf9..5d7f915 100644
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -119,8 +119,6 @@ AccountSettings::AccountSettings(QWidget *parent) :
     connect(folderMan, SIGNAL(folderListLoaded(Folder::Map)),
             this, SLOT(setFolderList(Folder::Map)));
     setFolderList(FolderMan::instance()->map());
-
-    _lastProgressUpdate.start();
 }
 
 void AccountSettings::slotAccountStateChanged(AccountState *newAccountState)
@@ -609,15 +607,6 @@ void AccountSettings::slotSetProgress(const QString& folder, const ProgressInfo
         return;
     }
 
-    // Don't update progess too often.
-    const int msBetweenProgressUpdates = 500;
-    if (_lastProgressUpdate.elapsed() < msBetweenProgressUpdates) {
-        qDebug() << "skip progress";
-        return;
-    }
-    _lastProgressUpdate.restart();
-
-
     if(!progress._lastCompletedItem.isEmpty()
             && Progress::isWarningKind(progress._lastCompletedItem._status)) {
         int warnCount = item->data(FolderStatusDelegate::WarningCount).toInt();
diff --git a/src/gui/accountsettings.h b/src/gui/accountsettings.h
index a6811eb..380e68c 100644
--- a/src/gui/accountsettings.h
+++ b/src/gui/accountsettings.h
@@ -98,7 +98,6 @@ private:
     QStringList _generalErrors;
     bool _wasDisabledBefore;
     AccountState *_accountState;
-    QElapsedTimer _lastProgressUpdate;
 private slots:
     void slotFolderSyncStateChange();
     void slotAccountStateChanged(AccountState*);

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