From 219cfb071263cf45cea6aad9e093bb0b605defd7 Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 27 Feb 2018 19:26:52 +0100 Subject: [PATCH] Make DeviceUISet and DeviceSet classes as they are forward declared like this --- sdrgui/device/deviceuiset.h | 3 ++- sdrsrv/device/deviceset.cpp | 2 +- sdrsrv/device/deviceset.h | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sdrgui/device/deviceuiset.h b/sdrgui/device/deviceuiset.h index b2978f175..79c9bae3d 100644 --- a/sdrgui/device/deviceuiset.h +++ b/sdrgui/device/deviceuiset.h @@ -32,8 +32,9 @@ class DeviceSinkAPI; class ChannelMarker; class PluginAPI; -struct DeviceUISet +class DeviceUISet { +public: SpectrumVis *m_spectrumVis; GLSpectrum *m_spectrum; GLSpectrumGUI *m_spectrumGUI; diff --git a/sdrsrv/device/deviceset.cpp b/sdrsrv/device/deviceset.cpp index ae58535ea..469628f47 100644 --- a/sdrsrv/device/deviceset.cpp +++ b/sdrsrv/device/deviceset.cpp @@ -295,7 +295,7 @@ void DeviceSet::loadTxChannelSettings(const Preset *preset, PluginAPI *pluginAPI // everything, that is still "available" is not needed anymore for(int i = 0; i < openChannels.count(); i++) { - qDebug("DeviceUISet::loadChannelSettings: destroying spare channel [%s]", qPrintable(openChannels[i].m_channelName)); + qDebug("DeviceSet::loadChannelSettings: destroying spare channel [%s]", qPrintable(openChannels[i].m_channelName)); openChannels[i].m_channelSourceAPI->destroy(); } diff --git a/sdrsrv/device/deviceset.h b/sdrsrv/device/deviceset.h index 0eecab2d7..dd072c0f2 100644 --- a/sdrsrv/device/deviceset.h +++ b/sdrsrv/device/deviceset.h @@ -28,8 +28,9 @@ class ChannelSinkAPI; class ChannelSourceAPI; class Preset; -struct DeviceSet +class DeviceSet { +public: DSPDeviceSourceEngine *m_deviceSourceEngine; DeviceSourceAPI *m_deviceSourceAPI; DSPDeviceSinkEngine *m_deviceSinkEngine;