Page MenuHomePhabricator
Files F13115510

D1669.diff
No OneTemporary
Actions

D1669.diff
View Options

diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp
--- a/src/qt/bitcoinunits.cpp
+++ b/src/qt/bitcoinunits.cpp
@@ -91,7 +91,7 @@
// Refuse to format invalid unit
return QString();
}
- qint64 n = (qint64)nIn.GetSatoshis();
+ qint64 n = qint64(nIn / SATOSHI);
qint64 coin = factor(unit);
int num_decimals = decimals(unit);
qint64 n_abs = (n > 0 ? n : -n);
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -640,16 +640,14 @@
// how many satoshis the estimated fee can vary per byte we guess wrong
double dFeeVary;
if (payTxFee.GetFeePerK() > Amount(0)) {
- dFeeVary = (double)std::max(CWallet::GetRequiredFee(1000),
- payTxFee.GetFeePerK())
- .GetSatoshis() /
- 1000;
+ dFeeVary =
+ std::max(CWallet::GetRequiredFee(1000), payTxFee.GetFeePerK()) /
+ (1000 * SATOSHI);
} else {
- dFeeVary = (double)std::max(
- CWallet::GetRequiredFee(1000),
- mempool.estimateSmartFee(nTxConfirmTarget).GetFeePerK())
- .GetSatoshis() /
- 1000;
+ dFeeVary =
+ std::max(CWallet::GetRequiredFee(1000),
+ mempool.estimateSmartFee(nTxConfirmTarget).GetFeePerK()) /
+ (1000 * SATOSHI);
}
QString toolTip4 =
tr("Can vary +/- %1 satoshi(s) per input.").arg(dFeeVary);
@@ -779,8 +777,7 @@
// padding so that sorting works correctly
itemOutput->setData(
COLUMN_AMOUNT, Qt::UserRole,
- QVariant(
- (qlonglong)out.tx->tx->vout[out.i].nValue.GetSatoshis()));
+ QVariant(qlonglong(out.tx->tx->vout[out.i].nValue / SATOSHI)));
// date
itemOutput->setText(COLUMN_DATE,
@@ -826,7 +823,7 @@
itemWalletAddress->setText(
COLUMN_AMOUNT, BitcoinUnits::format(nDisplayUnit, nSum));
itemWalletAddress->setData(COLUMN_AMOUNT, Qt::UserRole,
- QVariant((qlonglong)nSum.GetSatoshis()));
+ QVariant(qlonglong(nSum / SATOSHI)));
}
}
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -889,8 +889,8 @@
qWarning() << QString("PaymentServer::%1: Payment request amount out "
"of allowed range (%2, allowed 0 - %3).")
.arg(__func__)
- .arg(requestAmount.GetSatoshis())
- .arg(MAX_MONEY.GetSatoshis());
+ .arg(requestAmount / SATOSHI)
+ .arg(MAX_MONEY / SATOSHI);
}
return fVerified;
}
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -125,14 +125,14 @@
settings.setValue("nSmartFeeSliderPosition", 0);
if (!settings.contains("nTransactionFee"))
settings.setValue("nTransactionFee",
- (qint64)DEFAULT_TRANSACTION_FEE.GetSatoshis());
+ qint64(DEFAULT_TRANSACTION_FEE / SATOSHI));
if (!settings.contains("fPayOnlyMinFee"))
settings.setValue("fPayOnlyMinFee", false);
ui->groupFee->setId(ui->radioSmartFee, 0);
ui->groupFee->setId(ui->radioCustomFee, 1);
ui->groupFee
->button(
- (int)std::max(0, std::min(1, settings.value("nFeeRadio").toInt())))
+ std::max<int>(0, std::min(1, settings.value("nFeeRadio").toInt())))
->setChecked(true);
ui->groupCustomFee->setId(ui->radioCustomPerKilobyte, 0);
ui->groupCustomFee->setId(ui->radioCustomAtLeast, 1);
@@ -245,7 +245,7 @@
settings.setValue("nCustomFeeRadio", ui->groupCustomFee->checkedId());
settings.setValue("nSmartFeeSliderPosition", ui->sliderSmartFee->value());
settings.setValue("nTransactionFee",
- (qint64)ui->customFee->value().GetSatoshis());
+ qint64(ui->customFee->value() / SATOSHI));
settings.setValue("fPayOnlyMinFee", ui->checkBoxMinimumFee->isChecked());
delete ui;
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
--- a/src/qt/transactiontablemodel.cpp
+++ b/src/qt/transactiontablemodel.cpp
@@ -564,7 +564,7 @@
case ToAddress:
return formatTxToAddress(rec, true);
case Amount:
- return qint64((rec->credit + rec->debit).GetSatoshis());
+ return qint64((rec->credit + rec->debit) / SATOSHI);
}
break;
case Qt::ToolTipRole:
@@ -606,7 +606,7 @@
return walletModel->getAddressTableModel()->labelForAddress(
QString::fromStdString(rec->address));
case AmountRole:
- return qint64((rec->credit + rec->debit).GetSatoshis());
+ return qint64((rec->credit + rec->debit) / SATOSHI);
case TxIDRole:
return rec->getTxID();
case TxHashRole:

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 1, 11:16 (19 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5187554
Default Alt Text
D1669.diff (5 KB)

Event Timeline