From d085b4eb7d558af2a89ee3c16d1307fea5dffbc6 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 3 Oct 2020 11:43:14 +0200 Subject: [PATCH] Removed undesirable methods from PluginInstanceGUI and related common plugins --- .../channelrx/chanalyzer/chanalyzergui.cpp | 22 ------------- plugins/channelrx/chanalyzer/chanalyzergui.h | 5 --- plugins/channelrx/demodam/amdemodgui.cpp | 20 ------------ plugins/channelrx/demodam/amdemodgui.h | 5 --- plugins/channelrx/demodatv/atvdemodgui.cpp | 22 ------------- plugins/channelrx/demodatv/atvdemodgui.h | 5 --- plugins/channelrx/demodbfm/bfmdemodgui.cpp | 21 ------------- plugins/channelrx/demodbfm/bfmdemodgui.h | 5 --- plugins/channelrx/demoddatv/datvdemodgui.cpp | 21 ------------- plugins/channelrx/demoddatv/datvdemodgui.h | 5 --- plugins/channelrx/demoddsd/dsddemodgui.cpp | 21 ------------- plugins/channelrx/demoddsd/dsddemodgui.h | 5 --- .../channelrx/demodfreedv/freedvdemodgui.cpp | 22 ------------- .../channelrx/demodfreedv/freedvdemodgui.h | 5 --- plugins/channelrx/demodnfm/nfmdemodgui.cpp | 21 ------------- plugins/channelrx/demodnfm/nfmdemodgui.h | 5 --- plugins/channelrx/demodssb/ssbdemodgui.cpp | 22 ------------- plugins/channelrx/demodssb/ssbdemodgui.h | 5 --- plugins/channelrx/demodwfm/wfmdemodgui.cpp | 21 ------------- plugins/channelrx/demodwfm/wfmdemodgui.h | 5 --- plugins/channelrx/filesink/filesinkgui.cpp | 19 ------------ plugins/channelrx/filesink/filesinkgui.h | 5 --- .../channelrx/freqtracker/freqtrackergui.cpp | 20 ------------ .../channelrx/freqtracker/freqtrackergui.h | 5 --- plugins/channelrx/localsink/localsinkgui.cpp | 19 ------------ plugins/channelrx/localsink/localsinkgui.h | 5 --- .../channelrx/remotesink/remotesinkgui.cpp | 19 ------------ plugins/channelrx/remotesink/remotesinkgui.h | 5 --- plugins/channelrx/udpsink/udpsinkgui.cpp | 21 ------------- plugins/channelrx/udpsink/udpsinkgui.h | 5 --- .../channeltx/filesource/filesourcegui.cpp | 19 ------------ plugins/channeltx/filesource/filesourcegui.h | 5 --- .../channeltx/localsource/localsourcegui.cpp | 19 ------------ .../channeltx/localsource/localsourcegui.h | 5 --- plugins/channeltx/modam/ammodgui.cpp | 20 ------------ plugins/channeltx/modam/ammodgui.h | 5 --- plugins/channeltx/modatv/atvmodgui.cpp | 20 ------------ plugins/channeltx/modatv/atvmodgui.h | 5 --- plugins/channeltx/modfreedv/freedvmodgui.cpp | 21 ------------- plugins/channeltx/modfreedv/freedvmodgui.h | 5 --- plugins/channeltx/modnfm/nfmmodgui.cpp | 20 ------------ plugins/channeltx/modnfm/nfmmodgui.h | 5 --- plugins/channeltx/modpacket/packetmodgui.cpp | 20 ------------ plugins/channeltx/modpacket/packetmodgui.h | 5 --- plugins/channeltx/modssb/ssbmodgui.cpp | 21 ------------- plugins/channeltx/modssb/ssbmodgui.h | 5 --- plugins/channeltx/modwfm/wfmmodgui.cpp | 20 ------------ plugins/channeltx/modwfm/wfmmodgui.h | 5 --- .../remotesource/remotesourcegui.cpp | 19 ------------ .../channeltx/remotesource/remotesourcegui.h | 5 --- plugins/channeltx/udpsource/udpsourcegui.cpp | 20 ------------ plugins/channeltx/udpsource/udpsourcegui.h | 4 --- .../feature/rigctlserver/rigctlservergui.cpp | 10 ------ .../feature/rigctlserver/rigctlservergui.h | 4 --- plugins/feature/simpleptt/simplepttgui.cpp | 10 ------ plugins/feature/simpleptt/simplepttgui.h | 8 ++--- .../bladerf1output/bladerf1outputgui.cpp | 22 ------------- .../bladerf1output/bladerf1outputgui.h | 5 --- .../bladerf2output/bladerf2outputgui.cpp | 22 ------------- .../bladerf2output/bladerf2outputgui.h | 5 --- .../samplesink/fileoutput/fileoutputgui.cpp | 22 ------------- plugins/samplesink/fileoutput/fileoutputgui.h | 5 --- .../hackrfoutput/hackrfoutputgui.cpp | 22 ------------- .../samplesink/hackrfoutput/hackrfoutputgui.h | 5 --- .../limesdroutput/limesdroutputgui.cpp | 22 ------------- .../limesdroutput/limesdroutputgui.h | 5 --- .../samplesink/localoutput/localoutputgui.cpp | 20 ------------ .../samplesink/localoutput/localoutputgui.h | 5 --- .../plutosdroutput/plutosdroutputgui.cpp | 22 ------------- .../plutosdroutput/plutosdroutputgui.h | 4 --- .../remoteoutput/remoteoutputgui.cpp | 10 ------ .../samplesink/remoteoutput/remoteoutputgui.h | 5 --- .../soapysdroutput/soapysdroutputgui.cpp | 22 ------------- .../soapysdroutput/soapysdroutputgui.h | 5 --- plugins/samplesink/testsink/testsinkgui.cpp | 22 ------------- plugins/samplesink/testsink/testsinkgui.h | 5 --- .../samplesink/xtrxoutput/xtrxoutputgui.cpp | 22 ------------- plugins/samplesink/xtrxoutput/xtrxoutputgui.h | 5 --- plugins/samplesource/airspy/airspygui.cpp | 22 ------------- plugins/samplesource/airspy/airspygui.h | 5 --- plugins/samplesource/airspyhf/airspyhfgui.cpp | 22 ------------- plugins/samplesource/airspyhf/airspyhfgui.h | 5 --- .../bladerf1input/bladerf1inputgui.cpp | 22 ------------- .../bladerf1input/bladerf1inputgui.h | 5 --- .../bladerf2input/bladerf2inputgui.cpp | 22 ------------- .../bladerf2input/bladerf2inputgui.h | 5 --- plugins/samplesource/fcdpro/fcdprogui.cpp | 22 ------------- plugins/samplesource/fcdpro/fcdprogui.h | 5 --- .../samplesource/fcdproplus/fcdproplusgui.cpp | 22 ------------- .../samplesource/fcdproplus/fcdproplusgui.h | 5 --- .../samplesource/fileinput/fileinputgui.cpp | 24 +------------- plugins/samplesource/fileinput/fileinputgui.h | 5 --- .../hackrfinput/hackrfinputgui.cpp | 22 ------------- .../samplesource/hackrfinput/hackrfinputgui.h | 5 --- plugins/samplesource/kiwisdr/kiwisdrgui.cpp | 22 ------------- plugins/samplesource/kiwisdr/kiwisdrgui.h | 5 --- .../limesdrinput/limesdrinputgui.cpp | 22 ------------- .../limesdrinput/limesdrinputgui.h | 5 --- .../samplesource/localinput/localinputgui.cpp | 20 ------------ .../samplesource/localinput/localinputgui.h | 5 --- plugins/samplesource/perseus/perseusgui.cpp | 22 ------------- plugins/samplesource/perseus/perseusgui.h | 5 --- .../plutosdrinput/plutosdrinputgui.cpp | 22 ------------- .../plutosdrinput/plutosdrinputgui.h | 4 --- .../remoteinput/remoteinputgui.cpp | 20 ------------ .../samplesource/remoteinput/remoteinputgui.h | 5 --- plugins/samplesource/rtlsdr/rtlsdrgui.cpp | 22 ------------- plugins/samplesource/rtlsdr/rtlsdrgui.h | 5 --- plugins/samplesource/sdrplay/sdrplaygui.cpp | 22 ------------- plugins/samplesource/sdrplay/sdrplaygui.h | 5 --- .../soapysdrinput/soapysdrinputgui.cpp | 22 ------------- .../soapysdrinput/soapysdrinputgui.h | 5 --- .../samplesource/testsource/testsourcegui.cpp | 22 ------------- .../samplesource/testsource/testsourcegui.h | 5 --- .../samplesource/xtrxinput/xtrxinputgui.cpp | 22 ------------- plugins/samplesource/xtrxinput/xtrxinputgui.h | 5 --- sdrbase/plugin/plugininstancegui.h | 8 ----- sdrgui/device/deviceuiset.cpp | 31 +++---------------- sdrgui/device/deviceuiset.h | 2 -- sdrgui/feature/featureuiset.cpp | 17 ++-------- sdrgui/feature/featureuiset.h | 2 -- 121 files changed, 9 insertions(+), 1534 deletions(-) diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.cpp b/plugins/channelrx/chanalyzer/chanalyzergui.cpp index 7eb97d97a..7c657a861 100644 --- a/plugins/channelrx/chanalyzer/chanalyzergui.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzergui.cpp @@ -46,28 +46,6 @@ void ChannelAnalyzerGUI::destroy() delete this; } -void ChannelAnalyzerGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString ChannelAnalyzerGUI::getName() const -{ - return objectName(); -} - -qint64 ChannelAnalyzerGUI::getCenterFrequency() const -{ - return m_channelMarker.getCenterFrequency(); -} - -void ChannelAnalyzerGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_channelMarker.setCenterFrequency(centerFrequency); - m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency(); - applySettings(); -} - void ChannelAnalyzerGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.h b/plugins/channelrx/chanalyzer/chanalyzergui.h index da78ecbef..51c390758 100644 --- a/plugins/channelrx/chanalyzer/chanalyzergui.h +++ b/plugins/channelrx/chanalyzer/chanalyzergui.h @@ -46,11 +46,6 @@ public: static ChannelAnalyzerGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); diff --git a/plugins/channelrx/demodam/amdemodgui.cpp b/plugins/channelrx/demodam/amdemodgui.cpp index 5353e38af..9898a3c3b 100644 --- a/plugins/channelrx/demodam/amdemodgui.cpp +++ b/plugins/channelrx/demodam/amdemodgui.cpp @@ -48,26 +48,6 @@ void AMDemodGUI::destroy() delete this; } -void AMDemodGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString AMDemodGUI::getName() const -{ - return objectName(); -} - -qint64 AMDemodGUI::getCenterFrequency() const { - return m_channelMarker.getCenterFrequency(); -} - -void AMDemodGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_channelMarker.setCenterFrequency(centerFrequency); - applySettings(); -} - void AMDemodGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channelrx/demodam/amdemodgui.h b/plugins/channelrx/demodam/amdemodgui.h index cea9d848a..9c0a4cb6b 100644 --- a/plugins/channelrx/demodam/amdemodgui.h +++ b/plugins/channelrx/demodam/amdemodgui.h @@ -27,11 +27,6 @@ public: static AMDemodGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); diff --git a/plugins/channelrx/demodatv/atvdemodgui.cpp b/plugins/channelrx/demodatv/atvdemodgui.cpp index b7ab45495..426941c53 100644 --- a/plugins/channelrx/demodatv/atvdemodgui.cpp +++ b/plugins/channelrx/demodatv/atvdemodgui.cpp @@ -45,28 +45,6 @@ void ATVDemodGUI::destroy() delete this; } -void ATVDemodGUI::setName(const QString& strName) -{ - setObjectName(strName); -} - -QString ATVDemodGUI::getName() const -{ - return objectName(); -} - -qint64 ATVDemodGUI::getCenterFrequency() const -{ - return m_channelMarker.getCenterFrequency(); -} - -void ATVDemodGUI::setCenterFrequency(qint64 intCenterFrequency) -{ - m_channelMarker.setCenterFrequency(intCenterFrequency); - m_settings.m_inputFrequencyOffset = intCenterFrequency; - applySettings(); -} - void ATVDemodGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channelrx/demodatv/atvdemodgui.h b/plugins/channelrx/demodatv/atvdemodgui.h index 331bc721b..6d618ef51 100644 --- a/plugins/channelrx/demodatv/atvdemodgui.h +++ b/plugins/channelrx/demodatv/atvdemodgui.h @@ -46,11 +46,6 @@ public: static ATVDemodGUI* create(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); virtual void destroy(); - void setName(const QString& strName); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 intCenterFrequency); - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& arrData); diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.cpp b/plugins/channelrx/demodbfm/bfmdemodgui.cpp index 26269282c..b3083999d 100644 --- a/plugins/channelrx/demodbfm/bfmdemodgui.cpp +++ b/plugins/channelrx/demodbfm/bfmdemodgui.cpp @@ -56,27 +56,6 @@ void BFMDemodGUI::destroy() delete this; } -void BFMDemodGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString BFMDemodGUI::getName() const -{ - return objectName(); -} - -qint64 BFMDemodGUI::getCenterFrequency() const -{ - return m_channelMarker.getCenterFrequency(); -} - -void BFMDemodGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_channelMarker.setCenterFrequency(centerFrequency); - applySettings(); -} - void BFMDemodGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.h b/plugins/channelrx/demodbfm/bfmdemodgui.h index 5ee15b131..5def72064 100644 --- a/plugins/channelrx/demodbfm/bfmdemodgui.h +++ b/plugins/channelrx/demodbfm/bfmdemodgui.h @@ -44,11 +44,6 @@ public: static BFMDemodGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceAPI, BasebandSampleSink *rxChannel); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); diff --git a/plugins/channelrx/demoddatv/datvdemodgui.cpp b/plugins/channelrx/demoddatv/datvdemodgui.cpp index ceb96ca34..ea326ee88 100644 --- a/plugins/channelrx/demoddatv/datvdemodgui.cpp +++ b/plugins/channelrx/demoddatv/datvdemodgui.cpp @@ -51,27 +51,6 @@ void DATVDemodGUI::destroy() delete this; } -void DATVDemodGUI::setName(const QString& strName) -{ - setObjectName(strName); -} - -QString DATVDemodGUI::getName() const -{ - return objectName(); -} - -qint64 DATVDemodGUI::getCenterFrequency() const -{ - return m_objChannelMarker.getCenterFrequency(); -} - -void DATVDemodGUI::setCenterFrequency(qint64 intCenterFrequency) -{ - m_objChannelMarker.setCenterFrequency(intCenterFrequency); - applySettings(); -} - void DATVDemodGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channelrx/demoddatv/datvdemodgui.h b/plugins/channelrx/demoddatv/datvdemodgui.h index 543a1b2cb..acf4eb714 100644 --- a/plugins/channelrx/demoddatv/datvdemodgui.h +++ b/plugins/channelrx/demoddatv/datvdemodgui.h @@ -47,11 +47,6 @@ public: static DATVDemodGUI* create(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); virtual void destroy(); - void setName(const QString& strName); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 intCenterFrequency); - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& arrData); diff --git a/plugins/channelrx/demoddsd/dsddemodgui.cpp b/plugins/channelrx/demoddsd/dsddemodgui.cpp index bba97501c..eec1bfe01 100644 --- a/plugins/channelrx/demoddsd/dsddemodgui.cpp +++ b/plugins/channelrx/demoddsd/dsddemodgui.cpp @@ -52,27 +52,6 @@ void DSDDemodGUI::destroy() delete this; } -void DSDDemodGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString DSDDemodGUI::getName() const -{ - return objectName(); -} - -qint64 DSDDemodGUI::getCenterFrequency() const -{ - return m_channelMarker.getCenterFrequency(); -} - -void DSDDemodGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_channelMarker.setCenterFrequency(centerFrequency); - applySettings(); -} - void DSDDemodGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channelrx/demoddsd/dsddemodgui.h b/plugins/channelrx/demoddsd/dsddemodgui.h index 4198a1eec..319834549 100644 --- a/plugins/channelrx/demoddsd/dsddemodgui.h +++ b/plugins/channelrx/demoddsd/dsddemodgui.h @@ -49,11 +49,6 @@ public: static DSDDemodGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); diff --git a/plugins/channelrx/demodfreedv/freedvdemodgui.cpp b/plugins/channelrx/demodfreedv/freedvdemodgui.cpp index 4ebc609c7..4dd0cc272 100644 --- a/plugins/channelrx/demodfreedv/freedvdemodgui.cpp +++ b/plugins/channelrx/demodfreedv/freedvdemodgui.cpp @@ -48,28 +48,6 @@ void FreeDVDemodGUI::destroy() delete this; } -void FreeDVDemodGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString FreeDVDemodGUI::getName() const -{ - return objectName(); -} - -qint64 FreeDVDemodGUI::getCenterFrequency() const -{ - return m_channelMarker.getCenterFrequency(); -} - -void FreeDVDemodGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_channelMarker.setCenterFrequency(centerFrequency); - m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency(); - applySettings(); -} - void FreeDVDemodGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channelrx/demodfreedv/freedvdemodgui.h b/plugins/channelrx/demodfreedv/freedvdemodgui.h index 1f06490b8..05eac3a02 100644 --- a/plugins/channelrx/demodfreedv/freedvdemodgui.h +++ b/plugins/channelrx/demodfreedv/freedvdemodgui.h @@ -46,11 +46,6 @@ public: static FreeDVDemodGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.cpp b/plugins/channelrx/demodnfm/nfmdemodgui.cpp index 4551c540f..e1752bd8a 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.cpp +++ b/plugins/channelrx/demodnfm/nfmdemodgui.cpp @@ -29,27 +29,6 @@ void NFMDemodGUI::destroy() delete this; } -void NFMDemodGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString NFMDemodGUI::getName() const -{ - return objectName(); -} - -qint64 NFMDemodGUI::getCenterFrequency() const -{ - return m_channelMarker.getCenterFrequency(); -} - -void NFMDemodGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_channelMarker.setCenterFrequency(centerFrequency); - applySettings(); -} - void NFMDemodGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.h b/plugins/channelrx/demodnfm/nfmdemodgui.h index f7ef1fd5e..b58f992b6 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.h +++ b/plugins/channelrx/demodnfm/nfmdemodgui.h @@ -26,11 +26,6 @@ public: static NFMDemodGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); diff --git a/plugins/channelrx/demodssb/ssbdemodgui.cpp b/plugins/channelrx/demodssb/ssbdemodgui.cpp index c9b2b92c9..3348af0bc 100644 --- a/plugins/channelrx/demodssb/ssbdemodgui.cpp +++ b/plugins/channelrx/demodssb/ssbdemodgui.cpp @@ -30,28 +30,6 @@ void SSBDemodGUI::destroy() delete this; } -void SSBDemodGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString SSBDemodGUI::getName() const -{ - return objectName(); -} - -qint64 SSBDemodGUI::getCenterFrequency() const -{ - return m_channelMarker.getCenterFrequency(); -} - -void SSBDemodGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_channelMarker.setCenterFrequency(centerFrequency); - m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency(); - applySettings(); -} - void SSBDemodGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channelrx/demodssb/ssbdemodgui.h b/plugins/channelrx/demodssb/ssbdemodgui.h index 6645f7d78..cee563e38 100644 --- a/plugins/channelrx/demodssb/ssbdemodgui.h +++ b/plugins/channelrx/demodssb/ssbdemodgui.h @@ -29,11 +29,6 @@ public: static SSBDemodGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); diff --git a/plugins/channelrx/demodwfm/wfmdemodgui.cpp b/plugins/channelrx/demodwfm/wfmdemodgui.cpp index 668cfaeb5..2f4dd17c2 100644 --- a/plugins/channelrx/demodwfm/wfmdemodgui.cpp +++ b/plugins/channelrx/demodwfm/wfmdemodgui.cpp @@ -30,27 +30,6 @@ void WFMDemodGUI::destroy() delete this; } -void WFMDemodGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString WFMDemodGUI::getName() const -{ - return objectName(); -} - -qint64 WFMDemodGUI::getCenterFrequency() const -{ - return m_channelMarker.getCenterFrequency(); -} - -void WFMDemodGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_channelMarker.setCenterFrequency(centerFrequency); - applySettings(); -} - void WFMDemodGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channelrx/demodwfm/wfmdemodgui.h b/plugins/channelrx/demodwfm/wfmdemodgui.h index ded46149e..545a4c453 100644 --- a/plugins/channelrx/demodwfm/wfmdemodgui.h +++ b/plugins/channelrx/demodwfm/wfmdemodgui.h @@ -24,11 +24,6 @@ public: static WFMDemodGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); diff --git a/plugins/channelrx/filesink/filesinkgui.cpp b/plugins/channelrx/filesink/filesinkgui.cpp index d4be13ad9..b2f86a3a4 100644 --- a/plugins/channelrx/filesink/filesinkgui.cpp +++ b/plugins/channelrx/filesink/filesinkgui.cpp @@ -43,25 +43,6 @@ void FileSinkGUI::destroy() delete this; } -void FileSinkGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString FileSinkGUI::getName() const -{ - return objectName(); -} - -qint64 FileSinkGUI::getCenterFrequency() const { - return 0; -} - -void FileSinkGUI::setCenterFrequency(qint64 centerFrequency) -{ - (void) centerFrequency; -} - void FileSinkGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channelrx/filesink/filesinkgui.h b/plugins/channelrx/filesink/filesinkgui.h index 1e1da56dc..affdac758 100644 --- a/plugins/channelrx/filesink/filesinkgui.h +++ b/plugins/channelrx/filesink/filesinkgui.h @@ -45,11 +45,6 @@ public: static FileSinkGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); diff --git a/plugins/channelrx/freqtracker/freqtrackergui.cpp b/plugins/channelrx/freqtracker/freqtrackergui.cpp index 8726fe1f8..37b7190e1 100644 --- a/plugins/channelrx/freqtracker/freqtrackergui.cpp +++ b/plugins/channelrx/freqtracker/freqtrackergui.cpp @@ -49,26 +49,6 @@ void FreqTrackerGUI::destroy() delete this; } -void FreqTrackerGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString FreqTrackerGUI::getName() const -{ - return objectName(); -} - -qint64 FreqTrackerGUI::getCenterFrequency() const { - return m_channelMarker.getCenterFrequency(); -} - -void FreqTrackerGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_channelMarker.setCenterFrequency(centerFrequency); - applySettings(); -} - void FreqTrackerGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channelrx/freqtracker/freqtrackergui.h b/plugins/channelrx/freqtracker/freqtrackergui.h index 19d052d05..0a5fdec8a 100644 --- a/plugins/channelrx/freqtracker/freqtrackergui.h +++ b/plugins/channelrx/freqtracker/freqtrackergui.h @@ -44,11 +44,6 @@ public: static FreqTrackerGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); diff --git a/plugins/channelrx/localsink/localsinkgui.cpp b/plugins/channelrx/localsink/localsinkgui.cpp index 4dd3293d4..3d8f96c49 100644 --- a/plugins/channelrx/localsink/localsinkgui.cpp +++ b/plugins/channelrx/localsink/localsinkgui.cpp @@ -38,25 +38,6 @@ void LocalSinkGUI::destroy() delete this; } -void LocalSinkGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString LocalSinkGUI::getName() const -{ - return objectName(); -} - -qint64 LocalSinkGUI::getCenterFrequency() const { - return 0; -} - -void LocalSinkGUI::setCenterFrequency(qint64 centerFrequency) -{ - (void) centerFrequency; -} - void LocalSinkGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channelrx/localsink/localsinkgui.h b/plugins/channelrx/localsink/localsinkgui.h index f6607aae3..a1461c51d 100644 --- a/plugins/channelrx/localsink/localsinkgui.h +++ b/plugins/channelrx/localsink/localsinkgui.h @@ -44,11 +44,6 @@ public: static LocalSinkGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); diff --git a/plugins/channelrx/remotesink/remotesinkgui.cpp b/plugins/channelrx/remotesink/remotesinkgui.cpp index cf7813472..76c96ca35 100644 --- a/plugins/channelrx/remotesink/remotesinkgui.cpp +++ b/plugins/channelrx/remotesink/remotesinkgui.cpp @@ -39,25 +39,6 @@ void RemoteSinkGUI::destroy() delete this; } -void RemoteSinkGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString RemoteSinkGUI::getName() const -{ - return objectName(); -} - -qint64 RemoteSinkGUI::getCenterFrequency() const { - return 0; -} - -void RemoteSinkGUI::setCenterFrequency(qint64 centerFrequency) -{ - (void) centerFrequency; -} - void RemoteSinkGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channelrx/remotesink/remotesinkgui.h b/plugins/channelrx/remotesink/remotesinkgui.h index 7ba48fc0c..53c8b0af5 100644 --- a/plugins/channelrx/remotesink/remotesinkgui.h +++ b/plugins/channelrx/remotesink/remotesinkgui.h @@ -44,11 +44,6 @@ public: static RemoteSinkGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); diff --git a/plugins/channelrx/udpsink/udpsinkgui.cpp b/plugins/channelrx/udpsink/udpsinkgui.cpp index e350fcf56..8ae5ba4f6 100644 --- a/plugins/channelrx/udpsink/udpsinkgui.cpp +++ b/plugins/channelrx/udpsink/udpsinkgui.cpp @@ -41,27 +41,6 @@ void UDPSinkGUI::destroy() delete this; } -void UDPSinkGUI::setName(const QString& name) -{ - setObjectName(name); -} - -qint64 UDPSinkGUI::getCenterFrequency() const -{ - return m_channelMarker.getCenterFrequency(); -} - -void UDPSinkGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_channelMarker.setCenterFrequency(centerFrequency); - applySettings(); -} - -QString UDPSinkGUI::getName() const -{ - return objectName(); -} - void UDPSinkGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channelrx/udpsink/udpsinkgui.h b/plugins/channelrx/udpsink/udpsinkgui.h index 4854ecb56..3a2a54722 100644 --- a/plugins/channelrx/udpsink/udpsinkgui.h +++ b/plugins/channelrx/udpsink/udpsinkgui.h @@ -45,11 +45,6 @@ public: static UDPSinkGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); diff --git a/plugins/channeltx/filesource/filesourcegui.cpp b/plugins/channeltx/filesource/filesourcegui.cpp index 28a086512..aadebc252 100644 --- a/plugins/channeltx/filesource/filesourcegui.cpp +++ b/plugins/channeltx/filesource/filesourcegui.cpp @@ -44,25 +44,6 @@ void FileSourceGUI::destroy() delete this; } -void FileSourceGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString FileSourceGUI::getName() const -{ - return objectName(); -} - -qint64 FileSourceGUI::getCenterFrequency() const { - return 0; -} - -void FileSourceGUI::setCenterFrequency(qint64 centerFrequency) -{ - (void) centerFrequency; -} - void FileSourceGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channeltx/filesource/filesourcegui.h b/plugins/channeltx/filesource/filesourcegui.h index 909760ded..d9669fbad 100644 --- a/plugins/channeltx/filesource/filesourcegui.h +++ b/plugins/channeltx/filesource/filesourcegui.h @@ -41,11 +41,6 @@ public: static FileSourceGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); diff --git a/plugins/channeltx/localsource/localsourcegui.cpp b/plugins/channeltx/localsource/localsourcegui.cpp index dc4d65e15..4bfb23b01 100644 --- a/plugins/channeltx/localsource/localsourcegui.cpp +++ b/plugins/channeltx/localsource/localsourcegui.cpp @@ -38,25 +38,6 @@ void LocalSourceGUI::destroy() delete this; } -void LocalSourceGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString LocalSourceGUI::getName() const -{ - return objectName(); -} - -qint64 LocalSourceGUI::getCenterFrequency() const { - return 0; -} - -void LocalSourceGUI::setCenterFrequency(qint64 centerFrequency) -{ - (void) centerFrequency; -} - void LocalSourceGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channeltx/localsource/localsourcegui.h b/plugins/channeltx/localsource/localsourcegui.h index 3b0ea0d89..37b6c169d 100644 --- a/plugins/channeltx/localsource/localsourcegui.h +++ b/plugins/channeltx/localsource/localsourcegui.h @@ -44,11 +44,6 @@ public: static LocalSourceGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *txChannel); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); diff --git a/plugins/channeltx/modam/ammodgui.cpp b/plugins/channeltx/modam/ammodgui.cpp index 35c6c4ea0..979a51b90 100644 --- a/plugins/channeltx/modam/ammodgui.cpp +++ b/plugins/channeltx/modam/ammodgui.cpp @@ -48,26 +48,6 @@ void AMModGUI::destroy() delete this; } -void AMModGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString AMModGUI::getName() const -{ - return objectName(); -} - -qint64 AMModGUI::getCenterFrequency() const { - return m_channelMarker.getCenterFrequency(); -} - -void AMModGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_channelMarker.setCenterFrequency(centerFrequency); - applySettings(); -} - void AMModGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channeltx/modam/ammodgui.h b/plugins/channeltx/modam/ammodgui.h index 217ba3e5a..a1d798fed 100644 --- a/plugins/channeltx/modam/ammodgui.h +++ b/plugins/channeltx/modam/ammodgui.h @@ -44,11 +44,6 @@ public: static AMModGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); diff --git a/plugins/channeltx/modatv/atvmodgui.cpp b/plugins/channeltx/modatv/atvmodgui.cpp index 53a44df47..7a172041a 100644 --- a/plugins/channeltx/modatv/atvmodgui.cpp +++ b/plugins/channeltx/modatv/atvmodgui.cpp @@ -121,26 +121,6 @@ ATVModGUI::~ATVModGUI() delete ui; } -void ATVModGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString ATVModGUI::getName() const -{ - return objectName(); -} - -qint64 ATVModGUI::getCenterFrequency() const { - return m_channelMarker.getCenterFrequency(); -} - -void ATVModGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_channelMarker.setCenterFrequency(centerFrequency); - applySettings(); -} - void ATVModGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channeltx/modatv/atvmodgui.h b/plugins/channeltx/modatv/atvmodgui.h index da8f291b2..c32df01fb 100644 --- a/plugins/channeltx/modatv/atvmodgui.h +++ b/plugins/channeltx/modatv/atvmodgui.h @@ -43,11 +43,6 @@ public: static ATVModGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); diff --git a/plugins/channeltx/modfreedv/freedvmodgui.cpp b/plugins/channeltx/modfreedv/freedvmodgui.cpp index b57ad28db..f34a30f96 100644 --- a/plugins/channeltx/modfreedv/freedvmodgui.cpp +++ b/plugins/channeltx/modfreedv/freedvmodgui.cpp @@ -49,27 +49,6 @@ void FreeDVModGUI::destroy() delete this; } -void FreeDVModGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString FreeDVModGUI::getName() const -{ - return objectName(); -} - -qint64 FreeDVModGUI::getCenterFrequency() const { - return m_channelMarker.getCenterFrequency(); -} - -void FreeDVModGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_channelMarker.setCenterFrequency(centerFrequency); - m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency(); - applySettings(); -} - void FreeDVModGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channeltx/modfreedv/freedvmodgui.h b/plugins/channeltx/modfreedv/freedvmodgui.h index 20774464a..d8fe49e23 100644 --- a/plugins/channeltx/modfreedv/freedvmodgui.h +++ b/plugins/channeltx/modfreedv/freedvmodgui.h @@ -45,11 +45,6 @@ public: static FreeDVModGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); diff --git a/plugins/channeltx/modnfm/nfmmodgui.cpp b/plugins/channeltx/modnfm/nfmmodgui.cpp index 0754d8066..d4d186415 100644 --- a/plugins/channeltx/modnfm/nfmmodgui.cpp +++ b/plugins/channeltx/modnfm/nfmmodgui.cpp @@ -48,26 +48,6 @@ void NFMModGUI::destroy() delete this; } -void NFMModGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString NFMModGUI::getName() const -{ - return objectName(); -} - -qint64 NFMModGUI::getCenterFrequency() const { - return m_channelMarker.getCenterFrequency(); -} - -void NFMModGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_channelMarker.setCenterFrequency(centerFrequency); - applySettings(); -} - void NFMModGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channeltx/modnfm/nfmmodgui.h b/plugins/channeltx/modnfm/nfmmodgui.h index fcbbc61f4..c27dcde90 100644 --- a/plugins/channeltx/modnfm/nfmmodgui.h +++ b/plugins/channeltx/modnfm/nfmmodgui.h @@ -42,11 +42,6 @@ public: static NFMModGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); diff --git a/plugins/channeltx/modpacket/packetmodgui.cpp b/plugins/channeltx/modpacket/packetmodgui.cpp index e057dbc8d..62f6b9fb2 100644 --- a/plugins/channeltx/modpacket/packetmodgui.cpp +++ b/plugins/channeltx/modpacket/packetmodgui.cpp @@ -53,26 +53,6 @@ void PacketModGUI::destroy() delete this; } -void PacketModGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString PacketModGUI::getName() const -{ - return objectName(); -} - -qint64 PacketModGUI::getCenterFrequency() const { - return m_channelMarker.getCenterFrequency(); -} - -void PacketModGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_channelMarker.setCenterFrequency(centerFrequency); - applySettings(); -} - void PacketModGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channeltx/modpacket/packetmodgui.h b/plugins/channeltx/modpacket/packetmodgui.h index bab47c8a8..a573e82d8 100644 --- a/plugins/channeltx/modpacket/packetmodgui.h +++ b/plugins/channeltx/modpacket/packetmodgui.h @@ -44,11 +44,6 @@ public: static PacketModGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); diff --git a/plugins/channeltx/modssb/ssbmodgui.cpp b/plugins/channeltx/modssb/ssbmodgui.cpp index 2aa99a040..542a99197 100644 --- a/plugins/channeltx/modssb/ssbmodgui.cpp +++ b/plugins/channeltx/modssb/ssbmodgui.cpp @@ -49,27 +49,6 @@ void SSBModGUI::destroy() delete this; } -void SSBModGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString SSBModGUI::getName() const -{ - return objectName(); -} - -qint64 SSBModGUI::getCenterFrequency() const { - return m_channelMarker.getCenterFrequency(); -} - -void SSBModGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_channelMarker.setCenterFrequency(centerFrequency); - m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency(); - applySettings(); -} - void SSBModGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channeltx/modssb/ssbmodgui.h b/plugins/channeltx/modssb/ssbmodgui.h index a752b2d40..8163c8de5 100644 --- a/plugins/channeltx/modssb/ssbmodgui.h +++ b/plugins/channeltx/modssb/ssbmodgui.h @@ -45,11 +45,6 @@ public: static SSBModGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); diff --git a/plugins/channeltx/modwfm/wfmmodgui.cpp b/plugins/channeltx/modwfm/wfmmodgui.cpp index bb4bda6a1..fb5ef3b03 100644 --- a/plugins/channeltx/modwfm/wfmmodgui.cpp +++ b/plugins/channeltx/modwfm/wfmmodgui.cpp @@ -48,26 +48,6 @@ void WFMModGUI::destroy() delete this; } -void WFMModGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString WFMModGUI::getName() const -{ - return objectName(); -} - -qint64 WFMModGUI::getCenterFrequency() const { - return m_channelMarker.getCenterFrequency(); -} - -void WFMModGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_channelMarker.setCenterFrequency(centerFrequency); - applySettings(); -} - void WFMModGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channeltx/modwfm/wfmmodgui.h b/plugins/channeltx/modwfm/wfmmodgui.h index e1d847e95..0194f1b45 100644 --- a/plugins/channeltx/modwfm/wfmmodgui.h +++ b/plugins/channeltx/modwfm/wfmmodgui.h @@ -42,11 +42,6 @@ public: static WFMModGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); diff --git a/plugins/channeltx/remotesource/remotesourcegui.cpp b/plugins/channeltx/remotesource/remotesourcegui.cpp index 2b5084623..11560699d 100644 --- a/plugins/channeltx/remotesource/remotesourcegui.cpp +++ b/plugins/channeltx/remotesource/remotesourcegui.cpp @@ -37,25 +37,6 @@ void RemoteSourceGUI::destroy() delete this; } -void RemoteSourceGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString RemoteSourceGUI::getName() const -{ - return objectName(); -} - -qint64 RemoteSourceGUI::getCenterFrequency() const { - return 0; -} - -void RemoteSourceGUI::setCenterFrequency(qint64 centerFrequency) -{ - (void) centerFrequency; -} - void RemoteSourceGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channeltx/remotesource/remotesourcegui.h b/plugins/channeltx/remotesource/remotesourcegui.h index 664d785a4..d5a865220 100644 --- a/plugins/channeltx/remotesource/remotesourcegui.h +++ b/plugins/channeltx/remotesource/remotesourcegui.h @@ -43,11 +43,6 @@ public: static RemoteSourceGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); diff --git a/plugins/channeltx/udpsource/udpsourcegui.cpp b/plugins/channeltx/udpsource/udpsourcegui.cpp index ff5a56136..aaee4942e 100644 --- a/plugins/channeltx/udpsource/udpsourcegui.cpp +++ b/plugins/channeltx/udpsource/udpsourcegui.cpp @@ -40,26 +40,6 @@ void UDPSourceGUI::destroy() delete this; } -void UDPSourceGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString UDPSourceGUI::getName() const -{ - return objectName(); -} - -qint64 UDPSourceGUI::getCenterFrequency() const { - return m_channelMarker.getCenterFrequency(); -} - -void UDPSourceGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_channelMarker.setCenterFrequency(centerFrequency); - applySettings(); -} - void UDPSourceGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channeltx/udpsource/udpsourcegui.h b/plugins/channeltx/udpsource/udpsourcegui.h index a8980023a..dd3bca75b 100644 --- a/plugins/channeltx/udpsource/udpsourcegui.h +++ b/plugins/channeltx/udpsource/udpsourcegui.h @@ -45,10 +45,6 @@ public: static UDPSourceGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); virtual void resetToDefaults(); virtual QByteArray serialize() const; virtual bool deserialize(const QByteArray& data); diff --git a/plugins/feature/rigctlserver/rigctlservergui.cpp b/plugins/feature/rigctlserver/rigctlservergui.cpp index d5ba95b2f..f81ae6227 100644 --- a/plugins/feature/rigctlserver/rigctlservergui.cpp +++ b/plugins/feature/rigctlserver/rigctlservergui.cpp @@ -38,16 +38,6 @@ void RigCtlServerGUI::destroy() delete this; } -void RigCtlServerGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString RigCtlServerGUI::getName() const -{ - return objectName(); -} - void RigCtlServerGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/feature/rigctlserver/rigctlservergui.h b/plugins/feature/rigctlserver/rigctlservergui.h index 78adb9287..be1fa513c 100644 --- a/plugins/feature/rigctlserver/rigctlservergui.h +++ b/plugins/feature/rigctlserver/rigctlservergui.h @@ -39,10 +39,6 @@ class RigCtlServerGUI : public RollupWidget, public PluginInstanceGUI { public: static RigCtlServerGUI* create(PluginAPI* pluginAPI, FeatureUISet *featureUISet, Feature *feature); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const { return 0; } - virtual void setCenterFrequency(qint64 centerFrequency) {} void resetToDefaults(); QByteArray serialize() const; diff --git a/plugins/feature/simpleptt/simplepttgui.cpp b/plugins/feature/simpleptt/simplepttgui.cpp index 4999f88ca..434024cf8 100644 --- a/plugins/feature/simpleptt/simplepttgui.cpp +++ b/plugins/feature/simpleptt/simplepttgui.cpp @@ -38,16 +38,6 @@ void SimplePTTGUI::destroy() delete this; } -void SimplePTTGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString SimplePTTGUI::getName() const -{ - return objectName(); -} - void SimplePTTGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/feature/simpleptt/simplepttgui.h b/plugins/feature/simpleptt/simplepttgui.h index c94dc9a17..ead85732f 100644 --- a/plugins/feature/simpleptt/simplepttgui.h +++ b/plugins/feature/simpleptt/simplepttgui.h @@ -38,10 +38,6 @@ class SimplePTTGUI : public RollupWidget, public PluginInstanceGUI { public: static SimplePTTGUI* create(PluginAPI* pluginAPI, FeatureUISet *featureUISet, Feature *feature); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const { return 0; } - virtual void setCenterFrequency(qint64 centerFrequency) {} void resetToDefaults(); QByteArray serialize() const; @@ -71,7 +67,7 @@ private: void applyPTT(bool tx); void displaySettings(); void updateDeviceSetLists(); - + void leaveEvent(QEvent*); void enterEvent(QEvent*); @@ -90,4 +86,4 @@ private slots: }; -#endif // INCLUDE_FEATURE_SIMPLEPTTGUI_H_ \ No newline at end of file +#endif // INCLUDE_FEATURE_SIMPLEPTTGUI_H_ diff --git a/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp b/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp index 28633cc68..42d9764bf 100644 --- a/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp +++ b/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp @@ -81,16 +81,6 @@ void Bladerf1OutputGui::destroy() delete this; } -void Bladerf1OutputGui::setName(const QString& name) -{ - setObjectName(name); -} - -QString Bladerf1OutputGui::getName() const -{ - return objectName(); -} - void Bladerf1OutputGui::resetToDefaults() { m_settings.resetToDefaults(); @@ -98,18 +88,6 @@ void Bladerf1OutputGui::resetToDefaults() sendSettings(); } -qint64 Bladerf1OutputGui::getCenterFrequency() const -{ - return m_settings.m_centerFrequency; -} - -void Bladerf1OutputGui::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_centerFrequency = centerFrequency; - displaySettings(); - sendSettings(); -} - QByteArray Bladerf1OutputGui::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplesink/bladerf1output/bladerf1outputgui.h b/plugins/samplesink/bladerf1output/bladerf1outputgui.h index 0da480d8e..d500bb38c 100644 --- a/plugins/samplesink/bladerf1output/bladerf1outputgui.h +++ b/plugins/samplesink/bladerf1output/bladerf1outputgui.h @@ -41,12 +41,7 @@ public: virtual ~Bladerf1OutputGui(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp b/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp index 1f1ad1176..c89505446 100644 --- a/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp +++ b/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp @@ -95,16 +95,6 @@ void BladeRF2OutputGui::destroy() delete this; } -void BladeRF2OutputGui::setName(const QString& name) -{ - setObjectName(name); -} - -QString BladeRF2OutputGui::getName() const -{ - return objectName(); -} - void BladeRF2OutputGui::resetToDefaults() { m_settings.resetToDefaults(); @@ -112,18 +102,6 @@ void BladeRF2OutputGui::resetToDefaults() sendSettings(); } -qint64 BladeRF2OutputGui::getCenterFrequency() const -{ - return m_settings.m_centerFrequency; -} - -void BladeRF2OutputGui::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_centerFrequency = centerFrequency; - displaySettings(); - sendSettings(); -} - QByteArray BladeRF2OutputGui::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplesink/bladerf2output/bladerf2outputgui.h b/plugins/samplesink/bladerf2output/bladerf2outputgui.h index c1ec08aa5..3d1905db6 100644 --- a/plugins/samplesink/bladerf2output/bladerf2outputgui.h +++ b/plugins/samplesink/bladerf2output/bladerf2outputgui.h @@ -41,12 +41,7 @@ public: virtual ~BladeRF2OutputGui(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); virtual QByteArray serialize() const; virtual bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplesink/fileoutput/fileoutputgui.cpp b/plugins/samplesink/fileoutput/fileoutputgui.cpp index 325713850..449e1f436 100644 --- a/plugins/samplesink/fileoutput/fileoutputgui.cpp +++ b/plugins/samplesink/fileoutput/fileoutputgui.cpp @@ -83,16 +83,6 @@ void FileOutputGui::destroy() delete this; } -void FileOutputGui::setName(const QString& name) -{ - setObjectName(name); -} - -QString FileOutputGui::getName() const -{ - return objectName(); -} - void FileOutputGui::resetToDefaults() { m_settings.resetToDefaults(); @@ -100,18 +90,6 @@ void FileOutputGui::resetToDefaults() sendSettings(); } -qint64 FileOutputGui::getCenterFrequency() const -{ - return m_settings.m_centerFrequency; -} - -void FileOutputGui::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_centerFrequency = centerFrequency; - displaySettings(); - sendSettings(); -} - QByteArray FileOutputGui::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplesink/fileoutput/fileoutputgui.h b/plugins/samplesink/fileoutput/fileoutputgui.h index 398cae37b..73b4c6640 100644 --- a/plugins/samplesink/fileoutput/fileoutputgui.h +++ b/plugins/samplesink/fileoutput/fileoutputgui.h @@ -43,12 +43,7 @@ public: virtual ~FileOutputGui(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp index 5707ba083..341701d99 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp @@ -78,16 +78,6 @@ void HackRFOutputGui::destroy() delete this; } -void HackRFOutputGui::setName(const QString& name) -{ - setObjectName(name); -} - -QString HackRFOutputGui::getName() const -{ - return objectName(); -} - void HackRFOutputGui::resetToDefaults() { m_settings.resetToDefaults(); @@ -95,18 +85,6 @@ void HackRFOutputGui::resetToDefaults() sendSettings(); } -qint64 HackRFOutputGui::getCenterFrequency() const -{ - return m_settings.m_centerFrequency; -} - -void HackRFOutputGui::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_centerFrequency = centerFrequency; - displaySettings(); - sendSettings(); -} - QByteArray HackRFOutputGui::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputgui.h b/plugins/samplesink/hackrfoutput/hackrfoutputgui.h index 725764044..1fb812e36 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputgui.h +++ b/plugins/samplesink/hackrfoutput/hackrfoutputgui.h @@ -51,12 +51,7 @@ public: virtual ~HackRFOutputGui(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp index 63c81d527..a9f511fc7 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp @@ -106,16 +106,6 @@ void LimeSDROutputGUI::destroy() delete this; } -void LimeSDROutputGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString LimeSDROutputGUI::getName() const -{ - return objectName(); -} - void LimeSDROutputGUI::resetToDefaults() { m_settings.resetToDefaults(); @@ -123,18 +113,6 @@ void LimeSDROutputGUI::resetToDefaults() sendSettings(); } -qint64 LimeSDROutputGUI::getCenterFrequency() const -{ - return m_settings.m_centerFrequency + (m_settings.m_ncoEnable ? m_settings.m_ncoFrequency : 0); -} - -void LimeSDROutputGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_centerFrequency = centerFrequency - (m_settings.m_ncoEnable ? m_settings.m_ncoFrequency : 0); - displaySettings(); - sendSettings(); -} - QByteArray LimeSDROutputGUI::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.h b/plugins/samplesink/limesdroutput/limesdroutputgui.h index 8ebd9b3a3..16777ff79 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.h +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.h @@ -41,12 +41,7 @@ public: virtual ~LimeSDROutputGUI(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplesink/localoutput/localoutputgui.cpp b/plugins/samplesink/localoutput/localoutputgui.cpp index 1c3bf716b..55cc5ae0a 100644 --- a/plugins/samplesink/localoutput/localoutputgui.cpp +++ b/plugins/samplesink/localoutput/localoutputgui.cpp @@ -108,16 +108,6 @@ void LocalOutputGui::destroy() delete this; } -void LocalOutputGui::setName(const QString& name) -{ - setObjectName(name); -} - -QString LocalOutputGui::getName() const -{ - return objectName(); -} - void LocalOutputGui::resetToDefaults() { m_settings.resetToDefaults(); @@ -149,16 +139,6 @@ bool LocalOutputGui::deserialize(const QByteArray& data) } } -qint64 LocalOutputGui::getCenterFrequency() const -{ - return m_streamCenterFrequency; -} - -void LocalOutputGui::setCenterFrequency(qint64 centerFrequency) -{ - (void) centerFrequency; -} - bool LocalOutputGui::handleMessage(const Message& message) { if (LocalOutput::MsgConfigureLocalOutput::match(message)) diff --git a/plugins/samplesink/localoutput/localoutputgui.h b/plugins/samplesink/localoutput/localoutputgui.h index e128f38ad..2a4b3a0df 100644 --- a/plugins/samplesink/localoutput/localoutputgui.h +++ b/plugins/samplesink/localoutput/localoutputgui.h @@ -44,14 +44,9 @@ public: virtual ~LocalOutputGui(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } virtual bool handleMessage(const Message& message); diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp b/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp index 96f1779c8..5f9f959bd 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp +++ b/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp @@ -90,33 +90,11 @@ void PlutoSDROutputGUI::destroy() delete this; } -void PlutoSDROutputGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString PlutoSDROutputGUI::getName() const -{ - return objectName(); -} - void PlutoSDROutputGUI::resetToDefaults() { } -qint64 PlutoSDROutputGUI::getCenterFrequency() const -{ - return m_settings.m_centerFrequency; -} - -void PlutoSDROutputGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_centerFrequency = centerFrequency; - displaySettings(); - sendSettings(); -} - QByteArray PlutoSDROutputGUI::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputgui.h b/plugins/samplesink/plutosdroutput/plutosdroutputgui.h index 96c006b9e..77875e0df 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutputgui.h +++ b/plugins/samplesink/plutosdroutput/plutosdroutputgui.h @@ -43,11 +43,7 @@ public: virtual ~PlutoSDROutputGUI(); virtual void destroy(); - virtual void setName(const QString& name); - virtual QString getName() const; virtual void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); virtual QByteArray serialize() const; virtual bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplesink/remoteoutput/remoteoutputgui.cpp b/plugins/samplesink/remoteoutput/remoteoutputgui.cpp index 2b99df43d..0a2f21fc3 100644 --- a/plugins/samplesink/remoteoutput/remoteoutputgui.cpp +++ b/plugins/samplesink/remoteoutput/remoteoutputgui.cpp @@ -123,16 +123,6 @@ void RemoteOutputSinkGui::destroy() delete this; } -void RemoteOutputSinkGui::setName(const QString& name) -{ - setObjectName(name); -} - -QString RemoteOutputSinkGui::getName() const -{ - return objectName(); -} - void RemoteOutputSinkGui::resetToDefaults() { blockApplySettings(true); diff --git a/plugins/samplesink/remoteoutput/remoteoutputgui.h b/plugins/samplesink/remoteoutput/remoteoutputgui.h index 9fbdd18d8..0de0e4f19 100644 --- a/plugins/samplesink/remoteoutput/remoteoutputgui.h +++ b/plugins/samplesink/remoteoutput/remoteoutputgui.h @@ -77,12 +77,7 @@ public: virtual ~RemoteOutputSinkGui(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const { return m_deviceCenterFrequency; } - virtual void setCenterFrequency(qint64 centerFrequency) { (void) centerFrequency; } QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp b/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp index 32f9a3050..dc9a93a35 100644 --- a/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp +++ b/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp @@ -412,16 +412,6 @@ void SoapySDROutputGui::createArgumentsControl(const SoapySDR::ArgInfoList& argI } } -void SoapySDROutputGui::setName(const QString& name) -{ - setObjectName(name); -} - -QString SoapySDROutputGui::getName() const -{ - return objectName(); -} - void SoapySDROutputGui::resetToDefaults() { m_settings.resetToDefaults(); @@ -429,18 +419,6 @@ void SoapySDROutputGui::resetToDefaults() sendSettings(); } -qint64 SoapySDROutputGui::getCenterFrequency() const -{ - return m_settings.m_centerFrequency; -} - -void SoapySDROutputGui::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_centerFrequency = centerFrequency; - displaySettings(); - sendSettings(); -} - QByteArray SoapySDROutputGui::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplesink/soapysdroutput/soapysdroutputgui.h b/plugins/samplesink/soapysdroutput/soapysdroutputgui.h index abc8fc3ee..78daca034 100644 --- a/plugins/samplesink/soapysdroutput/soapysdroutputgui.h +++ b/plugins/samplesink/soapysdroutput/soapysdroutputgui.h @@ -49,12 +49,7 @@ public: virtual ~SoapySDROutputGui(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); virtual QByteArray serialize() const; virtual bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplesink/testsink/testsinkgui.cpp b/plugins/samplesink/testsink/testsinkgui.cpp index 1f7132777..f5e8b0a65 100644 --- a/plugins/samplesink/testsink/testsinkgui.cpp +++ b/plugins/samplesink/testsink/testsinkgui.cpp @@ -84,16 +84,6 @@ void TestSinkGui::destroy() delete this; } -void TestSinkGui::setName(const QString& name) -{ - setObjectName(name); -} - -QString TestSinkGui::getName() const -{ - return objectName(); -} - void TestSinkGui::resetToDefaults() { m_settings.resetToDefaults(); @@ -101,18 +91,6 @@ void TestSinkGui::resetToDefaults() sendSettings(); } -qint64 TestSinkGui::getCenterFrequency() const -{ - return m_settings.m_centerFrequency; -} - -void TestSinkGui::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_centerFrequency = centerFrequency; - displaySettings(); - sendSettings(); -} - QByteArray TestSinkGui::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplesink/testsink/testsinkgui.h b/plugins/samplesink/testsink/testsinkgui.h index 4d0ca5aaf..9f9ee8fe4 100644 --- a/plugins/samplesink/testsink/testsinkgui.h +++ b/plugins/samplesink/testsink/testsinkgui.h @@ -44,12 +44,7 @@ public: virtual ~TestSinkGui(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp b/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp index 25f62eadb..c25baaa3c 100644 --- a/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp +++ b/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp @@ -88,16 +88,6 @@ void XTRXOutputGUI::destroy() delete this; } -void XTRXOutputGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString XTRXOutputGUI::getName() const -{ - return objectName(); -} - void XTRXOutputGUI::resetToDefaults() { m_settings.resetToDefaults(); @@ -105,18 +95,6 @@ void XTRXOutputGUI::resetToDefaults() sendSettings(); } -qint64 XTRXOutputGUI::getCenterFrequency() const -{ - return m_settings.m_centerFrequency + (m_settings.m_ncoEnable ? m_settings.m_ncoFrequency : 0); -} - -void XTRXOutputGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_centerFrequency = centerFrequency - (m_settings.m_ncoEnable ? m_settings.m_ncoFrequency : 0); - displaySettings(); - sendSettings(); -} - QByteArray XTRXOutputGUI::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplesink/xtrxoutput/xtrxoutputgui.h b/plugins/samplesink/xtrxoutput/xtrxoutputgui.h index 6254ab596..013703f2e 100644 --- a/plugins/samplesink/xtrxoutput/xtrxoutputgui.h +++ b/plugins/samplesink/xtrxoutput/xtrxoutputgui.h @@ -40,12 +40,7 @@ public: virtual ~XTRXOutputGUI(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplesource/airspy/airspygui.cpp b/plugins/samplesource/airspy/airspygui.cpp index 17aeb6393..68979ec65 100644 --- a/plugins/samplesource/airspy/airspygui.cpp +++ b/plugins/samplesource/airspy/airspygui.cpp @@ -77,16 +77,6 @@ void AirspyGui::destroy() delete this; } -void AirspyGui::setName(const QString& name) -{ - setObjectName(name); -} - -QString AirspyGui::getName() const -{ - return objectName(); -} - void AirspyGui::resetToDefaults() { m_settings.resetToDefaults(); @@ -94,18 +84,6 @@ void AirspyGui::resetToDefaults() sendSettings(); } -qint64 AirspyGui::getCenterFrequency() const -{ - return m_settings.m_centerFrequency; -} - -void AirspyGui::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_centerFrequency = centerFrequency; - displaySettings(); - sendSettings(); -} - QByteArray AirspyGui::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplesource/airspy/airspygui.h b/plugins/samplesource/airspy/airspygui.h index d566600d1..1a7f03561 100644 --- a/plugins/samplesource/airspy/airspygui.h +++ b/plugins/samplesource/airspy/airspygui.h @@ -40,12 +40,7 @@ public: virtual ~AirspyGui(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue* getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplesource/airspyhf/airspyhfgui.cpp b/plugins/samplesource/airspyhf/airspyhfgui.cpp index 3347cbffe..add02f3ff 100644 --- a/plugins/samplesource/airspyhf/airspyhfgui.cpp +++ b/plugins/samplesource/airspyhf/airspyhfgui.cpp @@ -76,16 +76,6 @@ void AirspyHFGui::destroy() delete this; } -void AirspyHFGui::setName(const QString& name) -{ - setObjectName(name); -} - -QString AirspyHFGui::getName() const -{ - return objectName(); -} - void AirspyHFGui::resetToDefaults() { m_settings.resetToDefaults(); @@ -93,18 +83,6 @@ void AirspyHFGui::resetToDefaults() sendSettings(); } -qint64 AirspyHFGui::getCenterFrequency() const -{ - return m_settings.m_centerFrequency; -} - -void AirspyHFGui::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_centerFrequency = centerFrequency; - displaySettings(); - sendSettings(); -} - QByteArray AirspyHFGui::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplesource/airspyhf/airspyhfgui.h b/plugins/samplesource/airspyhf/airspyhfgui.h index 52254a252..aee52878a 100644 --- a/plugins/samplesource/airspyhf/airspyhfgui.h +++ b/plugins/samplesource/airspyhf/airspyhfgui.h @@ -41,12 +41,7 @@ public: virtual ~AirspyHFGui(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue* getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp b/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp index fb1cdd654..60eb7c1b7 100644 --- a/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp +++ b/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp @@ -86,16 +86,6 @@ void Bladerf1InputGui::destroy() delete this; } -void Bladerf1InputGui::setName(const QString& name) -{ - setObjectName(name); -} - -QString Bladerf1InputGui::getName() const -{ - return objectName(); -} - void Bladerf1InputGui::resetToDefaults() { m_settings.resetToDefaults(); @@ -103,18 +93,6 @@ void Bladerf1InputGui::resetToDefaults() sendSettings(); } -qint64 Bladerf1InputGui::getCenterFrequency() const -{ - return m_settings.m_centerFrequency; -} - -void Bladerf1InputGui::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_centerFrequency = centerFrequency; - displaySettings(); - sendSettings(); -} - QByteArray Bladerf1InputGui::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplesource/bladerf1input/bladerf1inputgui.h b/plugins/samplesource/bladerf1input/bladerf1inputgui.h index 01943cb81..80a432b9f 100644 --- a/plugins/samplesource/bladerf1input/bladerf1inputgui.h +++ b/plugins/samplesource/bladerf1input/bladerf1inputgui.h @@ -40,12 +40,7 @@ public: virtual ~Bladerf1InputGui(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp b/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp index 3601f6631..1c58a5d75 100644 --- a/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp +++ b/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp @@ -108,16 +108,6 @@ void BladeRF2InputGui::destroy() delete this; } -void BladeRF2InputGui::setName(const QString& name) -{ - setObjectName(name); -} - -QString BladeRF2InputGui::getName() const -{ - return objectName(); -} - void BladeRF2InputGui::resetToDefaults() { m_settings.resetToDefaults(); @@ -125,18 +115,6 @@ void BladeRF2InputGui::resetToDefaults() sendSettings(); } -qint64 BladeRF2InputGui::getCenterFrequency() const -{ - return m_settings.m_centerFrequency; -} - -void BladeRF2InputGui::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_centerFrequency = centerFrequency; - displaySettings(); - sendSettings(); -} - QByteArray BladeRF2InputGui::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplesource/bladerf2input/bladerf2inputgui.h b/plugins/samplesource/bladerf2input/bladerf2inputgui.h index df6c60188..2f12da82a 100644 --- a/plugins/samplesource/bladerf2input/bladerf2inputgui.h +++ b/plugins/samplesource/bladerf2input/bladerf2inputgui.h @@ -40,12 +40,7 @@ public: virtual ~BladeRF2InputGui(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); virtual QByteArray serialize() const; virtual bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplesource/fcdpro/fcdprogui.cpp b/plugins/samplesource/fcdpro/fcdprogui.cpp index b69dc5f99..520b27591 100644 --- a/plugins/samplesource/fcdpro/fcdprogui.cpp +++ b/plugins/samplesource/fcdpro/fcdprogui.cpp @@ -166,16 +166,6 @@ void FCDProGui::destroy() delete this; } -void FCDProGui::setName(const QString& name) -{ - setObjectName(name); -} - -QString FCDProGui::getName() const -{ - return objectName(); -} - void FCDProGui::resetToDefaults() { m_settings.resetToDefaults(); @@ -183,18 +173,6 @@ void FCDProGui::resetToDefaults() sendSettings(); } -qint64 FCDProGui::getCenterFrequency() const -{ - return m_settings.m_centerFrequency; -} - -void FCDProGui::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_centerFrequency = centerFrequency; - displaySettings(); - sendSettings(); -} - QByteArray FCDProGui::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplesource/fcdpro/fcdprogui.h b/plugins/samplesource/fcdpro/fcdprogui.h index 14679be72..812e9c01a 100644 --- a/plugins/samplesource/fcdpro/fcdprogui.h +++ b/plugins/samplesource/fcdpro/fcdprogui.h @@ -41,12 +41,7 @@ public: virtual ~FCDProGui(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp index 5ccd431cd..abcde4beb 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp @@ -84,16 +84,6 @@ void FCDProPlusGui::destroy() delete this; } -void FCDProPlusGui::setName(const QString& name) -{ - setObjectName(name); -} - -QString FCDProPlusGui::getName() const -{ - return objectName(); -} - void FCDProPlusGui::resetToDefaults() { m_settings.resetToDefaults(); @@ -101,18 +91,6 @@ void FCDProPlusGui::resetToDefaults() sendSettings(); } -qint64 FCDProPlusGui::getCenterFrequency() const -{ - return m_settings.m_centerFrequency; -} - -void FCDProPlusGui::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_centerFrequency = centerFrequency; - displaySettings(); - sendSettings(); -} - QByteArray FCDProPlusGui::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.h b/plugins/samplesource/fcdproplus/fcdproplusgui.h index 8cb567f11..f8570fd40 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusgui.h +++ b/plugins/samplesource/fcdproplus/fcdproplusgui.h @@ -40,12 +40,7 @@ public: virtual ~FCDProPlusGui(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplesource/fileinput/fileinputgui.cpp b/plugins/samplesource/fileinput/fileinputgui.cpp index 9691c9ce1..fbbaa52b6 100644 --- a/plugins/samplesource/fileinput/fileinputgui.cpp +++ b/plugins/samplesource/fileinput/fileinputgui.cpp @@ -91,16 +91,6 @@ void FileInputGUI::destroy() delete this; } -void FileInputGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString FileInputGUI::getName() const -{ - return objectName(); -} - void FileInputGUI::resetToDefaults() { m_settings.resetToDefaults(); @@ -108,18 +98,6 @@ void FileInputGUI::resetToDefaults() sendSettings(); } -qint64 FileInputGUI::getCenterFrequency() const -{ - return m_centerFrequency; -} - -void FileInputGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_centerFrequency = centerFrequency; - displaySettings(); - sendSettings(); -} - QByteArray FileInputGUI::serialize() const { return m_settings.serialize(); @@ -373,7 +351,7 @@ void FileInputGUI::updateWithStreamTime() qint64 t_sec = 0; qint64 t_msec = 0; - if (m_sampleRate > 0) + if (m_sampleRate > 0) { t_sec = m_samplesCount / m_sampleRate; t_msec = (m_samplesCount - (t_sec * m_sampleRate)) * 1000LL / m_sampleRate; diff --git a/plugins/samplesource/fileinput/fileinputgui.h b/plugins/samplesource/fileinput/fileinputgui.h index 3598a4f95..020aa9bf3 100644 --- a/plugins/samplesource/fileinput/fileinputgui.h +++ b/plugins/samplesource/fileinput/fileinputgui.h @@ -41,12 +41,7 @@ public: virtual ~FileInputGUI(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp index dba92aeb6..f5d427edb 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp @@ -81,16 +81,6 @@ void HackRFInputGui::destroy() delete this; } -void HackRFInputGui::setName(const QString& name) -{ - setObjectName(name); -} - -QString HackRFInputGui::getName() const -{ - return objectName(); -} - void HackRFInputGui::resetToDefaults() { m_settings.resetToDefaults(); @@ -98,18 +88,6 @@ void HackRFInputGui::resetToDefaults() sendSettings(); } -qint64 HackRFInputGui::getCenterFrequency() const -{ - return m_settings.m_centerFrequency; -} - -void HackRFInputGui::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_centerFrequency = centerFrequency; - displaySettings(); - sendSettings(); -} - QByteArray HackRFInputGui::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplesource/hackrfinput/hackrfinputgui.h b/plugins/samplesource/hackrfinput/hackrfinputgui.h index 32f19cc9f..3dbeeeb7e 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputgui.h +++ b/plugins/samplesource/hackrfinput/hackrfinputgui.h @@ -50,12 +50,7 @@ public: virtual ~HackRFInputGui(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplesource/kiwisdr/kiwisdrgui.cpp b/plugins/samplesource/kiwisdr/kiwisdrgui.cpp index 3b5cdfdad..bb69cc176 100644 --- a/plugins/samplesource/kiwisdr/kiwisdrgui.cpp +++ b/plugins/samplesource/kiwisdr/kiwisdrgui.cpp @@ -93,16 +93,6 @@ void KiwiSDRGui::destroy() delete this; } -void KiwiSDRGui::setName(const QString& name) -{ - setObjectName(name); -} - -QString KiwiSDRGui::getName() const -{ - return objectName(); -} - void KiwiSDRGui::resetToDefaults() { m_settings.resetToDefaults(); @@ -110,18 +100,6 @@ void KiwiSDRGui::resetToDefaults() sendSettings(); } -qint64 KiwiSDRGui::getCenterFrequency() const -{ - return m_settings.m_centerFrequency; -} - -void KiwiSDRGui::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_centerFrequency = centerFrequency; - displaySettings(); - sendSettings(); -} - QByteArray KiwiSDRGui::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplesource/kiwisdr/kiwisdrgui.h b/plugins/samplesource/kiwisdr/kiwisdrgui.h index c13a38f77..440f97639 100644 --- a/plugins/samplesource/kiwisdr/kiwisdrgui.h +++ b/plugins/samplesource/kiwisdr/kiwisdrgui.h @@ -42,12 +42,7 @@ public: virtual ~KiwiSDRGui(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp index 36acd8a3b..ffca63d8b 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp @@ -111,16 +111,6 @@ void LimeSDRInputGUI::destroy() delete this; } -void LimeSDRInputGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString LimeSDRInputGUI::getName() const -{ - return objectName(); -} - void LimeSDRInputGUI::resetToDefaults() { m_settings.resetToDefaults(); @@ -128,18 +118,6 @@ void LimeSDRInputGUI::resetToDefaults() sendSettings(); } -qint64 LimeSDRInputGUI::getCenterFrequency() const -{ - return m_settings.m_centerFrequency + (m_settings.m_ncoEnable ? m_settings.m_ncoFrequency : 0); -} - -void LimeSDRInputGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_centerFrequency = centerFrequency - (m_settings.m_ncoEnable ? m_settings.m_ncoFrequency : 0); - displaySettings(); - sendSettings(); -} - QByteArray LimeSDRInputGUI::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.h b/plugins/samplesource/limesdrinput/limesdrinputgui.h index b8d8f074e..a5411fe3e 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.h +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.h @@ -40,12 +40,7 @@ public: virtual ~LimeSDRInputGUI(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplesource/localinput/localinputgui.cpp b/plugins/samplesource/localinput/localinputgui.cpp index 0322d6477..ccc8014f2 100644 --- a/plugins/samplesource/localinput/localinputgui.cpp +++ b/plugins/samplesource/localinput/localinputgui.cpp @@ -122,16 +122,6 @@ void LocalInputGui::destroy() delete this; } -void LocalInputGui::setName(const QString& name) -{ - setObjectName(name); -} - -QString LocalInputGui::getName() const -{ - return objectName(); -} - void LocalInputGui::resetToDefaults() { m_settings.resetToDefaults(); @@ -163,16 +153,6 @@ bool LocalInputGui::deserialize(const QByteArray& data) } } -qint64 LocalInputGui::getCenterFrequency() const -{ - return m_streamCenterFrequency; -} - -void LocalInputGui::setCenterFrequency(qint64 centerFrequency) -{ - (void) centerFrequency; -} - bool LocalInputGui::handleMessage(const Message& message) { if (LocalInput::MsgConfigureLocalInput::match(message)) diff --git a/plugins/samplesource/localinput/localinputgui.h b/plugins/samplesource/localinput/localinputgui.h index 1e7962b17..bc842dd0d 100644 --- a/plugins/samplesource/localinput/localinputgui.h +++ b/plugins/samplesource/localinput/localinputgui.h @@ -44,14 +44,9 @@ public: virtual ~LocalInputGui(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } virtual bool handleMessage(const Message& message); diff --git a/plugins/samplesource/perseus/perseusgui.cpp b/plugins/samplesource/perseus/perseusgui.cpp index c7704ed18..5ee36f2bd 100644 --- a/plugins/samplesource/perseus/perseusgui.cpp +++ b/plugins/samplesource/perseus/perseusgui.cpp @@ -74,16 +74,6 @@ void PerseusGui::destroy() delete this; } -void PerseusGui::setName(const QString& name) -{ - setObjectName(name); -} - -QString PerseusGui::getName() const -{ - return objectName(); -} - void PerseusGui::resetToDefaults() { m_settings.resetToDefaults(); @@ -91,18 +81,6 @@ void PerseusGui::resetToDefaults() sendSettings(); } -qint64 PerseusGui::getCenterFrequency() const -{ - return m_settings.m_centerFrequency; -} - -void PerseusGui::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_centerFrequency = centerFrequency; - displaySettings(); - sendSettings(); -} - QByteArray PerseusGui::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplesource/perseus/perseusgui.h b/plugins/samplesource/perseus/perseusgui.h index 45ce70b3b..f58c85abb 100644 --- a/plugins/samplesource/perseus/perseusgui.h +++ b/plugins/samplesource/perseus/perseusgui.h @@ -40,12 +40,7 @@ public: virtual ~PerseusGui(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue* getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp index ee475b552..5ea6b4c7f 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp +++ b/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp @@ -92,33 +92,11 @@ void PlutoSDRInputGui::destroy() delete this; } -void PlutoSDRInputGui::setName(const QString& name) -{ - setObjectName(name); -} - -QString PlutoSDRInputGui::getName() const -{ - return objectName(); -} - void PlutoSDRInputGui::resetToDefaults() { } -qint64 PlutoSDRInputGui::getCenterFrequency() const -{ - return m_settings.m_centerFrequency; -} - -void PlutoSDRInputGui::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_centerFrequency = centerFrequency; - displaySettings(); - sendSettings(); -} - QByteArray PlutoSDRInputGui::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputgui.h b/plugins/samplesource/plutosdrinput/plutosdrinputgui.h index 206a9ea04..9ae463579 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputgui.h +++ b/plugins/samplesource/plutosdrinput/plutosdrinputgui.h @@ -43,11 +43,7 @@ public: virtual ~PlutoSDRInputGui(); virtual void destroy(); - virtual void setName(const QString& name); - virtual QString getName() const; virtual void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); virtual QByteArray serialize() const; virtual bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplesource/remoteinput/remoteinputgui.cpp b/plugins/samplesource/remoteinput/remoteinputgui.cpp index 78ffd14f9..04a420b5f 100644 --- a/plugins/samplesource/remoteinput/remoteinputgui.cpp +++ b/plugins/samplesource/remoteinput/remoteinputgui.cpp @@ -126,16 +126,6 @@ void RemoteInputGui::destroy() delete this; } -void RemoteInputGui::setName(const QString& name) -{ - setObjectName(name); -} - -QString RemoteInputGui::getName() const -{ - return objectName(); -} - void RemoteInputGui::resetToDefaults() { m_settings.resetToDefaults(); @@ -167,16 +157,6 @@ bool RemoteInputGui::deserialize(const QByteArray& data) } } -qint64 RemoteInputGui::getCenterFrequency() const -{ - return m_streamCenterFrequency; -} - -void RemoteInputGui::setCenterFrequency(qint64 centerFrequency) -{ - (void) centerFrequency; -} - bool RemoteInputGui::handleMessage(const Message& message) { if (RemoteInput::MsgConfigureRemoteInput::match(message)) diff --git a/plugins/samplesource/remoteinput/remoteinputgui.h b/plugins/samplesource/remoteinput/remoteinputgui.h index a3072de02..6df28f41e 100644 --- a/plugins/samplesource/remoteinput/remoteinputgui.h +++ b/plugins/samplesource/remoteinput/remoteinputgui.h @@ -45,14 +45,9 @@ public: virtual ~RemoteInputGui(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } virtual bool handleMessage(const Message& message); diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp index 1c503edaa..32e7b8568 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp @@ -80,16 +80,6 @@ void RTLSDRGui::destroy() delete this; } -void RTLSDRGui::setName(const QString& name) -{ - setObjectName(name); -} - -QString RTLSDRGui::getName() const -{ - return objectName(); -} - void RTLSDRGui::resetToDefaults() { m_settings.resetToDefaults(); @@ -97,18 +87,6 @@ void RTLSDRGui::resetToDefaults() sendSettings(); } -qint64 RTLSDRGui::getCenterFrequency() const -{ - return m_settings.m_centerFrequency; -} - -void RTLSDRGui::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_centerFrequency = centerFrequency; - displaySettings(); - sendSettings(); -} - void RTLSDRGui::on_dcOffset_toggled(bool checked) { m_settings.m_dcBlock = checked; diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.h b/plugins/samplesource/rtlsdr/rtlsdrgui.h index 8fc394100..b674dfec8 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrgui.h +++ b/plugins/samplesource/rtlsdr/rtlsdrgui.h @@ -42,12 +42,7 @@ public: virtual ~RTLSDRGui(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplesource/sdrplay/sdrplaygui.cpp b/plugins/samplesource/sdrplay/sdrplaygui.cpp index 22bf38fb0..8c804f54f 100644 --- a/plugins/samplesource/sdrplay/sdrplaygui.cpp +++ b/plugins/samplesource/sdrplay/sdrplaygui.cpp @@ -93,16 +93,6 @@ void SDRPlayGui::destroy() delete this; } -void SDRPlayGui::setName(const QString& name) -{ - setObjectName(name); -} - -QString SDRPlayGui::getName() const -{ - return objectName(); -} - void SDRPlayGui::resetToDefaults() { m_settings.resetToDefaults(); @@ -110,18 +100,6 @@ void SDRPlayGui::resetToDefaults() sendSettings(); } -qint64 SDRPlayGui::getCenterFrequency() const -{ - return m_settings.m_centerFrequency; -} - -void SDRPlayGui::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_centerFrequency = centerFrequency; - displaySettings(); - sendSettings(); -} - QByteArray SDRPlayGui::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplesource/sdrplay/sdrplaygui.h b/plugins/samplesource/sdrplay/sdrplaygui.h index 7eae71a0e..8bac4307d 100644 --- a/plugins/samplesource/sdrplay/sdrplaygui.h +++ b/plugins/samplesource/sdrplay/sdrplaygui.h @@ -42,12 +42,7 @@ public: virtual ~SDRPlayGui(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); virtual QByteArray serialize() const; virtual bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp b/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp index fd1906147..f932d22b8 100644 --- a/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp +++ b/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp @@ -416,16 +416,6 @@ void SoapySDRInputGui::createArgumentsControl(const SoapySDR::ArgInfoList& argIn } } -void SoapySDRInputGui::setName(const QString& name) -{ - setObjectName(name); -} - -QString SoapySDRInputGui::getName() const -{ - return objectName(); -} - void SoapySDRInputGui::resetToDefaults() { m_settings.resetToDefaults(); @@ -433,18 +423,6 @@ void SoapySDRInputGui::resetToDefaults() sendSettings(); } -qint64 SoapySDRInputGui::getCenterFrequency() const -{ - return m_settings.m_centerFrequency; -} - -void SoapySDRInputGui::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_centerFrequency = centerFrequency; - displaySettings(); - sendSettings(); -} - QByteArray SoapySDRInputGui::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputgui.h b/plugins/samplesource/soapysdrinput/soapysdrinputgui.h index f6ee896dc..a9d1fe367 100644 --- a/plugins/samplesource/soapysdrinput/soapysdrinputgui.h +++ b/plugins/samplesource/soapysdrinput/soapysdrinputgui.h @@ -47,12 +47,7 @@ public: virtual ~SoapySDRInputGui(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); virtual QByteArray serialize() const; virtual bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplesource/testsource/testsourcegui.cpp b/plugins/samplesource/testsource/testsourcegui.cpp index e2df0a97e..59c2f1b21 100644 --- a/plugins/samplesource/testsource/testsourcegui.cpp +++ b/plugins/samplesource/testsource/testsourcegui.cpp @@ -85,16 +85,6 @@ void TestSourceGui::destroy() delete this; } -void TestSourceGui::setName(const QString& name) -{ - setObjectName(name); -} - -QString TestSourceGui::getName() const -{ - return objectName(); -} - void TestSourceGui::resetToDefaults() { m_settings.resetToDefaults(); @@ -102,18 +92,6 @@ void TestSourceGui::resetToDefaults() sendSettings(); } -qint64 TestSourceGui::getCenterFrequency() const -{ - return m_settings.m_centerFrequency; -} - -void TestSourceGui::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_centerFrequency = centerFrequency; - displaySettings(); - sendSettings(); -} - QByteArray TestSourceGui::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplesource/testsource/testsourcegui.h b/plugins/samplesource/testsource/testsourcegui.h index 6f41f399d..047e600e3 100644 --- a/plugins/samplesource/testsource/testsourcegui.h +++ b/plugins/samplesource/testsource/testsourcegui.h @@ -41,12 +41,7 @@ public: virtual ~TestSourceGui(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplesource/xtrxinput/xtrxinputgui.cpp b/plugins/samplesource/xtrxinput/xtrxinputgui.cpp index 2d45dc408..e8044719c 100644 --- a/plugins/samplesource/xtrxinput/xtrxinputgui.cpp +++ b/plugins/samplesource/xtrxinput/xtrxinputgui.cpp @@ -91,16 +91,6 @@ void XTRXInputGUI::destroy() delete this; } -void XTRXInputGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString XTRXInputGUI::getName() const -{ - return objectName(); -} - void XTRXInputGUI::resetToDefaults() { m_settings.resetToDefaults(); @@ -108,18 +98,6 @@ void XTRXInputGUI::resetToDefaults() sendSettings(); } -qint64 XTRXInputGUI::getCenterFrequency() const -{ - return m_settings.m_centerFrequency + (m_settings.m_ncoEnable ? m_settings.m_ncoFrequency : 0); -} - -void XTRXInputGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_centerFrequency = centerFrequency - (m_settings.m_ncoEnable ? m_settings.m_ncoFrequency : 0); - displaySettings(); - sendSettings(); -} - QByteArray XTRXInputGUI::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplesource/xtrxinput/xtrxinputgui.h b/plugins/samplesource/xtrxinput/xtrxinputgui.h index 44eb1865f..9e1d01901 100644 --- a/plugins/samplesource/xtrxinput/xtrxinputgui.h +++ b/plugins/samplesource/xtrxinput/xtrxinputgui.h @@ -41,12 +41,7 @@ public: virtual ~XTRXInputGUI(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/sdrbase/plugin/plugininstancegui.h b/sdrbase/plugin/plugininstancegui.h index 22cb59512..bc6367d64 100644 --- a/sdrbase/plugin/plugininstancegui.h +++ b/sdrbase/plugin/plugininstancegui.h @@ -14,17 +14,9 @@ class SDRBASE_API PluginInstanceGUI { public: PluginInstanceGUI() { }; virtual ~PluginInstanceGUI() { }; - virtual void destroy() = 0; - virtual void setName(const QString& name) = 0; - virtual QString getName() const = 0; - virtual void resetToDefaults() = 0; - - virtual qint64 getCenterFrequency() const = 0; - virtual void setCenterFrequency(qint64 centerFrequency) = 0; - virtual QByteArray serialize() const = 0; virtual bool deserialize(const QByteArray& data) = 0; diff --git a/sdrgui/device/deviceuiset.cpp b/sdrgui/device/deviceuiset.cpp index a99bf309f..ee8d74081 100644 --- a/sdrgui/device/deviceuiset.cpp +++ b/sdrgui/device/deviceuiset.cpp @@ -96,19 +96,16 @@ void DeviceUISet::addRollupWidget(QWidget *widget) void DeviceUISet::registerRxChannelInstance(const QString& channelName, ChannelAPI *channelAPI, PluginInstanceGUI* pluginGUI) { m_channelInstanceRegistrations.append(ChannelInstanceRegistration(channelName, channelAPI, pluginGUI, 0)); - renameChannelInstances(); } void DeviceUISet::registerTxChannelInstance(const QString& channelName, ChannelAPI *channelAPI, PluginInstanceGUI* pluginGUI) { m_channelInstanceRegistrations.append(ChannelInstanceRegistration(channelName, channelAPI, pluginGUI, 1)); - renameChannelInstances(); } void DeviceUISet::registerChannelInstance(const QString& channelName, ChannelAPI *channelAPI, PluginInstanceGUI* pluginGUI) { m_channelInstanceRegistrations.append(ChannelInstanceRegistration(channelName, channelAPI, pluginGUI, 2)); - renameChannelInstances(); } void DeviceUISet::removeRxChannelInstance(PluginInstanceGUI* pluginGUI) @@ -121,8 +118,6 @@ void DeviceUISet::removeRxChannelInstance(PluginInstanceGUI* pluginGUI) break; } } - - renameChannelInstances(); } void DeviceUISet::removeTxChannelInstance(PluginInstanceGUI* pluginGUI) @@ -135,8 +130,6 @@ void DeviceUISet::removeTxChannelInstance(PluginInstanceGUI* pluginGUI) break; } } - - renameChannelInstances(); } void DeviceUISet::removeChannelInstance(PluginInstanceGUI* pluginGUI) @@ -149,8 +142,6 @@ void DeviceUISet::removeChannelInstance(PluginInstanceGUI* pluginGUI) break; } } - - renameChannelInstances(); } void DeviceUISet::freeChannels() @@ -170,7 +161,6 @@ void DeviceUISet::deleteChannel(int channelIndex) qPrintable(m_channelInstanceRegistrations[channelIndex].m_channelName), channelIndex); m_channelInstanceRegistrations[channelIndex].m_gui->destroy(); - renameChannelInstances(); } } @@ -225,8 +215,6 @@ void DeviceUISet::loadRxChannelSettings(const Preset *preset, PluginAPI *pluginA rxChannelGUI->deserialize(channelConfig.m_config); } } - - renameChannelInstances(); } else { @@ -302,8 +290,6 @@ void DeviceUISet::loadTxChannelSettings(const Preset *preset, PluginAPI *pluginA txChannelGUI->deserialize(channelConfig.m_config); } } - - renameChannelInstances(); } else { @@ -382,8 +368,6 @@ void DeviceUISet::loadMIMOChannelSettings(const Preset *preset, PluginAPI *plugi mimoChannelGUI->deserialize(channelConfig.m_config); } } - - renameChannelInstances(); } else { @@ -409,25 +393,18 @@ void DeviceUISet::saveMIMOChannelSettings(Preset *preset) } } -void DeviceUISet::renameChannelInstances() -{ - for (int i = 0; i < m_channelInstanceRegistrations.count(); i++) { - m_channelInstanceRegistrations[i].m_gui->setName(QString("%1:%2").arg(m_channelInstanceRegistrations[i].m_channelName).arg(i)); - } -} - // sort by increasing delta frequency and type (i.e. name) bool DeviceUISet::ChannelInstanceRegistration::operator<(const ChannelInstanceRegistration& other) const { - if (m_gui && other.m_gui) + if (m_channelAPI && other.m_channelAPI) { - if (m_gui->getCenterFrequency() == other.m_gui->getCenterFrequency()) + if (m_channelAPI->getCenterFrequency() == other.m_channelAPI->getCenterFrequency()) { - return m_gui->getName() < other.m_gui->getName(); + return m_channelAPI->getName() < other.m_channelAPI->getName(); } else { - return m_gui->getCenterFrequency() < other.m_gui->getCenterFrequency(); + return m_channelAPI->getCenterFrequency() < other.m_channelAPI->getCenterFrequency(); } } else diff --git a/sdrgui/device/deviceuiset.h b/sdrgui/device/deviceuiset.h index 3b229ab82..243e9b980 100644 --- a/sdrgui/device/deviceuiset.h +++ b/sdrgui/device/deviceuiset.h @@ -117,8 +117,6 @@ private: int m_nbAvailableRxChannels; //!< Number of Rx channels available for selection int m_nbAvailableTxChannels; //!< Number of Tx channels available for selection int m_nbAvailableMIMOChannels; //!< Number of MIMO channels available for selection - - void renameChannelInstances(); }; diff --git a/sdrgui/feature/featureuiset.cpp b/sdrgui/feature/featureuiset.cpp index d594775da..5d27c1acd 100644 --- a/sdrgui/feature/featureuiset.cpp +++ b/sdrgui/feature/featureuiset.cpp @@ -43,7 +43,6 @@ void FeatureUISet::addRollupWidget(QWidget *widget) void FeatureUISet::registerFeatureInstance(const QString& featureURI, PluginInstanceGUI* pluginGUI, Feature *feature) { m_featureInstanceRegistrations.append(FeatureInstanceRegistration(featureURI, pluginGUI, feature)); - renameFeatureInstances(); } void FeatureUISet::removeFeatureInstance(PluginInstanceGUI* pluginGUI) @@ -56,22 +55,13 @@ void FeatureUISet::removeFeatureInstance(PluginInstanceGUI* pluginGUI) break; } } - - renameFeatureInstances(); -} - -void FeatureUISet::renameFeatureInstances() -{ - for (int i = 0; i < m_featureInstanceRegistrations.count(); i++) { - m_featureInstanceRegistrations[i].m_gui->setName(QString("%1:%2").arg(m_featureInstanceRegistrations[i].m_featureURI).arg(i)); - } } // sort by name bool FeatureUISet::FeatureInstanceRegistration::operator<(const FeatureInstanceRegistration& other) const { - if (m_gui && other.m_gui) { - return m_gui->getName() < other.m_gui->getName(); + if (m_feature && other.m_feature) { + return m_feature->getName() < other.m_feature->getName(); } else { return false; } @@ -94,7 +84,6 @@ void FeatureUISet::deleteFeature(int featureIndex) qPrintable(m_featureInstanceRegistrations[featureIndex].m_featureURI), featureIndex); m_featureInstanceRegistrations[featureIndex].m_gui->destroy(); - renameFeatureInstances(); } } @@ -164,8 +153,6 @@ void FeatureUISet::loadFeatureSetSettings(const FeatureSetPreset *preset, Plugin featureGUI->deserialize(featureConfig.m_config); } } - - renameFeatureInstances(); } void FeatureUISet::saveFeatureSetSettings(FeatureSetPreset *preset) diff --git a/sdrgui/feature/featureuiset.h b/sdrgui/feature/featureuiset.h index 431089482..1b7ea7ba6 100644 --- a/sdrgui/feature/featureuiset.h +++ b/sdrgui/feature/featureuiset.h @@ -76,8 +76,6 @@ private: FeatureInstanceRegistrations m_featureInstanceRegistrations; int m_featureTabIndex; - - void renameFeatureInstances(); }; #endif // SDRGUI_FEATURE_FEATUREUISET_H_