mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

(qt) #5282 "Formatter's sizeToString() and memToString() return wrong text for 0 bytes": fixed.

This commit is contained in:
Jordan Lee 2013-02-09 18:59:05 +00:00
parent 6304bef11b
commit 00a5e86939
2 changed files with 149 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
qt/formatter.cc
View File

@ -94,30 +94,30 @@ Speed :: fromKBps( double KBps )
QString
Formatter :: memToString (int64_t bytes)
{
if( bytes < 1 )
if (bytes < 0)
return tr ("Unknown");
else if( !bytes )
if (!bytes)
return tr ("None");
else {
char buf[128];
tr_formatter_mem_B (buf, bytes, sizeof (buf));
return QString::fromUtf8 (buf);
}
}
QString
Formatter :: sizeToString (int64_t bytes)
{
if( bytes < 1 )
if (bytes < 0)
return tr ("Unknown");
else if( !bytes )
if (!bytes)
return tr ("None");
else {
char buf[128];
tr_formatter_size_B (buf, bytes, sizeof (buf));
return QString::fromUtf8 (buf);
}
}
QString
Formatter :: speedToString (const Speed& speed)
@ -127,6 +127,22 @@ Formatter :: speedToString( const Speed& speed )
return QString::fromUtf8 (buf);
}
QString
Formatter :: uploadSpeedToString (const Speed& uploadSpeed)
{
static const QChar uploadSymbol (0x25B4);
return tr ("%1 %2").arg (speedToString (uploadSpeed)).arg (uploadSymbol);
}
QString
Formatter :: downloadSpeedToString (const Speed& downloadSpeed)
{
static const QChar downloadSymbol (0x25BE);
return tr ("%1 %2").arg (speedToString (downloadSpeed)).arg (downloadSymbol);
}
QString
Formatter :: percentToString (double x)
{
@ -189,20 +205,3 @@ Formatter :: timeToString( int seconds )
return str;
}
QString
Formatter :: uploadSpeedToString (const Speed& uploadSpeed)
{
static const QChar uploadSymbol (0x25B4);
return tr( "%1 %2").arg(speedToString(uploadSpeed)).arg(uploadSymbol);
}
QString
Formatter :: downloadSpeedToString (const Speed& downloadSpeed)
{
static const QChar downloadSymbol (0x25BE);
return tr( "%1 %2").arg(speedToString(downloadSpeed)).arg(downloadSymbol);
}