Skip to content

Commit f7d70c6

Browse files
roybadamiroybadami
committed
Remove unused fAlign argument from BitcoinUnits::format and friends
1 parent 96df327 commit f7d70c6

File tree

5 files changed

+19
-18
lines changed

5 files changed

+19
-18
lines changed

‎src/qt/bitcoinunits.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ int BitcoinUnits::decimals(int unit)
111111
}
112112
}
113113

114-
QString BitcoinUnits::format(int unit, qint64 n, bool fPlus, SeparatorStyle separators, bool fAlign)
114+
QString BitcoinUnits::format(int unit, qint64 n, bool fPlus, SeparatorStyle separators)
115115
{
116116
// Note: not using straight sprintf here because we do NOT want
117117
// localized number formatting.
@@ -147,9 +147,10 @@ QString BitcoinUnits::format(int unit, qint64 n, bool fPlus, SeparatorStyle sepa
147147
return quotient_str + QString(".") + remainder_str;
148148
}
149149

150-
QString BitcoinUnits::formatWithUnit(int unit, qint64 amount, bool plussign, SeparatorStyle separators, bool fAlign)
150+
151+
QString BitcoinUnits::formatWithUnit(int unit, qint64 amount, bool plussign, SeparatorStyle separators)
151152
{
152-
return format(unit, amount, plussign, separators, fAlign) + QString(" ") + name(unit);
153+
return format(unit, amount, plussign, separators) + QString(" ") + name(unit);
153154
}
154155

155156
QString BitcoinUnits::formatHtmlWithUnit(int unit, qint64 amount, bool plussign, SeparatorStyle separators)

‎src/qt/bitcoinunits.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ class BitcoinUnits: public QAbstractListModel
8989
//! Number of decimals left
9090
static int decimals(int unit);
9191
//! Format as string
92-
static QString format(int unit, qint64 amount, bool plussign=false, SeparatorStyle separators=separatorStandard, bool fAlign=false);
92+
static QString format(int unit, qint64 amount, bool plussign=false, SeparatorStyle separators=separatorStandard);
9393
//! Format as string (with unit)
94-
static QString formatWithUnit(int unit, qint64 amount, bool plussign=false, SeparatorStyle separators=separatorStandard, bool fAlign=false);
94+
static QString formatWithUnit(int unit, qint64 amount, bool plussign=false, SeparatorStyle separators=separatorStandard);
9595
static QString formatHtmlWithUnit(int unit, qint64 amount, bool plussign=false, SeparatorStyle separators=separatorStandard);
9696
//! Parse string to coin amount
9797
static bool parse(int unit, const QString &value, qint64 *val_out);

‎src/qt/overviewpage.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class TxViewDelegate : public QAbstractItemDelegate
7272
foreground = option.palette.color(QPalette::Text);
7373
}
7474
painter->setPen(foreground);
75-
QString amountText = BitcoinUnits::formatWithUnit(unit, amount, true, BitcoinUnits::separatorAlways, true);
75+
QString amountText = BitcoinUnits::formatWithUnit(unit, amount, true, BitcoinUnits::separatorAlways);
7676
if(!confirmed)
7777
{
7878
amountText = QString("[") + amountText + QString("]");
@@ -147,14 +147,14 @@ void OverviewPage::setBalance(qint64 balance, qint64 unconfirmedBalance, qint64
147147
currentWatchOnlyBalance = watchOnlyBalance;
148148
currentWatchUnconfBalance = watchUnconfBalance;
149149
currentWatchImmatureBalance = watchImmatureBalance;
150-
ui->labelBalance->setText(BitcoinUnits::formatWithUnit(unit, balance, false, BitcoinUnits::separatorAlways, true));
151-
ui->labelUnconfirmed->setText(BitcoinUnits::formatWithUnit(unit, unconfirmedBalance, false, BitcoinUnits::separatorAlways, true));
152-
ui->labelImmature->setText(BitcoinUnits::formatWithUnit(unit, immatureBalance, false, BitcoinUnits::separatorAlways, true));
153-
ui->labelTotal->setText(BitcoinUnits::formatWithUnit(unit, balance + unconfirmedBalance + immatureBalance, false, BitcoinUnits::separatorAlways, true));
154-
ui->labelWatchAvailable->setText(BitcoinUnits::formatWithUnit(unit, watchOnlyBalance, false, BitcoinUnits::separatorAlways, true));
155-
ui->labelWatchPending->setText(BitcoinUnits::formatWithUnit(unit, watchUnconfBalance, false, BitcoinUnits::separatorAlways, true));
156-
ui->labelWatchImmature->setText(BitcoinUnits::formatWithUnit(unit, watchImmatureBalance, false, BitcoinUnits::separatorAlways, true));
157-
ui->labelWatchTotal->setText(BitcoinUnits::formatWithUnit(unit, watchOnlyBalance + watchUnconfBalance + watchImmatureBalance, false, BitcoinUnits::separatorAlways, true));
150+
ui->labelBalance->setText(BitcoinUnits::formatWithUnit(unit, balance, false, BitcoinUnits::separatorAlways));
151+
ui->labelUnconfirmed->setText(BitcoinUnits::formatWithUnit(unit, unconfirmedBalance, false, BitcoinUnits::separatorAlways));
152+
ui->labelImmature->setText(BitcoinUnits::formatWithUnit(unit, immatureBalance, false, BitcoinUnits::separatorAlways));
153+
ui->labelTotal->setText(BitcoinUnits::formatWithUnit(unit, balance + unconfirmedBalance + immatureBalance, false, BitcoinUnits::separatorAlways));
154+
ui->labelWatchAvailable->setText(BitcoinUnits::formatWithUnit(unit, watchOnlyBalance, false, BitcoinUnits::separatorAlways));
155+
ui->labelWatchPending->setText(BitcoinUnits::formatWithUnit(unit, watchUnconfBalance, false, BitcoinUnits::separatorAlways));
156+
ui->labelWatchImmature->setText(BitcoinUnits::formatWithUnit(unit, watchImmatureBalance, false, BitcoinUnits::separatorAlways));
157+
ui->labelWatchTotal->setText(BitcoinUnits::formatWithUnit(unit, watchOnlyBalance + watchUnconfBalance + watchImmatureBalance, false, BitcoinUnits::separatorAlways));
158158

159159
// only show immature (newly mined) balance if it's non-zero, so as not to complicate things
160160
// for the non-mining users

‎src/qt/transactiontablemodel.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -435,9 +435,9 @@ QVariant TransactionTableModel::addressColor(const TransactionRecord *wtx) const
435435
return QVariant();
436436
}
437437

438-
QString TransactionTableModel::formatTxAmount(const TransactionRecord *wtx, bool showUnconfirmed, BitcoinUnits::SeparatorStyle separators, bool fAlign) const
438+
QString TransactionTableModel::formatTxAmount(const TransactionRecord *wtx, bool showUnconfirmed, BitcoinUnits::SeparatorStyle separators) const
439439
{
440-
QString str = BitcoinUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), wtx->credit + wtx->debit, false, separators, fAlign);
440+
QString str = BitcoinUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), wtx->credit + wtx->debit, false, separators);
441441
if(showUnconfirmed)
442442
{
443443
if(!wtx->status.countsForBalance)
@@ -522,7 +522,7 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
522522
case ToAddress:
523523
return formatTxToAddress(rec, false);
524524
case Amount:
525-
return formatTxAmount(rec, true, BitcoinUnits::separatorAlways, true);
525+
return formatTxAmount(rec, true, BitcoinUnits::separatorAlways);
526526
}
527527
break;
528528
case Qt::EditRole:

‎src/qt/transactiontablemodel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class TransactionTableModel : public QAbstractTableModel
8080
QString formatTxDate(const TransactionRecord *wtx) const;
8181
QString formatTxType(const TransactionRecord *wtx) const;
8282
QString formatTxToAddress(const TransactionRecord *wtx, bool tooltip) const;
83-
QString formatTxAmount(const TransactionRecord *wtx, bool showUnconfirmed=true, BitcoinUnits::SeparatorStyle separators=BitcoinUnits::separatorStandard, bool fAlign=false) const;
83+
QString formatTxAmount(const TransactionRecord *wtx, bool showUnconfirmed=true, BitcoinUnits::SeparatorStyle separators=BitcoinUnits::separatorStandard) const;
8484
QString formatTooltip(const TransactionRecord *rec) const;
8585
QVariant txStatusDecoration(const TransactionRecord *wtx) const;
8686
QVariant txAddressDecoration(const TransactionRecord *wtx) const;

0 commit comments

Comments
 (0)