qt: Use WalletModel* instead of wallet name in main window

promag · promag · commit b2ce86c3ad79 · 2019-01-04T15:22:13.000Z
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2018 The Bitcoin Core developers
+// Copyright (c) 2011-2019 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -431,7 +431,7 @@ void BitcoinApplication::addWallet(WalletModel* walletModel)
     window->addWallet(walletModel);
 
     if (m_wallet_models.empty()) {
-        window->setCurrentWallet(walletModel->getWalletName());
+        window->setCurrentWallet(walletModel);
     }
 
 #ifdef ENABLE_BIP70
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2018 The Bitcoin Core developers
+// Copyright (c) 2011-2019 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -569,10 +569,9 @@ bool BitcoinGUI::addWallet(WalletModel *walletModel)
 {
     if(!walletFrame)
         return false;
-    const QString name = walletModel->getWalletName();
     const QString display_name = walletModel->getDisplayName();
     setWalletActionsEnabled(true);
-    m_wallet_selector->addItem(display_name, name);
+    m_wallet_selector->addItem(display_name, QVariant::fromValue(walletModel));
     if (m_wallet_selector->count() == 2) {
         m_wallet_selector_label_action->setVisible(true);
         m_wallet_selector_action->setVisible(true);
@@ -584,8 +583,7 @@ bool BitcoinGUI::addWallet(WalletModel *walletModel)
 bool BitcoinGUI::removeWallet(WalletModel* walletModel)
 {
     if (!walletFrame) return false;
-    QString name = walletModel->getWalletName();
-    int index = m_wallet_selector->findData(name);
+    int index = m_wallet_selector->findData(QVariant::fromValue(walletModel));
     m_wallet_selector->removeItem(index);
     if (m_wallet_selector->count() == 0) {
         setWalletActionsEnabled(false);
@@ -594,20 +592,20 @@ bool BitcoinGUI::removeWallet(WalletModel* walletModel)
         m_wallet_selector_action->setVisible(false);
     }
     rpcConsole->removeWallet(walletModel);
-    return walletFrame->removeWallet(name);
+    return walletFrame->removeWallet(walletModel);
 }
 
-bool BitcoinGUI::setCurrentWallet(const QString& name)
+bool BitcoinGUI::setCurrentWallet(WalletModel* wallet_model)
 {
     if(!walletFrame)
         return false;
-    return walletFrame->setCurrentWallet(name);
+    return walletFrame->setCurrentWallet(wallet_model);
 }
 
 bool BitcoinGUI::setCurrentWalletBySelectorIndex(int index)
 {
-    QString internal_name = m_wallet_selector->itemData(index).toString();
-    return setCurrentWallet(internal_name);
+    WalletModel* wallet_model = m_wallet_selector->itemData(index).value<WalletModel*>();
+    return setCurrentWallet(wallet_model);
 }
 
 void BitcoinGUI::removeAllWallets()
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2018 The Bitcoin Core developers
+// Copyright (c) 2011-2019 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -206,7 +206,7 @@ public Q_SLOTS:
     void message(const QString &title, const QString &message, unsigned int style, bool *ret = nullptr);
 
 #ifdef ENABLE_WALLET
-    bool setCurrentWallet(const QString& name);
+    bool setCurrentWallet(WalletModel* wallet_model);
     bool setCurrentWalletBySelectorIndex(int index);
     /** Set the UI status indicators based on the currently selected wallet.
     */
diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2018 The Bitcoin Core developers
+// Copyright (c) 2011-2019 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -46,8 +46,7 @@ bool WalletFrame::addWallet(WalletModel *walletModel)
         return false;
     }
 
-    const QString name = walletModel->getWalletName();
-    if (mapWalletViews.count(name) > 0) {
+    if (mapWalletViews.count(walletModel) > 0) {
         return false;
     }
 
@@ -65,7 +64,7 @@ bool WalletFrame::addWallet(WalletModel *walletModel)
     }
 
     walletStack->addWidget(walletView);
-    mapWalletViews[name] = walletView;
+    mapWalletViews[walletModel] = walletView;
 
     // Ensure a walletView is able to show the main window
     connect(walletView, &WalletView::showNormalIfMinimized, [this]{
@@ -77,32 +76,32 @@ bool WalletFrame::addWallet(WalletModel *walletModel)
     return true;
 }
 
-bool WalletFrame::setCurrentWallet(const QString& name)
+bool WalletFrame::setCurrentWallet(WalletModel* wallet_model)
 {
-    if (mapWalletViews.count(name) == 0)
+    if (mapWalletViews.count(wallet_model) == 0)
         return false;
 
-    WalletView *walletView = mapWalletViews.value(name);
+    WalletView *walletView = mapWalletViews.value(wallet_model);
     walletStack->setCurrentWidget(walletView);
     assert(walletView);
     walletView->updateEncryptionStatus();
     return true;
 }
 
-bool WalletFrame::removeWallet(const QString &name)
+bool WalletFrame::removeWallet(WalletModel* wallet_model)
 {
-    if (mapWalletViews.count(name) == 0)
+    if (mapWalletViews.count(wallet_model) == 0)
         return false;
 
-    WalletView *walletView = mapWalletViews.take(name);
+    WalletView *walletView = mapWalletViews.take(wallet_model);
     walletStack->removeWidget(walletView);
     delete walletView;
     return true;
 }
 
 void WalletFrame::removeAllWallets()
 {
-    QMap<QString, WalletView*>::const_iterator i;
+    QMap<WalletModel*, WalletView*>::const_iterator i;
     for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i)
         walletStack->removeWidget(i.value());
     mapWalletViews.clear();
@@ -120,35 +119,35 @@ bool WalletFrame::handlePaymentRequest(const SendCoinsRecipient &recipient)
 void WalletFrame::showOutOfSyncWarning(bool fShow)
 {
     bOutOfSync = fShow;
-    QMap<QString, WalletView*>::const_iterator i;
+    QMap<WalletModel*, WalletView*>::const_iterator i;
     for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i)
         i.value()->showOutOfSyncWarning(fShow);
 }
 
 void WalletFrame::gotoOverviewPage()
 {
-    QMap<QString, WalletView*>::const_iterator i;
+    QMap<WalletModel*, WalletView*>::const_iterator i;
     for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i)
         i.value()->gotoOverviewPage();
 }
 
 void WalletFrame::gotoHistoryPage()
 {
-    QMap<QString, WalletView*>::const_iterator i;
+    QMap<WalletModel*, WalletView*>::const_iterator i;
     for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i)
         i.value()->gotoHistoryPage();
 }
 
 void WalletFrame::gotoReceiveCoinsPage()
 {
-    QMap<QString, WalletView*>::const_iterator i;
+    QMap<WalletModel*, WalletView*>::const_iterator i;
     for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i)
         i.value()->gotoReceiveCoinsPage();
 }
 
 void WalletFrame::gotoSendCoinsPage(QString addr)
 {
-    QMap<QString, WalletView*>::const_iterator i;
+    QMap<WalletModel*, WalletView*>::const_iterator i;
     for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i)
         i.value()->gotoSendCoinsPage(addr);
 }
