Merge #9528: [qt] Rename formateNiceTimeOffset(qint64) to formatNiceTimeOffset(qint64)
988d300
[qt] Rename formateNiceTimeOffset(qint64) to formatNiceTimeOffset(qint64) (practicalswift)
This commit is contained in:
commit
8daf103fa1
4 changed files with 4 additions and 4 deletions
|
@ -817,7 +817,7 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
|
|||
}
|
||||
else
|
||||
{
|
||||
QString timeBehindText = GUIUtil::formateNiceTimeOffset(secs);
|
||||
QString timeBehindText = GUIUtil::formatNiceTimeOffset(secs);
|
||||
|
||||
progressBarLabel->setVisible(true);
|
||||
progressBar->setFormat(tr("%1 behind").arg(timeBehindText));
|
||||
|
|
|
@ -951,7 +951,7 @@ QString formatTimeOffset(int64_t nTimeOffset)
|
|||
return QString(QObject::tr("%1 s")).arg(QString::number((int)nTimeOffset, 10));
|
||||
}
|
||||
|
||||
QString formateNiceTimeOffset(qint64 secs)
|
||||
QString formatNiceTimeOffset(qint64 secs)
|
||||
{
|
||||
// Represent time from last generated block in human readable text
|
||||
QString timeBehindText;
|
||||
|
|
|
@ -200,7 +200,7 @@ namespace GUIUtil
|
|||
/* Format a CNodeCombinedStats.nTimeOffset into a user-readable string. */
|
||||
QString formatTimeOffset(int64_t nTimeOffset);
|
||||
|
||||
QString formateNiceTimeOffset(qint64 secs);
|
||||
QString formatNiceTimeOffset(qint64 secs);
|
||||
|
||||
class ClickableLabel : public QLabel
|
||||
{
|
||||
|
|
|
@ -105,7 +105,7 @@ void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVeri
|
|||
ui->progressIncreasePerH->setText(QString::number(progressPerHour*100, 'f', 2)+"%");
|
||||
|
||||
// show expected remaining time
|
||||
ui->expectedTimeLeft->setText(GUIUtil::formateNiceTimeOffset(remainingMSecs/1000.0));
|
||||
ui->expectedTimeLeft->setText(GUIUtil::formatNiceTimeOffset(remainingMSecs/1000.0));
|
||||
|
||||
static const int MAX_SAMPLES = 5000;
|
||||
if (blockProcessTime.count() > MAX_SAMPLES)
|
||||
|
|
Loading…
Reference in a new issue