gui: Drop BanTableModel dependency to ClientModel #18035

pull promag wants to merge 1 commits into bitcoin:master from promag:2020-01-bantablemodel changing 3 files +4 −9

promag commented at 12:15 AM on January 31, 2020: member

Trivial change since ClientModel is not used by BanTableModel.
gui: Drop BanTableModel dependency to ClientModel 8eec9c7989
promag requested review from hebasto on Jan 31, 2020
fanquake added the label GUI on Jan 31, 2020
jonasschnelli approved
jonasschnelli commented at 7:57 AM on January 31, 2020: contributor

Thanks for the cleanup.

utACK 8eec9c79890649044083c78c5f34019126aea561

in src/qt/bantablemodel.cpp:12 in 8eec9c7989

   5 | @@ -6,11 +6,10 @@
   6 |  
   7 |  #include <interfaces/node.h>
   8 |  #include <net_types.h> // For banmap_t
   9 | -#include <qt/clientmodel.h>
  10 |  
  11 |  #include <utility>
  12 |  
  13 | -#include <QDebug>
  14 | +#include <QDateTime>

hebasto commented at 8:06 AM on January 31, 2020:

nit: while here, <QVariant> and <QModelIndex> could also be added.

promag commented at 8:19 AM on January 31, 2020:

Done, and pushed to #18036.

in src/qt/bantablemodel.h:47 in 8eec9c7989

  43 | @@ -45,7 +44,7 @@ class BanTableModel : public QAbstractTableModel
  44 |      Q_OBJECT
  45 |  
  46 |  public:
  47 | -    explicit BanTableModel(interfaces::Node& node, ClientModel *parent = nullptr);
  48 | +    explicit BanTableModel(interfaces::Node& node, QObject* parent = nullptr);

hebasto commented at 8:09 AM on January 31, 2020:

nit: not allowing default parent seems safer w.r.t. Qt parent-child properties.

    explicit BanTableModel(interfaces::Node& node, QObject* parent);

promag commented at 8:19 AM on January 31, 2020:

Done, and pushed to #18036

hebasto approved
hebasto commented at 8:10 AM on January 31, 2020: member

ACK 8eec9c79890649044083c78c5f34019126aea561, tested on Linux Mint 19.3
promag commented at 8:19 AM on January 31, 2020: member

Included in #18036.
promag closed this on Jan 31, 2020
promag deleted the branch on Jan 31, 2020
DrahtBot locked this on Feb 15, 2022

Contributors

Labels