Skip to content

Commit d319c4d

Browse files
hebastopromag
andcommitted
qt, refactor: Replace WalletFrame::addWallet with WalletFrame::addView
No need to pass an instance of the WalletModel class to this method. Co-authored-by: João Barbosa <[email protected]>
1 parent 92ddc02 commit d319c4d

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/qt/bitcoingui.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,7 @@ void BitcoinGUI::addWallet(WalletModel* walletModel)
677677
if (!walletFrame) return;
678678

679679
WalletView* wallet_view = new WalletView(walletModel, platformStyle, walletFrame);
680-
if (!walletFrame->addWallet(walletModel, wallet_view)) return;
680+
if (!walletFrame->addView(wallet_view)) return;
681681

682682
rpcConsole->addWallet(walletModel);
683683
if (m_wallet_selector->count() == 0) {

src/qt/walletframe.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ void WalletFrame::setClientModel(ClientModel *_clientModel)
6464
}
6565
}
6666

67-
bool WalletFrame::addWallet(WalletModel* walletModel, WalletView* walletView)
67+
bool WalletFrame::addView(WalletView* walletView)
6868
{
69-
if (!clientModel || !walletModel) return false;
69+
if (!clientModel) return false;
7070

71-
if (mapWalletViews.count(walletModel) > 0) return false;
71+
if (mapWalletViews.count(walletView->getWalletModel()) > 0) return false;
7272

7373
walletView->setClientModel(clientModel);
7474
walletView->showOutOfSyncWarning(bOutOfSync);
@@ -81,7 +81,7 @@ bool WalletFrame::addWallet(WalletModel* walletModel, WalletView* walletView)
8181
}
8282

8383
walletStack->addWidget(walletView);
84-
mapWalletViews[walletModel] = walletView;
84+
mapWalletViews[walletView->getWalletModel()] = walletView;
8585

8686
return true;
8787
}

src/qt/walletframe.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class WalletFrame : public QFrame
3535

3636
void setClientModel(ClientModel *clientModel);
3737

38-
bool addWallet(WalletModel* walletModel, WalletView* walletView);
38+
bool addView(WalletView* walletView);
3939
void setCurrentWallet(WalletModel* wallet_model);
4040
void removeWallet(WalletModel* wallet_model);
4141
void removeAllWallets();

0 commit comments

Comments
 (0)