diff --git a/src/qt/walletframe.h b/src/qt/walletframe.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2018 The Bitcoin Core developers
+// Copyright (c) 2011-2019 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -37,8 +37,8 @@ class WalletFrame : public QFrame
     void setClientModel(ClientModel *clientModel);
 
     bool addWallet(WalletModel *walletModel);
-    bool setCurrentWallet(const QString& name);
-    bool removeWallet(const QString &name);
+    bool setCurrentWallet(WalletModel* wallet_model);
+    bool removeWallet(WalletModel* wallet_model);
     void removeAllWallets();
 
     bool handlePaymentRequest(const SendCoinsRecipient& recipient);
@@ -53,7 +53,7 @@ class WalletFrame : public QFrame
     QStackedWidget *walletStack;
     BitcoinGUI *gui;
     ClientModel *clientModel;
-    QMap<QString, WalletView*> mapWalletViews;
+    QMap<WalletModel*, WalletView*> mapWalletViews;
 
     bool bOutOfSync;
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) 2011-2018 The Bitcoin Core developers`
	`1`	`+// Copyright (c) 2011-2019 The Bitcoin Core developers`
`2`	`2`	`// Distributed under the MIT software license, see the accompanying`
`3`	`3`	`// file COPYING or http://www.opensource.org/licenses/mit-license.php.`
`4`	`4`
`@@ -46,8 +46,7 @@ bool WalletFrame::addWallet(WalletModel *walletModel)`
`46`	`46`	`return false;`
`47`	`47`	`}`
`48`	`48`
`49`		`- const QString name = walletModel->getWalletName();`
`50`		`- if (mapWalletViews.count(name) > 0) {`
	`49`	`+ if (mapWalletViews.count(walletModel) > 0) {`
`51`	`50`	`return false;`
`52`	`51`	`}`
`53`	`52`
`@@ -65,7 +64,7 @@ bool WalletFrame::addWallet(WalletModel *walletModel)`
`65`	`64`	`}`
`66`	`65`
`67`	`66`	`walletStack->addWidget(walletView);`
`68`		`- mapWalletViews[name] = walletView;`
	`67`	`+ mapWalletViews[walletModel] = walletView;`
