mirror of
https://github.com/dashpay/dash.git
synced 2024-12-27 04:52:59 +01:00
[QA] adabt QT_NO_KEYWORDS for QT ban implementation
This commit is contained in:
parent
07f70b2dde
commit
7f90ea78cb
@ -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)
|
||||
|
||||
void BanTableModel::refresh()
|
||||
{
|
||||
emit layoutAboutToBeChanged();
|
||||
Q_EMIT layoutAboutToBeChanged();
|
||||
priv->refreshBanlist();
|
||||
emit layoutChanged();
|
||||
Q_EMIT layoutChanged();
|
||||
}
|
||||
|
||||
void BanTableModel::sort(int column, Qt::SortOrder order)
|
||||
|
@ -60,7 +60,7 @@ public:
|
||||
bool shouldShow();
|
||||
/*@}*/
|
||||
|
||||
public slots:
|
||||
public Q_SLOTS:
|
||||
void refresh();
|
||||
|
||||
private:
|
||||
|
@ -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) :
|
||||
clientModel(0),
|
||||
historyPtr(0),
|
||||
cachedNodeid(-1),
|
||||
platformStyle(platformStyle)
|
||||
platformStyle(platformStyle),
|
||||
peersTableContextMenu(0),
|
||||
banTableContextMenu(0)
|
||||
{
|
||||
@ -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()
|
||||
if (possibleSubnet.IsValid())
|
||||
{
|
||||
CNode::Unban(possibleSubnet);
|
||||
DumpBanlist(); // store banlist to disk
|
||||
clientModel->getBanTableModel()->refresh();
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user