diff options
| author | Wladimir J. van der Laan <[email protected]> | 2013-12-16 09:46:55 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2013-12-16 09:46:55 +0100 |
| commit | 4a61c39456b553f7de8ccc019276d40aff10dac0 (patch) | |
| tree | 9cd224195e4cc38973792da6aa12117e59070d13 /src | |
| parent | Remove unused ThreadSafeAskFee from ui_interface (diff) | |
| download | discoin-4a61c39456b553f7de8ccc019276d40aff10dac0.tar.xz discoin-4a61c39456b553f7de8ccc019276d40aff10dac0.zip | |
qt: status WalletModel::Aborted is no longer used
Aborting transactions happens in the GUI now as it should,
not the backend.
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/sendcoinsdialog.cpp | 3 | ||||
| -rw-r--r-- | src/qt/walletmodel.h | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 03cf7f51e..4bf5c3c47 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -452,9 +452,8 @@ void SendCoinsDialog::processSendCoinsReturn(const WalletModel::SendCoinsReturn msgParams.first = tr("The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here."); msgParams.second = CClientUIInterface::MSG_ERROR; break; - // OK and Aborted are included to prevent a compiler warning. + // included to prevent a compiler warning. case WalletModel::OK: - case WalletModel::Aborted: default: return; } diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h index 44a1912ec..642021df1 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; }; |