Merge branch 'master' into pendulum.

opencor · Jun 27, 2019 · a67dbda · a67dbda
1 parent 7cc683d
commit a67dbda
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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)