foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-09 10:43:19 -05:00
Code Issues Activity

gui: Drop BanTableModel dependency to ClientModel

Browse source
This commit is contained in:
João Barbosa 2020-01-31 00:06:25 +00:00
parent 1d1f8bbf57
commit 61eb058cc1
3 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/qt/bantablemodel.cpp
View file

@ -6,12 +6,13 @@
#include <interfaces/node.h> #include <interfaces/node.h>
#include <net_types.h> // For banmap_t #include <net_types.h> // For banmap_t
#include <qt/clientmodel.h>
#include <utility> #include <utility>
#include <QDebug> #include <QDateTime>
#include <QList> #include <QList>
#include <QModelIndex>
#include <QVariant>
bool BannedNodeLessThan::operator()(const CCombinedBan& left, const CCombinedBan& right) const bool BannedNodeLessThan::operator()(const CCombinedBan& left, const CCombinedBan& right) const
{ {
@ -78,10 +79,9 @@ public:
} }
}; };
BanTableModel::BanTableModel(interfaces::Node& node, ClientModel *parent) : BanTableModel::BanTableModel(interfaces::Node& node, QObject* parent) :
QAbstractTableModel(parent), QAbstractTableModel(parent),
m_node(node), m_node(node)
clientModel(parent)
{ {
columns << tr("IP/Netmask") << tr("Banned Until"); columns << tr("IP/Netmask") << tr("Banned Until");
priv.reset(new BanTablePriv()); priv.reset(new BanTablePriv());

4
src/qt/bantablemodel.h
View file

@ -12,7 +12,6 @@
#include <QAbstractTableModel> #include <QAbstractTableModel>
#include <QStringList> #include <QStringList>
class ClientModel;
class BanTablePriv; class BanTablePriv;
namespace interfaces { namespace interfaces {
@ -45,7 +44,7 @@ class BanTableModel : public QAbstractTableModel
Q_OBJECT Q_OBJECT
public: public:
explicit BanTableModel(interfaces::Node& node, ClientModel *parent = nullptr); explicit BanTableModel(interfaces::Node& node, QObject* parent);
~BanTableModel(); ~BanTableModel();
void startAutoRefresh(); void startAutoRefresh();
void stopAutoRefresh(); void stopAutoRefresh();
@ -72,7 +71,6 @@ public Q_SLOTS:
private: private:
interfaces::Node& m_node; interfaces::Node& m_node;
ClientModel *clientModel;
QStringList columns; QStringList columns;
std::unique_ptr<BanTablePriv> priv; std::unique_ptr<BanTablePriv> priv;
}; };

1
test/lint/lint-circular-dependencies.sh
View file

@ -13,7 +13,6 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
"index/txindex -> validation -> index/txindex" "index/txindex -> validation -> index/txindex"
"policy/fees -> txmempool -> policy/fees" "policy/fees -> txmempool -> policy/fees"
"qt/addresstablemodel -> qt/walletmodel -> qt/addresstablemodel" "qt/addresstablemodel -> qt/walletmodel -> qt/addresstablemodel"
"qt/bantablemodel -> qt/clientmodel -> qt/bantablemodel"
"qt/bitcoingui -> qt/utilitydialog -> qt/bitcoingui" "qt/bitcoingui -> qt/utilitydialog -> qt/bitcoingui"
"qt/bitcoingui -> qt/walletframe -> qt/bitcoingui" "qt/bitcoingui -> qt/walletframe -> qt/bitcoingui"
"qt/bitcoingui -> qt/walletview -> qt/bitcoingui" "qt/bitcoingui -> qt/walletview -> qt/bitcoingui"