diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-01-05 08:55:42 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-01-05 08:57:04 +0100 |
| commit | a043facf5a8b75eb15547ed788296b6c3df2c586 (patch) | |
| tree | fd19ca62eb9af0616ad20bdf4587536e0f1562ed | |
| parent | 84eba479a17a853c1df1d5bbbe674f308429a8f6 (diff) | |
| parent | 7eeeac0ff59d4b822bc1f4fcd914572c957834ed (diff) | |
| download | bitcoin-a043facf5a8b75eb15547ed788296b6c3df2c586.tar.xz | |
Merge pull request #5594
7eeeac0 Remove dead BitcoinUnits::id code and update assets-attribution for non-image unit selector (Luke Dashjr)
| -rw-r--r-- | doc/assets-attribution.md | 8 | ||||
| -rw-r--r-- | src/qt/bitcoinunits.cpp | 11 | ||||
| -rw-r--r-- | src/qt/bitcoinunits.h | 2 |
3 files changed, 3 insertions, 18 deletions
diff --git a/doc/assets-attribution.md b/doc/assets-attribution.md index 31fe4e5b7a..c860cdc534 100644 --- a/doc/assets-attribution.md +++ b/doc/assets-attribution.md @@ -39,9 +39,7 @@ Jonas Schnelli src/qt/res/icons/connect[0-3].png, src/qt/res/icons/eye_minus.png, src/qt/res/icons/eye_plus.png, src/qt/res/icons/verify.png, src/qt/res/icons/tx_inout.png, src/qt/res/icons/tx_input.png, - src/qt/res/icons/unit_btc.png, src/qt/res/icons/unit_mbtc.png, - src/qt/res/icons/unit_ubtc.png, src/qt/res/src/verify.svg - src/qt/res/src/bitcoin.svg, src/qt/res/src/clock*.svg, - src/qt/res/src/connect*.svg, src/qt/res/src/mine.svg, - src/qt/res/src/qt.svg, src/qt/res/src/tx*.svg, + src/qt/res/src/verify.svg, src/qt/res/src/bitcoin.svg, + src/qt/res/src/clock*.svg, src/qt/res/src/connect*.svg, + src/qt/res/src/mine.svg, src/qt/res/src/qt.svg, src/qt/res/src/tx*.svg, src/qt/res/src/verify.svg, diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp index 758fba7058..425b45d918 100644 --- a/src/qt/bitcoinunits.cpp +++ b/src/qt/bitcoinunits.cpp @@ -36,17 +36,6 @@ bool BitcoinUnits::valid(int unit) } } -QString BitcoinUnits::id(int unit) -{ - switch(unit) - { - case BTC: return QString("btc"); - case mBTC: return QString("mbtc"); - case uBTC: return QString("ubtc"); - default: return QString("???"); - } -} - QString BitcoinUnits::name(int unit) { switch(unit) diff --git a/src/qt/bitcoinunits.h b/src/qt/bitcoinunits.h index a01fcc8cf9..1871c33a78 100644 --- a/src/qt/bitcoinunits.h +++ b/src/qt/bitcoinunits.h @@ -76,8 +76,6 @@ public: static QList<Unit> availableUnits(); //! Is unit ID valid? static bool valid(int unit); - //! Identifier, e.g. for image names - static QString id(int unit); //! Short name static QString name(int unit); //! Longer description |