Skip to content

Commit 152d5ba

Browse files
hebastojb55
authored andcommitted
qt, refactor: Remove BitcoinUnits::valid function
Since BitcoinUnits::Unit became a scoped enum, BitcoinUnits::valid function is no longer needed.
1 parent aa23960 commit 152d5ba

File tree

2 files changed

+3
-25
lines changed

2 files changed

+3
-25
lines changed

src/qt/bitcoinunits.cpp

+3-23
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,6 @@ QList<BitcoinUnit> BitcoinUnits::availableUnits()
2828
return unitlist;
2929
}
3030

31-
bool BitcoinUnits::valid(Unit unit)
32-
{
33-
switch(unit)
34-
{
35-
case Unit::BTC:
36-
case Unit::mBTC:
37-
case Unit::uBTC:
38-
case Unit::SAT:
39-
return true;
40-
default:
41-
return false;
42-
}
43-
}
44-
4531
QString BitcoinUnits::longName(Unit unit)
4632
{
4733
switch(unit)
@@ -104,8 +90,6 @@ QString BitcoinUnits::format(Unit unit, const CAmount& nIn, bool fPlus, Separato
10490
{
10591
// Note: not using straight sprintf here because we do NOT want
10692
// localized number formatting.
107-
if(!valid(unit))
108-
return QString(); // Refuse to format invalid unit
10993
qint64 n = (qint64)nIn;
11094
qint64 coin = factor(unit);
11195
int num_decimals = decimals(unit);
@@ -173,8 +157,9 @@ QString BitcoinUnits::formatWithPrivacy(Unit unit, const CAmount& amount, Separa
173157

174158
bool BitcoinUnits::parse(Unit unit, const QString& value, CAmount* val_out)
175159
{
176-
if(!valid(unit) || value.isEmpty())
160+
if (value.isEmpty()) {
177161
return false; // Refuse to parse invalid unit or empty string
162+
}
178163
int num_decimals = decimals(unit);
179164

180165
// Ignore spaces and thin spaces when parsing
@@ -212,12 +197,7 @@ bool BitcoinUnits::parse(Unit unit, const QString& value, CAmount* val_out)
212197

213198
QString BitcoinUnits::getAmountColumnTitle(Unit unit)
214199
{
215-
QString amountTitle = QObject::tr("Amount");
216-
if (BitcoinUnits::valid(unit))
217-
{
218-
amountTitle += " ("+BitcoinUnits::shortName(unit) + ")";
219-
}
220-
return amountTitle;
200+
return QObject::tr("Amount") + " (" + shortName(unit) + ")";
221201
}
222202

223203
int BitcoinUnits::rowCount(const QModelIndex &parent) const

src/qt/bitcoinunits.h

-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ class BitcoinUnits: public QAbstractListModel
6060

6161
//! Get list of units, for drop-down box
6262
static QList<Unit> availableUnits();
63-
//! Is unit ID valid?
64-
static bool valid(Unit unit);
6563
//! Long name
6664
static QString longName(Unit unit);
6765
//! Short name

0 commit comments

Comments
 (0)