d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-23 13:04:23 +00:00
Code Issues Projects Releases Wiki Activity

Clean up coding style

Browse Source
This commit is contained in:
Chocobo1 2021-02-06 11:25:17 +08:00
parent e4f7d607e1
commit 6a45919b25
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/base/bittorrent/torrent.cpp
View File

@ -29,8 +29,6 @@
#include "torrent.h"
#include <type_traits>
#include <QHash>
namespace BitTorrent
@ -42,13 +40,13 @@ namespace BitTorrent
// Torrent
const qreal Torrent::USE_GLOBAL_RATIO = -2.;
const qreal Torrent::NO_RATIO_LIMIT = -1.;
const qreal Torrent::USE_GLOBAL_RATIO = -2;
const qreal Torrent::NO_RATIO_LIMIT = -1;
const int Torrent::USE_GLOBAL_SEEDING_TIME = -2;
const int Torrent::NO_SEEDING_TIME_LIMIT = -1;
const qreal Torrent::MAX_RATIO = 9999.;
const qreal Torrent::MAX_RATIO = 9999;
const int Torrent::MAX_SEEDING_TIME = 525600;
bool Torrent::isResumed() const

12
src/gui/transferlistmodel.cpp
View File

@ -239,7 +239,7 @@ QString TransferListModel::displayValue(const BitTorrent::Torrent *torrent, cons
bool hideValues = false;
if (m_hideZeroValuesMode == HideZeroValuesMode::Always)
hideValues = true;
else if (m_hideZeroValuesMode != HideZeroValuesMode::Never)
else if (m_hideZeroValuesMode == HideZeroValuesMode::Paused)
hideValues = (torrent->state() == BitTorrent::TorrentState::PausedDownloading);
const auto availabilityString = [hideValues](const qreal value) -> QString
@ -269,9 +269,9 @@ QString TransferListModel::displayValue(const BitTorrent::Torrent *torrent, cons
const auto amountString = [hideValues](const qint64 value, const qint64 total) -> QString
{
return (hideValues && (value == 0) && (total == 0))
? QString {}
: QString::number(value) + " (" + QString::number(total) + ')';
if (hideValues && (value == 0) && (total == 0))
return {};
return QString::fromLatin1("%1 (%2)").arg(QString::number(value), QString::number(total));
};
const auto ratioString = [hideValues](const qreal value) -> QString
@ -285,13 +285,13 @@ QString TransferListModel::displayValue(const BitTorrent::Torrent *torrent, cons
const auto queuePositionString = [](const qint64 value) -> QString
{
return (value > 0) ? QString::number(value) : "*";
return (value > 0) ? QString::number(value) : QLatin1String("*");
};
const auto lastActivityString = [hideValues](qint64 value) -> QString
{
if (hideValues && ((value < 0) || (value >= MAX_ETA)))
return QString {};
return {};
// Show '< 1m ago' when elapsed time is 0
if (value == 0)