From 48505410026cfab9520fe03812dfa1097c21f311 Mon Sep 17 00:00:00 2001
From: Damjan Adamic <projectkk2glider@gmail.com>
Date: Tue, 15 Apr 2014 18:47:47 +0200
Subject: [PATCH] Fixes suggested by Bertrand

---
 companion/src/eeprominterface.cpp                  |  2 +-
 companion/src/eeprominterface.h                    |  3 +--
 companion/src/firmwares/opentx/opentxeeprom.cpp    | 10 +++++-----
 companion/src/firmwares/opentx/opentxinterface.cpp |  2 +-
 companion/src/simulation/simulatordialog.cpp       |  2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp
index d7594e9fb..1545b9d19 100644
--- a/companion/src/eeprominterface.cpp
+++ b/companion/src/eeprominterface.cpp
@@ -1206,7 +1206,7 @@ void RegisterEepromInterfaces()
 void UnregisterEepromInterfaces()
 {
   foreach(EEPROMInterface * intf, eepromInterfaces) {
-    //std::cout << "UnregisterEepromInterfaces(): deleting " << std::hex << reinterpret_cast<uint64_t>(intf) << std::dec << std::endl;
+    qDebug() << "UnregisterEepromInterfaces(): deleting " <<  QString::number( reinterpret_cast<uint64_t>(intf), 16 );
     delete intf;
   } 
   OpenTxEepromCleanup();
diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h
index be4428c38..49921735c 100644
--- a/companion/src/eeprominterface.h
+++ b/companion/src/eeprominterface.h
@@ -1270,8 +1270,7 @@ class FirmwareInfo {
 
     virtual ~FirmwareInfo()
     {
-      //std::cout << "~FirmwareInfo(): id: " << id.toUtf8().constData() << " name: " << name.toUtf8().constData() << std::endl;
-      if (eepromInterface) delete eepromInterface;
+      delete eepromInterface;
     }
 
     FirmwareInfo(const QString & id, const QString & name, EEPROMInterface * eepromInterface, const QString & url = QString(), const QString & stamp = QString(), const QString & rnurl = QString(), bool voice = false):
diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp
index 466d0ecd2..988128d07 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.cpp
+++ b/companion/src/firmwares/opentx/opentxeeprom.cpp
@@ -148,9 +148,9 @@ class SwitchesConversionTable: public ConversionTable {
     static void Cleanup() {
       for (std::list<Cache>::iterator it=internalCache.begin(); it!=internalCache.end(); it++) {
         Cache element = *it;
-        //std::cout << "~SwitchesConversionTable(): deleting " << std::hex << reinterpret_cast<uint64_t>(element.table) << std::dec << std::endl;
-        if (element.table) delete element.table;
+        delete element.table;
       }
+      internalCache.clear();
     }
 };
 
@@ -309,9 +309,9 @@ class SourcesConversionTable: public ConversionTable {
     static void Cleanup() {
       for (std::list<Cache>::iterator it=internalCache.begin(); it!=internalCache.end(); it++) {
         Cache element = *it;
-        //std::cout << "~SourcesConversionTable(): deleting " << std::hex << reinterpret_cast<uint64_t>(element.table) << std::dec << std::endl;
-        if (element.table) delete element.table;
+        delete element.table;
       }
+      internalCache.clear();
     }
 };
 
@@ -1459,7 +1459,7 @@ class LogicalSwitchField: public TransformedField {
     }
 
     ~LogicalSwitchField() {
-      if (andswitchesConversionTable) delete andswitchesConversionTable;
+      delete andswitchesConversionTable;
     }
     virtual void beforeExport()
     {
diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index 322eaebe2..fd7b1d3ac 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -1235,7 +1235,7 @@ void RegisterOpen9xFirmwares()
 
 void UnregisterOpen9xFirmwares() {
   foreach (FirmwareInfo * f, firmwares) {
-    //std::cout << "UnregisterOpen9xFirmwares(): deleting " << std::hex << reinterpret_cast<uint64_t>(f) << std::dec << std::endl;
+    qDebug() << "UnregisterOpen9xFirmwares(): deleting " <<  QString::number(reinterpret_cast<uint64_t>(f), 16 );
     delete f;
   }
 }
diff --git a/companion/src/simulation/simulatordialog.cpp b/companion/src/simulation/simulatordialog.cpp
index 1e13c2729..b6135cac3 100644
--- a/companion/src/simulation/simulatordialog.cpp
+++ b/companion/src/simulation/simulatordialog.cpp
@@ -142,7 +142,7 @@ SimulatorDialogTaranis::~SimulatorDialogTaranis()
 SimulatorDialog::~SimulatorDialog()
 {
   delete timer;
-  if (simulator) delete simulator;
+  delete simulator;
 }
 
 void SimulatorDialog::closeEvent (QCloseEvent *)