Skip to content

Commit 62cb8d9

Browse files
committed
qt: Drop BitcoinGUI* WalletFrame data member
This changes removes bitcoingui->walletframe->bitcoingui circular dependency. This commit does not change behavior.
1 parent f73e5c9 commit 62cb8d9

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

src/qt/walletframe.cpp

+3-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
#include <qt/walletframe.h>
66

7-
#include <qt/bitcoingui.h>
87
#include <qt/overviewpage.h>
98
#include <qt/walletmodel.h>
109
#include <qt/walletview.h>
@@ -17,9 +16,8 @@
1716
#include <QPushButton>
1817
#include <QVBoxLayout>
1918

20-
WalletFrame::WalletFrame(const PlatformStyle* _platformStyle, BitcoinGUI* _gui)
21-
: QFrame(_gui),
22-
gui(_gui),
19+
WalletFrame::WalletFrame(const PlatformStyle* _platformStyle, QWidget* parent)
20+
: QFrame(parent),
2321
platformStyle(_platformStyle),
2422
m_size_hint(OverviewPage{platformStyle, nullptr}.sizeHint())
2523
{
@@ -62,7 +60,7 @@ void WalletFrame::setClientModel(ClientModel *_clientModel)
6260

6361
bool WalletFrame::addWallet(WalletModel* walletModel, WalletView* walletView)
6462
{
65-
if (!gui || !clientModel || !walletModel) return false;
63+
if (!clientModel || !walletModel) return false;
6664

6765
if (mapWalletViews.count(walletModel) > 0) return false;
6866

src/qt/walletframe.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include <QFrame>
99
#include <QMap>
1010

11-
class BitcoinGUI;
1211
class ClientModel;
1312
class PlatformStyle;
1413
class SendCoinsRecipient;
@@ -31,7 +30,7 @@ class WalletFrame : public QFrame
3130
Q_OBJECT
3231

3332
public:
34-
explicit WalletFrame(const PlatformStyle *platformStyle, BitcoinGUI *_gui = nullptr);
33+
explicit WalletFrame(const PlatformStyle* platformStyle, QWidget* parent);
3534
~WalletFrame();
3635

3736
void setClientModel(ClientModel *clientModel);
@@ -55,7 +54,6 @@ class WalletFrame : public QFrame
5554

5655
private:
5756
QStackedWidget *walletStack;
58-
BitcoinGUI *gui;
5957
ClientModel *clientModel;
6058
QMap<WalletModel*, WalletView*> mapWalletViews;
6159

test/lint/lint-circular-dependencies.sh

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
1717
"index/coinstatsindex -> node/coinstats -> index/coinstatsindex"
1818
"policy/fees -> txmempool -> policy/fees"
1919
"qt/addresstablemodel -> qt/walletmodel -> qt/addresstablemodel"
20-
"qt/bitcoingui -> qt/walletframe -> qt/bitcoingui"
2120
"qt/recentrequeststablemodel -> qt/walletmodel -> qt/recentrequeststablemodel"
2221
"qt/sendcoinsdialog -> qt/walletmodel -> qt/sendcoinsdialog"
2322
"qt/transactiontablemodel -> qt/walletmodel -> qt/transactiontablemodel"

0 commit comments

Comments
 (0)