highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-29 10:19:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "refactor: Simplify connection syntax"

Browse Source 
This reverts commit 1a53b0da60.
This commit is contained in:
Hennadii Stepanov
2020-01-19 09:37:34 +02:00
parent a654626f07
commit 219417b388
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/qt/bitcoin.cpp
View File

@ -361,7 +361,9 @@ void BitcoinApplication::initializeResult(bool success)
if (paymentServer) { if (paymentServer) {
connect(paymentServer, &PaymentServer::receivedPaymentRequest, window, &BitcoinGUI::handlePaymentRequest); connect(paymentServer, &PaymentServer::receivedPaymentRequest, window, &BitcoinGUI::handlePaymentRequest);
connect(window, &BitcoinGUI::receivedURI, paymentServer, &PaymentServer::handleURIOrFile); connect(window, &BitcoinGUI::receivedURI, paymentServer, &PaymentServer::handleURIOrFile);
connect(paymentServer, &PaymentServer::message, window, &BitcoinGUI::message); connect(paymentServer, &PaymentServer::message, [this](const QString& title, const QString& message, unsigned int style) {
window->message(title, message, style);
});
QTimer::singleShot(100, paymentServer, &PaymentServer::uiReady); QTimer::singleShot(100, paymentServer, &PaymentServer::uiReady);
} }
#endif #endif

4
src/qt/bitcoingui.cpp
View File

@ -564,7 +564,9 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel)
connect(_clientModel, &ClientModel::numBlocksChanged, this, &BitcoinGUI::setNumBlocks); connect(_clientModel, &ClientModel::numBlocksChanged, this, &BitcoinGUI::setNumBlocks);
// Receive and report messages from client model // Receive and report messages from client model
connect(_clientModel, &ClientModel::message, this, &BitcoinGUI::message); connect(_clientModel, &ClientModel::message, [this](const QString &title, const QString &message, unsigned int style){
this->message(title, message, style);
});
// Show progress dialog // Show progress dialog
connect(_clientModel, &ClientModel::showProgress, this, &BitcoinGUI::showProgress); connect(_clientModel, &ClientModel::showProgress, this, &BitcoinGUI::showProgress);

4
src/qt/walletview.cpp
View File

@ -97,7 +97,9 @@ void WalletView::setBitcoinGUI(BitcoinGUI *gui)
connect(sendCoinsPage, &SendCoinsDialog::coinsSent, gui, &BitcoinGUI::gotoHistoryPage); connect(sendCoinsPage, &SendCoinsDialog::coinsSent, gui, &BitcoinGUI::gotoHistoryPage);
// Receive and report messages // Receive and report messages
connect(this, &WalletView::message, gui, &BitcoinGUI::message); connect(this, &WalletView::message, [gui](const QString &title, const QString &message, unsigned int style) {
gui->message(title, message, style);
});
// Pass through encryption status changed signals // Pass through encryption status changed signals
connect(this, &WalletView::encryptionStatusChanged, gui, &BitcoinGUI::updateWalletStatus); connect(this, &WalletView::encryptionStatusChanged, gui, &BitcoinGUI::updateWalletStatus);