mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-11-20 10:38:42 +01:00
Code Issues Projects Releases Wiki Activity

qt: Drop BitcoinGUI* WalletFrame data member

Browse Source 
This changes removes bitcoingui->walletframe->bitcoingui circular
dependency.

This commit does not change behavior.
This commit is contained in:
Hennadii Stepanov 2021-05-15 23:04:01 +03:00
parent f73e5c972a
commit 62cb8d98d2
No known key found for this signature in database
GPG Key ID: 410108112E7EA81F
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qt/walletframe.cpp
View File

@ -4,7 +4,6 @@
#include <qt/walletframe.h>
#include <qt/bitcoingui.h>
#include <qt/overviewpage.h>
#include <qt/walletmodel.h>
#include <qt/walletview.h>
@ -17,9 +16,8 @@
#include <QPushButton>
#include <QVBoxLayout>
WalletFrame::WalletFrame(const PlatformStyle* _platformStyle, BitcoinGUI* _gui)
: QFrame(_gui),
gui(_gui),
WalletFrame::WalletFrame(const PlatformStyle* _platformStyle, QWidget* parent)
: QFrame(parent),
platformStyle(_platformStyle),
m_size_hint(OverviewPage{platformStyle, nullptr}.sizeHint())
{
@ -62,7 +60,7 @@ void WalletFrame::setClientModel(ClientModel *_clientModel)
bool WalletFrame::addWallet(WalletModel* walletModel, WalletView* walletView)
{
if (!gui || !clientModel || !walletModel) return false;
if (!clientModel || !walletModel) return false;
if (mapWalletViews.count(walletModel) > 0) return false;

4
src/qt/walletframe.h
View File

@ -8,7 +8,6 @@
#include <QFrame>
#include <QMap>
class BitcoinGUI;
class ClientModel;
class PlatformStyle;
class SendCoinsRecipient;
@ -31,7 +30,7 @@ class WalletFrame : public QFrame
Q_OBJECT
public:
explicit WalletFrame(const PlatformStyle *platformStyle, BitcoinGUI *_gui = nullptr);
explicit WalletFrame(const PlatformStyle* platformStyle, QWidget* parent);
~WalletFrame();
void setClientModel(ClientModel *clientModel);
@ -55,7 +54,6 @@ Q_SIGNALS:
private:
QStackedWidget *walletStack;
BitcoinGUI *gui;
ClientModel *clientModel;
QMap<WalletModel*, WalletView*> mapWalletViews;

1
test/lint/lint-circular-dependencies.sh
View File

@ -17,7 +17,6 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
"index/coinstatsindex -> node/coinstats -> index/coinstatsindex"
"policy/fees -> txmempool -> policy/fees"
"qt/addresstablemodel -> qt/walletmodel -> qt/addresstablemodel"
"qt/bitcoingui -> qt/walletframe -> qt/bitcoingui"
"qt/recentrequeststablemodel -> qt/walletmodel -> qt/recentrequeststablemodel"
"qt/sendcoinsdialog -> qt/walletmodel -> qt/sendcoinsdialog"
"qt/transactiontablemodel -> qt/walletmodel -> qt/transactiontablemodel"