Missing initialization

companion/src/simulation/simulateduiwidget.h

@@ -97,7 +97,6 @@ class SimulatedUIWidget : public QWidget
     unsigned int m_backLight;
     int m_beepShow;
     int m_beepVal;
-
 };
 
 

companion/src/simulation/simulatormainwindow.cpp

@@ -153,19 +153,12 @@ SimulatorMainWindow::SimulatorMainWindow(QWidget *parent, const QString & firmwa
 
 SimulatorMainWindow::~SimulatorMainWindow()
 {
-  if (m_telemetryDockWidget)
-    delete m_telemetryDockWidget;
-  if (m_trainerDockWidget)
-    delete m_trainerDockWidget;
-  if (m_outputsDockWidget)
-    delete m_outputsDockWidget;
-  if (m_simulatorDockWidget)
-    delete m_simulatorDockWidget;
-  else if (m_simulatorWidget)
-    delete m_simulatorWidget;
-  if (m_consoleDockWidget)
-    delete m_consoleDockWidget;
-
+  delete m_telemetryDockWidget;
+  delete m_trainerDockWidget;
+  delete m_outputsDockWidget;
+  delete m_simulatorDockWidget;
+  delete m_simulatorWidget;
+  delete m_consoleDockWidget;
   delete ui;
 
   if (m_simulator) {
@@ -293,7 +286,7 @@ void SimulatorMainWindow::createDockWidgets()
   if (!m_telemetryDockWidget) {
     SimulatorIcon icon("telemetry");
     m_telemetryDockWidget = new QDockWidget(tr("Telemetry Simulator"), this);
-    TelemetrySimulator * telem = new TelemetrySimulator(this, m_simulator);
+    auto * telem = new TelemetrySimulator(this, m_simulator);
     m_telemetryDockWidget->setWidget(telem);
     m_telemetryDockWidget->setObjectName("TELEMETRY_SIMULATOR");
     addTool(m_telemetryDockWidget, Qt::LeftDockWidgetArea, icon, QKeySequence(tr("F4")));
@@ -302,7 +295,7 @@ void SimulatorMainWindow::createDockWidgets()
   if (!m_trainerDockWidget) {
     SimulatorIcon icon("trainer");
     m_trainerDockWidget = new QDockWidget(tr("Trainer Simulator"), this);
-    TrainerSimulator * trainer = new TrainerSimulator(this, m_simulator);
+    auto * trainer = new TrainerSimulator(this, m_simulator);
     m_trainerDockWidget->setWidget(trainer);
     m_trainerDockWidget->setObjectName("TRAINER_SIMULATOR");
     addTool(m_trainerDockWidget, Qt::TopDockWidgetArea, icon, QKeySequence(tr("F5")));

companion/src/simulation/simulatorwidget.cpp

@@ -50,17 +50,8 @@ SimulatorWidget::SimulatorWidget(QWidget * parent, SimulatorInterface * simulato
   simulator(simulator),
   firmware(getCurrentFirmware()),
   radioSettings(GeneralSettings()),
-  radioUiWidget(NULL),
-  vJoyLeft(NULL),
-  vJoyRight(NULL),
   m_board(getCurrentBoard()),
-  flags(flags),
-  startupFromFile(false),
-  deleteTempRadioData(false),
-  saveTempRadioData(false)
-#ifdef JOYSTICKS
-  , joystick(NULL)
-#endif
+  flags(flags)
 {
   ui->setupUi(this);
 
@@ -154,21 +145,16 @@ SimulatorWidget::~SimulatorWidget()
 {
   shutdown();
 
-  if (radioUiWidget)
-    delete radioUiWidget;
-  if (vJoyLeft)
-    delete vJoyLeft;
-  if (vJoyRight)
-    delete vJoyRight;
+  delete radioUiWidget;
+  delete vJoyLeft;
+  delete vJoyRight;
 #ifdef JOYSTICKS
-  if (joystick)
-    delete joystick;
+  delete joystick;
 #endif
-  firmware = NULL;
+  firmware = nullptr;
   delete ui;
 }
 
-
 /*
  * Public slots/setters
  */
@@ -570,7 +556,7 @@ void SimulatorWidget::setupRadioWidgets()
       continue;
 
     swcfg = Board::SwitchType(radioSettings.switchConfig[i]);
-    wname = RawSource(RawSourceType::SOURCE_TYPE_SWITCH, i).toString(NULL, &radioSettings);
+    wname = RawSource(RawSourceType::SOURCE_TYPE_SWITCH, i).toString(nullptr, &radioSettings);
     RadioSwitchWidget * sw = new RadioSwitchWidget(swcfg, wname, -1, ui->radioWidgetsHT);
     sw->setIndex(i);
     ui->radioWidgetsHTLayout->addWidget(sw);
@@ -585,7 +571,7 @@ void SimulatorWidget::setupRadioWidgets()
     if (!radioSettings.isPotAvailable(i))
       continue;
 
-    wname = RawSource(RawSourceType::SOURCE_TYPE_STICK, ttlSticks + i).toString(NULL, &radioSettings);
+    wname = RawSource(RawSourceType::SOURCE_TYPE_STICK, ttlSticks + i).toString(nullptr, &radioSettings);
     RadioKnobWidget * pot = new RadioKnobWidget(Board::PotType(radioSettings.potConfig[i]), wname, 0, ui->radioWidgetsHT);
     pot->setIndex(i);
     ui->radioWidgetsHTLayout->insertWidget(midpos++, pot);
@@ -599,7 +585,7 @@ void SimulatorWidget::setupRadioWidgets()
     if (!radioSettings.isSliderAvailable(i))
       continue;
 
-    wname = RawSource(RawSourceType::SOURCE_TYPE_STICK, ttlSticks + ttlKnobs + i).toString(NULL, &radioSettings);
+    wname = RawSource(RawSourceType::SOURCE_TYPE_STICK, ttlSticks + ttlKnobs + i).toString(nullptr, &radioSettings);
     RadioFaderWidget * sl = new RadioFaderWidget(wname, 0, ui->radioWidgetsVC);
     sl->setIndex(i);
     ui->VCGridLayout->addWidget(sl, 0, c++, 1, 1);
@@ -613,7 +599,7 @@ void SimulatorWidget::setupRadioWidgets()
   for (i = extraTrims; i > 0; --i) {
     trswidx -= 2;
     --tridx;
-    wname = RawSource(RawSourceType::SOURCE_TYPE_TRIM, tridx).toString(NULL, &radioSettings);
+    wname = RawSource(RawSourceType::SOURCE_TYPE_TRIM, tridx).toString(nullptr, &radioSettings);
     wname = wname.left(1) % wname.right(1);
     RadioTrimWidget * tw = new RadioTrimWidget(Qt::Vertical, ui->radioWidgetsVC);
     tw->setIndices(tridx, trswidx, trswidx + 1);
@@ -672,7 +658,7 @@ void SimulatorWidget::setupJoysticks()
     if (vJoyRight)
       disconnect(this, 0, vJoyRight, 0);
     joystick->deleteLater();
-    joystick = NULL;
+    joystick = nullptr;
   }
   if (vJoyRight)
     vJoyRight->setStickConstraint((VirtualJoystickWidget::HOLD_X | VirtualJoystickWidget::HOLD_Y), joysticksEnabled);

companion/src/simulation/simulatorwidget.h

@@ -33,8 +33,6 @@
 #include <QWidget>
 #include <QVector>
 
-void traceCb(const char * text);
-
 class Firmware;
 class SimulatorInterface;
 class SimulatedUIWidget;
@@ -130,9 +128,9 @@ class SimulatorWidget : public QWidget
     QVector<Simulator::keymapHelp_t> keymapHelp;
     QElapsedTimer m_heartbeatTimer;
 
-    SimulatedUIWidget     * radioUiWidget;
-    VirtualJoystickWidget * vJoyLeft;
-    VirtualJoystickWidget * vJoyRight;
+    SimulatedUIWidget     * radioUiWidget = nullptr;
+    VirtualJoystickWidget * vJoyLeft = nullptr;
+    VirtualJoystickWidget * vJoyRight = nullptr;
     QVector<RadioWidget *> m_radioWidgets;
 
     QString sdCardPath;
@@ -141,14 +139,13 @@ class SimulatorWidget : public QWidget
     Board::Type m_board;
     quint8 flags;
     int radioProfileId;
-    bool startupFromFile;
-    bool deleteTempRadioData;
-    bool saveTempRadioData;
+    bool startupFromFile = false;
+    bool deleteTempRadioData = false;
+    bool saveTempRadioData = false;
 
 #ifdef JOYSTICKS
-    Joystick *joystick;
+    Joystick * joystick = nullptr;
 #endif
-
 };
 
 #endif // _SIMULATORWIDGET_H_