Skip to content

Commit 9851a84

Browse files
committed
Merge #9255: qt: layoutAboutToChange signal is called layoutAboutToBeChanged
f36349e qt: Remove on_toggleNetworkActiveButton_clicked from RPCConsole (Wladimir J. van der Laan) 297cc20 qt: layoutAboutToChange signal is called layoutAboutToBeChanged (Wladimir J. van der Laan)
2 parents 2044e37 + f36349e commit 9851a84

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

src/qt/rpcconsole.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ void RPCConsole::setClientModel(ClientModel *model)
515515
// peer table signal handling - update peer details when new nodes are added to the model
516516
connect(model->getPeerTableModel(), SIGNAL(layoutChanged()), this, SLOT(peerLayoutChanged()));
517517
// peer table signal handling - cache selected node ids
518-
connect(model->getPeerTableModel(), SIGNAL(layoutAboutToChange()), this, SLOT(peerLayoutAboutToChange()));
518+
connect(model->getPeerTableModel(), SIGNAL(layoutAboutToBeChanged()), this, SLOT(peerLayoutAboutToChange()));
519519

520520
// set up ban table
521521
ui->banlistWidget->setModel(model->getBanTableModel());
@@ -778,7 +778,6 @@ void RPCConsole::startExecutor()
778778
connect(this, SIGNAL(stopExecutor()), &thread, SLOT(quit()));
779779
// - queue executor for deletion (in execution thread)
780780
connect(&thread, SIGNAL(finished()), executor, SLOT(deleteLater()), Qt::DirectConnection);
781-
connect(&thread, SIGNAL(finished()), this, SLOT(test()), Qt::DirectConnection);
782781

783782
// Default implementation of QThread::run() simply spins up an event loop in the thread,
784783
// which is what we want.
@@ -1090,8 +1089,3 @@ void RPCConsole::setTabFocus(enum TabTypes tabType)
10901089
{
10911090
ui->tabWidget->setCurrentIndex(tabType);
10921091
}
1093-
1094-
void RPCConsole::on_toggleNetworkActiveButton_clicked()
1095-
{
1096-
clientModel->setNetworkActive(!clientModel->getNetworkActive());
1097-
}

src/qt/rpcconsole.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ class RPCConsole: public QWidget
6262
private Q_SLOTS:
6363
void on_lineEdit_returnPressed();
6464
void on_tabWidget_currentChanged(int index);
65-
/** toggle network activity */
66-
void on_toggleNetworkActiveButton_clicked();
6765
/** open the debug.log from the current datadir */
6866
void on_openDebugLogfileButton_clicked();
6967
/** change the time range of the network traffic graph */

0 commit comments

Comments
 (0)