From 152d5bad50f145af922011f6ec1fd9afd9076ceb Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Thu, 21 Jan 2021 22:30:13 +0200
Subject: qt, refactor: Remove BitcoinUnits::valid function

Since BitcoinUnits::Unit became a scoped enum, BitcoinUnits::valid
function is no longer needed.
---
 src/qt/bitcoinunits.cpp | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

(limited to 'src/qt/bitcoinunits.cpp')

diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp
index df2b44dc39..94722ee9f6 100644
--- a/src/qt/bitcoinunits.cpp
+++ b/src/qt/bitcoinunits.cpp
@@ -28,20 +28,6 @@ QList<BitcoinUnit> BitcoinUnits::availableUnits()
     return unitlist;
 }
 
-bool BitcoinUnits::valid(Unit unit)
-{
-    switch(unit)
-    {
-    case Unit::BTC:
-    case Unit::mBTC:
-    case Unit::uBTC:
-    case Unit::SAT:
-        return true;
-    default:
-        return false;
-    }
-}
-
 QString BitcoinUnits::longName(Unit unit)
 {
     switch(unit)
@@ -104,8 +90,6 @@ QString BitcoinUnits::format(Unit unit, const CAmount& nIn, bool fPlus, Separato
 {
     // Note: not using straight sprintf here because we do NOT want
     // localized number formatting.
-    if(!valid(unit))
-        return QString(); // Refuse to format invalid unit
     qint64 n = (qint64)nIn;
     qint64 coin = factor(unit);
     int num_decimals = decimals(unit);
@@ -173,8 +157,9 @@ QString BitcoinUnits::formatWithPrivacy(Unit unit, const CAmount& amount, Separa
 
 bool BitcoinUnits::parse(Unit unit, const QString& value, CAmount* val_out)
 {
-    if(!valid(unit) || value.isEmpty())
+    if (value.isEmpty()) {
         return false; // Refuse to parse invalid unit or empty string
+    }
     int num_decimals = decimals(unit);
 
     // Ignore spaces and thin spaces when parsing
@@ -212,12 +197,7 @@ bool BitcoinUnits::parse(Unit unit, const QString& value, CAmount* val_out)
 
 QString BitcoinUnits::getAmountColumnTitle(Unit unit)
 {
-    QString amountTitle = QObject::tr("Amount");
-    if (BitcoinUnits::valid(unit))
-    {
-        amountTitle += " ("+BitcoinUnits::shortName(unit) + ")";
-    }
-    return amountTitle;
+    return QObject::tr("Amount") + " (" + shortName(unit) + ")";
 }
 
 int BitcoinUnits::rowCount(const QModelIndex &parent) const
-- 
cgit v1.2.3