diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-12-18 08:56:21 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-12-18 08:56:37 +0100 |
| commit | 57fdd68aaccbc845e2efca3a7b535832132fcf43 (patch) | |
| tree | d53e724b8060c6776ddf81f6afce08dc0128ef72 /src/wallet.h | |
| parent | 03d9dd47f67923571bd2f11574de8b4d8d7fc75d (diff) | |
| parent | 4a61c39456b553f7de8ccc019276d40aff10dac0 (diff) | |
| download | bitcoin-57fdd68aaccbc845e2efca3a7b535832132fcf43.tar.xz | |
Merge pull request #3415
4a61c39 qt: status WalletModel::Aborted is no longer used (Wladimir J. van der Laan)
ca2c83d Remove unused ThreadSafeAskFee from ui_interface (Wladimir J. van der Laan)
37e67d3 Remove unused ThreadSafeHandleURI from ui_interface (Wladimir J. van der Laan)
Diffstat (limited to 'src/wallet.h')
| -rw-r--r-- | src/wallet.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet.h b/src/wallet.h index 90209122fd..8e879c5e1a 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -217,8 +217,8 @@ public: bool CreateTransaction(CScript scriptPubKey, int64_t nValue, CWalletTx& wtxNew, CReserveKey& reservekey, int64_t& nFeeRet, std::string& strFailReason, const CCoinControl *coinControl = NULL); bool CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey); - std::string SendMoney(CScript scriptPubKey, int64_t nValue, CWalletTx& wtxNew, bool fAskFee=false); - std::string SendMoneyToDestination(const CTxDestination &address, int64_t nValue, CWalletTx& wtxNew, bool fAskFee=false); + std::string SendMoney(CScript scriptPubKey, int64_t nValue, CWalletTx& wtxNew); + std::string SendMoneyToDestination(const CTxDestination &address, int64_t nValue, CWalletTx& wtxNew); bool NewKeyPool(); bool TopUpKeyPool(unsigned int kpSize = 0); |