VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-25 09:18:54 -05:00
Code Issues Projects Releases Wiki Activity

Removed the destroy method from ChannelGUI interface

Browse Source
This commit is contained in:
f4exb 2024-08-25 00:41:39 +02:00
parent 36349e2837
commit a014491e61
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sdrgui/channel/channelgui.h
View File

@ -56,9 +56,8 @@ public:
ContextMenuChannelSettings ContextMenuChannelSettings
}; };
ChannelGUI(QWidget *parent = nullptr); explicit ChannelGUI(QWidget *parent = nullptr);
virtual ~ChannelGUI(); ~ChannelGUI() override;
virtual void destroy() = 0;
virtual void resetToDefaults() = 0; virtual void resetToDefaults() = 0;
// Data saved in the derived settings // Data saved in the derived settings

10
sdrgui/device/deviceuiset.cpp
View File

@ -166,7 +166,7 @@ void DeviceUISet::freeChannels()
for(int i = 0; i < m_channelInstanceRegistrations.count(); i++) for(int i = 0; i < m_channelInstanceRegistrations.count(); i++)
{ {
qDebug("DeviceUISet::freeChannels: destroying channel [%s]", qPrintable(m_channelInstanceRegistrations[i].m_channelAPI->getURI())); qDebug("DeviceUISet::freeChannels: destroying channel [%s]", qPrintable(m_channelInstanceRegistrations[i].m_channelAPI->getURI()));
m_channelInstanceRegistrations[i].m_gui->destroy(); delete m_channelInstanceRegistrations[i].m_gui;
delete m_channelInstanceRegistrations[i].m_channelAPI; delete m_channelInstanceRegistrations[i].m_channelAPI;
} }
@ -181,7 +181,7 @@ void DeviceUISet::deleteChannel(int channelIndex)
qDebug("DeviceUISet::deleteChannel: delete channel [%s] at %d", qDebug("DeviceUISet::deleteChannel: delete channel [%s] at %d",
qPrintable(m_channelInstanceRegistrations[channelIndex].m_channelAPI->getURI()), qPrintable(m_channelInstanceRegistrations[channelIndex].m_channelAPI->getURI()),
channelIndex); channelIndex);
m_channelInstanceRegistrations[channelIndex].m_gui->destroy(); delete m_channelInstanceRegistrations[channelIndex].m_gui;
delete m_channelInstanceRegistrations[channelIndex].m_channelAPI; delete m_channelInstanceRegistrations[channelIndex].m_channelAPI;
m_channelInstanceRegistrations.removeAt(channelIndex); m_channelInstanceRegistrations.removeAt(channelIndex);
} }
@ -320,7 +320,7 @@ void DeviceUISet::loadRxChannelSettings(const Preset *preset, PluginAPI *pluginA
qDebug("DeviceUISet::loadRxChannelSettings: destroying old channel [%s]", qDebug("DeviceUISet::loadRxChannelSettings: destroying old channel [%s]",
qPrintable(m_channelInstanceRegistrations[i].m_channelAPI->getURI())); qPrintable(m_channelInstanceRegistrations[i].m_channelAPI->getURI()));
m_channelInstanceRegistrations[i].m_channelAPI->setMessageQueueToGUI(nullptr); // have channel stop sending messages to its GUI m_channelInstanceRegistrations[i].m_channelAPI->setMessageQueueToGUI(nullptr); // have channel stop sending messages to its GUI
m_channelInstanceRegistrations[i].m_gui->destroy(); delete m_channelInstanceRegistrations[i].m_gui;
delete m_channelInstanceRegistrations[i].m_channelAPI; delete m_channelInstanceRegistrations[i].m_channelAPI;
} }
@ -449,7 +449,7 @@ void DeviceUISet::loadTxChannelSettings(const Preset *preset, PluginAPI *pluginA
qDebug("DeviceUISet::loadTxChannelSettings: destroying old channel [%s]", qDebug("DeviceUISet::loadTxChannelSettings: destroying old channel [%s]",
qPrintable(m_channelInstanceRegistrations[i].m_channelAPI->getURI())); qPrintable(m_channelInstanceRegistrations[i].m_channelAPI->getURI()));
m_channelInstanceRegistrations[i].m_channelAPI->setMessageQueueToGUI(nullptr); // have channel stop sending messages to its GUI m_channelInstanceRegistrations[i].m_channelAPI->setMessageQueueToGUI(nullptr); // have channel stop sending messages to its GUI
m_channelInstanceRegistrations[i].m_gui->destroy(); delete m_channelInstanceRegistrations[i].m_gui;
delete m_channelInstanceRegistrations[i].m_channelAPI; delete m_channelInstanceRegistrations[i].m_channelAPI;
} }
@ -575,7 +575,7 @@ void DeviceUISet::loadMIMOChannelSettings(const Preset *preset, PluginAPI *plugi
{ {
qDebug("DeviceUISet::loadMIMOChannelSettings: destroying old channel [%s]", qDebug("DeviceUISet::loadMIMOChannelSettings: destroying old channel [%s]",
qPrintable(m_channelInstanceRegistrations[i].m_channelAPI->getURI())); qPrintable(m_channelInstanceRegistrations[i].m_channelAPI->getURI()));
m_channelInstanceRegistrations[i].m_gui->destroy(); // stop GUI first (issue #1427) delete m_channelInstanceRegistrations[i].m_gui; // stop GUI first (issue #1427)
delete m_channelInstanceRegistrations[i].m_channelAPI; // stop channel before (issue #860) delete m_channelInstanceRegistrations[i].m_channelAPI; // stop channel before (issue #860)
} }