diff --git a/src/qt/bitcoinamountfield.cpp b/src/qt/bitcoinamountfield.cpp --- a/src/qt/bitcoinamountfield.cpp +++ b/src/qt/bitcoinamountfield.cpp @@ -56,7 +56,7 @@ if (valid) { val = qBound(m_min_amount, val, m_max_amount); input = BitcoinUnits::format(currentUnit, val, false, - BitcoinUnits::separatorAlways); + BitcoinUnits::SeparatorStyle::ALWAYS); lineEdit()->setText(input); } } @@ -67,7 +67,7 @@ void setValue(const Amount value) { lineEdit()->setText(BitcoinUnits::format( - currentUnit, value, false, BitcoinUnits::separatorAlways)); + currentUnit, value, false, BitcoinUnits::SeparatorStyle::ALWAYS)); Q_EMIT valueChanged(); } @@ -89,8 +89,9 @@ bool valid = false; Amount val(value(&valid)); currentUnit = unit; - lineEdit()->setPlaceholderText(BitcoinUnits::format( - currentUnit, m_min_amount, false, BitcoinUnits::separatorAlways)); + lineEdit()->setPlaceholderText( + BitcoinUnits::format(currentUnit, m_min_amount, false, + BitcoinUnits::SeparatorStyle::ALWAYS)); if (valid) { setValue(val); } else { @@ -109,7 +110,7 @@ int w = GUIUtil::TextWidth( fm, BitcoinUnits::format(BitcoinUnits::base, BitcoinUnits::maxMoney(), false, - BitcoinUnits::separatorAlways)); + BitcoinUnits::SeparatorStyle::ALWAYS)); // Cursor blinking space. w += 2; diff --git a/src/qt/bitcoinunits.h b/src/qt/bitcoinunits.h --- a/src/qt/bitcoinunits.h +++ b/src/qt/bitcoinunits.h @@ -41,7 +41,7 @@ */ enum Unit { base, sub }; - enum SeparatorStyle { separatorNever, separatorStandard, separatorAlways }; + enum class SeparatorStyle { NEVER, STANDARD, ALWAYS }; //! @name Static API //! Unit conversion and formatting @@ -63,16 +63,16 @@ static int decimals(int unit); //! Format as string static QString format(int unit, const Amount amount, bool plussign = false, - SeparatorStyle separators = separatorStandard, + SeparatorStyle separators = SeparatorStyle::STANDARD, bool justify = false); //! Format as string (with unit) static QString formatWithUnit(int unit, const Amount amount, bool plussign = false, - SeparatorStyle separators = separatorStandard); + SeparatorStyle separators = SeparatorStyle::STANDARD); //! Format as HTML string (with unit) static QString formatHtmlWithUnit(int unit, const Amount amount, bool plussign = false, - SeparatorStyle separators = separatorStandard); + SeparatorStyle separators = SeparatorStyle::STANDARD); //! Format as string (with unit) of fixed length to preserve privacy, if it //! is set. static QString formatWithPrivacy(int unit, const Amount &amount, diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp --- a/src/qt/bitcoinunits.cpp +++ b/src/qt/bitcoinunits.cpp @@ -127,8 +127,8 @@ // can't be confused with the decimal marker. QChar thin_sp(THIN_SP_CP); int q_size = quotient_str.size(); - if (separators == separatorAlways || - (separators == separatorStandard && q_size > 4)) { + if (separators == SeparatorStyle::ALWAYS || + (separators == SeparatorStyle::STANDARD && q_size > 4)) { for (int i = 3; i < q_size; i += 3) { quotient_str.insert(q_size - i, thin_sp); } diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -206,10 +206,10 @@ int paramCount = 0; if (info.amount != Amount::zero()) { - ret += - QString("?amount=%1") - .arg(BitcoinUnits::format(BitcoinUnits::base, info.amount, - false, BitcoinUnits::separatorNever)); + ret += QString("?amount=%1") + .arg(BitcoinUnits::format( + BitcoinUnits::base, info.amount, false, + BitcoinUnits::SeparatorStyle::NEVER)); paramCount++; } diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -92,7 +92,7 @@ } painter->setPen(foreground); QString amountText = BitcoinUnits::formatWithUnit( - unit, amount, true, BitcoinUnits::separatorAlways); + unit, amount, true, BitcoinUnits::SeparatorStyle::ALWAYS); if (!confirmed) { amountText = QString("[") + amountText + QString("]"); } @@ -188,64 +188,65 @@ if (walletModel->wallet().privateKeysDisabled()) { ui->labelBalance->setText(BitcoinUnits::formatWithPrivacy( unit, balances.watch_only_balance, - BitcoinUnits::separatorAlways, m_privacy)); + BitcoinUnits::SeparatorStyle::ALWAYS, m_privacy)); ui->labelUnconfirmed->setText(BitcoinUnits::formatWithPrivacy( unit, balances.unconfirmed_watch_only_balance, - BitcoinUnits::separatorAlways, m_privacy)); + BitcoinUnits::SeparatorStyle::ALWAYS, m_privacy)); ui->labelImmature->setText(BitcoinUnits::formatWithPrivacy( unit, balances.immature_watch_only_balance, - BitcoinUnits::separatorAlways, m_privacy)); + BitcoinUnits::SeparatorStyle::ALWAYS, m_privacy)); ui->labelTotal->setText(BitcoinUnits::formatWithPrivacy( unit, balances.watch_only_balance + balances.unconfirmed_watch_only_balance + balances.immature_watch_only_balance, - BitcoinUnits::separatorAlways, m_privacy)); + BitcoinUnits::SeparatorStyle::ALWAYS, m_privacy)); } else { ui->labelBalance->setText(BitcoinUnits::formatWithPrivacy( - unit, balances.balance, BitcoinUnits::separatorAlways, + unit, balances.balance, BitcoinUnits::SeparatorStyle::ALWAYS, m_privacy)); ui->labelUnconfirmed->setText(BitcoinUnits::formatWithPrivacy( unit, balances.unconfirmed_balance, - BitcoinUnits::separatorAlways, m_privacy)); + BitcoinUnits::SeparatorStyle::ALWAYS, m_privacy)); ui->labelImmature->setText(BitcoinUnits::formatWithPrivacy( - unit, balances.immature_balance, BitcoinUnits::separatorAlways, - m_privacy)); + unit, balances.immature_balance, + BitcoinUnits::SeparatorStyle::ALWAYS, m_privacy)); ui->labelTotal->setText(BitcoinUnits::formatWithPrivacy( unit, balances.balance + balances.unconfirmed_balance + balances.immature_balance, - BitcoinUnits::separatorAlways, m_privacy)); + BitcoinUnits::SeparatorStyle::ALWAYS, m_privacy)); ui->labelWatchAvailable->setText(BitcoinUnits::formatWithPrivacy( unit, balances.watch_only_balance, - BitcoinUnits::separatorAlways, m_privacy)); + BitcoinUnits::SeparatorStyle::ALWAYS, m_privacy)); ui->labelWatchPending->setText(BitcoinUnits::formatWithPrivacy( unit, balances.unconfirmed_watch_only_balance, - BitcoinUnits::separatorAlways, m_privacy)); + BitcoinUnits::SeparatorStyle::ALWAYS, m_privacy)); ui->labelWatchImmature->setText(BitcoinUnits::formatWithPrivacy( unit, balances.immature_watch_only_balance, - BitcoinUnits::separatorAlways, m_privacy)); + BitcoinUnits::SeparatorStyle::ALWAYS, m_privacy)); ui->labelWatchTotal->setText(BitcoinUnits::formatWithPrivacy( unit, balances.watch_only_balance + balances.unconfirmed_watch_only_balance + balances.immature_watch_only_balance, - BitcoinUnits::separatorAlways, m_privacy)); + BitcoinUnits::SeparatorStyle::ALWAYS, m_privacy)); } } else { ui->labelBalance->setText(BitcoinUnits::formatWithPrivacy( - unit, balances.balance, BitcoinUnits::separatorAlways, m_privacy)); - ui->labelUnconfirmed->setText(BitcoinUnits::formatWithPrivacy( - unit, balances.unconfirmed_balance, BitcoinUnits::separatorAlways, + unit, balances.balance, BitcoinUnits::SeparatorStyle::ALWAYS, m_privacy)); + ui->labelUnconfirmed->setText(BitcoinUnits::formatWithPrivacy( + unit, balances.unconfirmed_balance, + BitcoinUnits::SeparatorStyle::ALWAYS, m_privacy)); ui->labelImmature->setText(BitcoinUnits::formatWithPrivacy( - unit, balances.immature_balance, BitcoinUnits::separatorAlways, - m_privacy)); + unit, balances.immature_balance, + BitcoinUnits::SeparatorStyle::ALWAYS, m_privacy)); ui->labelTotal->setText(BitcoinUnits::formatWithPrivacy( unit, balances.balance + balances.unconfirmed_balance + balances.immature_balance, - BitcoinUnits::separatorAlways, m_privacy)); + BitcoinUnits::SeparatorStyle::ALWAYS, m_privacy)); } // only show immature (newly mined) balance if it's non-zero, so as not to diff --git a/src/qt/recentrequeststablemodel.cpp b/src/qt/recentrequeststablemodel.cpp --- a/src/qt/recentrequeststablemodel.cpp +++ b/src/qt/recentrequeststablemodel.cpp @@ -78,7 +78,7 @@ return BitcoinUnits::format( walletModel->getOptionsModel()->getDisplayUnit(), rec->recipient.amount, false, - BitcoinUnits::separatorNever); + BitcoinUnits::SeparatorStyle::NEVER); } else { return BitcoinUnits::format( walletModel->getOptionsModel()->getDisplayUnit(), diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp --- a/src/qt/test/wallettests.cpp +++ b/src/qt/test/wallettests.cpp @@ -168,7 +168,7 @@ int unit = walletModel.getOptionsModel()->getDisplayUnit(); Amount balance = walletModel.wallet().getBalance(); QString balanceComparison = BitcoinUnits::formatWithUnit( - unit, balance, false, BitcoinUnits::separatorAlways); + unit, balance, false, BitcoinUnits::SeparatorStyle::ALWAYS); QCOMPARE(balanceText, balanceComparison); } @@ -192,7 +192,7 @@ int unit = walletModel.getOptionsModel()->getDisplayUnit(); Amount balance = walletModel.wallet().getBalance(); QString balanceComparison = BitcoinUnits::formatWithUnit( - unit, balance, false, BitcoinUnits::separatorAlways); + unit, balance, false, BitcoinUnits::SeparatorStyle::ALWAYS); QCOMPARE(balanceText, balanceComparison); // Check Request Payment button diff --git a/src/qt/transactiontablemodel.h b/src/qt/transactiontablemodel.h --- a/src/qt/transactiontablemodel.h +++ b/src/qt/transactiontablemodel.h @@ -112,7 +112,7 @@ QString formatTxAmount(const TransactionRecord *wtx, bool showUnconfirmed = true, BitcoinUnits::SeparatorStyle separators = - BitcoinUnits::separatorStandard) const; + BitcoinUnits::SeparatorStyle::STANDARD) const; QString formatTooltip(const TransactionRecord *rec) const; QVariant txStatusDecoration(const TransactionRecord *wtx) const; QVariant txWatchonlyDecoration(const TransactionRecord *wtx) const; diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp --- a/src/qt/transactiontablemodel.cpp +++ b/src/qt/transactiontablemodel.cpp @@ -528,7 +528,7 @@ return formatTxToAddress(rec, false); case Amount: return formatTxAmount(rec, true, - BitcoinUnits::separatorAlways); + BitcoinUnits::SeparatorStyle::ALWAYS); } break; case Qt::EditRole: @@ -622,8 +622,8 @@ details.append(QString::fromStdString(rec->address)); details.append(" "); } - details.append( - formatTxAmount(rec, false, BitcoinUnits::separatorNever)); + details.append(formatTxAmount(rec, false, + BitcoinUnits::SeparatorStyle::NEVER)); return details; } case ConfirmedRole: @@ -632,7 +632,8 @@ rec->status.status == TransactionStatus::Status::Confirmed; case FormattedAmountRole: // Used for copy/export, so don't include separators - return formatTxAmount(rec, false, BitcoinUnits::separatorNever); + return formatTxAmount(rec, false, + BitcoinUnits::SeparatorStyle::NEVER); case StatusRole: return rec->status.status; }