aboutsummaryrefslogtreecommitdiff
path: root/src/keystore.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2012-05-06 19:40:58 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2012-05-20 10:44:50 +0200
commitab1b288fa7994db5f036e93d5f8ba73372017c40 (patch)
tree6454168811d3f2c011e907770b3ac7cfe8c49495 /src/keystore.cpp
parentfe4a655042f7de31dce120aeed72345579f1b59f (diff)
downloadbitcoin-ab1b288fa7994db5f036e93d5f8ba73372017c40.tar.xz
Convert UI interface to boost::signals2.
- Signals now go directly from the core to WalletModel/ClientModel. - WalletModel subscribes to signals on CWallet: Prepares for multi-wallet support, by no longer assuming an implicit global wallet. - Gets rid of noui.cpp, the few lines that were left are merged into init.cpp - Rename wxXXX message flags to MF_XXX, to make them UI indifferent. - ThreadSafeMessageBox no longer returns the value `4` which was never used, converted to void.
Diffstat (limited to 'src/keystore.cpp')
-rw-r--r--src/keystore.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/keystore.cpp b/src/keystore.cpp
index 55fba4c372..bdeae30135 100644
--- a/src/keystore.cpp
+++ b/src/keystore.cpp
@@ -5,7 +5,6 @@
#include "keystore.h"
#include "script.h"
-#include "ui_interface.h"
bool CKeyStore::GetPubKey(const CBitcoinAddress &address, std::vector<unsigned char> &vchPubKeyOut) const
{
@@ -84,7 +83,7 @@ bool CCryptoKeyStore::Lock()
vMasterKey.clear();
}
- NotifyKeyStoreStatusChanged(this);
+ NotifyStatusChanged(this);
return true;
}
@@ -114,7 +113,7 @@ bool CCryptoKeyStore::Unlock(const CKeyingMaterial& vMasterKeyIn)
}
vMasterKey = vMasterKeyIn;
}
- NotifyKeyStoreStatusChanged(this);
+ NotifyStatusChanged(this);
return true;
}