Merge pull request #1161

c8f0cf3 Stagenet

1 files changed, 18 insertions, 18 deletions

diff --git a/src/libwalletqt/WalletManager.cpp b/src/libwalletqt/WalletManager.cpp
index 7985c32e..189c0499 100644
--- a/src/libwalletqt/WalletManager.cpp
+++ b/src/libwalletqt/WalletManager.cpp
@@ -25,7 +25,7 @@ WalletManager *WalletManager::instance()
 }
 
 Wallet *WalletManager::createWallet(const QString &path, const QString &password,
-                                    const QString &language, bool testnet)
+                                    const QString &language, NetworkType::Type nettype)
 {
     QMutexLocker locker(&m_mutex);
     if (m_currentWallet) {
@@ -33,22 +33,22 @@ Wallet *WalletManager::createWallet(const QString &path, const QString &password
         delete m_currentWallet;
     }
     Monero::Wallet * w = m_pimpl->createWallet(path.toStdString(), password.toStdString(),
-                                                  language.toStdString(), testnet);
+                                                  language.toStdString(), static_cast<Monero::NetworkType>(nettype));
     m_currentWallet  = new Wallet(w);
     return m_currentWallet;
 }
 
-Wallet *WalletManager::openWallet(const QString &path, const QString &password, bool testnet)
+Wallet *WalletManager::openWallet(const QString &path, const QString &password, NetworkType::Type nettype)
 {
     QMutexLocker locker(&m_mutex);
     if (m_currentWallet) {
         qDebug() << "Closing open m_currentWallet" << m_currentWallet;
         delete m_currentWallet;
     }
-    qDebug("%s: opening wallet at %s, testnet = %d ",
-           __PRETTY_FUNCTION__, qPrintable(path), testnet);
+    qDebug("%s: opening wallet at %s, nettype = %d ",
+           __PRETTY_FUNCTION__, qPrintable(path), nettype);
 
-    Monero::Wallet * w =  m_pimpl->openWallet(path.toStdString(), password.toStdString(), testnet);
+    Monero::Wallet * w =  m_pimpl->openWallet(path.toStdString(), password.toStdString(), static_cast<Monero::NetworkType>(nettype));
     qDebug("%s: opened wallet: %s, status: %d", __PRETTY_FUNCTION__, w->address(0, 0).c_str(), w->status());
     m_currentWallet  = new Wallet(w);
 
@@ -60,10 +60,10 @@ Wallet *WalletManager::openWallet(const QString &path, const QString &password,
     return m_currentWallet;
 }
 
-void WalletManager::openWalletAsync(const QString &path, const QString &password, bool testnet)
+void WalletManager::openWalletAsync(const QString &path, const QString &password, NetworkType::Type nettype)
 {
     QFuture<Wallet*> future = QtConcurrent::run(this, &WalletManager::openWallet,
-                                        path, password, testnet);
+                                        path, password, nettype);
     QFutureWatcher<Wallet*> * watcher = new QFutureWatcher<Wallet*>();
 
     connect(watcher, &QFutureWatcher<Wallet*>::finished,
@@ -76,19 +76,19 @@ void WalletManager::openWalletAsync(const QString &path, const QString &password
 }
 
 
-Wallet *WalletManager::recoveryWallet(const QString &path, const QString &memo, bool testnet, quint64 restoreHeight)
+Wallet *WalletManager::recoveryWallet(const QString &path, const QString &memo, NetworkType::Type nettype, quint64 restoreHeight)
 {
     QMutexLocker locker(&m_mutex);
     if (m_currentWallet) {
         qDebug() << "Closing open m_currentWallet" << m_currentWallet;
         delete m_currentWallet;
     }
-    Monero::Wallet * w = m_pimpl->recoveryWallet(path.toStdString(), memo.toStdString(), testnet, restoreHeight);
+    Monero::Wallet * w = m_pimpl->recoveryWallet(path.toStdString(), memo.toStdString(), static_cast<Monero::NetworkType>(nettype), restoreHeight);
     m_currentWallet = new Wallet(w);
     return m_currentWallet;
 }
 
-Wallet *WalletManager::createWalletFromKeys(const QString &path, const QString &language, bool testnet,
+Wallet *WalletManager::createWalletFromKeys(const QString &path, const QString &language, NetworkType::Type nettype,
                                             const QString &address, const QString &viewkey, const QString &spendkey,
                                             quint64 restoreHeight)
 {
@@ -98,7 +98,7 @@ Wallet *WalletManager::createWalletFromKeys(const QString &path, const QString &
         delete m_currentWallet;
         m_currentWallet = NULL;
     }
-    Monero::Wallet * w = m_pimpl->createWalletFromKeys(path.toStdString(), language.toStdString(), testnet, restoreHeight,
+    Monero::Wallet * w = m_pimpl->createWalletFromKeys(path.toStdString(), language.toStdString(), static_cast<Monero::NetworkType>(nettype), restoreHeight,
                                                        address.toStdString(), viewkey.toStdString(), spendkey.toStdString());
     m_currentWallet = new Wallet(w);
     return m_currentWallet;
@@ -196,24 +196,24 @@ bool WalletManager::paymentIdValid(const QString &payment_id) const
     return Monero::Wallet::paymentIdValid(payment_id.toStdString());
 }
 
-bool WalletManager::addressValid(const QString &address, bool testnet) const
+bool WalletManager::addressValid(const QString &address, NetworkType::Type nettype) const
 {
-    return Monero::Wallet::addressValid(address.toStdString(), testnet);
+    return Monero::Wallet::addressValid(address.toStdString(), static_cast<Monero::NetworkType>(nettype));
 }
 
-bool WalletManager::keyValid(const QString &key, const QString &address, bool isViewKey,  bool testnet) const
+bool WalletManager::keyValid(const QString &key, const QString &address, bool isViewKey,  NetworkType::Type nettype) const
 {
     std::string error;
-    if(!Monero::Wallet::keyValid(key.toStdString(), address.toStdString(), isViewKey, testnet, error)){
+    if(!Monero::Wallet::keyValid(key.toStdString(), address.toStdString(), isViewKey, static_cast<Monero::NetworkType>(nettype), error)){
         qDebug() << QString::fromStdString(error);
         return false;
     }
     return true;
 }
 
-QString WalletManager::paymentIdFromAddress(const QString &address, bool testnet) const
+QString WalletManager::paymentIdFromAddress(const QString &address, NetworkType::Type nettype) const
 {
-    return QString::fromStdString(Monero::Wallet::paymentIdFromAddress(address.toStdString(), testnet));
+    return QString::fromStdString(Monero::Wallet::paymentIdFromAddress(address.toStdString(), static_cast<Monero::NetworkType>(nettype)));
 }
 
 void WalletManager::setDaemonAddress(const QString &address)