From c085dd408daac5ee312dfc42baed63b08233b91b Mon Sep 17 00:00:00 2001 From: phesch <ulila@student.kit.edu> Date: Mon, 2 May 2022 19:27:50 +0200 Subject: [PATCH] Remove superfluous slots in MemoryViewer Plus some template nonsense due to slot overloading --- .../libraries/armem_gui/PeriodicUpdateWidget.cpp | 15 +++------------ .../libraries/armem_gui/PeriodicUpdateWidget.h | 3 --- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/source/RobotAPI/libraries/armem_gui/PeriodicUpdateWidget.cpp b/source/RobotAPI/libraries/armem_gui/PeriodicUpdateWidget.cpp index 3c3b262ba..9fe9db837 100644 --- a/source/RobotAPI/libraries/armem_gui/PeriodicUpdateWidget.cpp +++ b/source/RobotAPI/libraries/armem_gui/PeriodicUpdateWidget.cpp @@ -52,8 +52,9 @@ namespace armarx::armem::gui connect(this, &This::updatePeriodic, this, &This::update); // See `startTimerIfEnabled` for the signal reasoning. - connect(this, &This::startTimerSignal, this, &This::_startTimerSlot); - connect(this, &This::stopTimerSignal, this, &This::_stopTimerSlot); + // qOverload is required because `QTimer::start()` is overloaded. + connect(this, &This::startTimerSignal, _timer, qOverload<>(&QTimer::start)); + connect(this, &This::stopTimerSignal, _timer, &QTimer::stop); } QPushButton* PeriodicUpdateWidget::updateButton() @@ -109,16 +110,6 @@ namespace armarx::armem::gui } } - void PeriodicUpdateWidget::_startTimerSlot() - { - _timer->start(); - } - - void PeriodicUpdateWidget::_stopTimerSlot() - { - _timer->stop(); - } - QCheckBox* PeriodicUpdateWidget::autoCheckBox() { return _autoCheckBox; diff --git a/source/RobotAPI/libraries/armem_gui/PeriodicUpdateWidget.h b/source/RobotAPI/libraries/armem_gui/PeriodicUpdateWidget.h index d99c20f67..d9438993c 100644 --- a/source/RobotAPI/libraries/armem_gui/PeriodicUpdateWidget.h +++ b/source/RobotAPI/libraries/armem_gui/PeriodicUpdateWidget.h @@ -49,9 +49,6 @@ namespace armarx::armem::gui void _updateTimerFrequency(); void _toggleAutoUpdates(bool enabled); - void _startTimerSlot(); - void _stopTimerSlot(); - signals: -- GitLab