Skip to content

Commit c8d38ab

Browse files
committed
Refactor tipUpdate as per style guide
1 parent 3b69a08 commit c8d38ab

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

src/qt/modaloverlay.cpp

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -82,39 +82,38 @@ void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVeri
8282
blockProcessTime.push_front(qMakePair(currentDate.toMSecsSinceEpoch(), nVerificationProgress));
8383

8484
// show progress speed if we have more then one sample
85-
if (blockProcessTime.size() >= 2)
86-
{
87-
double progressStart = blockProcessTime[0].second;
85+
if (blockProcessTime.size() >= 2) {
8886
double progressDelta = 0;
8987
double progressPerHour = 0;
9088
qint64 timeDelta = 0;
9189
qint64 remainingMSecs = 0;
9290
double remainingProgress = 1.0 - nVerificationProgress;
93-
for (int i = 1; i < blockProcessTime.size(); i++)
94-
{
91+
for (int i = 1; i < blockProcessTime.size(); i++) {
9592
QPair<qint64, double> sample = blockProcessTime[i];
9693

9794
// take first sample after 500 seconds or last available one
9895
if (sample.first < (currentDate.toMSecsSinceEpoch() - 500 * 1000) || i == blockProcessTime.size() - 1) {
99-
progressDelta = progressStart-sample.second;
96+
progressDelta = blockProcessTime[0].second - sample.second;
10097
timeDelta = blockProcessTime[0].first - sample.first;
101-
progressPerHour = progressDelta/(double)timeDelta*1000*3600;
98+
progressPerHour = progressDelta / (double) timeDelta * 1000 * 3600;
10299
remainingMSecs = (progressDelta > 0) ? remainingProgress / progressDelta * timeDelta : -1;
103100
break;
104101
}
105102
}
106103
// show progress increase per hour
107-
ui->progressIncreasePerH->setText(QString::number(progressPerHour*100, 'f', 2)+"%");
104+
ui->progressIncreasePerH->setText(QString::number(progressPerHour * 100, 'f', 2)+"%");
108105

106+
// show expected remaining time
109107
if(remainingMSecs >= 0) {
110108
ui->expectedTimeLeft->setText(GUIUtil::formatNiceTimeOffset(remainingMSecs / 1000.0));
111109
} else {
112110
ui->expectedTimeLeft->setText(QObject::tr("unknown"));
113111
}
114112

115113
static const int MAX_SAMPLES = 5000;
116-
if (blockProcessTime.count() > MAX_SAMPLES)
117-
blockProcessTime.remove(MAX_SAMPLES, blockProcessTime.count()-MAX_SAMPLES);
114+
if (blockProcessTime.count() > MAX_SAMPLES) {
115+
blockProcessTime.remove(MAX_SAMPLES, blockProcessTime.count() - MAX_SAMPLES);
116+
}
118117
}
119118

120119
// show the last block date
@@ -172,4 +171,4 @@ void ModalOverlay::closeClicked()
172171
{
173172
showHide(true);
174173
userClosed = true;
175-
}
174+
}

0 commit comments

Comments
 (0)