mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-22 15:04:44 +01:00
Code Issues Projects Releases Wiki Activity

qt, refactor: Drop no longer used PeerTableModel::sort function

Browse source
This commit is contained in:
Hennadii Stepanov 2021-02-22 09:52:02 +02:00
parent 778a64af20
commit 9a9f180df0
No known key found for this signature in database
GPG key ID: 410108112E7EA81F
2 changed files with 0 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/qt/peertablemodel.cpp
View file

@ -11,49 +11,15 @@
#include <utility> #include <utility>
#include <QDebug>
#include <QList> #include <QList>
#include <QTimer> #include <QTimer>
bool NodeLessThan::operator()(const CNodeCombinedStats &left, const CNodeCombinedStats &right) const
{
const CNodeStats *pLeft = &(left.nodeStats);
const CNodeStats *pRight = &(right.nodeStats);
if (order == Qt::DescendingOrder)
std::swap(pLeft, pRight);
switch (static_cast<PeerTableModel::ColumnIndex>(column)) {
case PeerTableModel::NetNodeId:
return pLeft->nodeid < pRight->nodeid;
case PeerTableModel::Address:
return pLeft->addrName.compare(pRight->addrName) < 0;
case PeerTableModel::ConnectionType:
return pLeft->m_conn_type < pRight->m_conn_type;
case PeerTableModel::Network:
return pLeft->m_network < pRight->m_network;
case PeerTableModel::Ping:
return pLeft->m_min_ping_time < pRight->m_min_ping_time;
case PeerTableModel::Sent:
return pLeft->nSendBytes < pRight->nSendBytes;
case PeerTableModel::Received:
return pLeft->nRecvBytes < pRight->nRecvBytes;
case PeerTableModel::Subversion:
return pLeft->cleanSubVer.compare(pRight->cleanSubVer) < 0;
} // no default case, so the compiler can warn about missing cases
assert(false);
}
// private implementation // private implementation
class PeerTablePriv class PeerTablePriv
{ {
public: public:
/** Local cache of peer information */ /** Local cache of peer information */
QList<CNodeCombinedStats> cachedNodeStats; QList<CNodeCombinedStats> cachedNodeStats;
/** Column to sort nodes by (default to unsorted) */
int sortColumn{-1};
/** Order (ascending or descending) to sort nodes by */
Qt::SortOrder sortOrder;
/** Index of rows by node ID */ /** Index of rows by node ID */
std::map<NodeId, int> mapNodeRows; std::map<NodeId, int> mapNodeRows;
@ -76,10 +42,6 @@ public:
} }
} }
if (sortColumn >= 0)
// sort cacheNodeStats (use stable sort to prevent rows jumping around unnecessarily)
std::stable_sort(cachedNodeStats.begin(), cachedNodeStats.end(), NodeLessThan(sortColumn, sortOrder));
// build index map // build index map
mapNodeRows.clear(); mapNodeRows.clear();
int row = 0; int row = 0;
@ -245,10 +207,3 @@ int PeerTableModel::getRowByNodeId(NodeId nodeid)
return it->second; return it->second;
} }
void PeerTableModel::sort(int column, Qt::SortOrder order)
{
priv->sortColumn = column;
priv->sortOrder = order;
refresh();
}

13
src/qt/peertablemodel.h
View file

@ -30,18 +30,6 @@ struct CNodeCombinedStats {
}; };
Q_DECLARE_METATYPE(CNodeCombinedStats*) Q_DECLARE_METATYPE(CNodeCombinedStats*)
class NodeLessThan
{
public:
NodeLessThan(int nColumn, Qt::SortOrder fOrder) :
column(nColumn), order(fOrder) {}
bool operator()(const CNodeCombinedStats &left, const CNodeCombinedStats &right) const;
private:
int column;
Qt::SortOrder order;
};
/** /**
Qt model providing information about connected peers, similar to the Qt model providing information about connected peers, similar to the
"getpeerinfo" RPC call. Used by the rpc console UI. "getpeerinfo" RPC call. Used by the rpc console UI.
@ -80,7 +68,6 @@ public:
QVariant headerData(int section, Qt::Orientation orientation, int role) const override; QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
QModelIndex index(int row, int column, const QModelIndex &parent) const override; QModelIndex index(int row, int column, const QModelIndex &parent) const override;
Qt::ItemFlags flags(const QModelIndex &index) const override; Qt::ItemFlags flags(const QModelIndex &index) const override;
void sort(int column, Qt::SortOrder order) override;
/*@}*/ /*@}*/
public Q_SLOTS: public Q_SLOTS: