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

Merge pull request #14717 from Chocobo1/ncmp

Browse Source 
Simplify natural sort classes interface
This commit is contained in:
Chocobo1
2021-04-13 14:22:25 +08:00
committed by GitHub
parent 650bf15db8 a64bb1a990
commit d82a1d7198
24 changed files with 235 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/properties/peerlistsortmodel.cpp
View File

@@ -28,7 +28,6 @@
#include "peerlistsortmodel.h"
#include "base/utils/string.h"
#include "peerlistwidget.h"
PeerListSortModel::PeerListSortModel(QObject *parent)
@@ -43,11 +42,10 @@ bool PeerListSortModel::lessThan(const QModelIndex &left, const QModelIndex &rig
{
case PeerListWidget::IP:
case PeerListWidget::CLIENT:
{
{
const QString strL = left.data(UnderlyingDataRole).toString();
const QString strR = right.data(UnderlyingDataRole).toString();
const int result = Utils::String::naturalCompare(strL, strR, Qt::CaseInsensitive);
return (result < 0);
return m_naturalLessThan(strL, strR);
}
break;
default:

4
src/gui/properties/peerlistsortmodel.h
View File

@@ -30,6 +30,8 @@
#include <QSortFilterProxyModel>
#include "base/utils/compare.h"
class PeerListSortModel final : public QSortFilterProxyModel
{
Q_OBJECT
@@ -45,4 +47,6 @@ public:
private:
bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
Utils::Compare::NaturalLessThan<Qt::CaseInsensitive> m_naturalLessThan;
};