aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2013-12-16 09:46:55 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2013-12-16 09:46:55 +0100
commit4a61c39456b553f7de8ccc019276d40aff10dac0 (patch)
tree9cd224195e4cc38973792da6aa12117e59070d13
parentca2c83da50a2665f238432834c0246f52b5e234c (diff)
qt: status WalletModel::Aborted is no longer used
Aborting transactions happens in the GUI now as it should, not the backend.
-rw-r--r--src/qt/sendcoinsdialog.cpp3
-rw-r--r--src/qt/walletmodel.h5
2 files changed, 3 insertions, 5 deletions
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 03cf7f51ea..4bf5c3c479 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 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;
};