highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-05 04:31:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

qt: Remove QSignalMapper from RPCConsole

Browse Source 
The QSignalMapper class is obsolete since Qt 5.10.
This commit is contained in:
Hennadii Stepanov 2019-08-24 10:21:04 +03:00
parent 3ca514ddb7
commit 9e0c1d676c
No known key found for this signature in database
GPG Key ID: 410108112E7EA81F
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/qt/rpcconsole.cpp
View File

@ -34,7 +34,6 @@
#include <QMessageBox> #include <QMessageBox>
#include <QScrollBar> #include <QScrollBar>
#include <QSettings> #include <QSettings>
#include <QSignalMapper>
#include <QTime> #include <QTime>
#include <QTimer> #include <QTimer>
#include <QStringList> #include <QStringList>
@ -603,19 +602,10 @@ void RPCConsole::setClientModel(ClientModel *model)
peersTableContextMenu->addAction(banAction7d); peersTableContextMenu->addAction(banAction7d);
peersTableContextMenu->addAction(banAction365d); peersTableContextMenu->addAction(banAction365d);
// Add a signal mapping to allow dynamic context menu arguments. connect(banAction1h, &QAction::triggered, [this] { banSelectedNode(60 * 60); });
// We need to use int (instead of int64_t), because signal mapper only supports connect(banAction24h, &QAction::triggered, [this] { banSelectedNode(60 * 60 * 24); });
// int or objects, which is okay because max bantime (1 year) is < int_max. connect(banAction7d, &QAction::triggered, [this] { banSelectedNode(60 * 60 * 24 * 7); });
QSignalMapper* signalMapper = new QSignalMapper(this); connect(banAction365d, &QAction::triggered, [this] { banSelectedNode(60 * 60 * 24 * 365); });
signalMapper->setMapping(banAction1h, 60*60);
signalMapper->setMapping(banAction24h, 60*60*24);
signalMapper->setMapping(banAction7d, 60*60*24*7);
signalMapper->setMapping(banAction365d, 60*60*24*365);
connect(banAction1h, &QAction::triggered, signalMapper, static_cast<void (QSignalMapper::*)()>(&QSignalMapper::map));
connect(banAction24h, &QAction::triggered, signalMapper, static_cast<void (QSignalMapper::*)()>(&QSignalMapper::map));
connect(banAction7d, &QAction::triggered, signalMapper, static_cast<void (QSignalMapper::*)()>(&QSignalMapper::map));
connect(banAction365d, &QAction::triggered, signalMapper, static_cast<void (QSignalMapper::*)()>(&QSignalMapper::map));
connect(signalMapper, static_cast<void (QSignalMapper::*)(int)>(&QSignalMapper::mapped), this, &RPCConsole::banSelectedNode);
// peer table context menu signals // peer table context menu signals
connect(ui->peerWidget, &QTableView::customContextMenuRequested, this, &RPCConsole::showPeersTableContextMenu); connect(ui->peerWidget, &QTableView::customContextMenuRequested, this, &RPCConsole::showPeersTableContextMenu);