|
34 | 34 | #include <QScrollBar>
|
35 | 35 | #include <QScreen>
|
36 | 36 | #include <QSettings>
|
37 |
| -#include <QSignalMapper> |
38 | 37 | #include <QTime>
|
39 | 38 | #include <QTimer>
|
40 | 39 | #include <QStringList>
|
@@ -614,19 +613,10 @@ void RPCConsole::setClientModel(ClientModel *model)
|
614 | 613 | peersTableContextMenu->addAction(banAction7d);
|
615 | 614 | peersTableContextMenu->addAction(banAction365d);
|
616 | 615 |
|
617 |
| - // Add a signal mapping to allow dynamic context menu arguments. |
618 |
| - // We need to use int (instead of int64_t), because signal mapper only supports |
619 |
| - // int or objects, which is okay because max bantime (1 year) is < int_max. |
620 |
| - QSignalMapper* signalMapper = new QSignalMapper(this); |
621 |
| - signalMapper->setMapping(banAction1h, 60*60); |
622 |
| - signalMapper->setMapping(banAction24h, 60*60*24); |
623 |
| - signalMapper->setMapping(banAction7d, 60*60*24*7); |
624 |
| - signalMapper->setMapping(banAction365d, 60*60*24*365); |
625 |
| - connect(banAction1h, &QAction::triggered, signalMapper, static_cast<void (QSignalMapper::*)()>(&QSignalMapper::map)); |
626 |
| - connect(banAction24h, &QAction::triggered, signalMapper, static_cast<void (QSignalMapper::*)()>(&QSignalMapper::map)); |
627 |
| - connect(banAction7d, &QAction::triggered, signalMapper, static_cast<void (QSignalMapper::*)()>(&QSignalMapper::map)); |
628 |
| - connect(banAction365d, &QAction::triggered, signalMapper, static_cast<void (QSignalMapper::*)()>(&QSignalMapper::map)); |
629 |
| - connect(signalMapper, static_cast<void (QSignalMapper::*)(int)>(&QSignalMapper::mapped), this, &RPCConsole::banSelectedNode); |
| 616 | + connect(banAction1h, &QAction::triggered, [this] { banSelectedNode(60 * 60); }); |
| 617 | + connect(banAction24h, &QAction::triggered, [this] { banSelectedNode(60 * 60 * 24); }); |
| 618 | + connect(banAction7d, &QAction::triggered, [this] { banSelectedNode(60 * 60 * 24 * 7); }); |
| 619 | + connect(banAction365d, &QAction::triggered, [this] { banSelectedNode(60 * 60 * 24 * 365); }); |
630 | 620 |
|
631 | 621 | // peer table context menu signals
|
632 | 622 | connect(ui->peerWidget, &QTableView::customContextMenuRequested, this, &RPCConsole::showPeersTableContextMenu);
|
|
0 commit comments