[Pkg-owncloud-commits] [owncloud-client] 235/498: ProgressDispatcher: Minor cleanups.

[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 7e6804fda85968dc5d1267ab6755a63a2f2c21de
Author: Christian Kamm <kamm at incasoftware.de>
Date:   Thu Jul 2 13:49:19 2015 +0200

    ProgressDispatcher: Minor cleanups.
---
 src/libsync/progressdispatcher.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/libsync/progressdispatcher.h b/src/libsync/progressdispatcher.h
index 23cccd0..6a04d3c 100644
--- a/src/libsync/progressdispatcher.h
+++ b/src/libsync/progressdispatcher.h
@@ -78,7 +78,7 @@ public:
     /** Number of a file that is currently in progress. */
     quint64 currentFile() const;
 
-    /** Return true is the size need to be taken in account in the total amount of time */
+    /** Return true if the size needs to be taken in account in the total amount of time */
     static inline bool isSizeDependent(const SyncFileItem & item)
     {
         return ! item._isDirectory && (
@@ -95,7 +95,7 @@ public:
         /// Estimated completion amount per second. (of bytes or files)
         quint64 estimatedBandwidth;
 
-        /// Estimated eta in milliseconds.
+        /// Estimated time remaining in milliseconds.
         quint64 estimatedEta;
     };
 
@@ -107,10 +107,10 @@ public:
     {
         Progress()
             : _progressPerSec(0)
-            , _completed(0)
             , _prevCompleted(0)
-            , _total(0)
             , _initialSmoothing(1.0)
+            , _completed(0)
+            , _total(0)
         {
         }
 
@@ -126,15 +126,18 @@ public:
          */
         void update();
 
+        // Updated by update()
         double _progressPerSec;
-        quint64 _completed;
         quint64 _prevCompleted;
-        quint64 _total;
 
         // Used to get to a good value faster when
         // progress measurement stats. See update().
         double _initialSmoothing;
 
+        // Set and updated by ProgressInfo
+        quint64 _completed;
+        quint64 _total;
+
         friend class ProgressInfo;
     };
 

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