Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 08:15:17 +03:00
Code Issues Wiki Activity

Fixes suggested by Bertrand

Browse source
This commit is contained in:
Damjan Adamic 2014-04-15 18:47:47 +02:00
parent 5a522fac4b
commit 4850541002
5 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
companion/src/eeprominterface.cpp
View file

@ -1206,7 +1206,7 @@ void RegisterEepromInterfaces()
void UnregisterEepromInterfaces() void UnregisterEepromInterfaces()
{ {
foreach(EEPROMInterface * intf, eepromInterfaces) { 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; delete intf;
} }
OpenTxEepromCleanup(); OpenTxEepromCleanup();

3
companion/src/eeprominterface.h
View file

@ -1270,8 +1270,7 @@ class FirmwareInfo {
virtual ~FirmwareInfo() virtual ~FirmwareInfo()
{ {
//std::cout << "~FirmwareInfo(): id: " << id.toUtf8().constData() << " name: " << name.toUtf8().constData() << std::endl; delete eepromInterface;
if (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): FirmwareInfo(const QString & id, const QString & name, EEPROMInterface * eepromInterface, const QString & url = QString(), const QString & stamp = QString(), const QString & rnurl = QString(), bool voice = false):

10
companion/src/firmwares/opentx/opentxeeprom.cpp
View file

@ -148,9 +148,9 @@ class SwitchesConversionTable: public ConversionTable {
static void Cleanup() { static void Cleanup() {
for (std::list<Cache>::iterator it=internalCache.begin(); it!=internalCache.end(); it++) { for (std::list<Cache>::iterator it=internalCache.begin(); it!=internalCache.end(); it++) {
Cache element = *it; Cache element = *it;
//std::cout << "~SwitchesConversionTable(): deleting " << std::hex << reinterpret_cast<uint64_t>(element.table) << std::dec << std::endl; delete element.table;
if (element.table) delete element.table;
} }
internalCache.clear();
} }
}; };
@ -309,9 +309,9 @@ class SourcesConversionTable: public ConversionTable {
static void Cleanup() { static void Cleanup() {
for (std::list<Cache>::iterator it=internalCache.begin(); it!=internalCache.end(); it++) { for (std::list<Cache>::iterator it=internalCache.begin(); it!=internalCache.end(); it++) {
Cache element = *it; Cache element = *it;
//std::cout << "~SourcesConversionTable(): deleting " << std::hex << reinterpret_cast<uint64_t>(element.table) << std::dec << std::endl; delete element.table;
if (element.table) delete element.table;
} }
internalCache.clear();
} }
}; };
@ -1459,7 +1459,7 @@ class LogicalSwitchField: public TransformedField {
} }
~LogicalSwitchField() { ~LogicalSwitchField() {
if (andswitchesConversionTable) delete andswitchesConversionTable; delete andswitchesConversionTable;
} }
virtual void beforeExport() virtual void beforeExport()
{ {

2
companion/src/firmwares/opentx/opentxinterface.cpp
View file

@ -1235,7 +1235,7 @@ void RegisterOpen9xFirmwares()
void UnregisterOpen9xFirmwares() { void UnregisterOpen9xFirmwares() {
foreach (FirmwareInfo * f, firmwares) { 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; delete f;
} }
} }

2
companion/src/simulation/simulatordialog.cpp
View file

@ -142,7 +142,7 @@ SimulatorDialogTaranis::~SimulatorDialogTaranis()
SimulatorDialog::~SimulatorDialog() SimulatorDialog::~SimulatorDialog()
{ {
delete timer; delete timer;
if (simulator) delete simulator; delete simulator;
} }
void SimulatorDialog::closeEvent (QCloseEvent *) void SimulatorDialog::closeEvent (QCloseEvent *)