`69`	`68`
`70`	`69`	`// Ensure a walletView is able to show the main window`
`71`	`70`	`connect(walletView, &WalletView::showNormalIfMinimized, [this]{`
`@@ -77,32 +76,32 @@ bool WalletFrame::addWallet(WalletModel *walletModel)`
`77`	`76`	`return true;`
`78`	`77`	`}`
`79`	`78`
`80`		`-bool WalletFrame::setCurrentWallet(const QString& name)`
	`79`	`+bool WalletFrame::setCurrentWallet(WalletModel* wallet_model)`
`81`	`80`	`{`
`82`		`- if (mapWalletViews.count(name) == 0)`
	`81`	`+ if (mapWalletViews.count(wallet_model) == 0)`
`83`	`82`	`return false;`
`84`	`83`
`85`		`- WalletView *walletView = mapWalletViews.value(name);`
	`84`	`+ WalletView *walletView = mapWalletViews.value(wallet_model);`
`86`	`85`	`walletStack->setCurrentWidget(walletView);`
`87`	`86`	`assert(walletView);`
`88`	`87`	`walletView->updateEncryptionStatus();`
`89`	`88`	`return true;`
`90`	`89`	`}`
`91`	`90`
`92`		`-bool WalletFrame::removeWallet(const QString &name)`
	`91`	`+bool WalletFrame::removeWallet(WalletModel* wallet_model)`
`93`	`92`	`{`
`94`		`- if (mapWalletViews.count(name) == 0)`
	`93`	`+ if (mapWalletViews.count(wallet_model) == 0)`
`95`	`94`	`return false;`
`96`	`95`
`97`		`- WalletView *walletView = mapWalletViews.take(name);`
	`96`	`+ WalletView *walletView = mapWalletViews.take(wallet_model);`
`98`	`97`	`walletStack->removeWidget(walletView);`
`99`	`98`	`delete walletView;`
`100`	`99`	`return true;`
`101`	`100`	`}`
`102`	`101`
`103`	`102`	`void WalletFrame::removeAllWallets()`
`104`	`103`	`{`
`105`		`- QMap<QString, WalletView*>::const_iterator i;`
	`104`	`+ QMap<WalletModel, WalletView>::const_iterator i;`
`106`	`105`	`for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i)`
`107`	`106`	`walletStack->removeWidget(i.value());`
`108`	`107`	`mapWalletViews.clear();`
`@@ -120,35 +119,35 @@ bool WalletFrame::handlePaymentRequest(const SendCoinsRecipient &recipient)`
`120`	`119`	`void WalletFrame::showOutOfSyncWarning(bool fShow)`
`121`	`120`	`{`
`122`	`121`	`bOutOfSync = fShow;`
`123`		`- QMap<QString, WalletView*>::const_iterator i;`
	`122`	`+ QMap<WalletModel, WalletView>::const_iterator i;`
`124`	`123`	`for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i)`
`125`	`124`	`i.value()->showOutOfSyncWarning(fShow);`
`126`	`125`	`}`
`127`	`126`
`128`	`127`	`void WalletFrame::gotoOverviewPage()`
`129`	`128`	`{`
`130`		`- QMap<QString, WalletView*>::const_iterator i;`
	`129`	`+ QMap<WalletModel, WalletView>::const_iterator i;`
`131`	`130`	`for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i)`
`132`	`131`	`i.value()->gotoOverviewPage();`
`133`	`132`	`}`
`134`	`133`
`135`	`134`	`void WalletFrame::gotoHistoryPage()`
`136`	`135`	`{`
`137`		`- QMap<QString, WalletView*>::const_iterator i;`
	`136`	`+ QMap<WalletModel, WalletView>::const_iterator i;`
`138`	`137`	`for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i)`
`139`	`138`	`i.value()->gotoHistoryPage();`
`140`	`139`	`}`
`141`	`140`
`142`	`141`	`void WalletFrame::gotoReceiveCoinsPage()`
`143`	`142`	`{`
`144`		`- QMap<QString, WalletView*>::const_iterator i;`
	`143`	`+ QMap<WalletModel, WalletView>::const_iterator i;`
`145`	`144`	`for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i)`
`146`	`145`	`i.value()->gotoReceiveCoinsPage();`
`147`	`146`	`}`
`148`	`147`
`149`	`148`	`void WalletFrame::gotoSendCoinsPage(QString addr)`
`150`	`149`	`{`
`151`		`- QMap<QString, WalletView*>::const_iterator i;`
	`150`	`+ QMap<WalletModel, WalletView>::const_iterator i;`
`152`	`151`	`for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i)`
`153`	`152`	`i.value()->gotoSendCoinsPage(addr);`
`154`	`153`	`}`