Skip to content

Commit bd0ac4c

Browse files
committed
GUI: recv_report: Rename reset() to avoid shadowing
The parent class QProgressBar already has a reset() method so rename to avoid confusion
1 parent 3dcd9ee commit bd0ac4c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

gui/QT/widget/recv_report.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88

99
RecvReportWidget::RecvReportWidget(QWidget *parent) : QProgressBar(parent){
1010
elapsedTimer.start();
11-
reset();
11+
resetRecvReports();
1212
QObject::connect(&timer, &QTimer::timeout, this, &RecvReportWidget::timeout);
1313
timer.setInterval(timeout_msec);
1414
#if defined(Q_OS_WIN) || defined(Q_OS_MACOS)
1515
setStyle(QStyleFactory::create("Fusion")); //mac style progressbars have no text
1616
#endif
1717
}
1818

19-
void RecvReportWidget::reset(){
19+
void RecvReportWidget::resetRecvReports(){
2020
reports.clear();
2121
timer.stop();
2222
setRange(0, 100);

gui/QT/widget/recv_report.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class RecvReportWidget : public QProgressBar{
1818

1919
void updateVal();
2020
void parseLine(std::string_view line);
21-
void reset();
21+
void resetRecvReports();
2222

2323
private slots:
2424
void timeout();

gui/QT/window/ultragrid_window.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ void UltragridWindow::start(){
363363
ui.actionRefresh->setEnabled(true);
364364
receiverLoss.resetRecvReports();
365365
clearFmtLabels();
366-
rtcpRr.reset();
366+
rtcpRr.resetRecvReports();
367367
ui.send_bandwidth->reset();
368368

369369
if(!requested && (es == QProcess::ExitStatus::CrashExit || ec != 0)){

0 commit comments

Comments
 (0)