diff options
author | Christian Kamm <mail@ckamm.de> | 2019-02-13 12:15:33 +0300 |
---|---|---|
committer | ckamm <mail@ckamm.de> | 2019-02-14 12:53:33 +0300 |
commit | 89753773e3dce904ffc00a3d098dd5dbc000a7f3 (patch) | |
tree | 44b905f819554ab9e350bfbca0abb7a3cc2d3d62 /src/gui/folderstatusmodel.cpp | |
parent | fb6446b3e5d9ed921af257995194fa5147e2cd9a (diff) |
Fix warnings about signedness
Sizes are always qint64, not unsigned.
TransferIds are always uint.
Diffstat (limited to 'src/gui/folderstatusmodel.cpp')
-rw-r--r-- | src/gui/folderstatusmodel.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp index 4ea8150f1..6c56d660d 100644 --- a/src/gui/folderstatusmodel.cpp +++ b/src/gui/folderstatusmodel.cpp @@ -921,7 +921,7 @@ void FolderStatusModel::slotSetProgress(const ProgressInfo &progress) // item if no items are in progress. SyncFileItem curItem = progress._lastCompletedItem; qint64 curItemProgress = -1; // -1 means finished - quint64 biggerItemSize = -1; + qint64 biggerItemSize = 0; quint64 estimatedUpBw = 0; quint64 estimatedDownBw = 0; QString allFilenames; @@ -1000,13 +1000,11 @@ void FolderStatusModel::slotSetProgress(const ProgressInfo &progress) pi->_progressString = fileProgressString; // overall progress - quint64 completedSize = progress.completedSize(); - quint64 completedFile = progress.completedFiles(); - quint64 currentFile = progress.currentFile(); - if (currentFile == ULLONG_MAX) - currentFile = 0; - quint64 totalSize = qMax(completedSize, progress.totalSize()); - quint64 totalFileCount = qMax(currentFile, progress.totalFiles()); + qint64 completedSize = progress.completedSize(); + qint64 completedFile = progress.completedFiles(); + qint64 currentFile = progress.currentFile(); + qint64 totalSize = qMax(completedSize, progress.totalSize()); + qint64 totalFileCount = qMax(currentFile, progress.totalFiles()); QString overallSyncString; if (totalSize > 0) { QString s1 = Utility::octetsToString(completedSize); |