Remove unused member wallet in UnlockContext inner class

bwang22 · Oct 8, 2017 · 9bee2ca · 9bee2ca
1 parent bc63f24
commit 9bee2ca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
@@ -558,13 +558,11 @@ WalletModel::UnlockContext WalletModel::requestUnlock(bool relock)
     // If wallet is still locked, unlock was failed or cancelled, mark context as invalid
     bool valid = getEncryptionStatus() != Locked;
 
-    return UnlockContext(this, valid, relock);
+    return UnlockContext(valid, relock);
     //    return UnlockContext(this, valid, was_locked && !isAnonymizeOnlyUnlocked());
 }
 
-WalletModel::UnlockContext::UnlockContext(WalletModel* wallet, bool valid, bool relock) : wallet(wallet),
-                                                                                          valid(valid),
-                                                                                          relock(relock)
+WalletModel::UnlockContext::UnlockContext(bool valid, bool relock) : valid(valid), relock(relock)
 {
 }
 

diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
@@ -173,7 +173,7 @@ class WalletModel : public QObject
     class UnlockContext
     {
     public:
-        UnlockContext(WalletModel* wallet, bool valid, bool relock);
+        UnlockContext(bool valid, bool relock);
         ~UnlockContext();
 
         bool isValid() const { return valid; }
@@ -187,7 +187,6 @@ class WalletModel : public QObject
         }
 
     private:
-        WalletModel* wallet;
         bool valid;
         mutable bool relock; // mutable, as it can be set to false by copying