d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-05 03:14:44 +00:00
Code Issues Projects Releases Wiki Activity

TorrentContentModel: Simplify progress update code

Browse Source
This commit is contained in:
Christophe Dumez 2012-08-26 18:45:41 +03:00
parent d849ac32f9
commit f3e465c142
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/torrentcontentmodelfile.cpp
View File

@ -73,10 +73,6 @@ void TorrentContentModelFile::setPriority(int new_prio, bool update_parent)
m_priority = new_prio; m_priority = new_prio;
// Reset progress if priority is 0
if (m_priority == 0)
setProgress(0);
// Update parent // Update parent
if (update_parent) { if (update_parent) {
m_parentItem->updateSize(); m_parentItem->updateSize();

12
src/torrentcontentmodelfolder.cpp
View File

@ -124,10 +124,6 @@ void TorrentContentModelFolder::setPriority(int new_prio, bool update_parent)
m_priority = new_prio; m_priority = new_prio;
// Reset progress if priority is IGNORED
if (m_priority == prio::IGNORED)
setProgress(0);
// Update parent // Update parent
if (update_parent) { if (update_parent) {
m_parentItem->updateSize(); m_parentItem->updateSize();
@ -154,14 +150,14 @@ void TorrentContentModelFolder::updateProgress()
if (isRootItem()) if (isRootItem())
return; return;
m_totalDone = 0; qulonglong total_done = 0;
foreach (TorrentContentModelItem* child, m_childItems) { foreach (TorrentContentModelItem* child, m_childItems) {
if (child->priority() > 0) if (child->priority() > 0)
m_totalDone += child->totalDone(); total_done += child->totalDone();
} }
Q_ASSERT(m_totalDone <= m_size); Q_ASSERT(total_done <= m_size);
setProgress(m_totalDone); setProgress(total_done);
} }
void TorrentContentModelFolder::updateSize() void TorrentContentModelFolder::updateSize()

4
src/torrentcontentmodelitem.cpp
View File

@ -76,8 +76,6 @@ void TorrentContentModelItem::setSize(qulonglong size)
void TorrentContentModelItem::setProgress(qulonglong done) void TorrentContentModelItem::setProgress(qulonglong done)
{ {
Q_ASSERT(!isRootItem()); Q_ASSERT(!isRootItem());
if (m_priority == prio::IGNORED)
return;
m_totalDone = done; m_totalDone = done;
Q_ASSERT(m_totalDone <= m_size); Q_ASSERT(m_totalDone <= m_size);
@ -94,7 +92,7 @@ float TorrentContentModelItem::progress() const
{ {
Q_ASSERT(!isRootItem()); Q_ASSERT(!isRootItem());
if (m_priority == prio::IGNORED) if (m_priority == prio::IGNORED)
return -1; return 0;
if (m_size > 0) if (m_size > 0)
return m_totalDone / (double) m_size; return m_totalDone / (double) m_size;