From 8565f1e61efa60cbacf781e8324285bb3e022a96 Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Sat, 24 Jan 2009 19:20:34 +0000 Subject: [PATCH] - Code optimization --- src/misc.h | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/misc.h b/src/misc.h index 63c791f6b..ddde6719b 100644 --- a/src/misc.h +++ b/src/misc.h @@ -106,17 +106,13 @@ class misc : public QObject{ // see http://en.wikipedia.org/wiki/Kilobyte // value must be given in bytes static QString friendlyUnit(float val) { - if(val < 0) { + if(val < 0) return tr("Unknown", "Unknown (size)"); - } - const QString units[4] = {tr("B", "bytes"), tr("KiB", "kibibytes (1024 bytes)"), tr("MiB", "mebibytes (1024 kibibytes)"), tr("GiB", "gibibytes (1024 mibibytes)")}; - for(unsigned int i=0; i<5; ++i) { - if (val < 1024.) { - return QString(QByteArray::number(val, 'f', 1)) + units[i]; - } - val /= 1024.; - } - return QString(QByteArray::number(val, 'f', 1)) + tr("TiB", "tebibytes (1024 gibibytes)"); + const QString units[5] = {tr("B", "bytes"), tr("KiB", "kibibytes (1024 bytes)"), tr("MiB", "mebibytes (1024 kibibytes)"), tr("GiB", "gibibytes (1024 mibibytes)"), tr("TiB", "tebibytes (1024 gibibytes)")}; + char i = 0; + while(val > 1024. && i++<6) + val /= 1024.; + return QString(QByteArray::number(val, 'f', 1)) + units[(int)i]; } static bool isPreviewable(QString extension){