diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-17 14:08:07 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-21 07:46:33 +0200 |
| commit | ad26dc9c314406034cef7684d4c9f9ec31d6347e (patch) | |
| tree | 4d0d630b572f44025b1674cb02f44953f44c05e6 /src/qt | |
| parent | cd057bfd415815dd4fa219ef213640635d4b6d37 (diff) | |
Revert "Formatting, spelling, comment fixes."
This reverts commit 7a19efe04069d9a1e251cdc94b25184f76d9d901.
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/transactionrecord.h | 13 | ||||
| -rw-r--r-- | src/qt/transactiontablemodel.cpp | 4 | ||||
| -rw-r--r-- | src/qt/walletmodel.cpp | 14 |
3 files changed, 12 insertions, 19 deletions
diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h index d3cfa77d97..e6ff4ca080 100644 --- a/src/qt/transactionrecord.h +++ b/src/qt/transactionrecord.h @@ -19,17 +19,10 @@ class TransactionStatus { public: TransactionStatus(): - countsForBalance(false), - sortKey(""), - matures_in(0), - status(Offline), - hasConflicting(false), - depth(0), - open_for(0), - cur_num_blocks(-1), + countsForBalance(false), sortKey(""), + matures_in(0), status(Offline), hasConflicting(false), depth(0), open_for(0), cur_num_blocks(-1), cur_num_conflicts(-1) - { - } + { } enum Status { Confirmed, /**< Have 6 or more confirmations (normal tx) or fully mature (mined tx) **/ diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp index cf4c90c7ff..6156a2ecd2 100644 --- a/src/qt/transactiontablemodel.cpp +++ b/src/qt/transactiontablemodel.cpp @@ -546,9 +546,9 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const case Qt::TextAlignmentRole: return column_alignments[index.column()]; case Qt::BackgroundColorRole: - if (rec->status.hasConflicting) + if (rec->status.hasConflicting) return COLOR_HASCONFLICTING_BG; - break; + break; case Qt::ForegroundRole: if (rec->status.hasConflicting) return COLOR_HASCONFLICTING; diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 7df8812ccd..3cbf35436c 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -164,13 +164,13 @@ void WalletModel::checkBalanceChanged() void WalletModel::updateTransaction(const QString &hash, int status) { - if (status == CT_GOT_CONFLICT) - { - emit message(tr("Conflict Received"), - tr("WARNING: Transaction may never be confirmed. Its input was seen being spent by another transaction on the network. Wait for confirmation!"), - CClientUIInterface::MSG_WARNING); - return; - } + if (status == CT_GOT_CONFLICT) + { + emit message(tr("Conflict Received"), + tr("WARNING: Transaction may never be confirmed. Its input was seen being spent by another transaction on the network. Wait for confirmation!"), + CClientUIInterface::MSG_WARNING); + return; + } if(transactionTableModel) transactionTableModel->updateTransaction(hash, status); |