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

hebasto · promag · hebasto · commit d319c4dae9ed · 2021-09-03T00:27:14.000+03:00
No need to pass an instance of the WalletModel class to this method.

Co-authored-by: João Barbosa &lt;joao.paulo.barbosa@gmail.com&gt;
diff --git 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
@@ -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
@@ -35,7 +35,7 @@ class WalletFrame : public QFrame
 
     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();

Original file line number	Diff line number	Diff line change
`@@ -64,11 +64,11 @@ void WalletFrame::setClientModel(ClientModel *_clientModel)`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`-bool WalletFrame::addWallet(WalletModel* walletModel, WalletView* walletView)`
	`67`	`+bool WalletFrame::addView(WalletView* walletView)`
`68`	`68`	`{`
`69`		`- if (!clientModel \|\| !walletModel) return false;`
	`69`	`+ if (!clientModel) return false;`
`70`	`70`
`71`		`- if (mapWalletViews.count(walletModel) > 0) return false;`
	`71`	`+ if (mapWalletViews.count(walletView->getWalletModel()) > 0) return false;`
`72`	`72`
`73`	`73`	`walletView->setClientModel(clientModel);`
`74`	`74`	`walletView->showOutOfSyncWarning(bOutOfSync);`
`@@ -81,7 +81,7 @@ bool WalletFrame::addWallet(WalletModel* walletModel, WalletView* walletView)`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`walletStack->addWidget(walletView);`
`84`		`- mapWalletViews[walletModel] = walletView;`
	`84`	`+ mapWalletViews[walletView->getWalletModel()] = walletView;`
`85`	`85`
`86`	`86`	`return true;`
`87`	`87`	`}`