diff options
| author | Jeff Garzik <jgarzik@bitpay.com> | 2013-06-10 06:17:38 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@bitpay.com> | 2013-06-10 06:17:38 -0700 |
| commit | f59530ce6eb5a889e6eb750024ddb20e7b0df9d7 (patch) | |
| tree | e224b540dce7890cbf54f43215a05213bd5cb494 /src/qt | |
| parent | 8b313c93311813e8697807a701604d182ee83d44 (diff) | |
| parent | 6e68524e95da2bedc21b1d95c4a206b902ab7c22 (diff) | |
| download | bitcoin-f59530ce6eb5a889e6eb750024ddb20e7b0df9d7.tar.xz | |
Merge pull request #2154 from CodeShark/dependencycleanup
Clean up code dependencies
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/transactiondesc.cpp | 4 | ||||
| -rw-r--r-- | src/qt/transactionrecord.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index e4dbf9c0d9..aeef721ce5 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -12,7 +12,7 @@ QString TransactionDesc::FormatTxStatus(const CWalletTx& wtx) { - if (!wtx.IsFinal()) + if (!IsFinalTx(wtx)) { if (wtx.nLockTime < LOCKTIME_THRESHOLD) return tr("Open for %n more block(s)", "", wtx.nLockTime - nBestHeight + 1); @@ -186,7 +186,7 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx) strHTML += "<b>" + tr("Credit") + ":</b> " + BitcoinUnits::formatWithUnit(BitcoinUnits::BTC, nValue) + "<br>"; } - int64 nTxFee = nDebit - wtx.GetValueOut(); + int64 nTxFee = nDebit - GetValueOut(wtx); if (nTxFee > 0) strHTML += "<b>" + tr("Transaction fee") + ":</b> " + BitcoinUnits::formatWithUnit(BitcoinUnits::BTC, -nTxFee) + "<br>"; } diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp index 40a5f735cd..e954508769 100644 --- a/src/qt/transactionrecord.cpp +++ b/src/qt/transactionrecord.cpp @@ -89,7 +89,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet * // // Debit // - int64 nTxFee = nDebit - wtx.GetValueOut(); + int64 nTxFee = nDebit - GetValueOut(wtx); for (unsigned int nOut = 0; nOut < wtx.vout.size(); nOut++) { @@ -162,7 +162,7 @@ void TransactionRecord::updateStatus(const CWalletTx &wtx) status.depth = wtx.GetDepthInMainChain(); status.cur_num_blocks = nBestHeight; - if (!wtx.IsFinal()) + if (!IsFinalTx(wtx)) { if (wtx.nLockTime < LOCKTIME_THRESHOLD) { |