mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-12-12 05:44:14 +03:00
Code Issues Projects Releases Packages Wiki Activity

Don't use 'else' after return/break

Browse source
This commit is contained in:
thalieht 2019-02-12 20:05:01 +02:00
parent 78ab0e4ba9
commit 8a3f942385
15 changed files with 75 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/app/cmdoptions.cpp
View file

@ -89,8 +89,8 @@ namespace
if ((USAGE_TEXT_COLUMN - usage.length() - 4) > 0)
return res + QString(USAGE_TEXT_COLUMN - usage.length() - 4, ' ');
else
return res;
return res;
}
private:
@ -256,13 +256,13 @@ namespace
if (parts.size() == 1) {
return TriStateBool(m_defaultValue);
}
else if (parts.size() == 2) {
if (parts.size() == 2) {
QString val = parts[1];
if ((val.toUpper() == QLatin1String("TRUE")) || (val == QLatin1String("1"))) {
return TriStateBool::True;
}
else if ((val.toUpper() == QLatin1String("FALSE")) || (val == QLatin1String("0"))) {
if ((val.toUpper() == QLatin1String("FALSE")) || (val == QLatin1String("0"))) {
return TriStateBool::False;
}
}
@ -281,20 +281,19 @@ namespace
if (val.isEmpty()) {
return TriStateBool(m_defaultValue);
}
else if (val == QLatin1String("-1")) {
if (val == QLatin1String("-1")) {
return TriStateBool::Undefined;
}
else if ((val.toUpper() == QLatin1String("TRUE")) || (val == QLatin1String("1"))) {
if ((val.toUpper() == QLatin1String("TRUE")) || (val == QLatin1String("1"))) {
return TriStateBool::True;
}
else if ((val.toUpper() == QLatin1String("FALSE")) || (val == QLatin1String("0"))) {
if ((val.toUpper() == QLatin1String("FALSE")) || (val == QLatin1String("0"))) {
return TriStateBool::False;
}
else {
qDebug() << QObject::tr("Expected %1 in environment variable '%2', but got '%3'")
.arg(QLatin1String("true|false"), envVarName(), val);
return TriStateBool::Undefined;
}
qDebug() << QObject::tr("Expected %1 in environment variable '%2', but got '%3'")
.arg(QLatin1String("true|false"), envVarName(), val);
return TriStateBool::Undefined;
}
bool m_defaultValue;

10
src/base/bittorrent/private/filterparserthread.cpp
View file

@ -177,9 +177,8 @@ int FilterParserThread::parseDATFilterFile()
memmove(buffer.data(), buffer.data() + start, offset);
break;
}
else {
++nbLine;
}
++nbLine;
if ((buffer[start] == '#')
|| ((buffer[start] == '/') && ((start + 1 < dataSize) && (buffer[start + 1] == '/')))) {
@ -325,9 +324,8 @@ int FilterParserThread::parseP2PFilterFile()
memmove(buffer.data(), buffer.data() + start, offset);
break;
}
else {
++nbLine;
}
++nbLine;
if ((buffer[start] == '#')
|| ((buffer[start] == '/') && ((start + 1 < dataSize) && (buffer[start + 1] == '/')))) {

8
src/base/bittorrent/trackerentry.cpp
View file

@ -59,12 +59,12 @@ TrackerEntry::Status TrackerEntry::status() const
// true when the tracker hasn't been tried yet.
if (m_nativeEntry.verified && m_nativeEntry.is_working())
return Working;
else if ((m_nativeEntry.fails == 0) && m_nativeEntry.updating)
if ((m_nativeEntry.fails == 0) && m_nativeEntry.updating)
return Updating;
else if (m_nativeEntry.fails == 0)
if (m_nativeEntry.fails == 0)
return NotContacted;
else
return NotWorking;
return NotWorking;
}
void TrackerEntry::setTier(const int value)

9
src/base/net/private/geoipdatabase.cpp
View file

@ -178,7 +178,7 @@ QString GeoIPDatabase::lookup(const QHostAddress &hostAddr) const
if (id == m_nodeCount) {
return QString();
}
else if (id > m_nodeCount) {
if (id > m_nodeCount) {
QString country = m_countries.value(id);
if (country.isEmpty()) {
const quint32 offset = id - m_nodeCount - sizeof(DATA_SECTION_SEPARATOR);
@ -191,9 +191,8 @@ QString GeoIPDatabase::lookup(const QHostAddress &hostAddr) const
}
return country;
}
else {
ptr = m_data + (id * m_nodeSize);
}
ptr = m_data + (id * m_nodeSize);
}
}
@ -205,7 +204,7 @@ if (!metadata.contains(#key)) { \
error = errMsgNotFound.arg(#key); \
return false; \
} \
else if (metadata.value(#key).userType() != QMetaType::type) { \
if (metadata.value(#key).userType() != QMetaType::type) { \
error = errMsgInvalid.arg(#key); \
return false; \
}

16
src/base/rss/private/rss_parser.cpp
View file

@ -556,22 +556,20 @@ void Parser::parse_impl(const QByteArray &feedData)
foundChannel = true;
break;
}
else {
qDebug() << "Skip rss item: " << xml.name();
xml.skipCurrentElement();
}
qDebug() << "Skip rss item: " << xml.name();
xml.skipCurrentElement();
}
break;
}
else if (xml.name() == "feed") { // Atom feed
if (xml.name() == "feed") { // Atom feed
parseAtomChannel(xml);
foundChannel = true;
break;
}
else {
qDebug() << "Skip root item: " << xml.name();
xml.skipCurrentElement();
}
qDebug() << "Skip root item: " << xml.name();
xml.skipCurrentElement();
}
if (!foundChannel) {

4
src/base/rss/rss_item.cpp
View file

@ -81,8 +81,8 @@ QString Item::joinPath(const QString &path1, const QString &path2)
{
if (path1.isEmpty())
return path2;
else
return path1 + Item::PathSeparator + path2;
return (path1 + Item::PathSeparator + path2);
}
QStringList Item::expandPath(const QString &path)

11
src/base/torrentfilter.cpp
View file

@ -174,19 +174,22 @@ bool TorrentFilter::matchState(const BitTorrent::TorrentHandle *const torrent) c
bool TorrentFilter::matchHash(const BitTorrent::TorrentHandle *const torrent) const
{
if (m_hashSet == AnyHash) return true;
else return m_hashSet.contains(torrent->hash());
return m_hashSet.contains(torrent->hash());
}
bool TorrentFilter::matchCategory(const BitTorrent::TorrentHandle *const torrent) const
{
if (m_category.isNull()) return true;
else return (torrent->belongsToCategory(m_category));
return (torrent->belongsToCategory(m_category));
}
bool TorrentFilter::matchTag(const BitTorrent::TorrentHandle *const torrent) const
{
// Empty tag is a special value to indicate we're filtering for untagged torrents.
if (m_tag.isNull()) return true;
else if (m_tag.isEmpty()) return torrent->tags().isEmpty();
else return (torrent->hasTag(m_tag));
if (m_tag.isEmpty()) return torrent->tags().isEmpty();
return (torrent->hasTag(m_tag));
}

4
src/base/utils/misc.cpp
View file

@ -285,8 +285,8 @@ int Utils::Misc::friendlyUnitPrecision(SizeUnit unit)
// friendlyUnit's number of digits after the decimal point
if (unit == SizeUnit::Byte) return 0;
if (unit <= SizeUnit::MebiByte) return 1;
else if (unit == SizeUnit::GibiByte) return 2;
else return 3;
if (unit == SizeUnit::GibiByte) return 2;
return 3;
}
qlonglong Utils::Misc::sizeInBytes(qreal size, Utils::Misc::SizeUnit unit)

5
src/gui/mainwindow.cpp
View file

@ -758,9 +758,8 @@ void MainWindow::tabChanged(int newTab)
m_searchFilterAction->setVisible(true);
return;
}
else {
m_searchFilterAction->setVisible(false);
}
m_searchFilterAction->setVisible(false);
if (m_tabs->currentWidget() == m_searchWidget) {
qDebug("Changed tab to search engine, giving focus to search input");
m_searchWidget->giveFocusToSearchInput();

18
src/gui/optionsdialog.cpp
View file

@ -1209,32 +1209,32 @@ int OptionsDialog::getMaxConnecs() const
{
if (!m_ui->checkMaxConnecs->isChecked())
return -1;
else
return m_ui->spinMaxConnec->value();
return m_ui->spinMaxConnec->value();
}
int OptionsDialog::getMaxConnecsPerTorrent() const
{
if (!m_ui->checkMaxConnecsPerTorrent->isChecked())
return -1;
else
return m_ui->spinMaxConnecPerTorrent->value();
return m_ui->spinMaxConnecPerTorrent->value();
}
int OptionsDialog::getMaxUploads() const
{
if (!m_ui->checkMaxUploads->isChecked())
return -1;
else
return m_ui->spinMaxUploads->value();
return m_ui->spinMaxUploads->value();
}
int OptionsDialog::getMaxUploadsPerTorrent() const
{
if (!m_ui->checkMaxUploadsPerTorrent->isChecked())
return -1;
else
return m_ui->spinMaxUploadsPerTorrent->value();
return m_ui->spinMaxUploadsPerTorrent->value();
}
void OptionsDialog::on_buttonBox_accepted()
@ -1645,7 +1645,7 @@ QString OptionsDialog::languageToLocalizedString(const QLocale &locale)
case QLocale::English: {
if (locale.country() == QLocale::Australia)
return QString::fromUtf8(C_LOCALE_ENGLISH_AUSTRALIA);
else if (locale.country() == QLocale::UnitedKingdom)
if (locale.country() == QLocale::UnitedKingdom)
return QString::fromUtf8(C_LOCALE_ENGLISH_UNITEDKINGDOM);
return QString::fromUtf8(C_LOCALE_ENGLISH);
}

5
src/gui/properties/piecesbar.cpp
View file

@ -147,9 +147,8 @@ bool PiecesBar::event(QEvent *e)
showToolTip(static_cast<QHelpEvent *>(e));
return true;
}
else {
return base::event(e);
}
return base::event(e);
}
void PiecesBar::enterEvent(QEvent *e)

10
src/gui/torrentcontentfiltermodel.cpp
View file

@ -96,12 +96,11 @@ bool TorrentContentFilterModel::lessThan(const QModelIndex &left, const QModelIn
const QString strR = right.data().toString();
return Utils::String::naturalLessThan<Qt::CaseInsensitive>(strL, strR);
}
else if ((leftType == TorrentContentModelItem::FolderType) && (sortOrder() == Qt::AscendingOrder)) {
if ((leftType == TorrentContentModelItem::FolderType) && (sortOrder() == Qt::AscendingOrder)) {
return true;
}
else {
return false;
}
return false;
}
default:
return QSortFilterProxyModel::lessThan(left, right);
@ -136,8 +135,7 @@ bool TorrentContentFilterModel::hasFiltered(const QModelIndex &folder) const
if (m_model->hasChildren(childIndex)) {
if (hasFiltered(childIndex))
return true;
else
continue;
continue;
}
name = childIndex.data().toString();
if (name.contains(filterRegExp()))

8
src/gui/torrentcontentmodel.cpp
View file

@ -287,8 +287,8 @@ int TorrentContentModel::columnCount(const QModelIndex &parent) const
{
if (parent.isValid())
return static_cast<TorrentContentModelItem*>(parent.internalPointer())->columnCount();
else
return m_rootItem->columnCount();
return m_rootItem->columnCount();
}
bool TorrentContentModel::setData(const QModelIndex &index, const QVariant &value, int role)
@ -361,8 +361,8 @@ QVariant TorrentContentModel::data(const QModelIndex &index, int role) const
if ((index.column() == TorrentContentModelItem::COL_NAME) && (role == Qt::DecorationRole)) {
if (item->itemType() == TorrentContentModelItem::FolderType)
return getDirectoryIcon();
else
return m_fileIconProvider->icon(QFileInfo(item->name()));
return m_fileIconProvider->icon(QFileInfo(item->name()));
}
if ((index.column() == TorrentContentModelItem::COL_NAME) && (role == Qt::CheckStateRole)) {

8
src/gui/transferlistfilterswidget.cpp
View file

@ -543,12 +543,12 @@ QStringList TrackerFiltersList::getHashes(int row)
{
if (row == 1)
return m_trackers.value("");
else if (row == 2)
if (row == 2)
return m_errors.keys();
else if (row == 3)
if (row == 3)
return m_warnings.keys();
else
return m_trackers.value(trackerFromRow(row));
return m_trackers.value(trackerFromRow(row));
}
TransferListFiltersWidget::TransferListFiltersWidget(QWidget *parent, TransferListWidget *transferList)

19
src/gui/transferlistsortmodel.cpp
View file

@ -160,8 +160,8 @@ bool TransferListSortModel::lessThan(const QModelIndex &left, const QModelIndex
const bool isAscendingOrder = (sortOrder() == Qt::AscendingOrder);
if (isSeedingL)
return !isAscendingOrder;
else
return isAscendingOrder;
return isAscendingOrder;
}
const qlonglong etaL = left.data().toLongLong();
@ -171,15 +171,14 @@ bool TransferListSortModel::lessThan(const QModelIndex &left, const QModelIndex
if (isInvalidL && isInvalidR) {
if (isSeedingL) // Both seeding
return dateLessThan(TransferListModel::TR_SEED_DATE, left, right, true);
else
return (prioL < prioR);
return (prioL < prioR);
}
else if (!isInvalidL && !isInvalidR) {
if (!isInvalidL && !isInvalidR) {
return (etaL < etaR);
}
else {
return !isInvalidL;
}
return !isInvalidL;
}
case TransferListModel::TR_LAST_ACTIVITY: {
@ -221,8 +220,8 @@ bool TransferListSortModel::lowerPositionThan(const QModelIndex &left, const QMo
if ((queueL > 0) || (queueR > 0)) {
if ((queueL > 0) && (queueR > 0))
return queueL < queueR;
else
return queueL != 0;
return queueL != 0;
}
// Sort according to TR_SEED_DATE