qt: Make path to showModalOverlay slot shorter

hebasto · hebasto · commit 3eb6d5b40681 · 2020-07-10T12:39:09.000+03:00
This commit does not change behavior.
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -204,11 +204,6 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformSty
     modalOverlay = new ModalOverlay(enableWallet, this->centralWidget());
     connect(labelBlocksIcon, &GUIUtil::ClickableLabel::clicked, this, &BitcoinGUI::showModalOverlay);
     connect(progressBar, &GUIUtil::ClickableProgressBar::clicked, this, &BitcoinGUI::showModalOverlay);
-#ifdef ENABLE_WALLET
-    if(enableWallet) {
-        connect(walletFrame, &WalletFrame::requestedSyncWarningInfo, this, &BitcoinGUI::showModalOverlay);
-    }
-#endif
 
 #ifdef Q_OS_MAC
     m_app_nap_inhibitor = new CAppNapInhibitor;
@@ -673,7 +668,7 @@ void BitcoinGUI::addWallet(WalletModel* walletModel)
         m_wallet_selector_action->setVisible(true);
     }
 
-    connect(walletView, &WalletView::outOfSyncWarningClicked, walletFrame, &WalletFrame::outOfSyncWarningClicked);
+    connect(walletView, &WalletView::outOfSyncWarningClicked, this, &BitcoinGUI::showModalOverlay);
     connect(walletView, &WalletView::transactionClicked, this, &BitcoinGUI::gotoHistoryPage);
     connect(walletView, &WalletView::coinsSent, this, &BitcoinGUI::gotoHistoryPage);
     connect(walletView, &WalletView::message, [this](const QString& title, const QString& message, unsigned int style) {
diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp
@@ -208,8 +208,3 @@ WalletModel* WalletFrame::currentWalletModel() const
     WalletView* wallet_view = currentWalletView();
     return wallet_view ? wallet_view->getWalletModel() : nullptr;
 }
-
-void WalletFrame::outOfSyncWarningClicked()
-{
-    Q_EMIT requestedSyncWarningInfo();
-}
diff --git a/src/qt/walletframe.h b/src/qt/walletframe.h
@@ -43,10 +43,6 @@ class WalletFrame : public QFrame
 
     void showOutOfSyncWarning(bool fShow);
 
-Q_SIGNALS:
-    /** Notify that the user has requested more information about the out-of-sync warning */
-    void requestedSyncWarningInfo();
-
 private:
     QStackedWidget *walletStack;
     ClientModel *clientModel;
@@ -88,8 +84,6 @@ public Q_SLOTS:
     void usedSendingAddresses();
     /** Show used receiving addresses */
     void usedReceivingAddresses();
-    /** Pass on signal over requested out-of-sync-warning information */
-    void outOfSyncWarningClicked();
 };
 
 #endif // BITCOIN_QT_WALLETFRAME_H
diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp
@@ -73,7 +73,7 @@ WalletView::WalletView(const PlatformStyle *_platformStyle, QWidget *parent):
     // Clicking on a transaction on the overview pre-selects the transaction on the transaction history page
     connect(overviewPage, &OverviewPage::transactionClicked, transactionView, static_cast<void (TransactionView::*)(const QModelIndex&)>(&TransactionView::focusTransaction));
 
-    connect(overviewPage, &OverviewPage::outOfSyncWarningClicked, this, &WalletView::requestedSyncWarningInfo);
+    connect(overviewPage, &OverviewPage::outOfSyncWarningClicked, this, &WalletView::outOfSyncWarningClicked);
 
     connect(sendCoinsPage, &SendCoinsDialog::coinsSent, this, &WalletView::coinsSent);
     // Highlight transaction after send
@@ -347,8 +347,3 @@ void WalletView::showProgress(const QString &title, int nProgress)
         }
     }
 }
-
-void WalletView::requestedSyncWarningInfo()
-{
-    Q_EMIT outOfSyncWarningClicked();
-}
diff --git a/src/qt/walletview.h b/src/qt/walletview.h
@@ -111,9 +111,6 @@ public Q_SLOTS:
     /** Show progress dialog e.g. for rescan */
     void showProgress(const QString &title, int nProgress);
 
-    /** User has requested more information about the out of sync state */
-    void requestedSyncWarningInfo();
-
 Q_SIGNALS:
     void setPrivacy(bool privacy);
     void transactionClicked();

Original file line number	Diff line number	Diff line change
`@@ -208,8 +208,3 @@ WalletModel* WalletFrame::currentWalletModel() const`
`208`	`208`	`WalletView* wallet_view = currentWalletView();`
`209`	`209`	`return wallet_view ? wallet_view->getWalletModel() : nullptr;`
`210`	`210`	`}`
`211`		`-`
`212`		`-void WalletFrame::outOfSyncWarningClicked()`
`213`		`-{`
`214`		`- Q_EMIT requestedSyncWarningInfo();`
`215`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ WalletView::WalletView(const PlatformStyle _platformStyle, QWidget parent):`
`73`	`73`	`// Clicking on a transaction on the overview pre-selects the transaction on the transaction history page`
`74`	`74`	`connect(overviewPage, &OverviewPage::transactionClicked, transactionView, static_cast<void (TransactionView::*)(const QModelIndex&)>(&TransactionView::focusTransaction));`
`75`	`75`
`76`		`- connect(overviewPage, &OverviewPage::outOfSyncWarningClicked, this, &WalletView::requestedSyncWarningInfo);`
	`76`	`+ connect(overviewPage, &OverviewPage::outOfSyncWarningClicked, this, &WalletView::outOfSyncWarningClicked);`
`77`	`77`
`78`	`78`	`connect(sendCoinsPage, &SendCoinsDialog::coinsSent, this, &WalletView::coinsSent);`
`79`	`79`	`// Highlight transaction after send`
`@@ -347,8 +347,3 @@ void WalletView::showProgress(const QString &title, int nProgress)`
`347`	`347`	`}`
`348`	`348`	`}`
`349`	`349`	`}`
`350`		`-`
`351`		`-void WalletView::requestedSyncWarningInfo()`
`352`		`-{`
`353`		`- Q_EMIT outOfSyncWarningClicked();`
`354`		`-}`