Browse Source

[QA] adabt QT_NO_KEYWORDS for QT ban implementation

pull/1/head
Jonas Schnelli 7 years ago
parent
commit
7f90ea78cb
  1. 10
      src/qt/bantablemodel.cpp
  2. 2
      src/qt/bantablemodel.h
  3. 5
      src/qt/rpcconsole.cpp

10
src/qt/bantablemodel.cpp

@ -54,11 +54,11 @@ public: @@ -54,11 +54,11 @@ public:
#if QT_VERSION >= 0x040700
cachedBanlist.reserve(banMap.size());
#endif
foreach (const PAIRTYPE(CSubNet, CBanEntry)& banentry, banMap)
for (banmap_t::iterator it = banMap.begin(); it != banMap.end(); it++)
{
CCombinedBan banEntry;
banEntry.subnet = banentry.first;
banEntry.banEntry = banentry.second;
banEntry.subnet = (*it).first;
banEntry.banEntry = (*it).second;
cachedBanlist.append(banEntry);
}
@ -161,9 +161,9 @@ QModelIndex BanTableModel::index(int row, int column, const QModelIndex &parent) @@ -161,9 +161,9 @@ QModelIndex BanTableModel::index(int row, int column, const QModelIndex &parent)
void BanTableModel::refresh()
{
emit layoutAboutToBeChanged();
Q_EMIT layoutAboutToBeChanged();
priv->refreshBanlist();
emit layoutChanged();
Q_EMIT layoutChanged();
}
void BanTableModel::sort(int column, Qt::SortOrder order)

2
src/qt/bantablemodel.h

@ -60,7 +60,7 @@ public: @@ -60,7 +60,7 @@ public:
bool shouldShow();
/*@}*/
public slots:
public Q_SLOTS:
void refresh();
private:

5
src/qt/rpcconsole.cpp

@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
#include <QKeyEvent>
#include <QMenu>
#include <QScrollBar>
#include <QSignalMapper>
#include <QThread>
#include <QTime>
#include <QTimer>
@ -242,7 +243,7 @@ RPCConsole::RPCConsole(const PlatformStyle *platformStyle, QWidget *parent) : @@ -242,7 +243,7 @@ RPCConsole::RPCConsole(const PlatformStyle *platformStyle, QWidget *parent) :
clientModel(0),
historyPtr(0),
cachedNodeid(-1),
platformStyle(platformStyle)
platformStyle(platformStyle),
peersTableContextMenu(0),
banTableContextMenu(0)
{
@ -807,7 +808,6 @@ void RPCConsole::banSelectedNode(int bantime) @@ -807,7 +808,6 @@ void RPCConsole::banSelectedNode(int bantime)
SplitHostPort(nStr, port, addr);
CNode::Ban(CNetAddr(addr), BanReasonManuallyAdded, bantime);
DumpBanlist(); // store banlist to disk
bannedNode->fDisconnect = true;
clearSelectedNode();
@ -827,7 +827,6 @@ void RPCConsole::unbanSelectedNode() @@ -827,7 +827,6 @@ void RPCConsole::unbanSelectedNode()
if (possibleSubnet.IsValid())
{
CNode::Unban(possibleSubnet);
DumpBanlist(); // store banlist to disk
clientModel->getBanTableModel()->refresh();
}
}

Loading…
Cancel
Save