squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2026-01-02 21:52:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Replace min, max, clamp functions with std counterparts

Browse Source
This commit is contained in:
Chocobo1
2021-12-27 20:31:57 +08:00
parent 3ea4c66d41
commit 63043b4927
7 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/addnewtorrentdialog.cpp
View File

@@ -28,6 +28,8 @@
#include "addnewtorrentdialog.h"
#include <algorithm>
#include <QDebug>
#include <QDir>
#include <QFileDialog>
@@ -231,7 +233,7 @@ int AddNewTorrentDialog::savePathHistoryLength()
{
const int defaultHistoryLength = 8;
const int value = settings()->loadValue(KEY_SAVEPATHHISTORYLENGTH, defaultHistoryLength);
return qBound(minPathHistoryLength, value, maxPathHistoryLength);
return std::clamp(value, minPathHistoryLength, maxPathHistoryLength);
}
void AddNewTorrentDialog::setSavePathHistoryLength(const int value)

3
src/gui/properties/downloadedpiecesbar.cpp
View File

@@ -28,6 +28,7 @@
#include "downloadedpiecesbar.h"
#include <algorithm>
#include <cmath>
#include <QDebug>
@@ -117,7 +118,7 @@ QVector<float> DownloadedPiecesBar::bitfieldToFloatVector(const QBitArray &vecin
value /= ratio;
// float precision sometimes gives > 1, because it's not possible to store irrational numbers
value = qMin(value, 1.0f);
value = std::min(value, 1.0f);
result[x] = value;
}

7
src/gui/properties/pieceavailabilitybar.cpp
View File

@@ -28,6 +28,7 @@
#include "pieceavailabilitybar.h"
#include <algorithm>
#include <cmath>
#include <QDebug>
@@ -46,9 +47,9 @@ QVector<float> PieceAvailabilityBar::intToFloatVector(const QVector<int> &vecin,
const int maxElement = *std::max_element(vecin.begin(), vecin.end());
// qMax because in normalization we don't want divide by 0
// std::max because in normalization we don't want divide by 0
// if maxElement == 0 check will be disabled please enable this line:
// const int maxElement = qMax(*std::max_element(avail.begin(), avail.end()), 1);
// const int maxElement = std::max(*std::max_element(avail.begin(), avail.end()), 1);
if (maxElement == 0)
return result;
@@ -115,7 +116,7 @@ QVector<float> PieceAvailabilityBar::intToFloatVector(const QVector<int> &vecin,
value /= ratio * maxElement;
// float precision sometimes gives > 1, because it's not possible to store irrational numbers
value = qMin(value, 1.0f);
value = std::min(value, 1.0f);
result[x] = value;
}

18
src/gui/speedlimitdialog.cpp
View File

@@ -28,6 +28,8 @@
#include "speedlimitdialog.h"
#include <algorithm>
#include <QStyle>
#include "base/bittorrent/session.h"
@@ -65,17 +67,17 @@ SpeedLimitDialog::SpeedLimitDialog(QWidget *parent)
slider->setValue(value);
};
const auto *session = BitTorrent::Session::instance();
const int uploadVal = qMax(0, (session->globalUploadSpeedLimit() / 1024));
const int downloadVal = qMax(0, (session->globalDownloadSpeedLimit() / 1024));
const int maxUpload = qMax(10000, (session->globalUploadSpeedLimit() / 1024));
const int maxDownload = qMax(10000, (session->globalDownloadSpeedLimit() / 1024));
const int uploadVal = std::max(0, (session->globalUploadSpeedLimit() / 1024));
const int downloadVal = std::max(0, (session->globalDownloadSpeedLimit() / 1024));
const int maxUpload = std::max(10000, (session->globalUploadSpeedLimit() / 1024));
const int maxDownload = std::max(10000, (session->globalDownloadSpeedLimit() / 1024));
initSlider(m_ui->sliderUploadLimit, uploadVal, maxUpload);
initSlider(m_ui->sliderDownloadLimit, downloadVal, maxDownload);
const int altUploadVal = qMax(0, (session->altGlobalUploadSpeedLimit() / 1024));
const int altDownloadVal = qMax(0, (session->altGlobalDownloadSpeedLimit() / 1024));
const int altMaxUpload = qMax(10000, (session->altGlobalUploadSpeedLimit() / 1024));
const int altMaxDownload = qMax(10000, (session->altGlobalDownloadSpeedLimit() / 1024));
const int altUploadVal = std::max(0, (session->altGlobalUploadSpeedLimit() / 1024));
const int altDownloadVal = std::max(0, (session->altGlobalDownloadSpeedLimit() / 1024));
const int altMaxUpload = std::max(10000, (session->altGlobalUploadSpeedLimit() / 1024));
const int altMaxDownload = std::max(10000, (session->altGlobalDownloadSpeedLimit() / 1024));
initSlider(m_ui->sliderAltUploadLimit, altUploadVal, altMaxUpload);
initSlider(m_ui->sliderAltDownloadLimit, altDownloadVal, altMaxDownload);

14
src/gui/torrentoptionsdialog.cpp
View File

@@ -30,6 +30,8 @@
#include "torrentoptionsdialog.h"
#include <algorithm>
#include <QLineEdit>
#include <QMessageBox>
#include <QString>
@@ -78,8 +80,8 @@ TorrentOptionsDialog::TorrentOptionsDialog(QWidget *parent, const QVector<BitTor
const QString firstTorrentSavePath = torrents[0]->savePath();
const QString firstTorrentCategory = torrents[0]->category();
const int firstTorrentUpLimit = qMax(0, torrents[0]->uploadLimit());
const int firstTorrentDownLimit = qMax(0, torrents[0]->downloadLimit());
const int firstTorrentUpLimit = std::max(0, torrents[0]->uploadLimit());
const int firstTorrentDownLimit = std::max(0, torrents[0]->downloadLimit());
const qreal firstTorrentRatio = torrents[0]->ratioLimit();
const int firstTorrentSeedingTime = torrents[0]->seedingTimeLimit();
@@ -112,12 +114,12 @@ TorrentOptionsDialog::TorrentOptionsDialog(QWidget *parent, const QVector<BitTor
}
if (allSameUpLimit)
{
if (qMax(0, torrent->uploadLimit()) != firstTorrentUpLimit)
if (std::max(0, torrent->uploadLimit()) != firstTorrentUpLimit)
allSameUpLimit = false;
}
if (allSameDownLimit)
{
if (qMax(0, torrent->downloadLimit()) != firstTorrentDownLimit)
if (std::max(0, torrent->downloadLimit()) != firstTorrentDownLimit)
allSameDownLimit = false;
}
if (allSameRatio)
@@ -201,8 +203,8 @@ TorrentOptionsDialog::TorrentOptionsDialog(QWidget *parent, const QVector<BitTor
? (session->altGlobalDownloadSpeedLimit() / 1024)
: (session->globalDownloadSpeedLimit() / 1024);
const int uploadVal = qMax(0, (firstTorrentUpLimit / 1024));
const int downloadVal = qMax(0, (firstTorrentDownLimit / 1024));
const int uploadVal = std::max(0, (firstTorrentUpLimit / 1024));
const int downloadVal = std::max(0, (firstTorrentDownLimit / 1024));
int maxUpload = (globalUploadLimit <= 0) ? 10000 : globalUploadLimit;
int maxDownload = (globalDownloadLimit <= 0) ? 10000 : globalDownloadLimit;