neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt: status WalletModel::Aborted is no longer used

Browse Source 
Aborting transactions happens in the GUI now as it should,
not the backend.
This commit is contained in:
Wladimir J. van der Laan 2013-12-16 09:46:55 +01:00
parent ca2c83da50
commit 4a61c39456
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qt/sendcoinsdialog.cpp
View File

@ -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.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; msgParams.second = CClientUIInterface::MSG_ERROR;
break; break;
// OK and Aborted are included to prevent a compiler warning. // included to prevent a compiler warning.
case WalletModel::OK: case WalletModel::OK:
case WalletModel::Aborted:
default: default:
return; return;
} }

5
src/qt/walletmodel.h
View File

@ -75,8 +75,7 @@ public:
AmountWithFeeExceedsBalance, AmountWithFeeExceedsBalance,
DuplicateAddress, DuplicateAddress,
TransactionCreationFailed, // Error returned when wallet is still locked TransactionCreationFailed, // Error returned when wallet is still locked
TransactionCommitFailed, TransactionCommitFailed
Aborted
}; };
enum EncryptionStatus enum EncryptionStatus
@ -103,7 +102,7 @@ public:
// Return status record for SendCoins, contains error id + information // Return status record for SendCoins, contains error id + information
struct SendCoinsReturn struct SendCoinsReturn
{ {
SendCoinsReturn(StatusCode status = Aborted): SendCoinsReturn(StatusCode status = OK):
status(status) {} status(status) {}
StatusCode status; StatusCode status;
}; };