Merge pull request #3019

dcc040a WalletManager: instantiable QML type (xiphon)

2 files changed, 3 insertions, 15 deletions

diff --git a/src/libwalletqt/WalletManager.cpp b/src/libwalletqt/WalletManager.cpp
index bae16c46..6ce771ae 100644
--- a/src/libwalletqt/WalletManager.cpp
+++ b/src/libwalletqt/WalletManager.cpp
@@ -85,17 +85,6 @@ private:
   PassphraseHelper m_phelper;
 };
 
-WalletManager * WalletManager::m_instance = nullptr;
-
-WalletManager *WalletManager::instance()
-{
-    if (!m_instance) {
-        m_instance = new WalletManager;
-    }
-
-    return m_instance;
-}
-
 Wallet *WalletManager::createWallet(const QString &path, const QString &password,
                                     const QString &language, NetworkType::Type nettype, quint64 kdfRounds)
 {
diff --git a/src/libwalletqt/WalletManager.h b/src/libwalletqt/WalletManager.h
index 013846fa..5a901ba3 100644
--- a/src/libwalletqt/WalletManager.h
+++ b/src/libwalletqt/WalletManager.h
@@ -51,6 +51,9 @@ class WalletManager : public QObject, public PassprasePrompter
     Q_PROPERTY(bool connected READ connected)
 
 public:
+    explicit WalletManager(QObject *parent = 0);
+    ~WalletManager();
+
     enum LogLevel {
         LogLevel_Silent = Monero::WalletManagerFactory::LogLevel_Silent,
         LogLevel_0 = Monero::WalletManagerFactory::LogLevel_0,
@@ -62,7 +65,6 @@ public:
         LogLevel_Max = Monero::WalletManagerFactory::LogLevel_Max,
     };
 
-    static WalletManager * instance();
     // wizard: createWallet path;
     Q_INVOKABLE Wallet * createWallet(const QString &path, const QString &password,
                                       const QString &language, NetworkType::Type nettype = NetworkType::MAINNET, quint64 kdfRounds = 1);
@@ -208,9 +210,6 @@ public slots:
 private:
     friend class WalletPassphraseListenerImpl;
 
-    explicit WalletManager(QObject *parent = 0);
-    ~WalletManager();
-
     bool isMining() const;
 
     static WalletManager * m_instance;