From d319c4dae9ed7d59d71b926e677707fce4194d0c Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Fri, 3 Sep 2021 00:27:14 +0300 Subject: qt, refactor: Replace WalletFrame::addWallet with WalletFrame::addView MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No need to pass an instance of the WalletModel class to this method. Co-authored-by: João Barbosa --- src/qt/bitcoingui.cpp | 2 +- src/qt/walletframe.cpp | 8 ++++---- src/qt/walletframe.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/qt') diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 2c53962d29..862bdd3bfe 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -677,7 +677,7 @@ void BitcoinGUI::addWallet(WalletModel* walletModel) if (!walletFrame) return; WalletView* wallet_view = new WalletView(walletModel, platformStyle, walletFrame); - if (!walletFrame->addWallet(walletModel, wallet_view)) return; + if (!walletFrame->addView(wallet_view)) return; rpcConsole->addWallet(walletModel); if (m_wallet_selector->count() == 0) { diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp index d5bde544f7..f694fbecb5 100644 --- a/src/qt/walletframe.cpp +++ b/src/qt/walletframe.cpp @@ -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->showOutOfSyncWarning(bOutOfSync); @@ -81,7 +81,7 @@ bool WalletFrame::addWallet(WalletModel* walletModel, WalletView* walletView) } walletStack->addWidget(walletView); - mapWalletViews[walletModel] = walletView; + mapWalletViews[walletView->getWalletModel()] = walletView; return true; } diff --git a/src/qt/walletframe.h b/src/qt/walletframe.h index cbf6af95ec..cfca5c4c5c 100644 --- a/src/qt/walletframe.h +++ b/src/qt/walletframe.h @@ -35,7 +35,7 @@ public: void setClientModel(ClientModel *clientModel); - bool addWallet(WalletModel* walletModel, WalletView* walletView); + bool addView(WalletView* walletView); void setCurrentWallet(WalletModel* wallet_model); void removeWallet(WalletModel* wallet_model); void removeAllWallets(); -- cgit v1.2.3