Browse Source

Merge #9528: [qt] Rename formateNiceTimeOffset(qint64) to formatNiceTimeOffset(qint64)

988d300 [qt] Rename formateNiceTimeOffset(qint64) to formatNiceTimeOffset(qint64) (practicalswift)
0.14
MarcoFalke 8 years ago
parent
commit
8daf103fa1
No known key found for this signature in database
GPG Key ID: 2D7F2372E50FE137
  1. 2
      src/qt/bitcoingui.cpp
  2. 2
      src/qt/guiutil.cpp
  3. 2
      src/qt/guiutil.h
  4. 2
      src/qt/modaloverlay.cpp

2
src/qt/bitcoingui.cpp

@ -817,7 +817,7 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer @@ -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));

2
src/qt/guiutil.cpp

@ -951,7 +951,7 @@ QString formatTimeOffset(int64_t nTimeOffset) @@ -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;

2
src/qt/guiutil.h

@ -200,7 +200,7 @@ namespace GUIUtil @@ -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
{

2
src/qt/modaloverlay.cpp

@ -105,7 +105,7 @@ void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVeri @@ -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…
Cancel
Save