diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-17 14:09:46 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-21 07:46:33 +0200 |
| commit | 3015e0bca6bc2cb8beb747873fdf7b80e74d679f (patch) | |
| tree | a66ed0fe4911a3bc3244f629f8871b286b6f0a35 /src/qt/transactionrecord.h | |
| parent | 39d3f2cb40a539fff1daba3d76a6c59e932d0f0a (diff) | |
| download | bitcoin-3015e0bca6bc2cb8beb747873fdf7b80e74d679f.tar.xz | |
Revert "UI to alert of respend attempt affecting wallet."
This reverts commit ada5a067c75f19a724cc054286ecf2254e5dbe8f.
Conflicts:
src/qt/guiconstants.h
src/wallet.h
Diffstat (limited to 'src/qt/transactionrecord.h')
| -rw-r--r-- | src/qt/transactionrecord.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h index e6ff4ca080..626b7654c6 100644 --- a/src/qt/transactionrecord.h +++ b/src/qt/transactionrecord.h @@ -20,8 +20,7 @@ class TransactionStatus public: TransactionStatus(): countsForBalance(false), sortKey(""), - matures_in(0), status(Offline), hasConflicting(false), depth(0), open_for(0), cur_num_blocks(-1), - cur_num_conflicts(-1) + matures_in(0), status(Offline), depth(0), open_for(0), cur_num_blocks(-1) { } enum Status { @@ -52,10 +51,6 @@ public: /** @name Reported status @{*/ Status status; - - // Has conflicting transactions spending same prevout - bool hasConflicting; - qint64 depth; qint64 open_for; /**< Timestamp if status==OpenUntilDate, otherwise number of additional blocks that need to be mined before @@ -64,10 +59,6 @@ public: /** Current number of blocks (to know whether cached status is still valid) */ int cur_num_blocks; - - /** Number of conflicts received into wallet as of last status update */ - int64_t cur_num_conflicts; - }; /** UI model for a transaction. A core transaction can be represented by multiple UI transactions if it has @@ -145,7 +136,7 @@ public: /** Return whether a status update is needed. */ - bool statusUpdateNeeded(int64_t nConflictsReceived); + bool statusUpdateNeeded(); }; #endif // TRANSACTIONRECORD_H |