Merge pull request #9892 from Chocobo1/progress

Code cleanup

src/base/bittorrent/torrenthandle.cpp

@@ -973,12 +973,13 @@ qulonglong TorrentHandle::eta() const
 QVector<qreal> TorrentHandle::filesProgress() const
 {
     std::vector<boost::int64_t> fp;
-    QVector<qreal> result;
     m_nativeHandle.file_progress(fp, libt::torrent_handle::piece_granularity);
 
-    int count = static_cast<int>(fp.size());
+    const int count = static_cast<int>(fp.size());
+    QVector<qreal> result;
+    result.reserve(count);
     for (int i = 0; i < count; ++i) {
-        qlonglong size = fileSize(i);
+        const qlonglong size = fileSize(i);
         if ((size <= 0) || (fp[i] == size))
             result << 1;
         else
@@ -2100,7 +2101,7 @@ void TorrentHandle::prioritizeFiles(const QVector<int> &priorities)
 
 QVector<qreal> TorrentHandle::availableFileFractions() const
 {
-    const auto filesCount = this->filesCount();
+    const int filesCount = this->filesCount();
     if (filesCount < 0) return {};
 
     const QVector<int> piecesAvailability = pieceAvailability();
@@ -2109,12 +2110,13 @@ QVector<qreal> TorrentHandle::availableFileFractions() const
 
     QVector<qreal> res;
     res.reserve(filesCount);
-    TorrentInfo info = this->info();
-    for (int file = 0; file < filesCount; ++file) {
-        TorrentInfo::PieceRange filePieces = info.filePieces(file);
+    const TorrentInfo info = this->info();
+    for (int i = 0; i < filesCount; ++i) {
+        const TorrentInfo::PieceRange filePieces = info.filePieces(i);
+
         int availablePieces = 0;
         for (int piece = filePieces.first(); piece <= filePieces.last(); ++piece) {
-            availablePieces += piecesAvailability[piece] > 0 ? 1 : 0;
+            availablePieces += (piecesAvailability[piece] > 0) ? 1 : 0;
         }
         res.push_back(static_cast<qreal>(availablePieces) / filePieces.size());
     }

src/gui/torrentcontentmodelfolder.cpp

@@ -142,13 +142,14 @@ void TorrentContentModelFolder::recalculateProgress()
     qulonglong tSize = 0;
     qulonglong tRemaining = 0;
     foreach (TorrentContentModelItem *child, m_childItems) {
-        if (child->priority() != prio::IGNORED) {
-            if (child->itemType() == FolderType)
-                static_cast<TorrentContentModelFolder *>(child)->recalculateProgress();
-            tProgress += child->progress() * child->size();
-            tSize += child->size();
-            tRemaining += child->remaining();
-        }
+        if (child->priority() == prio::IGNORED)
+            continue;
+
+        if (child->itemType() == FolderType)
+            static_cast<TorrentContentModelFolder *>(child)->recalculateProgress();
+        tProgress += child->progress() * child->size();
+        tSize += child->size();
+        tRemaining += child->remaining();
     }
 
     if (!isRootItem() && (tSize > 0)) {

src/gui/torrentcontentmodelitem.cpp

@@ -74,9 +74,7 @@ qreal TorrentContentModelItem::progress() const
 {
     Q_ASSERT(!isRootItem());
 
-    if (m_size > 0) return m_progress;
-
-    return 1;
+    return (m_size > 0) ? m_progress : 1;
 }
 
 qulonglong TorrentContentModelItem::remaining() const
@@ -89,7 +87,7 @@ qreal TorrentContentModelItem::availability() const
 {
     Q_ASSERT(!isRootItem());
 
-    return m_size > 0 ? m_availability : 0.;
+    return (m_size > 0) ? m_availability : 0;
 }
 
 int TorrentContentModelItem::priority() const