From: Christian Kamm Date: Wed, 22 Apr 2015 09:46:00 +0000 (+0200) Subject: Revert "AccountSettings: Update progress only twice per second. #3014" X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~1673^2~16 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=68bf22f469d3649a5bd93e4ec95621caf56c8e6f;p=nextcloud-desktop.git 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. --- diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp index 4a7baf97c..5d7f9150d 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 a6811eb1f..380e68c45 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*);