foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-09 10:43:19 -05:00
Code Issues 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/walletframe.h>
#include <qt/bitcoingui.h>
#include <qt/overviewpage.h> #include <qt/overviewpage.h>
#include <qt/walletmodel.h> #include <qt/walletmodel.h>
#include <qt/walletview.h> #include <qt/walletview.h>
@ -17,9 +16,8 @@
#include <QPushButton> #include <QPushButton>
#include <QVBoxLayout> #include <QVBoxLayout>
WalletFrame::WalletFrame(const PlatformStyle* _platformStyle, BitcoinGUI* _gui) WalletFrame::WalletFrame(const PlatformStyle* _platformStyle, QWidget* parent)
: QFrame(_gui), : QFrame(parent),
gui(_gui),
platformStyle(_platformStyle), platformStyle(_platformStyle),
m_size_hint(OverviewPage{platformStyle, nullptr}.sizeHint()) m_size_hint(OverviewPage{platformStyle, nullptr}.sizeHint())
{ {
@ -62,7 +60,7 @@ void WalletFrame::setClientModel(ClientModel *_clientModel)
bool WalletFrame::addWallet(WalletModel* walletModel, WalletView* walletView) 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; if (mapWalletViews.count(walletModel) > 0) return false;

4
src/qt/walletframe.h
View file

@ -8,7 +8,6 @@
#include <QFrame> #include <QFrame>
#include <QMap> #include <QMap>
class BitcoinGUI;
class ClientModel; class ClientModel;
class PlatformStyle; class PlatformStyle;
class SendCoinsRecipient; class SendCoinsRecipient;
@ -31,7 +30,7 @@ class WalletFrame : public QFrame
Q_OBJECT Q_OBJECT
public: public:
explicit WalletFrame(const PlatformStyle *platformStyle, BitcoinGUI *_gui = nullptr); explicit WalletFrame(const PlatformStyle* platformStyle, QWidget* parent);
~WalletFrame(); ~WalletFrame();
void setClientModel(ClientModel *clientModel); void setClientModel(ClientModel *clientModel);
@ -55,7 +54,6 @@ Q_SIGNALS:
private: private:
QStackedWidget *walletStack; QStackedWidget *walletStack;
BitcoinGUI *gui;
ClientModel *clientModel; ClientModel *clientModel;
QMap<WalletModel*, WalletView*> mapWalletViews; 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" "index/coinstatsindex -> node/coinstats -> index/coinstatsindex"
"policy/fees -> txmempool -> policy/fees" "policy/fees -> txmempool -> policy/fees"
"qt/addresstablemodel -> qt/walletmodel -> qt/addresstablemodel" "qt/addresstablemodel -> qt/walletmodel -> qt/addresstablemodel"
"qt/bitcoingui -> qt/walletframe -> qt/bitcoingui"
"qt/recentrequeststablemodel -> qt/walletmodel -> qt/recentrequeststablemodel" "qt/recentrequeststablemodel -> qt/walletmodel -> qt/recentrequeststablemodel"
"qt/sendcoinsdialog -> qt/walletmodel -> qt/sendcoinsdialog" "qt/sendcoinsdialog -> qt/walletmodel -> qt/sendcoinsdialog"
"qt/transactiontablemodel -> qt/walletmodel -> qt/transactiontablemodel" "qt/transactiontablemodel -> qt/walletmodel -> qt/transactiontablemodel"