diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp --- a/src/qt/walletframe.cpp +++ b/src/qt/walletframe.cpp @@ -43,7 +43,6 @@ } WalletView *walletView = new WalletView(platformStyle, walletModel, this); - walletView->setBitcoinGUI(gui); walletView->setClientModel(clientModel); walletView->showOutOfSyncWarning(bOutOfSync); @@ -59,6 +58,20 @@ connect(walletView, &WalletView::outOfSyncWarningClicked, this, &WalletFrame::outOfSyncWarningClicked); + connect(walletView, &WalletView::transactionClicked, gui, + &BitcoinGUI::gotoHistoryPage); + connect(walletView, &WalletView::coinsSent, gui, + &BitcoinGUI::gotoHistoryPage); + connect( + walletView, &WalletView::message, + [this](const QString &title, const QString &message, + unsigned int style) { gui->message(title, message, style); }); + connect(walletView, &WalletView::encryptionStatusChanged, gui, + &BitcoinGUI::updateWalletStatus); + connect(walletView, &WalletView::incomingTransaction, gui, + &BitcoinGUI::incomingTransaction); + connect(walletView, &WalletView::hdEnabledStatusChanged, gui, + &BitcoinGUI::updateWalletStatus); return true; } diff --git a/src/qt/walletview.h b/src/qt/walletview.h --- a/src/qt/walletview.h +++ b/src/qt/walletview.h @@ -9,7 +9,6 @@ #include -class BitcoinGUI; class ClientModel; class OverviewPage; class PlatformStyle; @@ -40,7 +39,6 @@ QWidget *parent); ~WalletView(); - void setBitcoinGUI(BitcoinGUI *gui); /** * Set the client model. * The client model represents the part of the core that communicates with diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp --- a/src/qt/walletview.cpp +++ b/src/qt/walletview.cpp @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -107,37 +106,6 @@ WalletView::~WalletView() {} -void WalletView::setBitcoinGUI(BitcoinGUI *gui) { - if (gui) { - // Clicking on a transaction on the overview page simply sends you to - // transaction history page - connect(this, &WalletView::transactionClicked, gui, - &BitcoinGUI::gotoHistoryPage); - - // Navigate to transaction history page after send - connect(this, &WalletView::coinsSent, gui, - &BitcoinGUI::gotoHistoryPage); - - // Receive and report messages - 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); - - // Pass through transaction notifications - connect(this, &WalletView::incomingTransaction, gui, - &BitcoinGUI::incomingTransaction); - - // Connect HD enabled state signal - connect(this, &WalletView::hdEnabledStatusChanged, gui, - &BitcoinGUI::updateWalletStatus); - } -} - void WalletView::setClientModel(ClientModel *_clientModel) { this->clientModel = _clientModel; diff --git a/test/lint/lint-circular-dependencies.sh b/test/lint/lint-circular-dependencies.sh --- a/test/lint/lint-circular-dependencies.sh +++ b/test/lint/lint-circular-dependencies.sh @@ -16,7 +16,6 @@ "index/txindex -> validation -> index/txindex" "qt/addresstablemodel -> qt/walletmodel -> qt/addresstablemodel" "qt/bitcoingui -> qt/walletframe -> qt/bitcoingui" - "qt/bitcoingui -> qt/walletview -> qt/bitcoingui" "qt/clientmodel -> qt/peertablemodel -> qt/clientmodel" "qt/recentrequeststablemodel -> qt/walletmodel -> qt/recentrequeststablemodel" "qt/transactiontablemodel -> qt/walletmodel -> qt/transactiontablemodel"