d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-11 15:27:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #12847 from Chocobo1/deprecated

Browse Source 
Don't use deprecated Qt function options
This commit is contained in:
Mike Tzou 2020-05-18 11:41:11 +08:00 committed by GitHub
commit 774c0276f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/base/rss/rss_item.cpp
View File

@ -67,7 +67,7 @@ bool Item::isValidPath(const QString &path)
{ {
static const QRegularExpression re( static const QRegularExpression re(
QString(R"(\A[^\%1]+(\%1[^\%1]+)*\z)").arg(Item::PathSeparator) QString(R"(\A[^\%1]+(\%1[^\%1]+)*\z)").arg(Item::PathSeparator)
, QRegularExpression::DontCaptureOption | QRegularExpression::OptimizeOnFirstUsageOption); , QRegularExpression::DontCaptureOption);
if (path.isEmpty() || !re.match(path).hasMatch()) { if (path.isEmpty() || !re.match(path).hasMatch()) {
qDebug() << "Incorrect RSS Item path:" << path; qDebug() << "Incorrect RSS Item path:" << path;

2
src/gui/properties/speedplotview.cpp
View File

@ -339,7 +339,7 @@ void SpeedPlotView::paintEvent(QPaintEvent *)
} }
// Set antialiasing for graphs // Set antialiasing for graphs
painter.setRenderHints(QPainter::Antialiasing | QPainter::HighQualityAntialiasing); painter.setRenderHints(QPainter::Antialiasing);
// draw graphs // draw graphs
rect.adjust(3, 0, 0, 0); // Need, else graphs cross left gridline rect.adjust(3, 0, 0, 0); // Need, else graphs cross left gridline

28
src/gui/transferlistsortmodel.cpp
View File

@ -100,6 +100,14 @@ bool TransferListSortModel::lessThan_impl(const QModelIndex &left, const QModelI
return lessThan_impl(left.sibling(left.row(), column), right.sibling(right.row(), column)); return lessThan_impl(left.sibling(left.row(), column), right.sibling(right.row(), column));
}; };
const auto hashLessThan = [this, &left, &right]() -> bool
{
const TransferListModel *model = qobject_cast<TransferListModel *>(sourceModel());
const QString hashL = model->torrentHandle(left)->hash();
const QString hashR = model->torrentHandle(right)->hash();
return hashL < hashR;
};
const int sortColumn = left.column(); const int sortColumn = left.column();
const QVariant leftValue = left.data(TransferListModel::UnderlyingDataRole); const QVariant leftValue = left.data(TransferListModel::UnderlyingDataRole);
const QVariant rightValue = right.data(TransferListModel::UnderlyingDataRole); const QVariant rightValue = right.data(TransferListModel::UnderlyingDataRole);
@ -138,8 +146,9 @@ bool TransferListSortModel::lessThan_impl(const QModelIndex &left, const QModelI
else if (dateR.isValid()) { else if (dateR.isValid()) {
return false; return false;
} }
return hashLessThan();
} }
break;
case TransferListModel::TR_QUEUE_POSITION: { case TransferListModel::TR_QUEUE_POSITION: {
// QVariant has comparators for all basic types // QVariant has comparators for all basic types
@ -166,8 +175,9 @@ bool TransferListSortModel::lessThan_impl(const QModelIndex &left, const QModelI
else if (dateR.isValid()) { else if (dateR.isValid()) {
return true; return true;
} }
return hashLessThan();
} }
break;
case TransferListModel::TR_SEEDS: case TransferListModel::TR_SEEDS:
case TransferListModel::TR_PEERS: { case TransferListModel::TR_PEERS: {
@ -237,19 +247,11 @@ bool TransferListSortModel::lessThan_impl(const QModelIndex &left, const QModelI
if (rightValue < 0) return true; if (rightValue < 0) return true;
return (leftValue < rightValue); return (leftValue < rightValue);
default:
if (leftValue != rightValue)
return QSortFilterProxyModel::lessThan(left, right);
return invokeLessThanForColumn(TransferListModel::TR_QUEUE_POSITION);
} }
// Finally, sort by hash return (leftValue != rightValue)
const TransferListModel *model = qobject_cast<TransferListModel *>(sourceModel()); ? QSortFilterProxyModel::lessThan(left, right)
const QString hashL = model->torrentHandle(left)->hash(); : invokeLessThanForColumn(TransferListModel::TR_QUEUE_POSITION);
const QString hashR = model->torrentHandle(right)->hash();
return hashL < hashR;
} }
bool TransferListSortModel::filterAcceptsRow(const int sourceRow, const QModelIndex &sourceParent) const bool TransferListSortModel::filterAcceptsRow(const int sourceRow, const QModelIndex &sourceParent) const