Skip to content

Commit 219417b

Browse files
committed
Revert "refactor: Simplify connection syntax"
This reverts commit 1a53b0d.
1 parent a654626 commit 219417b

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

src/qt/bitcoin.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,9 @@ void BitcoinApplication::initializeResult(bool success)
361361
if (paymentServer) {
362362
connect(paymentServer, &PaymentServer::receivedPaymentRequest, window, &BitcoinGUI::handlePaymentRequest);
363363
connect(window, &BitcoinGUI::receivedURI, paymentServer, &PaymentServer::handleURIOrFile);
364-
connect(paymentServer, &PaymentServer::message, window, &BitcoinGUI::message);
364+
connect(paymentServer, &PaymentServer::message, [this](const QString& title, const QString& message, unsigned int style) {
365+
window->message(title, message, style);
366+
});
365367
QTimer::singleShot(100, paymentServer, &PaymentServer::uiReady);
366368
}
367369
#endif

src/qt/bitcoingui.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,9 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel)
564564
connect(_clientModel, &ClientModel::numBlocksChanged, this, &BitcoinGUI::setNumBlocks);
565565

566566
// Receive and report messages from client model
567-
connect(_clientModel, &ClientModel::message, this, &BitcoinGUI::message);
567+
connect(_clientModel, &ClientModel::message, [this](const QString &title, const QString &message, unsigned int style){
568+
this->message(title, message, style);
569+
});
568570

569571
// Show progress dialog
570572
connect(_clientModel, &ClientModel::showProgress, this, &BitcoinGUI::showProgress);

src/qt/walletview.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,9 @@ void WalletView::setBitcoinGUI(BitcoinGUI *gui)
9797
connect(sendCoinsPage, &SendCoinsDialog::coinsSent, gui, &BitcoinGUI::gotoHistoryPage);
9898

9999
// Receive and report messages
100-
connect(this, &WalletView::message, gui, &BitcoinGUI::message);
100+
connect(this, &WalletView::message, [gui](const QString &title, const QString &message, unsigned int style) {
101+
gui->message(title, message, style);
102+
});
101103

102104
// Pass through encryption status changed signals
103105
connect(this, &WalletView::encryptionStatusChanged, gui, &BitcoinGUI::updateWalletStatus);

0 commit comments

Comments
 (0)