From a67dbda124da3dbebdbc18e8449b6b4dad246007 Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Fri, 28 Jun 2019 11:06:11 +1200 Subject: [PATCH] Merge branch 'master' into pendulum. --- .../simulation/PendulumWindow/src/pendulumwindowwindow.h | 6 +++--- .../src/simulationexperimentviewwidget.cpp | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/plugins/simulation/PendulumWindow/src/pendulumwindowwindow.h b/src/plugins/simulation/PendulumWindow/src/pendulumwindowwindow.h index 1be8c3a1ae..0bf8d60c7b 100644 --- a/src/plugins/simulation/PendulumWindow/src/pendulumwindowwindow.h +++ b/src/plugins/simulation/PendulumWindow/src/pendulumwindowwindow.h @@ -49,7 +49,7 @@ class QSlider; namespace Ui { class PendulumWindowWindow; -} +} // namespace Ui //============================================================================== @@ -81,9 +81,9 @@ class PENDULUMWINDOW_EXPORT PendulumWindowWindow : public Core::WindowWidget public: explicit PendulumWindowWindow(QWidget *pParent); - ~PendulumWindowWindow(); + ~PendulumWindowWindow() override; - virtual void retranslateUi(); + void retranslateUi() override; void initData(const quint64 &pDataSize, const double &pMinimumTime, const double &pMaximumTime, const double &pTimeInterval, diff --git a/src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewwidget.cpp b/src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewwidget.cpp index 4ed08854f3..2985bc33e6 100644 --- a/src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewwidget.cpp +++ b/src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewwidget.cpp @@ -545,7 +545,6 @@ void SimulationExperimentViewWidget::checkSimulationResults(const QString &pFile // Make sure that our previous run, if any, is complete, if we are coming // here as a result of having added a new run - SimulationSupport::Simulation *simulation = simulationWidget->simulation(); int simulationRunsCount = simulation->runsCount(); if ( (pTask == SimulationExperimentViewSimulationWidget::Task::AddRun)