Skip to content

Commit 3dcd9ee

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

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

gui/QT/widget/recv_loss.cpp

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

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

18-
void RecvLossWidget::reset(){
18+
void RecvLossWidget::resetRecvReports(){
1919
timer.stop();
2020
setRange(0, 100);
2121
setValue(0);

gui/QT/widget/recv_loss.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Q_OBJECT
1717
~RecvLossWidget() = default;
1818

1919
void parseLine(std::string_view);
20-
void reset();
20+
void resetRecvReports();
2121

2222
private slots:
2323
void timeout();

gui/QT/window/ultragrid_window.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ UltragridWindow::UltragridWindow(QWidget *parent): QMainWindow(parent){
105105

106106
versionLabel.setText(QString("Ver: ") + verString);
107107

108-
receiverLoss.reset();
108+
receiverLoss.resetRecvReports();
109109

110110
ui.localPreviewBar->addWidget(&rtcpRr);
111111
ui.localPreviewBar->setAlignment(&rtcpRr, Qt::AlignBottom);
@@ -361,7 +361,7 @@ void UltragridWindow::start(){
361361
ui.startButton->setText("Start");
362362
ui.startButton->setEnabled(true);
363363
ui.actionRefresh->setEnabled(true);
364-
receiverLoss.reset();
364+
receiverLoss.resetRecvReports();
365365
clearFmtLabels();
366366
rtcpRr.reset();
367367
ui.send_bandwidth->reset();

0 commit comments

Comments
 (0)