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/qt/walletmodel.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/qt/walletmodel.h')
| -rw-r--r-- | src/qt/walletmodel.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h index 44a1912ecc..642021df1a 100644 --- a/src/qt/walletmodel.h +++ b/src/qt/walletmodel.h @@ -75,8 +75,7 @@ public: AmountWithFeeExceedsBalance, DuplicateAddress, TransactionCreationFailed, // Error returned when wallet is still locked - TransactionCommitFailed, - Aborted + TransactionCommitFailed }; enum EncryptionStatus @@ -103,7 +102,7 @@ public: // Return status record for SendCoins, contains error id + information struct SendCoinsReturn { - SendCoinsReturn(StatusCode status = Aborted): + SendCoinsReturn(StatusCode status = OK): status(status) {} StatusCode status; }; |