Skip to content

Commit 9e0c1d6

Browse files
committed
qt: Remove QSignalMapper from RPCConsole
The QSignalMapper class is obsolete since Qt 5.10.
1 parent 3ca514d commit 9e0c1d6

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

src/qt/rpcconsole.cpp

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
#include <QMessageBox>
3535
#include <QScrollBar>
3636
#include <QSettings>
37-
#include <QSignalMapper>
3837
#include <QTime>
3938
#include <QTimer>
4039
#include <QStringList>
@@ -603,19 +602,10 @@ void RPCConsole::setClientModel(ClientModel *model)
603602
peersTableContextMenu->addAction(banAction7d);
604603
peersTableContextMenu->addAction(banAction365d);
605604

606-
// Add a signal mapping to allow dynamic context menu arguments.
607-
// We need to use int (instead of int64_t), because signal mapper only supports
608-
// int or objects, which is okay because max bantime (1 year) is < int_max.
609-
QSignalMapper* signalMapper = new QSignalMapper(this);
610-
signalMapper->setMapping(banAction1h, 60*60);
611-
signalMapper->setMapping(banAction24h, 60*60*24);
612-
signalMapper->setMapping(banAction7d, 60*60*24*7);
613-
signalMapper->setMapping(banAction365d, 60*60*24*365);
614-
connect(banAction1h, &QAction::triggered, signalMapper, static_cast<void (QSignalMapper::*)()>(&QSignalMapper::map));
615-
connect(banAction24h, &QAction::triggered, signalMapper, static_cast<void (QSignalMapper::*)()>(&QSignalMapper::map));
616-
connect(banAction7d, &QAction::triggered, signalMapper, static_cast<void (QSignalMapper::*)()>(&QSignalMapper::map));
617-
connect(banAction365d, &QAction::triggered, signalMapper, static_cast<void (QSignalMapper::*)()>(&QSignalMapper::map));
618-
connect(signalMapper, static_cast<void (QSignalMapper::*)(int)>(&QSignalMapper::mapped), this, &RPCConsole::banSelectedNode);
605+
connect(banAction1h, &QAction::triggered, [this] { banSelectedNode(60 * 60); });
606+
connect(banAction24h, &QAction::triggered, [this] { banSelectedNode(60 * 60 * 24); });
607+
connect(banAction7d, &QAction::triggered, [this] { banSelectedNode(60 * 60 * 24 * 7); });
608+
connect(banAction365d, &QAction::triggered, [this] { banSelectedNode(60 * 60 * 24 * 365); });
619609

620610
// peer table context menu signals
621611
connect(ui->peerWidget, &QTableView::customContextMenuRequested, this, &RPCConsole::showPeersTableContextMenu);

0 commit comments

Comments
 (0)