walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'master' of git://github.com/danmar/cppcheck

This commit is contained in:
vBm 2010-12-14 15:36:19 +01:00
parent 0b1006a56a 05ebf120c3
commit 0b8f2ef254
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
createrelease
View File

@ -37,6 +37,10 @@
# #
# Upload manual.pdf and version.txt... # Upload manual.pdf and version.txt...
# sftp hyd_danmar,cppcheck@web.sourceforge.net # sftp hyd_danmar,cppcheck@web.sourceforge.net
#
# Make sure "cppcheck --errorlist" works
#
# save "cppcheck --doc" output on wiki
# Tag to use # Tag to use
tag=$1 tag=$1

26
gui/statsdialog.cpp
View File

@ -66,7 +66,31 @@ void StatsDialog::setNumberOfFilesScanned(int num)
void StatsDialog::setScanDuration(double seconds) void StatsDialog::setScanDuration(double seconds)
{ {
mUI.mScanDuration->setText(tr("%1 secs").arg(seconds)); // Factor the duration into units (days/hours/minutes/seconds)
int secs = seconds;
int days = secs / (24 * 60 * 60);
secs -= days * (24 * 60 * 60);
int hours = secs / (60 * 60);
secs -= hours * (60 * 60);
int mins = secs / 60;
secs -= mins * 60;
// Concatenate the two most significant units (e.g. "1 day and 3 hours")
QStringList parts;
if (days)
parts << ((days == 1) ? tr("1 day") : tr("%1 days").arg(days));
if (hours)
parts << ((hours == 1) ? tr("1 hour") : tr("%1 hours").arg(hours));
if (mins && parts.size() < 2)
parts << ((mins == 1) ? tr("1 minute") : tr("%1 minutes").arg(mins));
if (secs && parts.size() < 2)
parts << ((secs == 1) ? tr("1 second") : tr("%1 seconds").arg(secs));
// For durations < 1s, show the fraction of a second (e.g. "0.7 seconds")
if (parts.isEmpty())
parts << tr("0.%1 seconds").arg(int(10.0 *(seconds - secs)));
mUI.mScanDuration->setText(parts.join(tr(" and ")));
} }
void StatsDialog::copyToClipboard() void StatsDialog::copyToClipboard()