Revert "refactor: Simplify connection syntax"

hebasto · hebasto · commit 219417b388a0 · 2020-01-19T09:37:34.000+02:00
This reverts commit 1a53b0d.
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
@@ -361,7 +361,9 @@ void BitcoinApplication::initializeResult(bool success)
         if (paymentServer) {
             connect(paymentServer, &PaymentServer::receivedPaymentRequest, window, &BitcoinGUI::handlePaymentRequest);
             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);
         }
 #endif
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -564,7 +564,9 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel)
         connect(_clientModel, &ClientModel::numBlocksChanged, this, &BitcoinGUI::setNumBlocks);
 
         // 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
         connect(_clientModel, &ClientModel::showProgress, this, &BitcoinGUI::showProgress);
diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp
@@ -97,7 +97,9 @@ void WalletView::setBitcoinGUI(BitcoinGUI *gui)
         connect(sendCoinsPage, &SendCoinsDialog::coinsSent, gui, &BitcoinGUI::gotoHistoryPage);
 
         // 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
         connect(this, &WalletView::encryptionStatusChanged, gui, &BitcoinGUI::updateWalletStatus);
