mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-22 06:52:36 +01:00
Code Issues Projects Releases Wiki Activity

qt, refactor: Replace WalletFrame::addWallet with WalletFrame::addView

Browse source 
No need to pass an instance of the WalletModel class to this method.

Co-authored-by: João Barbosa <joao.paulo.barbosa@gmail.com>
This commit is contained in:
Hennadii Stepanov 2021-09-03 00:27:14 +03:00
parent 92ddc02a16
commit d319c4dae9
No known key found for this signature in database
GPG key ID: 410108112E7EA81F
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/qt/bitcoingui.cpp
View file

@ -677,7 +677,7 @@ void BitcoinGUI::addWallet(WalletModel* walletModel)
if (!walletFrame) return; if (!walletFrame) return;
WalletView* wallet_view = new WalletView(walletModel, platformStyle, walletFrame); WalletView* wallet_view = new WalletView(walletModel, platformStyle, walletFrame);
if (!walletFrame->addWallet(walletModel, wallet_view)) return; if (!walletFrame->addView(wallet_view)) return;
rpcConsole->addWallet(walletModel); rpcConsole->addWallet(walletModel);
if (m_wallet_selector->count() == 0) { if (m_wallet_selector->count() == 0) {

8
src/qt/walletframe.cpp
View file

@ -64,11 +64,11 @@ void WalletFrame::setClientModel(ClientModel *_clientModel)
} }
} }
bool WalletFrame::addWallet(WalletModel* walletModel, WalletView* walletView) bool WalletFrame::addView(WalletView* walletView)
{ {
if (!clientModel || !walletModel) return false; if (!clientModel) return false;
if (mapWalletViews.count(walletModel) > 0) return false; if (mapWalletViews.count(walletView->getWalletModel()) > 0) return false;
walletView->setClientModel(clientModel); walletView->setClientModel(clientModel);
walletView->showOutOfSyncWarning(bOutOfSync); walletView->showOutOfSyncWarning(bOutOfSync);
@ -81,7 +81,7 @@ bool WalletFrame::addWallet(WalletModel* walletModel, WalletView* walletView)
} }
walletStack->addWidget(walletView); walletStack->addWidget(walletView);
mapWalletViews[walletModel] = walletView; mapWalletViews[walletView->getWalletModel()] = walletView;
return true; return true;
} }

2
src/qt/walletframe.h
View file

@ -35,7 +35,7 @@ public:
void setClientModel(ClientModel *clientModel); void setClientModel(ClientModel *clientModel);
bool addWallet(WalletModel* walletModel, WalletView* walletView); bool addView(WalletView* walletView);
void setCurrentWallet(WalletModel* wallet_model); void setCurrentWallet(WalletModel* wallet_model);
void removeWallet(WalletModel* wallet_model); void removeWallet(WalletModel* wallet_model);
void removeAllWallets(); void removeAllWallets();