Qt: Get wallet name from WalletModel rather than passing it around

Github-Pull: bitcoin#11383 Rebased-From: 6445a935e6daeadd38c3d8633083ca45fc2cfe1f
bitcoinknots · Nov 6, 2017 · 42ca0f5 · 42ca0f5
1 parent 51b4432
commit 42ca0f5
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 16 deletions.
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
@@ -490,14 +490,9 @@ void BitcoinApplication::initializeResult(bool success)
         for (CWalletRef pwallet : vpwallets) {
             WalletModel * const walletModel = new WalletModel(platformStyle, pwallet, optionsModel);
 
-            QString WalletName = QString::fromStdString(pwallet->GetName());
-            if (WalletName.endsWith(".dat")) {
-                WalletName.truncate(WalletName.size() - 4);
-            }
-
-            window->addWallet(WalletName, walletModel);
+            window->addWallet(walletModel);
             if (fFirstWallet) {
-                window->setCurrentWallet(WalletName);
+                window->setCurrentWallet(walletModel->getWalletName());
                 fFirstWallet = false;
             }
 

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -536,10 +536,11 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel)
 }
 
 #ifdef ENABLE_WALLET
-bool BitcoinGUI::addWallet(const QString& name, WalletModel *walletModel)
+bool BitcoinGUI::addWallet(WalletModel *walletModel)
 {
     if(!walletFrame)
         return false;
+    const QString name = walletModel->getWalletName();
     setWalletActionsEnabled(true);
     WalletSelector->addItem(name);
     if (WalletSelector->count() == 2) {
@@ -549,8 +550,8 @@ bool BitcoinGUI::addWallet(const QString& name, WalletModel *walletModel)
         appToolBar->addWidget(WalletSelectorLabel);
         appToolBar->addWidget(WalletSelector);
     }
-    rpcConsole->addWallet(name, walletModel);
-    return walletFrame->addWallet(name, walletModel);
+    rpcConsole->addWallet(walletModel);
+    return walletFrame->addWallet(walletModel);
 }
 
 bool BitcoinGUI::setCurrentWallet(const QString& name)

diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
@@ -62,7 +62,7 @@ class BitcoinGUI : public QMainWindow
         The wallet model represents a bitcoin wallet, and offers access to the list of transactions, address book and sending
         functionality.
     */
-    bool addWallet(const QString& name, WalletModel *walletModel);
+    bool addWallet(WalletModel *walletModel);
     void removeAllWallets();
     bool multiWallet() const;
 #endif // ENABLE_WALLET

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
@@ -663,8 +663,9 @@ void RPCConsole::setClientModel(ClientModel *model)
 }
 
 #ifdef ENABLE_WALLET
-void RPCConsole::addWallet(const QString name, WalletModel * const walletModel)
+void RPCConsole::addWallet(WalletModel * const walletModel)
 {
+    const QString name = walletModel->getWalletName();
     CWalletRef * const ppwallet = new CWalletRef(walletModel->getWallet());
     ui->WalletSelector->addItem(name, QVariant::fromValue((void*)(ppwallet)));
     if (ui->WalletSelector->count() == 2 && !isVisible()) {

diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h
@@ -43,7 +43,7 @@ class RPCConsole: public QWidget
     }
 
     void setClientModel(ClientModel *model);
-    void addWallet(const QString name, WalletModel * const walletModel);
+    void addWallet(WalletModel * const walletModel);
 
     enum MessageClass {
         MC_ERROR,

diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp
@@ -3,6 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "walletframe.h"
+#include "walletmodel.h"
 
 #include "bitcoingui.h"
 #include "walletview.h"
@@ -38,10 +39,16 @@ void WalletFrame::setClientModel(ClientModel *_clientModel)
     this->clientModel = _clientModel;
 }
 
-bool WalletFrame::addWallet(const QString& name, WalletModel *walletModel)
+bool WalletFrame::addWallet(WalletModel *walletModel)
 {
-    if (!gui || !clientModel || !walletModel || mapWalletViews.count(name) > 0)
+    if (!gui || !clientModel || !walletModel) {
         return false;
+    }
+
+    const QString name = walletModel->getWalletName();
+    if (mapWalletViews.count(name) > 0) {
+        return false;
+    }
 
     WalletView *walletView = new WalletView(platformStyle, this);
     walletView->setBitcoinGUI(gui);

diff --git a/src/qt/walletframe.h b/src/qt/walletframe.h
@@ -36,7 +36,7 @@ class WalletFrame : public QFrame
 
     void setClientModel(ClientModel *clientModel);
 
-    bool addWallet(const QString& name, WalletModel *walletModel);
+    bool addWallet(WalletModel *walletModel);
     bool setCurrentWallet(const QString& name);
     bool removeWallet(const QString &name);
     void removeAllWallets();