From f2d01b61d34437c8f26356e127c7b28d5b9422e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= Date: Sat, 21 Nov 2020 20:24:18 +0100 Subject: [PATCH] Avoid global QString init in plugins This workarounds issue with LTO with GCC #716 --- .../channelmimo/beamsteeringcwmod/beamsteeringcwmod.cpp | 4 ++-- plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h | 8 ++++---- plugins/channelmimo/interferometer/interferometer.cpp | 4 ++-- plugins/channelmimo/interferometer/interferometer.h | 8 ++++---- plugins/channelrx/chanalyzer/chanalyzer.cpp | 4 ++-- plugins/channelrx/chanalyzer/chanalyzer.h | 8 ++++---- plugins/channelrx/demodadsb/adsbdemod.cpp | 4 ++-- plugins/channelrx/demodadsb/adsbdemod.h | 8 ++++---- plugins/channelrx/demodam/amdemod.cpp | 4 ++-- plugins/channelrx/demodam/amdemod.h | 8 ++++---- plugins/channelrx/demodatv/atvdemod.cpp | 4 ++-- plugins/channelrx/demodatv/atvdemod.h | 8 ++++---- plugins/channelrx/demodbfm/bfmdemod.cpp | 4 ++-- plugins/channelrx/demodbfm/bfmdemod.h | 8 ++++---- plugins/channelrx/demodchirpchat/chirpchatdemod.cpp | 4 ++-- plugins/channelrx/demodchirpchat/chirpchatdemod.h | 8 ++++---- plugins/channelrx/demoddatv/datvdemod.cpp | 4 ++-- plugins/channelrx/demoddatv/datvdemod.h | 8 ++++---- plugins/channelrx/demoddatv/datvdemodgui.cpp | 2 +- plugins/channelrx/demoddatv/datvdemodgui.h | 2 +- plugins/channelrx/demoddsd/dsddemod.cpp | 4 ++-- plugins/channelrx/demoddsd/dsddemod.h | 8 ++++---- plugins/channelrx/demodfreedv/freedvdemod.cpp | 4 ++-- plugins/channelrx/demodfreedv/freedvdemod.h | 8 ++++---- plugins/channelrx/demodnfm/nfmdemod.cpp | 4 ++-- plugins/channelrx/demodnfm/nfmdemod.h | 8 ++++---- plugins/channelrx/demodssb/ssbdemod.cpp | 4 ++-- plugins/channelrx/demodssb/ssbdemod.h | 8 ++++---- plugins/channelrx/demodwfm/wfmdemod.cpp | 4 ++-- plugins/channelrx/demodwfm/wfmdemod.h | 8 ++++---- plugins/channelrx/filesink/filesink.cpp | 4 ++-- plugins/channelrx/filesink/filesink.h | 8 ++++---- plugins/channelrx/freqtracker/freqtracker.cpp | 4 ++-- plugins/channelrx/freqtracker/freqtracker.h | 8 ++++---- plugins/channelrx/localsink/localsink.cpp | 4 ++-- plugins/channelrx/localsink/localsink.h | 8 ++++---- plugins/channelrx/remotesink/remotesink.cpp | 4 ++-- plugins/channelrx/remotesink/remotesink.h | 8 ++++---- plugins/channelrx/sigmffilesink/sigmffilesink.cpp | 4 ++-- plugins/channelrx/sigmffilesink/sigmffilesink.h | 8 ++++---- plugins/channelrx/udpsink/udpsink.cpp | 4 ++-- plugins/channelrx/udpsink/udpsink.h | 8 ++++---- plugins/channeltx/filesource/filesource.cpp | 4 ++-- plugins/channeltx/filesource/filesource.h | 8 ++++---- plugins/channeltx/localsource/localsource.cpp | 4 ++-- plugins/channeltx/localsource/localsource.h | 8 ++++---- plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp | 4 ++-- plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.h | 6 +++--- plugins/channeltx/modam/ammod.cpp | 4 ++-- plugins/channeltx/modam/ammod.h | 8 ++++---- plugins/channeltx/modatv/atvmod.cpp | 4 ++-- plugins/channeltx/modatv/atvmod.h | 8 ++++---- plugins/channeltx/modchirpchat/chirpchatmod.cpp | 4 ++-- plugins/channeltx/modchirpchat/chirpchatmod.h | 8 ++++---- plugins/channeltx/modfreedv/freedvmod.cpp | 4 ++-- plugins/channeltx/modfreedv/freedvmod.h | 8 ++++---- plugins/channeltx/modnfm/nfmmod.cpp | 4 ++-- plugins/channeltx/modnfm/nfmmod.h | 8 ++++---- plugins/channeltx/modpacket/packetmod.cpp | 4 ++-- plugins/channeltx/modpacket/packetmod.h | 8 ++++---- plugins/channeltx/modssb/ssbmod.cpp | 4 ++-- plugins/channeltx/modssb/ssbmod.h | 8 ++++---- plugins/channeltx/modwfm/wfmmod.cpp | 4 ++-- plugins/channeltx/modwfm/wfmmod.h | 8 ++++---- plugins/channeltx/remotesource/remotesource.cpp | 4 ++-- plugins/channeltx/remotesource/remotesource.h | 8 ++++---- plugins/channeltx/udpsource/udpsource.cpp | 4 ++-- plugins/channeltx/udpsource/udpsource.h | 8 ++++---- plugins/feature/afc/afc.cpp | 4 ++-- plugins/feature/afc/afc.h | 8 ++++---- plugins/feature/gs232controller/gs232controller.cpp | 4 ++-- plugins/feature/gs232controller/gs232controller.h | 8 ++++---- plugins/feature/rigctlserver/rigctlserver.cpp | 4 ++-- plugins/feature/rigctlserver/rigctlserver.h | 8 ++++---- plugins/feature/simpleptt/simpleptt.cpp | 4 ++-- plugins/feature/simpleptt/simpleptt.h | 8 ++++---- plugins/samplemimo/bladerf2mimo/bladerf2mimoplugin.cpp | 4 ++-- plugins/samplemimo/bladerf2mimo/bladerf2mimoplugin.h | 3 --- plugins/samplemimo/limesdrmimo/limesdrmimoplugin.cpp | 4 ++-- plugins/samplemimo/limesdrmimo/limesdrmimoplugin.h | 3 --- plugins/samplemimo/metismiso/metismisoplugin.cpp | 4 ++-- plugins/samplemimo/metismiso/metismisoplugin.h | 3 --- plugins/samplemimo/testmi/testmiplugin.cpp | 4 ++-- plugins/samplemimo/testmi/testmiplugin.h | 3 --- plugins/samplemimo/testmosync/testmosyncplugin.cpp | 4 ++-- plugins/samplemimo/testmosync/testmosyncplugin.h | 3 --- plugins/samplemimo/xtrxmimo/xtrxmimoplugin.cpp | 4 ++-- plugins/samplemimo/xtrxmimo/xtrxmimoplugin.h | 3 --- .../samplesink/bladerf1output/bladerf1outputplugin.cpp | 4 ++-- plugins/samplesink/bladerf1output/bladerf1outputplugin.h | 3 --- .../samplesink/bladerf2output/bladerf2outputplugin.cpp | 4 ++-- plugins/samplesink/bladerf2output/bladerf2outputplugin.h | 3 --- plugins/samplesink/fileoutput/fileoutputplugin.cpp | 4 ++-- plugins/samplesink/fileoutput/fileoutputplugin.h | 3 --- plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp | 4 ++-- plugins/samplesink/hackrfoutput/hackrfoutputplugin.h | 3 --- plugins/samplesink/limesdroutput/limesdroutputplugin.cpp | 4 ++-- plugins/samplesink/limesdroutput/limesdroutputplugin.h | 3 --- plugins/samplesink/localoutput/localoutputplugin.cpp | 4 ++-- plugins/samplesink/localoutput/localoutputplugin.h | 3 --- .../samplesink/plutosdroutput/plutosdroutputplugin.cpp | 4 ++-- plugins/samplesink/plutosdroutput/plutosdroutputplugin.h | 3 +-- plugins/samplesink/remoteoutput/remoteoutputplugin.cpp | 4 ++-- plugins/samplesink/remoteoutput/remoteoutputplugin.h | 3 --- .../samplesink/soapysdroutput/soapysdroutputplugin.cpp | 4 ++-- plugins/samplesink/soapysdroutput/soapysdroutputplugin.h | 3 --- plugins/samplesink/testsink/testsinkplugin.cpp | 4 ++-- plugins/samplesink/testsink/testsinkplugin.h | 3 --- plugins/samplesink/usrpoutput/usrpoutputplugin.cpp | 4 ++-- plugins/samplesink/usrpoutput/usrpoutputplugin.h | 3 --- plugins/samplesink/xtrxoutput/xtrxoutputplugin.cpp | 4 ++-- plugins/samplesink/xtrxoutput/xtrxoutputplugin.h | 3 --- plugins/samplesource/airspy/airspyplugin.cpp | 4 ++-- plugins/samplesource/airspy/airspyplugin.h | 2 -- plugins/samplesource/airspyhf/airspyhfplugin.cpp | 4 ++-- plugins/samplesource/airspyhf/airspyhfplugin.h | 2 -- plugins/samplesource/audioinput/audioinputplugin.cpp | 4 ++-- plugins/samplesource/audioinput/audioinputplugin.h | 3 --- .../samplesource/bladerf1input/bladerf1inputplugin.cpp | 4 ++-- plugins/samplesource/bladerf1input/bladerf1inputplugin.h | 3 --- .../samplesource/bladerf2input/bladerf2inputplugin.cpp | 4 ++-- plugins/samplesource/bladerf2input/bladerf2inputplugin.h | 3 --- plugins/samplesource/fcdproplus/fcdproplusplugin.cpp | 2 +- plugins/samplesource/fcdproplus/fcdproplusplugin.h | 2 -- plugins/samplesource/fileinput/fileinputplugin.cpp | 4 ++-- plugins/samplesource/fileinput/fileinputplugin.h | 3 --- plugins/samplesource/hackrfinput/hackrfinputplugin.cpp | 4 ++-- plugins/samplesource/hackrfinput/hackrfinputplugin.h | 3 --- plugins/samplesource/kiwisdr/kiwisdrplugin.cpp | 4 ++-- plugins/samplesource/kiwisdr/kiwisdrplugin.h | 3 --- plugins/samplesource/limesdrinput/limesdrinputplugin.cpp | 4 ++-- plugins/samplesource/limesdrinput/limesdrinputplugin.h | 3 --- plugins/samplesource/localinput/localinputplugin.cpp | 4 ++-- plugins/samplesource/localinput/localinputplugin.h | 3 --- plugins/samplesource/perseus/perseusplugin.cpp | 4 ++-- plugins/samplesource/perseus/perseusplugin.h | 2 -- .../samplesource/plutosdrinput/plutosdrinputplugin.cpp | 4 ++-- plugins/samplesource/plutosdrinput/plutosdrinputplugin.h | 3 +-- plugins/samplesource/remoteinput/remoteinputplugin.cpp | 4 ++-- plugins/samplesource/remoteinput/remoteinputplugin.h | 3 --- plugins/samplesource/rtlsdr/rtlsdrplugin.cpp | 4 ++-- plugins/samplesource/rtlsdr/rtlsdrplugin.h | 3 --- plugins/samplesource/sdrplay/sdrplayplugin.cpp | 4 ++-- plugins/samplesource/sdrplay/sdrplayplugin.h | 3 --- .../samplesource/sigmffileinput/sigmffileinputplugin.cpp | 4 ++-- .../samplesource/sigmffileinput/sigmffileinputplugin.h | 3 --- .../samplesource/soapysdrinput/soapysdrinputplugin.cpp | 4 ++-- plugins/samplesource/soapysdrinput/soapysdrinputplugin.h | 3 --- plugins/samplesource/testsource/testsourceplugin.cpp | 4 ++-- plugins/samplesource/testsource/testsourceplugin.h | 3 --- plugins/samplesource/usrpinput/usrpinputplugin.cpp | 4 ++-- plugins/samplesource/usrpinput/usrpinputplugin.h | 3 --- plugins/samplesource/xtrxinput/xtrxinputplugin.cpp | 4 ++-- plugins/samplesource/xtrxinput/xtrxinputplugin.h | 3 --- 154 files changed, 302 insertions(+), 411 deletions(-) diff --git a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.cpp b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.cpp index 72288cd4f..bd9e83cd2 100644 --- a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.cpp +++ b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.cpp @@ -35,8 +35,8 @@ MESSAGE_CLASS_DEFINITION(BeamSteeringCWMod::MsgConfigureBeamSteeringCWMod, Message) MESSAGE_CLASS_DEFINITION(BeamSteeringCWMod::MsgBasebandNotification, Message) -const QString BeamSteeringCWMod::m_channelIdURI = "sdrangel.channel.beamsteeringcwmod"; -const QString BeamSteeringCWMod::m_channelId = "BeamSteeringCWMod"; +const char* const BeamSteeringCWMod::m_channelIdURI = "sdrangel.channel.beamsteeringcwmod"; +const char* const BeamSteeringCWMod::m_channelId = "BeamSteeringCWMod"; BeamSteeringCWMod::BeamSteeringCWMod(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamMIMO), diff --git a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h index 45c1507e1..c328af5d7 100644 --- a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h +++ b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h @@ -97,8 +97,8 @@ public: virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples, unsigned int sourceIndex); virtual bool handleMessage(const Message& cmd); //!< Processing of a message. Returns true if message has actually been processed - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = "BeamSteeringCWMod"; } virtual qint64 getCenterFrequency() const { return m_frequencyOffset; } uint32_t getBasebandSampleRate() const { return m_basebandSampleRate; } @@ -139,8 +139,8 @@ public: const QStringList& channelSettingsKeys, SWGSDRangel::SWGChannelSettings& response); - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; static const int m_fftSize; private: diff --git a/plugins/channelmimo/interferometer/interferometer.cpp b/plugins/channelmimo/interferometer/interferometer.cpp index 77d132d70..75fb7c9d7 100644 --- a/plugins/channelmimo/interferometer/interferometer.cpp +++ b/plugins/channelmimo/interferometer/interferometer.cpp @@ -35,8 +35,8 @@ MESSAGE_CLASS_DEFINITION(Interferometer::MsgConfigureInterferometer, Message) MESSAGE_CLASS_DEFINITION(Interferometer::MsgBasebandNotification, Message) -const QString Interferometer::m_channelIdURI = "sdrangel.channel.interferometer"; -const QString Interferometer::m_channelId = "Interferometer"; +const char* const Interferometer::m_channelIdURI = "sdrangel.channel.interferometer"; +const char* const Interferometer::m_channelId = "Interferometer"; const int Interferometer::m_fftSize = 4096; Interferometer::Interferometer(DeviceAPI *deviceAPI) : diff --git a/plugins/channelmimo/interferometer/interferometer.h b/plugins/channelmimo/interferometer/interferometer.h index 7978516ae..cd64f25e7 100644 --- a/plugins/channelmimo/interferometer/interferometer.h +++ b/plugins/channelmimo/interferometer/interferometer.h @@ -98,8 +98,8 @@ public: virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples, unsigned int sourceIndex); virtual bool handleMessage(const Message& cmd); //!< Processing of a message. Returns true if message has actually been processed - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = "Interferometer"; } virtual qint64 getCenterFrequency() const { return m_frequencyOffset; } uint32_t getDeviceSampleRate() const { return m_deviceSampleRate; } @@ -144,8 +144,8 @@ public: const QStringList& channelSettingsKeys, SWGSDRangel::SWGChannelSettings& response); - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; static const int m_fftSize; private: diff --git a/plugins/channelrx/chanalyzer/chanalyzer.cpp b/plugins/channelrx/chanalyzer/chanalyzer.cpp index 9fd4b7e65..f6f57398c 100644 --- a/plugins/channelrx/chanalyzer/chanalyzer.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzer.cpp @@ -27,8 +27,8 @@ MESSAGE_CLASS_DEFINITION(ChannelAnalyzer::MsgConfigureChannelAnalyzer, Message) -const QString ChannelAnalyzer::m_channelIdURI = "sdrangel.channel.chanalyzer"; -const QString ChannelAnalyzer::m_channelId = "ChannelAnalyzer"; +const char* const ChannelAnalyzer::m_channelIdURI = "sdrangel.channel.chanalyzer"; +const char* const ChannelAnalyzer::m_channelId = "ChannelAnalyzer"; ChannelAnalyzer::ChannelAnalyzer(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), diff --git a/plugins/channelrx/chanalyzer/chanalyzer.h b/plugins/channelrx/chanalyzer/chanalyzer.h index d208dff1e..d9db7e53a 100644 --- a/plugins/channelrx/chanalyzer/chanalyzer.h +++ b/plugins/channelrx/chanalyzer/chanalyzer.h @@ -77,8 +77,8 @@ public: virtual void stop(); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = objectName(); } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } @@ -95,8 +95,8 @@ public: return m_settings.m_inputFrequencyOffset; } - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; private: DeviceAPI *m_deviceAPI; diff --git a/plugins/channelrx/demodadsb/adsbdemod.cpp b/plugins/channelrx/demodadsb/adsbdemod.cpp index 88c371082..3cd87e795 100644 --- a/plugins/channelrx/demodadsb/adsbdemod.cpp +++ b/plugins/channelrx/demodadsb/adsbdemod.cpp @@ -46,8 +46,8 @@ MESSAGE_CLASS_DEFINITION(ADSBDemod::MsgConfigureADSBDemod, Message) -const QString ADSBDemod::m_channelIdURI = "sdrangel.channel.adsbdemod"; -const QString ADSBDemod::m_channelId = "ADSBDemod"; +const char* const ADSBDemod::m_channelIdURI = "sdrangel.channel.adsbdemod"; +const char* const ADSBDemod::m_channelId = "ADSBDemod"; ADSBDemod::ADSBDemod(DeviceAPI *devieAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), diff --git a/plugins/channelrx/demodadsb/adsbdemod.h b/plugins/channelrx/demodadsb/adsbdemod.h index 2bebbbb81..9a84cfe19 100644 --- a/plugins/channelrx/demodadsb/adsbdemod.h +++ b/plugins/channelrx/demodadsb/adsbdemod.h @@ -73,8 +73,8 @@ public: virtual void stop(); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } @@ -130,8 +130,8 @@ public: uint32_t getNumberOfDeviceStreams() const; - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; private: DeviceAPI* m_deviceAPI; diff --git a/plugins/channelrx/demodam/amdemod.cpp b/plugins/channelrx/demodam/amdemod.cpp index b52e0fbf6..9c0c87df6 100644 --- a/plugins/channelrx/demodam/amdemod.cpp +++ b/plugins/channelrx/demodam/amdemod.cpp @@ -41,8 +41,8 @@ MESSAGE_CLASS_DEFINITION(AMDemod::MsgConfigureAMDemod, Message) -const QString AMDemod::m_channelIdURI = "sdrangel.channel.amdemod"; -const QString AMDemod::m_channelId = "AMDemod"; +const char* const AMDemod::m_channelIdURI = "sdrangel.channel.amdemod"; +const char* const AMDemod::m_channelId = "AMDemod"; const int AMDemod::m_udpBlockSize = 512; AMDemod::AMDemod(DeviceAPI *deviceAPI) : diff --git a/plugins/channelrx/demodam/amdemod.h b/plugins/channelrx/demodam/amdemod.h index e9d6eef10..7d5f6f853 100644 --- a/plugins/channelrx/demodam/amdemod.h +++ b/plugins/channelrx/demodam/amdemod.h @@ -71,8 +71,8 @@ public: virtual void stop(); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } @@ -124,8 +124,8 @@ public: uint32_t getNumberOfDeviceStreams() const; - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; private: DeviceAPI *m_deviceAPI; diff --git a/plugins/channelrx/demodatv/atvdemod.cpp b/plugins/channelrx/demodatv/atvdemod.cpp index 82c8d368f..fe718f7b0 100644 --- a/plugins/channelrx/demodatv/atvdemod.cpp +++ b/plugins/channelrx/demodatv/atvdemod.cpp @@ -29,8 +29,8 @@ MESSAGE_CLASS_DEFINITION(ATVDemod::MsgConfigureATVDemod, Message) -const QString ATVDemod::m_channelIdURI = "sdrangel.channel.demodatv"; -const QString ATVDemod::m_channelId = "ATVDemod"; +const char* const ATVDemod::m_channelIdURI = "sdrangel.channel.demodatv"; +const char* const ATVDemod::m_channelId = "ATVDemod"; ATVDemod::ATVDemod(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), diff --git a/plugins/channelrx/demodatv/atvdemod.h b/plugins/channelrx/demodatv/atvdemod.h index 7c414df92..603aee11c 100644 --- a/plugins/channelrx/demodatv/atvdemod.h +++ b/plugins/channelrx/demodatv/atvdemod.h @@ -70,8 +70,8 @@ public: virtual void stop(); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = objectName(); } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } @@ -94,8 +94,8 @@ public: bool getBFOLocked() { return m_basebandSink->getBFOLocked(); } void setVideoTabIndex(int videoTabIndex) { m_basebandSink->setVideoTabIndex(videoTabIndex); } - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; private: DeviceAPI* m_deviceAPI; diff --git a/plugins/channelrx/demodbfm/bfmdemod.cpp b/plugins/channelrx/demodbfm/bfmdemod.cpp index 82e79b7b0..7ade1ceae 100644 --- a/plugins/channelrx/demodbfm/bfmdemod.cpp +++ b/plugins/channelrx/demodbfm/bfmdemod.cpp @@ -43,8 +43,8 @@ MESSAGE_CLASS_DEFINITION(BFMDemod::MsgConfigureBFMDemod, Message) -const QString BFMDemod::m_channelIdURI = "sdrangel.channel.bfm"; -const QString BFMDemod::m_channelId = "BFMDemod"; +const char* const BFMDemod::m_channelIdURI = "sdrangel.channel.bfm"; +const char* const BFMDemod::m_channelId = "BFMDemod"; const int BFMDemod::m_udpBlockSize = 512; BFMDemod::BFMDemod(DeviceAPI *deviceAPI) : diff --git a/plugins/channelrx/demodbfm/bfmdemod.h b/plugins/channelrx/demodbfm/bfmdemod.h index 8025bca2f..9e01bbe84 100644 --- a/plugins/channelrx/demodbfm/bfmdemod.h +++ b/plugins/channelrx/demodbfm/bfmdemod.h @@ -79,8 +79,8 @@ public: virtual void stop(); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } @@ -138,8 +138,8 @@ public: uint32_t getNumberOfDeviceStreams() const; - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; private: DeviceAPI *m_deviceAPI; diff --git a/plugins/channelrx/demodchirpchat/chirpchatdemod.cpp b/plugins/channelrx/demodchirpchat/chirpchatdemod.cpp index d859753b7..34341cf69 100644 --- a/plugins/channelrx/demodchirpchat/chirpchatdemod.cpp +++ b/plugins/channelrx/demodchirpchat/chirpchatdemod.cpp @@ -44,8 +44,8 @@ MESSAGE_CLASS_DEFINITION(ChirpChatDemod::MsgConfigureChirpChatDemod, Message) MESSAGE_CLASS_DEFINITION(ChirpChatDemod::MsgReportDecodeBytes, Message) MESSAGE_CLASS_DEFINITION(ChirpChatDemod::MsgReportDecodeString, Message) -const QString ChirpChatDemod::m_channelIdURI = "sdrangel.channel.chirpchatdemod"; -const QString ChirpChatDemod::m_channelId = "ChirpChatDemod"; +const char* const ChirpChatDemod::m_channelIdURI = "sdrangel.channel.chirpchatdemod"; +const char* const ChirpChatDemod::m_channelId = "ChirpChatDemod"; ChirpChatDemod::ChirpChatDemod(DeviceAPI* deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), diff --git a/plugins/channelrx/demodchirpchat/chirpchatdemod.h b/plugins/channelrx/demodchirpchat/chirpchatdemod.h index 2401606d0..1ddf8e3d6 100644 --- a/plugins/channelrx/demodchirpchat/chirpchatdemod.h +++ b/plugins/channelrx/demodchirpchat/chirpchatdemod.h @@ -209,8 +209,8 @@ public: virtual void stop(); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return 0; } @@ -256,8 +256,8 @@ public: uint32_t getNumberOfDeviceStreams() const; - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; private: DeviceAPI *m_deviceAPI; diff --git a/plugins/channelrx/demoddatv/datvdemod.cpp b/plugins/channelrx/demoddatv/datvdemod.cpp index 2d07916bc..b86ee59d8 100644 --- a/plugins/channelrx/demoddatv/datvdemod.cpp +++ b/plugins/channelrx/demoddatv/datvdemod.cpp @@ -23,8 +23,8 @@ #include "datvdemod.h" -const QString DATVDemod::m_channelIdURI = "sdrangel.channel.demoddatv"; -const QString DATVDemod::m_channelId = "DATVDemod"; +const char* const DATVDemod::m_channelIdURI = "sdrangel.channel.demoddatv"; +const char* const DATVDemod::m_channelId = "DATVDemod"; MESSAGE_CLASS_DEFINITION(DATVDemod::MsgConfigureDATVDemod, Message) diff --git a/plugins/channelrx/demoddatv/datvdemod.h b/plugins/channelrx/demoddatv/datvdemod.h index a6cd67116..0a8b217fc 100644 --- a/plugins/channelrx/demoddatv/datvdemod.h +++ b/plugins/channelrx/demoddatv/datvdemod.h @@ -41,8 +41,8 @@ public: virtual ~DATVDemod(); virtual void destroy() { delete this; } - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = objectName(); } virtual qint64 getCenterFrequency() const { return m_settings.m_centerFrequency; } @@ -80,8 +80,8 @@ public: int getModcodCodeRate() const { return m_basebandSink->getModcodCodeRate(); } bool isCstlnSetByModcod() const { return m_basebandSink->isCstlnSetByModcod(); } - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; class MsgConfigureDATVDemod : public Message { MESSAGE_CLASS_DECLARATION diff --git a/plugins/channelrx/demoddatv/datvdemodgui.cpp b/plugins/channelrx/demoddatv/datvdemodgui.cpp index e8170bbd1..94f4c74d8 100644 --- a/plugins/channelrx/demoddatv/datvdemodgui.cpp +++ b/plugins/channelrx/demoddatv/datvdemodgui.cpp @@ -36,7 +36,7 @@ #include "datvdemodreport.h" #include "datvdemodgui.h" -const QString DATVDemodGUI::m_strChannelID = "sdrangel.channel.demoddatv"; +const char* const DATVDemodGUI::m_strChannelID = "sdrangel.channel.demoddatv"; DATVDemodGUI* DATVDemodGUI::create(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, diff --git a/plugins/channelrx/demoddatv/datvdemodgui.h b/plugins/channelrx/demoddatv/datvdemodgui.h index 4f3f29c13..bc39ea5c1 100644 --- a/plugins/channelrx/demoddatv/datvdemodgui.h +++ b/plugins/channelrx/demoddatv/datvdemodgui.h @@ -52,7 +52,7 @@ public: virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - static const QString m_strChannelID; + static const char* const m_strChannelID; private slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channelrx/demoddsd/dsddemod.cpp b/plugins/channelrx/demoddsd/dsddemod.cpp index be9eaea32..045379e6f 100644 --- a/plugins/channelrx/demoddsd/dsddemod.cpp +++ b/plugins/channelrx/demoddsd/dsddemod.cpp @@ -45,8 +45,8 @@ MESSAGE_CLASS_DEFINITION(DSDDemod::MsgConfigureDSDDemod, Message) -const QString DSDDemod::m_channelIdURI = "sdrangel.channel.dsddemod"; -const QString DSDDemod::m_channelId = "DSDDemod"; +const char* const DSDDemod::m_channelIdURI = "sdrangel.channel.dsddemod"; +const char* const DSDDemod::m_channelId = "DSDDemod"; const int DSDDemod::m_udpBlockSize = 512; DSDDemod::DSDDemod(DeviceAPI *deviceAPI) : diff --git a/plugins/channelrx/demoddsd/dsddemod.h b/plugins/channelrx/demoddsd/dsddemod.h index d27cc2e41..580738eb2 100644 --- a/plugins/channelrx/demoddsd/dsddemod.h +++ b/plugins/channelrx/demoddsd/dsddemod.h @@ -72,8 +72,8 @@ public: virtual void stop(); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } @@ -123,8 +123,8 @@ public: const char *updateAndGetStatusText() { return m_basebandSink->updateAndGetStatusText(); } int getAudioSampleRate() const { return m_basebandSink->getAudioSampleRate(); } - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; private: DeviceAPI *m_deviceAPI; diff --git a/plugins/channelrx/demodfreedv/freedvdemod.cpp b/plugins/channelrx/demodfreedv/freedvdemod.cpp index 8757e37ff..b0c7493e5 100644 --- a/plugins/channelrx/demodfreedv/freedvdemod.cpp +++ b/plugins/channelrx/demodfreedv/freedvdemod.cpp @@ -39,8 +39,8 @@ MESSAGE_CLASS_DEFINITION(FreeDVDemod::MsgConfigureFreeDVDemod, Message) MESSAGE_CLASS_DEFINITION(FreeDVDemod::MsgResyncFreeDVDemod, Message) -const QString FreeDVDemod::m_channelIdURI = "sdrangel.channel.freedvdemod"; -const QString FreeDVDemod::m_channelId = "FreeDVDemod"; +const char* const FreeDVDemod::m_channelIdURI = "sdrangel.channel.freedvdemod"; +const char* const FreeDVDemod::m_channelId = "FreeDVDemod"; FreeDVDemod::FreeDVDemod(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), diff --git a/plugins/channelrx/demodfreedv/freedvdemod.h b/plugins/channelrx/demodfreedv/freedvdemod.h index 5e2815654..f6c2b12cc 100644 --- a/plugins/channelrx/demodfreedv/freedvdemod.h +++ b/plugins/channelrx/demodfreedv/freedvdemod.h @@ -85,8 +85,8 @@ public: virtual void stop(); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } @@ -143,8 +143,8 @@ public: uint32_t getNumberOfDeviceStreams() const; void setLevelMeter(QObject *levelMeter); - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; private: DeviceAPI *m_deviceAPI; diff --git a/plugins/channelrx/demodnfm/nfmdemod.cpp b/plugins/channelrx/demodnfm/nfmdemod.cpp index 0b746ad83..6942fa40c 100644 --- a/plugins/channelrx/demodnfm/nfmdemod.cpp +++ b/plugins/channelrx/demodnfm/nfmdemod.cpp @@ -43,8 +43,8 @@ MESSAGE_CLASS_DEFINITION(NFMDemod::MsgConfigureNFMDemod, Message) -const QString NFMDemod::m_channelIdURI = "sdrangel.channel.nfmdemod"; -const QString NFMDemod::m_channelId = "NFMDemod"; +const char* const NFMDemod::m_channelIdURI = "sdrangel.channel.nfmdemod"; +const char* const NFMDemod::m_channelId = "NFMDemod"; const int NFMDemod::m_udpBlockSize = 512; diff --git a/plugins/channelrx/demodnfm/nfmdemod.h b/plugins/channelrx/demodnfm/nfmdemod.h index 00216ea59..d7365bd42 100644 --- a/plugins/channelrx/demodnfm/nfmdemod.h +++ b/plugins/channelrx/demodnfm/nfmdemod.h @@ -71,8 +71,8 @@ public: virtual void stop(); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } @@ -124,8 +124,8 @@ public: uint32_t getNumberOfDeviceStreams() const; - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; private: DeviceAPI* m_deviceAPI; diff --git a/plugins/channelrx/demodssb/ssbdemod.cpp b/plugins/channelrx/demodssb/ssbdemod.cpp index ba12e38b0..55bb8f3b5 100644 --- a/plugins/channelrx/demodssb/ssbdemod.cpp +++ b/plugins/channelrx/demodssb/ssbdemod.cpp @@ -44,8 +44,8 @@ MESSAGE_CLASS_DEFINITION(SSBDemod::MsgConfigureSSBDemod, Message) -const QString SSBDemod::m_channelIdURI = "sdrangel.channel.ssbdemod"; -const QString SSBDemod::m_channelId = "SSBDemod"; +const char* const SSBDemod::m_channelIdURI = "sdrangel.channel.ssbdemod"; +const char* const SSBDemod::m_channelId = "SSBDemod"; SSBDemod::SSBDemod(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), diff --git a/plugins/channelrx/demodssb/ssbdemod.h b/plugins/channelrx/demodssb/ssbdemod.h index 4fa933b9d..d5819a2ff 100644 --- a/plugins/channelrx/demodssb/ssbdemod.h +++ b/plugins/channelrx/demodssb/ssbdemod.h @@ -74,8 +74,8 @@ public: virtual void stop(); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } @@ -128,8 +128,8 @@ public: uint32_t getNumberOfDeviceStreams() const; - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; private: DeviceAPI *m_deviceAPI; diff --git a/plugins/channelrx/demodwfm/wfmdemod.cpp b/plugins/channelrx/demodwfm/wfmdemod.cpp index ded004f5b..ffd21135c 100644 --- a/plugins/channelrx/demodwfm/wfmdemod.cpp +++ b/plugins/channelrx/demodwfm/wfmdemod.cpp @@ -46,8 +46,8 @@ MESSAGE_CLASS_DEFINITION(WFMDemod::MsgConfigureWFMDemod, Message) -const QString WFMDemod::m_channelIdURI = "sdrangel.channel.wfmdemod"; -const QString WFMDemod::m_channelId = "WFMDemod"; +const char* const WFMDemod::m_channelIdURI = "sdrangel.channel.wfmdemod"; +const char* const WFMDemod::m_channelId = "WFMDemod"; const int WFMDemod::m_udpBlockSize = 512; WFMDemod::WFMDemod(DeviceAPI* deviceAPI) : diff --git a/plugins/channelrx/demodwfm/wfmdemod.h b/plugins/channelrx/demodwfm/wfmdemod.h index dd6ec9548..b2ffa71d3 100644 --- a/plugins/channelrx/demodwfm/wfmdemod.h +++ b/plugins/channelrx/demodwfm/wfmdemod.h @@ -70,8 +70,8 @@ public: virtual void stop(); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } @@ -119,8 +119,8 @@ public: uint32_t getNumberOfDeviceStreams() const; - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; private: DeviceAPI* m_deviceAPI; diff --git a/plugins/channelrx/filesink/filesink.cpp b/plugins/channelrx/filesink/filesink.cpp index 58401e2f6..718e8814a 100644 --- a/plugins/channelrx/filesink/filesink.cpp +++ b/plugins/channelrx/filesink/filesink.cpp @@ -44,8 +44,8 @@ MESSAGE_CLASS_DEFINITION(FileSink::MsgConfigureFileSink, Message) -const QString FileSink::m_channelIdURI = "sdrangel.channel.filesink"; -const QString FileSink::m_channelId = "FileSink"; +const char* const FileSink::m_channelIdURI = "sdrangel.channel.filesink"; +const char* const FileSink::m_channelId = "FileSink"; FileSink::FileSink(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), diff --git a/plugins/channelrx/filesink/filesink.h b/plugins/channelrx/filesink/filesink.h index 73831ad66..e4d991682 100644 --- a/plugins/channelrx/filesink/filesink.h +++ b/plugins/channelrx/filesink/filesink.h @@ -72,8 +72,8 @@ public: virtual void stop(); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = "File Sink"; } virtual qint64 getCenterFrequency() const { return m_frequencyOffset; } @@ -126,8 +126,8 @@ public: uint64_t getByteCount() const; unsigned int getNbTracks() const; - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; private: DeviceAPI *m_deviceAPI; diff --git a/plugins/channelrx/freqtracker/freqtracker.cpp b/plugins/channelrx/freqtracker/freqtracker.cpp index 8b108c258..6b4952b9b 100644 --- a/plugins/channelrx/freqtracker/freqtracker.cpp +++ b/plugins/channelrx/freqtracker/freqtracker.cpp @@ -47,8 +47,8 @@ MESSAGE_CLASS_DEFINITION(FreqTracker::MsgConfigureFreqTracker, Message) -const QString FreqTracker::m_channelIdURI = "sdrangel.channel.freqtracker"; -const QString FreqTracker::m_channelId = "FreqTracker"; +const char* const FreqTracker::m_channelIdURI = "sdrangel.channel.freqtracker"; +const char* const FreqTracker::m_channelId = "FreqTracker"; const int FreqTracker::m_udpBlockSize = 512; FreqTracker::FreqTracker(DeviceAPI *deviceAPI) : diff --git a/plugins/channelrx/freqtracker/freqtracker.h b/plugins/channelrx/freqtracker/freqtracker.h index 317c90238..10a407519 100644 --- a/plugins/channelrx/freqtracker/freqtracker.h +++ b/plugins/channelrx/freqtracker/freqtracker.h @@ -70,8 +70,8 @@ public: virtual void stop(); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } @@ -126,8 +126,8 @@ public: uint32_t getNumberOfDeviceStreams() const; - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; private: DeviceAPI* m_deviceAPI; diff --git a/plugins/channelrx/localsink/localsink.cpp b/plugins/channelrx/localsink/localsink.cpp index a33a80997..5f78e7f72 100644 --- a/plugins/channelrx/localsink/localsink.cpp +++ b/plugins/channelrx/localsink/localsink.cpp @@ -42,8 +42,8 @@ MESSAGE_CLASS_DEFINITION(LocalSink::MsgConfigureLocalSink, Message) MESSAGE_CLASS_DEFINITION(LocalSink::MsgBasebandSampleRateNotification, Message) -const QString LocalSink::m_channelIdURI = "sdrangel.channel.localsink"; -const QString LocalSink::m_channelId = "LocalSink"; +const char* const LocalSink::m_channelIdURI = "sdrangel.channel.localsink"; +const char* const LocalSink::m_channelId = "LocalSink"; LocalSink::LocalSink(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), diff --git a/plugins/channelrx/localsink/localsink.h b/plugins/channelrx/localsink/localsink.h index 564c23b43..e3255d36e 100644 --- a/plugins/channelrx/localsink/localsink.h +++ b/plugins/channelrx/localsink/localsink.h @@ -92,8 +92,8 @@ public: virtual void stop(); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = "Local Sink"; } virtual qint64 getCenterFrequency() const { return m_frequencyOffset; } @@ -132,8 +132,8 @@ public: void getLocalDevices(std::vector& indexes); uint32_t getNumberOfDeviceStreams() const; - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; private: DeviceAPI *m_deviceAPI; diff --git a/plugins/channelrx/remotesink/remotesink.cpp b/plugins/channelrx/remotesink/remotesink.cpp index 548e0a912..53d4cc6d4 100644 --- a/plugins/channelrx/remotesink/remotesink.cpp +++ b/plugins/channelrx/remotesink/remotesink.cpp @@ -43,8 +43,8 @@ MESSAGE_CLASS_DEFINITION(RemoteSink::MsgConfigureRemoteSink, Message) -const QString RemoteSink::m_channelIdURI = "sdrangel.channel.remotesink"; -const QString RemoteSink::m_channelId = "RemoteSink"; +const char* const RemoteSink::m_channelIdURI = "sdrangel.channel.remotesink"; +const char* const RemoteSink::m_channelId = "RemoteSink"; RemoteSink::RemoteSink(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), diff --git a/plugins/channelrx/remotesink/remotesink.h b/plugins/channelrx/remotesink/remotesink.h index 95cffed7c..29a737d06 100644 --- a/plugins/channelrx/remotesink/remotesink.h +++ b/plugins/channelrx/remotesink/remotesink.h @@ -71,8 +71,8 @@ public: virtual void stop(); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = "Remote Sink"; } virtual qint64 getCenterFrequency() const { return m_frequencyOffset; } @@ -111,8 +111,8 @@ public: uint32_t getNumberOfDeviceStreams() const; int getBasebandSampleRate() const { return m_basebandSampleRate; } - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; signals: void dataBlockAvailable(RemoteDataBlock *dataBlock); diff --git a/plugins/channelrx/sigmffilesink/sigmffilesink.cpp b/plugins/channelrx/sigmffilesink/sigmffilesink.cpp index cc06d560d..d520cbc1c 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesink.cpp +++ b/plugins/channelrx/sigmffilesink/sigmffilesink.cpp @@ -44,8 +44,8 @@ MESSAGE_CLASS_DEFINITION(SigMFFileSink::MsgConfigureSigMFFileSink, Message) -const QString SigMFFileSink::m_channelIdURI = "sdrangel.channel.sigmffilesink"; -const QString SigMFFileSink::m_channelId = "SigMFFileSink"; +const char* const SigMFFileSink::m_channelIdURI = "sdrangel.channel.sigmffilesink"; +const char* const SigMFFileSink::m_channelId = "SigMFFileSink"; SigMFFileSink::SigMFFileSink(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), diff --git a/plugins/channelrx/sigmffilesink/sigmffilesink.h b/plugins/channelrx/sigmffilesink/sigmffilesink.h index d4d5def70..a19b6ea15 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesink.h +++ b/plugins/channelrx/sigmffilesink/sigmffilesink.h @@ -72,8 +72,8 @@ public: virtual void stop(); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = "SigMF File Sink"; } virtual qint64 getCenterFrequency() const { return m_frequencyOffset; } @@ -126,8 +126,8 @@ public: uint64_t getByteCount() const; unsigned int getNbTracks() const; - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; private: DeviceAPI *m_deviceAPI; diff --git a/plugins/channelrx/udpsink/udpsink.cpp b/plugins/channelrx/udpsink/udpsink.cpp index 7a0882f0f..5b6b67c54 100644 --- a/plugins/channelrx/udpsink/udpsink.cpp +++ b/plugins/channelrx/udpsink/udpsink.cpp @@ -40,8 +40,8 @@ MESSAGE_CLASS_DEFINITION(UDPSink::MsgConfigureUDPSink, Message) -const QString UDPSink::m_channelIdURI = "sdrangel.channel.udpsink"; -const QString UDPSink::m_channelId = "UDPSink"; +const char* const UDPSink::m_channelIdURI = "sdrangel.channel.udpsink"; +const char* const UDPSink::m_channelId = "UDPSink"; UDPSink::UDPSink(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), diff --git a/plugins/channelrx/udpsink/udpsink.h b/plugins/channelrx/udpsink/udpsink.h index 69cd4b82b..92ea9afe7 100644 --- a/plugins/channelrx/udpsink/udpsink.h +++ b/plugins/channelrx/udpsink/udpsink.h @@ -78,8 +78,8 @@ public: virtual void stop(); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } @@ -121,8 +121,8 @@ public: uint32_t getNumberOfDeviceStreams() const; - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; static const int udpBlockSize = 512; // UDP block size in number of bytes private slots: diff --git a/plugins/channeltx/filesource/filesource.cpp b/plugins/channeltx/filesource/filesource.cpp index f04815005..9dba3ab9f 100644 --- a/plugins/channeltx/filesource/filesource.cpp +++ b/plugins/channeltx/filesource/filesource.cpp @@ -46,8 +46,8 @@ MESSAGE_CLASS_DEFINITION(FileSource::MsgConfigureFileSourceStreamTiming, Message MESSAGE_CLASS_DEFINITION(FileSource::MsgConfigureFileSourceSeek, Message) MESSAGE_CLASS_DEFINITION(FileSource::MsgReportFileSourceAcquisition, Message) -const QString FileSource::m_channelIdURI = "sdrangel.channeltx.filesource"; -const QString FileSource::m_channelId ="FileSource"; +const char* const FileSource::m_channelIdURI = "sdrangel.channeltx.filesource"; +const char* const FileSource::m_channelId ="FileSource"; FileSource::FileSource(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), diff --git a/plugins/channeltx/filesource/filesource.h b/plugins/channeltx/filesource/filesource.h index 6a281f5ac..76841fa9a 100644 --- a/plugins/channeltx/filesource/filesource.h +++ b/plugins/channeltx/filesource/filesource.h @@ -174,8 +174,8 @@ public: virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return 0; } @@ -231,8 +231,8 @@ public: void setMessageQueueToGUI(MessageQueue* queue) override; uint32_t getNumberOfDeviceStreams() const; - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; private: DeviceAPI* m_deviceAPI; diff --git a/plugins/channeltx/localsource/localsource.cpp b/plugins/channeltx/localsource/localsource.cpp index 889c38ce1..2387570c7 100644 --- a/plugins/channeltx/localsource/localsource.cpp +++ b/plugins/channeltx/localsource/localsource.cpp @@ -39,8 +39,8 @@ MESSAGE_CLASS_DEFINITION(LocalSource::MsgConfigureLocalSource, Message) MESSAGE_CLASS_DEFINITION(LocalSource::MsgBasebandSampleRateNotification, Message) -const QString LocalSource::m_channelIdURI = "sdrangel.channel.localsource"; -const QString LocalSource::m_channelId = "LocalSource"; +const char* const LocalSource::m_channelIdURI = "sdrangel.channel.localsource"; +const char* const LocalSource::m_channelId = "LocalSource"; LocalSource::LocalSource(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), diff --git a/plugins/channeltx/localsource/localsource.h b/plugins/channeltx/localsource/localsource.h index d53436c65..6a0264aa1 100644 --- a/plugins/channeltx/localsource/localsource.h +++ b/plugins/channeltx/localsource/localsource.h @@ -89,8 +89,8 @@ public: virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = "Local Sink"; } virtual qint64 getCenterFrequency() const { return m_frequencyOffset; } @@ -129,8 +129,8 @@ public: void getLocalDevices(std::vector& indexes); uint32_t getNumberOfDeviceStreams() const; - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; private: DeviceAPI *m_deviceAPI; diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp b/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp index af9dcb8c6..bfe06007f 100644 --- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp +++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp @@ -49,8 +49,8 @@ MESSAGE_CLASS_DEFINITION(IEEE_802_15_4_Mod::MsgConfigureIEEE_802_15_4_Mod, Message) MESSAGE_CLASS_DEFINITION(IEEE_802_15_4_Mod::MsgTXIEEE_802_15_4_Mod, Message) -const QString IEEE_802_15_4_Mod::m_channelIdURI = "sdrangel.channeltx.mod802.15.4"; -const QString IEEE_802_15_4_Mod::m_channelId = "IEEE_802_15_4_Mod"; +const char* const IEEE_802_15_4_Mod::m_channelIdURI = "sdrangel.channeltx.mod802.15.4"; +const char* const IEEE_802_15_4_Mod::m_channelId = "IEEE_802_15_4_Mod"; IEEE_802_15_4_Mod::IEEE_802_15_4_Mod(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.h b/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.h index 3937bb79f..2ada722b0 100644 --- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.h +++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.h @@ -97,7 +97,7 @@ public: virtual bool handleMessage(const Message& cmd); virtual void getIdentifier(QString& id) { id = objectName(); } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } @@ -148,8 +148,8 @@ public: void setLevelMeter(QObject *levelMeter); uint32_t getNumberOfDeviceStreams() const; - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; private: diff --git a/plugins/channeltx/modam/ammod.cpp b/plugins/channeltx/modam/ammod.cpp index 577469b86..bfd4e4531 100644 --- a/plugins/channeltx/modam/ammod.cpp +++ b/plugins/channeltx/modam/ammod.cpp @@ -49,8 +49,8 @@ MESSAGE_CLASS_DEFINITION(AMMod::MsgConfigureFileSourceStreamTiming, Message) MESSAGE_CLASS_DEFINITION(AMMod::MsgReportFileSourceStreamData, Message) MESSAGE_CLASS_DEFINITION(AMMod::MsgReportFileSourceStreamTiming, Message) -const QString AMMod::m_channelIdURI = "sdrangel.channeltx.modam"; -const QString AMMod::m_channelId ="AMMod"; +const char* const AMMod::m_channelIdURI = "sdrangel.channeltx.modam"; +const char* const AMMod::m_channelId ="AMMod"; AMMod::AMMod(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), diff --git a/plugins/channeltx/modam/ammod.h b/plugins/channeltx/modam/ammod.h index 25a4c019e..4f1ac606b 100644 --- a/plugins/channeltx/modam/ammod.h +++ b/plugins/channeltx/modam/ammod.h @@ -181,8 +181,8 @@ public: virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } @@ -229,8 +229,8 @@ public: int getAudioSampleRate() const; int getFeedbackAudioSampleRate() const; - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; private: enum RateState { diff --git a/plugins/channeltx/modatv/atvmod.cpp b/plugins/channeltx/modatv/atvmod.cpp index 327528dbf..0bec0911e 100644 --- a/plugins/channeltx/modatv/atvmod.cpp +++ b/plugins/channeltx/modatv/atvmod.cpp @@ -51,8 +51,8 @@ MESSAGE_CLASS_DEFINITION(ATVMod::MsgConfigureVideoFileSourceStreamTiming, Messag MESSAGE_CLASS_DEFINITION(ATVMod::MsgConfigureCameraIndex, Message) MESSAGE_CLASS_DEFINITION(ATVMod::MsgConfigureCameraData, Message) -const QString ATVMod::m_channelIdURI = "sdrangel.channeltx.modatv"; -const QString ATVMod::m_channelId = "ATVMod"; +const char* const ATVMod::m_channelIdURI = "sdrangel.channeltx.modatv"; +const char* const ATVMod::m_channelId = "ATVMod"; ATVMod::ATVMod(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), diff --git a/plugins/channeltx/modatv/atvmod.h b/plugins/channeltx/modatv/atvmod.h index ffe53c515..9fdfde245 100644 --- a/plugins/channeltx/modatv/atvmod.h +++ b/plugins/channeltx/modatv/atvmod.h @@ -253,8 +253,8 @@ public: virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } @@ -302,8 +302,8 @@ public: void getCameraNumbers(std::vector& numbers); void setMessageQueueToGUI(MessageQueue* queue) override; - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; private: DeviceAPI* m_deviceAPI; diff --git a/plugins/channeltx/modchirpchat/chirpchatmod.cpp b/plugins/channeltx/modchirpchat/chirpchatmod.cpp index f24877e69..5d0b182e7 100644 --- a/plugins/channeltx/modchirpchat/chirpchatmod.cpp +++ b/plugins/channeltx/modchirpchat/chirpchatmod.cpp @@ -44,8 +44,8 @@ MESSAGE_CLASS_DEFINITION(ChirpChatMod::MsgConfigureChirpChatMod, Message) MESSAGE_CLASS_DEFINITION(ChirpChatMod::MsgReportPayloadTime, Message) -const QString ChirpChatMod::m_channelIdURI = "sdrangel.channeltx.modchirpchat"; -const QString ChirpChatMod::m_channelId = "ChirpChatMod"; +const char* const ChirpChatMod::m_channelIdURI = "sdrangel.channeltx.modchirpchat"; +const char* const ChirpChatMod::m_channelId = "ChirpChatMod"; ChirpChatMod::ChirpChatMod(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), diff --git a/plugins/channeltx/modchirpchat/chirpchatmod.h b/plugins/channeltx/modchirpchat/chirpchatmod.h index 9734e465e..06f446250 100644 --- a/plugins/channeltx/modchirpchat/chirpchatmod.h +++ b/plugins/channeltx/modchirpchat/chirpchatmod.h @@ -95,8 +95,8 @@ public: virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } @@ -142,8 +142,8 @@ public: uint32_t getNumberOfDeviceStreams() const; bool getModulatorActive() const; - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; private: DeviceAPI* m_deviceAPI; diff --git a/plugins/channeltx/modfreedv/freedvmod.cpp b/plugins/channeltx/modfreedv/freedvmod.cpp index 93ab8871d..d079082e9 100644 --- a/plugins/channeltx/modfreedv/freedvmod.cpp +++ b/plugins/channeltx/modfreedv/freedvmod.cpp @@ -48,8 +48,8 @@ MESSAGE_CLASS_DEFINITION(FreeDVMod::MsgConfigureFileSourceStreamTiming, Message) MESSAGE_CLASS_DEFINITION(FreeDVMod::MsgReportFileSourceStreamData, Message) MESSAGE_CLASS_DEFINITION(FreeDVMod::MsgReportFileSourceStreamTiming, Message) -const QString FreeDVMod::m_channelIdURI = "sdrangel.channeltx.freedvmod"; -const QString FreeDVMod::m_channelId = "FreeDVMod"; +const char* const FreeDVMod::m_channelIdURI = "sdrangel.channeltx.freedvmod"; +const char* const FreeDVMod::m_channelId = "FreeDVMod"; FreeDVMod::FreeDVMod(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), diff --git a/plugins/channeltx/modfreedv/freedvmod.h b/plugins/channeltx/modfreedv/freedvmod.h index 758547d6e..f8b3867b0 100644 --- a/plugins/channeltx/modfreedv/freedvmod.h +++ b/plugins/channeltx/modfreedv/freedvmod.h @@ -185,8 +185,8 @@ public: virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } @@ -236,8 +236,8 @@ public: void setLevelMeter(QObject *levelMeter); uint32_t getNumberOfDeviceStreams() const; - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; private: enum RateState { diff --git a/plugins/channeltx/modnfm/nfmmod.cpp b/plugins/channeltx/modnfm/nfmmod.cpp index 5227ccf98..ec0e34ae3 100644 --- a/plugins/channeltx/modnfm/nfmmod.cpp +++ b/plugins/channeltx/modnfm/nfmmod.cpp @@ -50,8 +50,8 @@ MESSAGE_CLASS_DEFINITION(NFMMod::MsgConfigureFileSourceStreamTiming, Message) MESSAGE_CLASS_DEFINITION(NFMMod::MsgReportFileSourceStreamData, Message) MESSAGE_CLASS_DEFINITION(NFMMod::MsgReportFileSourceStreamTiming, Message) -const QString NFMMod::m_channelIdURI = "sdrangel.channeltx.modnfm"; -const QString NFMMod::m_channelId = "NFMMod"; +const char* const NFMMod::m_channelIdURI = "sdrangel.channeltx.modnfm"; +const char* const NFMMod::m_channelId = "NFMMod"; NFMMod::NFMMod(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), diff --git a/plugins/channeltx/modnfm/nfmmod.h b/plugins/channeltx/modnfm/nfmmod.h index ff3abb104..017744d52 100644 --- a/plugins/channeltx/modnfm/nfmmod.h +++ b/plugins/channeltx/modnfm/nfmmod.h @@ -181,8 +181,8 @@ public: virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } @@ -229,8 +229,8 @@ public: int getAudioSampleRate() const; int getFeedbackAudioSampleRate() const; - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; private: enum RateState { diff --git a/plugins/channeltx/modpacket/packetmod.cpp b/plugins/channeltx/modpacket/packetmod.cpp index 4a14c0d10..4cbc734a7 100644 --- a/plugins/channeltx/modpacket/packetmod.cpp +++ b/plugins/channeltx/modpacket/packetmod.cpp @@ -49,8 +49,8 @@ MESSAGE_CLASS_DEFINITION(PacketMod::MsgConfigurePacketMod, Message) MESSAGE_CLASS_DEFINITION(PacketMod::MsgTXPacketMod, Message) -const QString PacketMod::m_channelIdURI = "sdrangel.channeltx.modpacket"; -const QString PacketMod::m_channelId = "PacketMod"; +const char* const PacketMod::m_channelIdURI = "sdrangel.channeltx.modpacket"; +const char* const PacketMod::m_channelId = "PacketMod"; PacketMod::PacketMod(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), diff --git a/plugins/channeltx/modpacket/packetmod.h b/plugins/channeltx/modpacket/packetmod.h index c28276a25..5115aa4b0 100644 --- a/plugins/channeltx/modpacket/packetmod.h +++ b/plugins/channeltx/modpacket/packetmod.h @@ -102,8 +102,8 @@ public: virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } @@ -153,8 +153,8 @@ public: void setLevelMeter(QObject *levelMeter); uint32_t getNumberOfDeviceStreams() const; - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; private: enum RateState { diff --git a/plugins/channeltx/modssb/ssbmod.cpp b/plugins/channeltx/modssb/ssbmod.cpp index 9d1951ee2..0ac6b8f3f 100644 --- a/plugins/channeltx/modssb/ssbmod.cpp +++ b/plugins/channeltx/modssb/ssbmod.cpp @@ -49,8 +49,8 @@ MESSAGE_CLASS_DEFINITION(SSBMod::MsgConfigureFileSourceStreamTiming, Message) MESSAGE_CLASS_DEFINITION(SSBMod::MsgReportFileSourceStreamData, Message) MESSAGE_CLASS_DEFINITION(SSBMod::MsgReportFileSourceStreamTiming, Message) -const QString SSBMod::m_channelIdURI = "sdrangel.channeltx.modssb"; -const QString SSBMod::m_channelId = "SSBMod"; +const char* const SSBMod::m_channelIdURI = "sdrangel.channeltx.modssb"; +const char* const SSBMod::m_channelId = "SSBMod"; SSBMod::SSBMod(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), diff --git a/plugins/channeltx/modssb/ssbmod.h b/plugins/channeltx/modssb/ssbmod.h index 16088a26e..a6d611cf8 100644 --- a/plugins/channeltx/modssb/ssbmod.h +++ b/plugins/channeltx/modssb/ssbmod.h @@ -183,8 +183,8 @@ public: virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } @@ -232,8 +232,8 @@ public: int getFeedbackAudioSampleRate() const; uint32_t getNumberOfDeviceStreams() const; - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; private: enum RateState { diff --git a/plugins/channeltx/modwfm/wfmmod.cpp b/plugins/channeltx/modwfm/wfmmod.cpp index 1bac328b9..038d6a2dc 100644 --- a/plugins/channeltx/modwfm/wfmmod.cpp +++ b/plugins/channeltx/modwfm/wfmmod.cpp @@ -48,8 +48,8 @@ MESSAGE_CLASS_DEFINITION(WFMMod::MsgConfigureFileSourceStreamTiming, Message) MESSAGE_CLASS_DEFINITION(WFMMod::MsgReportFileSourceStreamData, Message) MESSAGE_CLASS_DEFINITION(WFMMod::MsgReportFileSourceStreamTiming, Message) -const QString WFMMod::m_channelIdURI = "sdrangel.channeltx.modwfm"; -const QString WFMMod::m_channelId = "WFMMod"; +const char* const WFMMod::m_channelIdURI = "sdrangel.channeltx.modwfm"; +const char* const WFMMod::m_channelId = "WFMMod"; WFMMod::WFMMod(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), diff --git a/plugins/channeltx/modwfm/wfmmod.h b/plugins/channeltx/modwfm/wfmmod.h index fee868cae..1b7335cc7 100644 --- a/plugins/channeltx/modwfm/wfmmod.h +++ b/plugins/channeltx/modwfm/wfmmod.h @@ -181,8 +181,8 @@ public: virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } @@ -229,8 +229,8 @@ public: int getAudioSampleRate() const; int getFeedbackAudioSampleRate() const; - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; signals: /** diff --git a/plugins/channeltx/remotesource/remotesource.cpp b/plugins/channeltx/remotesource/remotesource.cpp index a2a7c0162..5aaedc71a 100644 --- a/plugins/channeltx/remotesource/remotesource.cpp +++ b/plugins/channeltx/remotesource/remotesource.cpp @@ -40,8 +40,8 @@ MESSAGE_CLASS_DEFINITION(RemoteSource::MsgConfigureRemoteSource, Message) MESSAGE_CLASS_DEFINITION(RemoteSource::MsgQueryStreamData, Message) MESSAGE_CLASS_DEFINITION(RemoteSource::MsgReportStreamData, Message) -const QString RemoteSource::m_channelIdURI = "sdrangel.channeltx.remotesource"; -const QString RemoteSource::m_channelId ="RemoteSource"; +const char* const RemoteSource::m_channelIdURI = "sdrangel.channeltx.remotesource"; +const char* const RemoteSource::m_channelId ="RemoteSource"; RemoteSource::RemoteSource(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), diff --git a/plugins/channeltx/remotesource/remotesource.h b/plugins/channeltx/remotesource/remotesource.h index 5ecce8b91..de334eb21 100644 --- a/plugins/channeltx/remotesource/remotesource.h +++ b/plugins/channeltx/remotesource/remotesource.h @@ -164,8 +164,8 @@ public: virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return 0; } @@ -207,8 +207,8 @@ public: uint32_t getNumberOfDeviceStreams() const; - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; private: DeviceAPI* m_deviceAPI; diff --git a/plugins/channeltx/udpsource/udpsource.cpp b/plugins/channeltx/udpsource/udpsource.cpp index 7fc513ce8..05573c4f3 100644 --- a/plugins/channeltx/udpsource/udpsource.cpp +++ b/plugins/channeltx/udpsource/udpsource.cpp @@ -37,8 +37,8 @@ MESSAGE_CLASS_DEFINITION(UDPSource::MsgConfigureUDPSource, Message) MESSAGE_CLASS_DEFINITION(UDPSource::MsgConfigureChannelizer, Message) -const QString UDPSource::m_channelIdURI = "sdrangel.channeltx.udpsource"; -const QString UDPSource::m_channelId = "UDPSource"; +const char* const UDPSource::m_channelIdURI = "sdrangel.channeltx.udpsource"; +const char* const UDPSource::m_channelId = "UDPSource"; UDPSource::UDPSource(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), diff --git a/plugins/channeltx/udpsource/udpsource.h b/plugins/channeltx/udpsource/udpsource.h index 16d95dec1..342d90c9c 100644 --- a/plugins/channeltx/udpsource/udpsource.h +++ b/plugins/channeltx/udpsource/udpsource.h @@ -102,8 +102,8 @@ public: virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = m_channelId; } - virtual const QString& getURI() const { return m_channelIdURI; } + virtual void getIdentifier(QString& id) { id = objectName(); } + virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } @@ -153,8 +153,8 @@ public: void setLevelMeter(QObject *levelMeter); uint32_t getNumberOfDeviceStreams() const; - static const QString m_channelIdURI; - static const QString m_channelId; + static const char* const m_channelIdURI; + static const char* const m_channelId; private slots: void networkManagerFinished(QNetworkReply *reply); diff --git a/plugins/feature/afc/afc.cpp b/plugins/feature/afc/afc.cpp index bf073d2ea..0ccaf5d85 100644 --- a/plugins/feature/afc/afc.cpp +++ b/plugins/feature/afc/afc.cpp @@ -40,8 +40,8 @@ MESSAGE_CLASS_DEFINITION(AFC::MsgStartStop, Message) MESSAGE_CLASS_DEFINITION(AFC::MsgDeviceTrack, Message) MESSAGE_CLASS_DEFINITION(AFC::MsgDevicesApply, Message) -const QString AFC::m_featureIdURI = "sdrangel.feature.afc"; -const QString AFC::m_featureId = "AFC"; +const char* const AFC::m_featureIdURI = "sdrangel.feature.afc"; +const char* const AFC::m_featureId = "AFC"; AFC::AFC(WebAPIAdapterInterface *webAPIAdapterInterface) : Feature(m_featureIdURI, webAPIAdapterInterface), diff --git a/plugins/feature/afc/afc.h b/plugins/feature/afc/afc.h index a735f42db..bd2f4934e 100644 --- a/plugins/feature/afc/afc.h +++ b/plugins/feature/afc/afc.h @@ -112,8 +112,8 @@ public: virtual void destroy() { delete this; } virtual bool handleMessage(const Message& cmd); - virtual const QString& getURI() const { return m_featureIdURI; } - virtual void getIdentifier(QString& id) const { id = m_featureId; } + virtual const QString& getURI() const { return getName(); } + virtual void getIdentifier(QString& id) const { id = objectName(); } virtual void getTitle(QString& title) const { title = m_settings.m_title; } virtual QByteArray serialize() const; @@ -151,8 +151,8 @@ public: const QStringList& featureSettingsKeys, SWGSDRangel::SWGFeatureSettings& response); - static const QString m_featureIdURI; - static const QString m_featureId; + static const char* const m_featureIdURI; + static const char* const m_featureId; private: QThread m_thread; diff --git a/plugins/feature/gs232controller/gs232controller.cpp b/plugins/feature/gs232controller/gs232controller.cpp index 06577d36b..6efc567f2 100644 --- a/plugins/feature/gs232controller/gs232controller.cpp +++ b/plugins/feature/gs232controller/gs232controller.cpp @@ -35,8 +35,8 @@ MESSAGE_CLASS_DEFINITION(GS232Controller::MsgConfigureGS232Controller, Message) MESSAGE_CLASS_DEFINITION(GS232Controller::MsgStartStop, Message) -const QString GS232Controller::m_featureIdURI = "sdrangel.feature.gs232controller"; -const QString GS232Controller::m_featureId = "GS232Controller"; +const char* const GS232Controller::m_featureIdURI = "sdrangel.feature.gs232controller"; +const char* const GS232Controller::m_featureId = "GS232Controller"; GS232Controller::GS232Controller(WebAPIAdapterInterface *webAPIAdapterInterface) : Feature(m_featureIdURI, webAPIAdapterInterface), diff --git a/plugins/feature/gs232controller/gs232controller.h b/plugins/feature/gs232controller/gs232controller.h index d101992f3..5b8d47392 100644 --- a/plugins/feature/gs232controller/gs232controller.h +++ b/plugins/feature/gs232controller/gs232controller.h @@ -86,8 +86,8 @@ public: virtual void destroy() { delete this; } virtual bool handleMessage(const Message& cmd); - virtual const QString& getURI() const { return m_featureIdURI; } - virtual void getIdentifier(QString& id) const { id = m_featureId; } + virtual const QString& getURI() const { return getName(); } + virtual void getIdentifier(QString& id) const { id = objectName(); } virtual void getTitle(QString& title) const { title = m_settings.m_title; } virtual QByteArray serialize() const; @@ -116,8 +116,8 @@ public: const QStringList& featureSettingsKeys, SWGSDRangel::SWGFeatureSettings& response); - static const QString m_featureIdURI; - static const QString m_featureId; + static const char* const m_featureIdURI; + static const char* const m_featureId; private: QThread m_thread; diff --git a/plugins/feature/rigctlserver/rigctlserver.cpp b/plugins/feature/rigctlserver/rigctlserver.cpp index b3956ece2..ef67c003f 100644 --- a/plugins/feature/rigctlserver/rigctlserver.cpp +++ b/plugins/feature/rigctlserver/rigctlserver.cpp @@ -35,8 +35,8 @@ MESSAGE_CLASS_DEFINITION(RigCtlServer::MsgConfigureRigCtlServer, Message) MESSAGE_CLASS_DEFINITION(RigCtlServer::MsgStartStop, Message) -const QString RigCtlServer::m_featureIdURI = "sdrangel.feature.rigctlserver"; -const QString RigCtlServer::m_featureId = "RigCtlServer"; +const char* const RigCtlServer::m_featureIdURI = "sdrangel.feature.rigctlserver"; +const char* const RigCtlServer::m_featureId = "RigCtlServer"; RigCtlServer::RigCtlServer(WebAPIAdapterInterface *webAPIAdapterInterface) : Feature(m_featureIdURI, webAPIAdapterInterface), diff --git a/plugins/feature/rigctlserver/rigctlserver.h b/plugins/feature/rigctlserver/rigctlserver.h index 17814a46a..4dd930f10 100644 --- a/plugins/feature/rigctlserver/rigctlserver.h +++ b/plugins/feature/rigctlserver/rigctlserver.h @@ -86,8 +86,8 @@ public: virtual void destroy() { delete this; } virtual bool handleMessage(const Message& cmd); - virtual const QString& getURI() const { return m_featureIdURI; } - virtual void getIdentifier(QString& id) const { id = m_featureId; } + virtual const QString& getURI() const { return getName(); } + virtual void getIdentifier(QString& id) const { id = objectName(); } virtual void getTitle(QString& title) const { title = m_settings.m_title; } virtual QByteArray serialize() const; @@ -116,8 +116,8 @@ public: const QStringList& featureSettingsKeys, SWGSDRangel::SWGFeatureSettings& response); - static const QString m_featureIdURI; - static const QString m_featureId; + static const char* const m_featureIdURI; + static const char* const m_featureId; private: QThread m_thread; diff --git a/plugins/feature/simpleptt/simpleptt.cpp b/plugins/feature/simpleptt/simpleptt.cpp index 96020316f..31a9ea0d7 100644 --- a/plugins/feature/simpleptt/simpleptt.cpp +++ b/plugins/feature/simpleptt/simpleptt.cpp @@ -35,8 +35,8 @@ MESSAGE_CLASS_DEFINITION(SimplePTT::MsgConfigureSimplePTT, Message) MESSAGE_CLASS_DEFINITION(SimplePTT::MsgPTT, Message) MESSAGE_CLASS_DEFINITION(SimplePTT::MsgStartStop, Message) -const QString SimplePTT::m_featureIdURI = "sdrangel.feature.simpleptt"; -const QString SimplePTT::m_featureId = "SimplePTT"; +const char* const SimplePTT::m_featureIdURI = "sdrangel.feature.simpleptt"; +const char* const SimplePTT::m_featureId = "SimplePTT"; SimplePTT::SimplePTT(WebAPIAdapterInterface *webAPIAdapterInterface) : Feature(m_featureIdURI, webAPIAdapterInterface), diff --git a/plugins/feature/simpleptt/simpleptt.h b/plugins/feature/simpleptt/simpleptt.h index 1f2d4a540..f81661860 100644 --- a/plugins/feature/simpleptt/simpleptt.h +++ b/plugins/feature/simpleptt/simpleptt.h @@ -104,8 +104,8 @@ public: virtual void destroy() { delete this; } virtual bool handleMessage(const Message& cmd); - virtual const QString& getURI() const { return m_featureIdURI; } - virtual void getIdentifier(QString& id) const { id = m_featureId; } + virtual const QString& getURI() const { return getName(); } + virtual void getIdentifier(QString& id) const { id = objectName(); } virtual void getTitle(QString& title) const { title = m_settings.m_title; } virtual QByteArray serialize() const; @@ -143,8 +143,8 @@ public: const QStringList& featureSettingsKeys, SWGSDRangel::SWGFeatureSettings& response); - static const QString m_featureIdURI; - static const QString m_featureId; + static const char* const m_featureIdURI; + static const char* const m_featureId; private: QThread m_thread; diff --git a/plugins/samplemimo/bladerf2mimo/bladerf2mimoplugin.cpp b/plugins/samplemimo/bladerf2mimo/bladerf2mimoplugin.cpp index da42d1052..068c72c2c 100644 --- a/plugins/samplemimo/bladerf2mimo/bladerf2mimoplugin.cpp +++ b/plugins/samplemimo/bladerf2mimo/bladerf2mimoplugin.cpp @@ -37,8 +37,8 @@ const PluginDescriptor BladeRF2MIMOPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString BladeRF2MIMOPlugin::m_hardwareID = "BladeRF2"; -const QString BladeRF2MIMOPlugin::m_deviceTypeID = BLADERF2MIMO_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "BladeRF2"; +static constexpr const char* const m_deviceTypeID = BLADERF2MIMO_DEVICE_TYPE_ID; BladeRF2MIMOPlugin::BladeRF2MIMOPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplemimo/bladerf2mimo/bladerf2mimoplugin.h b/plugins/samplemimo/bladerf2mimo/bladerf2mimoplugin.h index e31779a27..708c0703a 100644 --- a/plugins/samplemimo/bladerf2mimo/bladerf2mimoplugin.h +++ b/plugins/samplemimo/bladerf2mimo/bladerf2mimoplugin.h @@ -46,9 +46,6 @@ public: virtual DeviceSampleMIMO* createSampleMIMOPluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplemimo/limesdrmimo/limesdrmimoplugin.cpp b/plugins/samplemimo/limesdrmimo/limesdrmimoplugin.cpp index c26911b0b..d5b8bc1a1 100644 --- a/plugins/samplemimo/limesdrmimo/limesdrmimoplugin.cpp +++ b/plugins/samplemimo/limesdrmimo/limesdrmimoplugin.cpp @@ -38,8 +38,8 @@ const PluginDescriptor LimeSDRMIMOPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString LimeSDRMIMOPlugin::m_hardwareID = "LimeSDR"; -const QString LimeSDRMIMOPlugin::m_deviceTypeID = LIMESDRMIMO_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "LimeSDR"; +static constexpr const char* const m_deviceTypeID = LIMESDRMIMO_DEVICE_TYPE_ID; LimeSDRMIMOPlugin::LimeSDRMIMOPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplemimo/limesdrmimo/limesdrmimoplugin.h b/plugins/samplemimo/limesdrmimo/limesdrmimoplugin.h index d8091b80a..48ec5006f 100644 --- a/plugins/samplemimo/limesdrmimo/limesdrmimoplugin.h +++ b/plugins/samplemimo/limesdrmimo/limesdrmimoplugin.h @@ -46,9 +46,6 @@ public: virtual DeviceSampleMIMO* createSampleMIMOPluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplemimo/metismiso/metismisoplugin.cpp b/plugins/samplemimo/metismiso/metismisoplugin.cpp index 0e5ed4b86..683c650ad 100644 --- a/plugins/samplemimo/metismiso/metismisoplugin.cpp +++ b/plugins/samplemimo/metismiso/metismisoplugin.cpp @@ -39,8 +39,8 @@ const PluginDescriptor MetisMISOPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString MetisMISOPlugin::m_hardwareID = "MetisMISO"; -const QString MetisMISOPlugin::m_deviceTypeID = METISMISO_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "MetisMISO"; +static constexpr const char* const m_deviceTypeID = METISMISO_DEVICE_TYPE_ID; MetisMISOPlugin::MetisMISOPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplemimo/metismiso/metismisoplugin.h b/plugins/samplemimo/metismiso/metismisoplugin.h index 81d9655bd..688a35fc9 100644 --- a/plugins/samplemimo/metismiso/metismisoplugin.h +++ b/plugins/samplemimo/metismiso/metismisoplugin.h @@ -46,9 +46,6 @@ public: virtual DeviceSampleMIMO* createSampleMIMOPluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplemimo/testmi/testmiplugin.cpp b/plugins/samplemimo/testmi/testmiplugin.cpp index 261746906..3dd679329 100644 --- a/plugins/samplemimo/testmi/testmiplugin.cpp +++ b/plugins/samplemimo/testmi/testmiplugin.cpp @@ -38,8 +38,8 @@ const PluginDescriptor TestMIPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString TestMIPlugin::m_hardwareID = "TestMI"; -const QString TestMIPlugin::m_deviceTypeID = TESTMI_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "TestMI"; +static constexpr const char* const m_deviceTypeID = TESTMI_DEVICE_TYPE_ID; TestMIPlugin::TestMIPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplemimo/testmi/testmiplugin.h b/plugins/samplemimo/testmi/testmiplugin.h index fac2584ca..165e0a28b 100644 --- a/plugins/samplemimo/testmi/testmiplugin.h +++ b/plugins/samplemimo/testmi/testmiplugin.h @@ -45,9 +45,6 @@ public: virtual DeviceSampleMIMO* createSampleMIMOPluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplemimo/testmosync/testmosyncplugin.cpp b/plugins/samplemimo/testmosync/testmosyncplugin.cpp index ee8812d25..2c36bbe3f 100644 --- a/plugins/samplemimo/testmosync/testmosyncplugin.cpp +++ b/plugins/samplemimo/testmosync/testmosyncplugin.cpp @@ -36,8 +36,8 @@ const PluginDescriptor TestMOSyncPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString TestMOSyncPlugin::m_hardwareID = "TestMOSync"; -const QString TestMOSyncPlugin::m_deviceTypeID = TESTMOSYNC_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "TestMOSync"; +static constexpr const char* const m_deviceTypeID = TESTMOSYNC_DEVICE_TYPE_ID; TestMOSyncPlugin::TestMOSyncPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplemimo/testmosync/testmosyncplugin.h b/plugins/samplemimo/testmosync/testmosyncplugin.h index 4cd0b4485..86eaca221 100644 --- a/plugins/samplemimo/testmosync/testmosyncplugin.h +++ b/plugins/samplemimo/testmosync/testmosyncplugin.h @@ -45,9 +45,6 @@ public: virtual DeviceSampleMIMO* createSampleMIMOPluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplemimo/xtrxmimo/xtrxmimoplugin.cpp b/plugins/samplemimo/xtrxmimo/xtrxmimoplugin.cpp index 8735bc9b5..78de4ed0c 100644 --- a/plugins/samplemimo/xtrxmimo/xtrxmimoplugin.cpp +++ b/plugins/samplemimo/xtrxmimo/xtrxmimoplugin.cpp @@ -38,8 +38,8 @@ const PluginDescriptor XTRXMIMOPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString XTRXMIMOPlugin::m_hardwareID = "XTRX"; -const QString XTRXMIMOPlugin::m_deviceTypeID = XTRXMIMO_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "XTRX"; +static constexpr const char* const m_deviceTypeID = XTRXMIMO_DEVICE_TYPE_ID; XTRXMIMOPlugin::XTRXMIMOPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplemimo/xtrxmimo/xtrxmimoplugin.h b/plugins/samplemimo/xtrxmimo/xtrxmimoplugin.h index 18e939598..16bbbbfe7 100644 --- a/plugins/samplemimo/xtrxmimo/xtrxmimoplugin.h +++ b/plugins/samplemimo/xtrxmimo/xtrxmimoplugin.h @@ -46,9 +46,6 @@ public: virtual DeviceSampleMIMO* createSampleMIMOPluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplesink/bladerf1output/bladerf1outputplugin.cpp b/plugins/samplesink/bladerf1output/bladerf1outputplugin.cpp index b6c550299..34cea980d 100644 --- a/plugins/samplesink/bladerf1output/bladerf1outputplugin.cpp +++ b/plugins/samplesink/bladerf1output/bladerf1outputplugin.cpp @@ -39,8 +39,8 @@ const PluginDescriptor Bladerf1OutputPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString Bladerf1OutputPlugin::m_hardwareID = "BladeRF1"; -const QString Bladerf1OutputPlugin::m_deviceTypeID = BLADERF1OUTPUT_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "BladeRF1"; +static constexpr const char* const m_deviceTypeID = BLADERF1OUTPUT_DEVICE_TYPE_ID; Bladerf1OutputPlugin::Bladerf1OutputPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesink/bladerf1output/bladerf1outputplugin.h b/plugins/samplesink/bladerf1output/bladerf1outputplugin.h index 5c7d1d506..e9a28f207 100644 --- a/plugins/samplesink/bladerf1output/bladerf1outputplugin.h +++ b/plugins/samplesink/bladerf1output/bladerf1outputplugin.h @@ -47,9 +47,6 @@ public: virtual DeviceSampleSink* createSampleSinkPluginInstance(const QString& sinkId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp b/plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp index 93d265374..655d1ed4b 100644 --- a/plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp +++ b/plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp @@ -39,8 +39,8 @@ const PluginDescriptor BladeRF2OutputPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString BladeRF2OutputPlugin::m_hardwareID = "BladeRF2"; -const QString BladeRF2OutputPlugin::m_deviceTypeID = BLADERF2OUTPUT_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "BladeRF2"; +static constexpr const char* const m_deviceTypeID = BLADERF2OUTPUT_DEVICE_TYPE_ID; BladeRF2OutputPlugin::BladeRF2OutputPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesink/bladerf2output/bladerf2outputplugin.h b/plugins/samplesink/bladerf2output/bladerf2outputplugin.h index eb74c9ecd..1a64ed093 100644 --- a/plugins/samplesink/bladerf2output/bladerf2outputplugin.h +++ b/plugins/samplesink/bladerf2output/bladerf2outputplugin.h @@ -47,9 +47,6 @@ public: virtual DeviceSampleSink* createSampleSinkPluginInstance(const QString& sinkId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplesink/fileoutput/fileoutputplugin.cpp b/plugins/samplesink/fileoutput/fileoutputplugin.cpp index e674c595f..01e8a848f 100644 --- a/plugins/samplesink/fileoutput/fileoutputplugin.cpp +++ b/plugins/samplesink/fileoutput/fileoutputplugin.cpp @@ -37,8 +37,8 @@ const PluginDescriptor FileOutputPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString FileOutputPlugin::m_hardwareID = "FileOutput"; -const QString FileOutputPlugin::m_deviceTypeID = FILEOUTPUT_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "FileOutput"; +static constexpr const char* const m_deviceTypeID = FILEOUTPUT_DEVICE_TYPE_ID; FileOutputPlugin::FileOutputPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesink/fileoutput/fileoutputplugin.h b/plugins/samplesink/fileoutput/fileoutputplugin.h index dff44c650..4487669c2 100644 --- a/plugins/samplesink/fileoutput/fileoutputplugin.h +++ b/plugins/samplesink/fileoutput/fileoutputplugin.h @@ -45,9 +45,6 @@ public: DeviceUISet *deviceUISet); virtual DeviceSampleSink* createSampleSinkPluginInstance(const QString& sinkId, DeviceAPI *deviceAPI); - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp index d4c110df8..01c8529ef 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp @@ -39,8 +39,8 @@ const PluginDescriptor HackRFOutputPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString HackRFOutputPlugin::m_hardwareID = "HackRF"; -const QString HackRFOutputPlugin::m_deviceTypeID = HACKRFOUTPUT_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "HackRF"; +static constexpr const char* const m_deviceTypeID = HACKRFOUTPUT_DEVICE_TYPE_ID; HackRFOutputPlugin::HackRFOutputPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputplugin.h b/plugins/samplesink/hackrfoutput/hackrfoutputplugin.h index 0de297bc6..9fa1e49e1 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputplugin.h +++ b/plugins/samplesink/hackrfoutput/hackrfoutputplugin.h @@ -45,9 +45,6 @@ public: virtual DeviceSampleSink* createSampleSinkPluginInstance(const QString& sinkId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp b/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp index f80a07375..e68bc0ec6 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp @@ -42,8 +42,8 @@ const PluginDescriptor LimeSDROutputPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString LimeSDROutputPlugin::m_hardwareID = "LimeSDR"; -const QString LimeSDROutputPlugin::m_deviceTypeID = LIMESDROUTPUT_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "LimeSDR"; +static constexpr const char* const m_deviceTypeID = LIMESDROUTPUT_DEVICE_TYPE_ID; LimeSDROutputPlugin::LimeSDROutputPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesink/limesdroutput/limesdroutputplugin.h b/plugins/samplesink/limesdroutput/limesdroutputplugin.h index 5e767373d..93c0c2674 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputplugin.h +++ b/plugins/samplesink/limesdroutput/limesdroutputplugin.h @@ -45,9 +45,6 @@ public: virtual DeviceSampleSink* createSampleSinkPluginInstance(const QString& sinkId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplesink/localoutput/localoutputplugin.cpp b/plugins/samplesink/localoutput/localoutputplugin.cpp index d2964d3dc..1b82362df 100644 --- a/plugins/samplesink/localoutput/localoutputplugin.cpp +++ b/plugins/samplesink/localoutput/localoutputplugin.cpp @@ -38,8 +38,8 @@ const PluginDescriptor LocalOutputPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString LocalOutputPlugin::m_hardwareID = "LocalOutput"; -const QString LocalOutputPlugin::m_deviceTypeID = LOCALOUTPUT_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "LocalOutput"; +static constexpr const char* const m_deviceTypeID = LOCALOUTPUT_DEVICE_TYPE_ID; LocalOutputPlugin::LocalOutputPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesink/localoutput/localoutputplugin.h b/plugins/samplesink/localoutput/localoutputplugin.h index ef7bed5c9..b56c1346a 100644 --- a/plugins/samplesink/localoutput/localoutputplugin.h +++ b/plugins/samplesink/localoutput/localoutputplugin.h @@ -45,9 +45,6 @@ public: virtual DeviceSampleSink* createSampleSinkPluginInstance(const QString& sinkId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputplugin.cpp b/plugins/samplesink/plutosdroutput/plutosdroutputplugin.cpp index 53739d005..63bfb9eea 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutputplugin.cpp +++ b/plugins/samplesink/plutosdroutput/plutosdroutputplugin.cpp @@ -38,8 +38,8 @@ const PluginDescriptor PlutoSDROutputPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString PlutoSDROutputPlugin::m_hardwareID = "PlutoSDR"; -const QString PlutoSDROutputPlugin::m_deviceTypeID = PLUTOSDR_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "PlutoSDR"; +const char* const PlutoSDROutputPlugin::m_deviceTypeID = PLUTOSDR_DEVICE_TYPE_ID; PlutoSDROutputPlugin::PlutoSDROutputPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputplugin.h b/plugins/samplesink/plutosdroutput/plutosdroutputplugin.h index b5abd6b89..aa6f63695 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutputplugin.h +++ b/plugins/samplesink/plutosdroutput/plutosdroutputplugin.h @@ -47,8 +47,7 @@ public: virtual QString getDeviceTypeId() const { return m_deviceTypeID; } - static const QString m_hardwareID; - static const QString m_deviceTypeID; + static const char* const m_deviceTypeID; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/samplesink/remoteoutput/remoteoutputplugin.cpp b/plugins/samplesink/remoteoutput/remoteoutputplugin.cpp index 7fadcfcc9..85694359d 100644 --- a/plugins/samplesink/remoteoutput/remoteoutputplugin.cpp +++ b/plugins/samplesink/remoteoutput/remoteoutputplugin.cpp @@ -38,8 +38,8 @@ const PluginDescriptor RemoteOutputPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString RemoteOutputPlugin::m_hardwareID = "RemoteOutput"; -const QString RemoteOutputPlugin::m_deviceTypeID = REMOTEOUTPUT_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "RemoteOutput"; +static constexpr const char* const m_deviceTypeID = REMOTEOUTPUT_DEVICE_TYPE_ID; RemoteOutputPlugin::RemoteOutputPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesink/remoteoutput/remoteoutputplugin.h b/plugins/samplesink/remoteoutput/remoteoutputplugin.h index 7d43cc246..009c46e54 100644 --- a/plugins/samplesink/remoteoutput/remoteoutputplugin.h +++ b/plugins/samplesink/remoteoutput/remoteoutputplugin.h @@ -46,9 +46,6 @@ public: virtual DeviceSampleSink* createSampleSinkPluginInstance(const QString& sinkId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp b/plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp index d6dca055b..4b8340593 100644 --- a/plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp +++ b/plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp @@ -40,8 +40,8 @@ const PluginDescriptor SoapySDROutputPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString SoapySDROutputPlugin::m_hardwareID = "SoapySDR"; -const QString SoapySDROutputPlugin::m_deviceTypeID = SOAPYSDROUTPUT_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "SoapySDR"; +static constexpr const char* const m_deviceTypeID = SOAPYSDROUTPUT_DEVICE_TYPE_ID; SoapySDROutputPlugin::SoapySDROutputPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesink/soapysdroutput/soapysdroutputplugin.h b/plugins/samplesink/soapysdroutput/soapysdroutputplugin.h index 85c5d726c..56e64500a 100644 --- a/plugins/samplesink/soapysdroutput/soapysdroutputplugin.h +++ b/plugins/samplesink/soapysdroutput/soapysdroutputplugin.h @@ -47,9 +47,6 @@ public: virtual DeviceSampleSink* createSampleSinkPluginInstance(const QString& sinkId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplesink/testsink/testsinkplugin.cpp b/plugins/samplesink/testsink/testsinkplugin.cpp index 50d2ef8fa..2cedfbee2 100644 --- a/plugins/samplesink/testsink/testsinkplugin.cpp +++ b/plugins/samplesink/testsink/testsinkplugin.cpp @@ -37,8 +37,8 @@ const PluginDescriptor TestSinkPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString TestSinkPlugin::m_hardwareID = "TestSink"; -const QString TestSinkPlugin::m_deviceTypeID = TESTSINK_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "TestSink"; +static constexpr const char* const m_deviceTypeID = TESTSINK_DEVICE_TYPE_ID; TestSinkPlugin::TestSinkPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesink/testsink/testsinkplugin.h b/plugins/samplesink/testsink/testsinkplugin.h index 1d231fe08..7ea0e63ef 100644 --- a/plugins/samplesink/testsink/testsinkplugin.h +++ b/plugins/samplesink/testsink/testsinkplugin.h @@ -45,9 +45,6 @@ public: DeviceUISet *deviceUISet); virtual DeviceSampleSink* createSampleSinkPluginInstance(const QString& sinkId, DeviceAPI *deviceAPI); - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplesink/usrpoutput/usrpoutputplugin.cpp b/plugins/samplesink/usrpoutput/usrpoutputplugin.cpp index 853edf47e..1153a5e23 100644 --- a/plugins/samplesink/usrpoutput/usrpoutputplugin.cpp +++ b/plugins/samplesink/usrpoutput/usrpoutputplugin.cpp @@ -42,8 +42,8 @@ const PluginDescriptor USRPOutputPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString USRPOutputPlugin::m_hardwareID = "USRP"; -const QString USRPOutputPlugin::m_deviceTypeID = USRPOUTPUT_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "USRP"; +static constexpr const char* const m_deviceTypeID = USRPOUTPUT_DEVICE_TYPE_ID; USRPOutputPlugin::USRPOutputPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesink/usrpoutput/usrpoutputplugin.h b/plugins/samplesink/usrpoutput/usrpoutputplugin.h index bee84d0c1..67ce833d8 100644 --- a/plugins/samplesink/usrpoutput/usrpoutputplugin.h +++ b/plugins/samplesink/usrpoutput/usrpoutputplugin.h @@ -46,9 +46,6 @@ public: virtual DeviceSampleSink* createSampleSinkPluginInstance(const QString& sinkId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplesink/xtrxoutput/xtrxoutputplugin.cpp b/plugins/samplesink/xtrxoutput/xtrxoutputplugin.cpp index 69c14b6c4..0ec9f19b1 100644 --- a/plugins/samplesink/xtrxoutput/xtrxoutputplugin.cpp +++ b/plugins/samplesink/xtrxoutput/xtrxoutputplugin.cpp @@ -43,8 +43,8 @@ const PluginDescriptor XTRXOutputPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString XTRXOutputPlugin::m_hardwareID = "XTRX"; -const QString XTRXOutputPlugin::m_deviceTypeID = XTRXOUTPUT_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "XTRX"; +static constexpr const char* const m_deviceTypeID = XTRXOUTPUT_DEVICE_TYPE_ID; XTRXOutputPlugin::XTRXOutputPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesink/xtrxoutput/xtrxoutputplugin.h b/plugins/samplesink/xtrxoutput/xtrxoutputplugin.h index 5b99a4c4c..05517f7df 100644 --- a/plugins/samplesink/xtrxoutput/xtrxoutputplugin.h +++ b/plugins/samplesink/xtrxoutput/xtrxoutputplugin.h @@ -45,9 +45,6 @@ public: virtual DeviceSampleSink* createSampleSinkPluginInstance(const QString& sinkId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplesource/airspy/airspyplugin.cpp b/plugins/samplesource/airspy/airspyplugin.cpp index d56e17020..7abfb5498 100644 --- a/plugins/samplesource/airspy/airspyplugin.cpp +++ b/plugins/samplesource/airspy/airspyplugin.cpp @@ -41,8 +41,8 @@ const PluginDescriptor AirspyPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString AirspyPlugin::m_hardwareID = "Airspy"; -const QString AirspyPlugin::m_deviceTypeID = AIRSPY_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "Airspy"; +static constexpr const char* const m_deviceTypeID = AIRSPY_DEVICE_TYPE_ID; AirspyPlugin::AirspyPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesource/airspy/airspyplugin.h b/plugins/samplesource/airspy/airspyplugin.h index c994038a8..37b297d48 100644 --- a/plugins/samplesource/airspy/airspyplugin.h +++ b/plugins/samplesource/airspy/airspyplugin.h @@ -45,8 +45,6 @@ public: virtual DeviceSampleSource* createSampleSourcePluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; static const int m_maxDevices; private: diff --git a/plugins/samplesource/airspyhf/airspyhfplugin.cpp b/plugins/samplesource/airspyhf/airspyhfplugin.cpp index 56e39f8b5..acc25d39c 100644 --- a/plugins/samplesource/airspyhf/airspyhfplugin.cpp +++ b/plugins/samplesource/airspyhf/airspyhfplugin.cpp @@ -39,8 +39,8 @@ const PluginDescriptor AirspyHFPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString AirspyHFPlugin::m_hardwareID = "AirspyHF"; -const QString AirspyHFPlugin::m_deviceTypeID = AIRSPYHF_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "AirspyHF"; +static constexpr const char* const m_deviceTypeID = AIRSPYHF_DEVICE_TYPE_ID; const int AirspyHFPlugin::m_maxDevices = 32; AirspyHFPlugin::AirspyHFPlugin(QObject* parent) : diff --git a/plugins/samplesource/airspyhf/airspyhfplugin.h b/plugins/samplesource/airspyhf/airspyhfplugin.h index c293e16e9..2be61e211 100644 --- a/plugins/samplesource/airspyhf/airspyhfplugin.h +++ b/plugins/samplesource/airspyhf/airspyhfplugin.h @@ -45,8 +45,6 @@ public: virtual DeviceSampleSource* createSampleSourcePluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; static const int m_maxDevices; private: diff --git a/plugins/samplesource/audioinput/audioinputplugin.cpp b/plugins/samplesource/audioinput/audioinputplugin.cpp index c167795ca..fbf214fdc 100644 --- a/plugins/samplesource/audioinput/audioinputplugin.cpp +++ b/plugins/samplesource/audioinput/audioinputplugin.cpp @@ -38,8 +38,8 @@ const PluginDescriptor AudioInputPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString AudioInputPlugin::m_hardwareID = "AudioInput"; -const QString AudioInputPlugin::m_deviceTypeID = AUDIOINPUT_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "AudioInput"; +static constexpr const char* const m_deviceTypeID = AUDIOINPUT_DEVICE_TYPE_ID; AudioInputPlugin::AudioInputPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesource/audioinput/audioinputplugin.h b/plugins/samplesource/audioinput/audioinputplugin.h index 23976ca78..0be8fdb03 100644 --- a/plugins/samplesource/audioinput/audioinputplugin.h +++ b/plugins/samplesource/audioinput/audioinputplugin.h @@ -46,9 +46,6 @@ public: virtual DeviceSampleSource* createSampleSourcePluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplesource/bladerf1input/bladerf1inputplugin.cpp b/plugins/samplesource/bladerf1input/bladerf1inputplugin.cpp index cc2500dd3..65d6deed1 100644 --- a/plugins/samplesource/bladerf1input/bladerf1inputplugin.cpp +++ b/plugins/samplesource/bladerf1input/bladerf1inputplugin.cpp @@ -39,8 +39,8 @@ const PluginDescriptor Blderf1InputPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString Blderf1InputPlugin::m_hardwareID = "BladeRF1"; -const QString Blderf1InputPlugin::m_deviceTypeID = BLADERF1INPUT_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "BladeRF1"; +static constexpr const char* const m_deviceTypeID = BLADERF1INPUT_DEVICE_TYPE_ID; Blderf1InputPlugin::Blderf1InputPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesource/bladerf1input/bladerf1inputplugin.h b/plugins/samplesource/bladerf1input/bladerf1inputplugin.h index 444d02707..ca6996490 100644 --- a/plugins/samplesource/bladerf1input/bladerf1inputplugin.h +++ b/plugins/samplesource/bladerf1input/bladerf1inputplugin.h @@ -47,9 +47,6 @@ public: virtual DeviceSampleSource* createSampleSourcePluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplesource/bladerf2input/bladerf2inputplugin.cpp b/plugins/samplesource/bladerf2input/bladerf2inputplugin.cpp index 392f7ae81..b8feb3927 100644 --- a/plugins/samplesource/bladerf2input/bladerf2inputplugin.cpp +++ b/plugins/samplesource/bladerf2input/bladerf2inputplugin.cpp @@ -39,8 +39,8 @@ const PluginDescriptor Blderf2InputPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString Blderf2InputPlugin::m_hardwareID = "BladeRF2"; -const QString Blderf2InputPlugin::m_deviceTypeID = BLADERF2INPUT_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "BladeRF2"; +static constexpr const char* const m_deviceTypeID = BLADERF2INPUT_DEVICE_TYPE_ID; Blderf2InputPlugin::Blderf2InputPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesource/bladerf2input/bladerf2inputplugin.h b/plugins/samplesource/bladerf2input/bladerf2inputplugin.h index d58468826..d975f23e8 100644 --- a/plugins/samplesource/bladerf2input/bladerf2inputplugin.h +++ b/plugins/samplesource/bladerf2input/bladerf2inputplugin.h @@ -47,9 +47,6 @@ public: virtual DeviceSampleSource* createSampleSourcePluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp b/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp index 3dafc1ae6..d3fcb19e5 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp @@ -38,7 +38,7 @@ const PluginDescriptor FCDProPlusPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString FCDProPlusPlugin::m_deviceTypeID = FCDPROPLUS_DEVICE_TYPE_ID; +static constexpr const char* const m_deviceTypeID = FCDPROPLUS_DEVICE_TYPE_ID; FCDProPlusPlugin::FCDProPlusPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesource/fcdproplus/fcdproplusplugin.h b/plugins/samplesource/fcdproplus/fcdproplusplugin.h index 37a26915a..f65963e21 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusplugin.h +++ b/plugins/samplesource/fcdproplus/fcdproplusplugin.h @@ -28,8 +28,6 @@ public: virtual DeviceSampleSource* createSampleSourcePluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplesource/fileinput/fileinputplugin.cpp b/plugins/samplesource/fileinput/fileinputplugin.cpp index 00ab9c9a6..43b56e9be 100644 --- a/plugins/samplesource/fileinput/fileinputplugin.cpp +++ b/plugins/samplesource/fileinput/fileinputplugin.cpp @@ -38,8 +38,8 @@ const PluginDescriptor FileInputPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString FileInputPlugin::m_hardwareID = "FileInput"; -const QString FileInputPlugin::m_deviceTypeID = FILEINPUT_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "FileInput"; +static constexpr const char* const m_deviceTypeID = FILEINPUT_DEVICE_TYPE_ID; FileInputPlugin::FileInputPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesource/fileinput/fileinputplugin.h b/plugins/samplesource/fileinput/fileinputplugin.h index 40096b85c..486b3875f 100644 --- a/plugins/samplesource/fileinput/fileinputplugin.h +++ b/plugins/samplesource/fileinput/fileinputplugin.h @@ -45,9 +45,6 @@ public: virtual DeviceSampleSource* createSampleSourcePluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp b/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp index f14ad8016..8874123a0 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp @@ -40,8 +40,8 @@ const PluginDescriptor HackRFInputPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString HackRFInputPlugin::m_hardwareID = "HackRF"; -const QString HackRFInputPlugin::m_deviceTypeID = HACKRF_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "HackRF"; +static constexpr const char* const m_deviceTypeID = HACKRF_DEVICE_TYPE_ID; HackRFInputPlugin::HackRFInputPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesource/hackrfinput/hackrfinputplugin.h b/plugins/samplesource/hackrfinput/hackrfinputplugin.h index 4d8ead765..99b91cf85 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputplugin.h +++ b/plugins/samplesource/hackrfinput/hackrfinputplugin.h @@ -45,9 +45,6 @@ public: virtual DeviceSampleSource* createSampleSourcePluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplesource/kiwisdr/kiwisdrplugin.cpp b/plugins/samplesource/kiwisdr/kiwisdrplugin.cpp index 9f32fa53f..4e4d52815 100644 --- a/plugins/samplesource/kiwisdr/kiwisdrplugin.cpp +++ b/plugins/samplesource/kiwisdr/kiwisdrplugin.cpp @@ -39,8 +39,8 @@ const PluginDescriptor KiwiSDRPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString KiwiSDRPlugin::m_hardwareID = "KiwiSDR"; -const QString KiwiSDRPlugin::m_deviceTypeID = KIWISDR_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "KiwiSDR"; +static constexpr const char* const m_deviceTypeID = KIWISDR_DEVICE_TYPE_ID; KiwiSDRPlugin::KiwiSDRPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesource/kiwisdr/kiwisdrplugin.h b/plugins/samplesource/kiwisdr/kiwisdrplugin.h index 38ecb02de..b31eb1636 100644 --- a/plugins/samplesource/kiwisdr/kiwisdrplugin.h +++ b/plugins/samplesource/kiwisdr/kiwisdrplugin.h @@ -46,9 +46,6 @@ public: virtual DeviceSampleSource* createSampleSourcePluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp b/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp index 4f886ccf5..da48fe530 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp @@ -42,8 +42,8 @@ const PluginDescriptor LimeSDRInputPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString LimeSDRInputPlugin::m_hardwareID = "LimeSDR"; -const QString LimeSDRInputPlugin::m_deviceTypeID = LIMESDR_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "LimeSDR"; +static constexpr const char* const m_deviceTypeID = LIMESDR_DEVICE_TYPE_ID; LimeSDRInputPlugin::LimeSDRInputPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesource/limesdrinput/limesdrinputplugin.h b/plugins/samplesource/limesdrinput/limesdrinputplugin.h index 133087450..0334626ce 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputplugin.h +++ b/plugins/samplesource/limesdrinput/limesdrinputplugin.h @@ -45,9 +45,6 @@ public: virtual DeviceSampleSource* createSampleSourcePluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplesource/localinput/localinputplugin.cpp b/plugins/samplesource/localinput/localinputplugin.cpp index ffde0c8e9..7c5fc128b 100644 --- a/plugins/samplesource/localinput/localinputplugin.cpp +++ b/plugins/samplesource/localinput/localinputplugin.cpp @@ -38,8 +38,8 @@ const PluginDescriptor LocalInputPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString LocalInputPlugin::m_hardwareID = "LocalInput"; -const QString LocalInputPlugin::m_deviceTypeID = LOCALINPUT_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "LocalInput"; +static constexpr const char* const m_deviceTypeID = LOCALINPUT_DEVICE_TYPE_ID; LocalInputPlugin::LocalInputPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesource/localinput/localinputplugin.h b/plugins/samplesource/localinput/localinputplugin.h index 852a28fab..ffe9105ec 100644 --- a/plugins/samplesource/localinput/localinputplugin.h +++ b/plugins/samplesource/localinput/localinputplugin.h @@ -45,9 +45,6 @@ public: virtual DeviceSampleSource* createSampleSourcePluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplesource/perseus/perseusplugin.cpp b/plugins/samplesource/perseus/perseusplugin.cpp index 26cd0a5b2..d7cd6b9d1 100644 --- a/plugins/samplesource/perseus/perseusplugin.cpp +++ b/plugins/samplesource/perseus/perseusplugin.cpp @@ -40,8 +40,8 @@ const PluginDescriptor PerseusPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString PerseusPlugin::m_hardwareID = "Perseus"; -const QString PerseusPlugin::m_deviceTypeID = PERSEUS_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "Perseus"; +static constexpr const char* const m_deviceTypeID = PERSEUS_DEVICE_TYPE_ID; const int PerseusPlugin::m_maxDevices = 32; PerseusPlugin::PerseusPlugin(QObject* parent) : diff --git a/plugins/samplesource/perseus/perseusplugin.h b/plugins/samplesource/perseus/perseusplugin.h index ac6dab15c..2233a4d92 100644 --- a/plugins/samplesource/perseus/perseusplugin.h +++ b/plugins/samplesource/perseus/perseusplugin.h @@ -45,8 +45,6 @@ public: virtual DeviceSampleSource* createSampleSourcePluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; static const int m_maxDevices; private: diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp index 7b9b4ca8f..1e8454d0b 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp +++ b/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp @@ -40,8 +40,8 @@ const PluginDescriptor PlutoSDRInputPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString PlutoSDRInputPlugin::m_hardwareID = "PlutoSDR"; -const QString PlutoSDRInputPlugin::m_deviceTypeID = PLUTOSDR_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "PlutoSDR"; +const char* const PlutoSDRInputPlugin::m_deviceTypeID = PLUTOSDR_DEVICE_TYPE_ID; PlutoSDRInputPlugin::PlutoSDRInputPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputplugin.h b/plugins/samplesource/plutosdrinput/plutosdrinputplugin.h index f9dda1030..af9bbff9b 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputplugin.h +++ b/plugins/samplesource/plutosdrinput/plutosdrinputplugin.h @@ -47,8 +47,7 @@ public: virtual QString getDeviceTypeId() const { return m_deviceTypeID; } - static const QString m_hardwareID; - static const QString m_deviceTypeID; + static const char* const m_deviceTypeID; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/samplesource/remoteinput/remoteinputplugin.cpp b/plugins/samplesource/remoteinput/remoteinputplugin.cpp index a81807287..f5964b9e5 100644 --- a/plugins/samplesource/remoteinput/remoteinputplugin.cpp +++ b/plugins/samplesource/remoteinput/remoteinputplugin.cpp @@ -38,8 +38,8 @@ const PluginDescriptor RemoteInputPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString RemoteInputPlugin::m_hardwareID = "RemoteInput"; -const QString RemoteInputPlugin::m_deviceTypeID = REMOTEINPUT_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "RemoteInput"; +static constexpr const char* const m_deviceTypeID = REMOTEINPUT_DEVICE_TYPE_ID; RemoteInputPlugin::RemoteInputPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesource/remoteinput/remoteinputplugin.h b/plugins/samplesource/remoteinput/remoteinputplugin.h index 564e38a8c..674be218a 100644 --- a/plugins/samplesource/remoteinput/remoteinputplugin.h +++ b/plugins/samplesource/remoteinput/remoteinputplugin.h @@ -45,9 +45,6 @@ public: virtual DeviceSampleSource* createSampleSourcePluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp index cd1693fb7..be74fd8ca 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp @@ -22,8 +22,8 @@ const PluginDescriptor RTLSDRPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString RTLSDRPlugin::m_hardwareID = "RTLSDR"; -const QString RTLSDRPlugin::m_deviceTypeID = RTLSDR_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "RTLSDR"; +static constexpr const char* const m_deviceTypeID = RTLSDR_DEVICE_TYPE_ID; RTLSDRPlugin::RTLSDRPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesource/rtlsdr/rtlsdrplugin.h b/plugins/samplesource/rtlsdr/rtlsdrplugin.h index 1519e6272..a246d73fe 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrplugin.h +++ b/plugins/samplesource/rtlsdr/rtlsdrplugin.h @@ -28,9 +28,6 @@ public: virtual DeviceSampleSource* createSampleSourcePluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplesource/sdrplay/sdrplayplugin.cpp b/plugins/samplesource/sdrplay/sdrplayplugin.cpp index 21c360996..f8a30a074 100644 --- a/plugins/samplesource/sdrplay/sdrplayplugin.cpp +++ b/plugins/samplesource/sdrplay/sdrplayplugin.cpp @@ -38,8 +38,8 @@ const PluginDescriptor SDRPlayPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString SDRPlayPlugin::m_hardwareID = "SDRplay1"; -const QString SDRPlayPlugin::m_deviceTypeID = SDRPLAY_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "SDRplay1"; +static constexpr const char* const m_deviceTypeID = SDRPLAY_DEVICE_TYPE_ID; SDRPlayPlugin::SDRPlayPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesource/sdrplay/sdrplayplugin.h b/plugins/samplesource/sdrplay/sdrplayplugin.h index fd67e43e0..16dd0757a 100644 --- a/plugins/samplesource/sdrplay/sdrplayplugin.h +++ b/plugins/samplesource/sdrplay/sdrplayplugin.h @@ -45,9 +45,6 @@ public: virtual DeviceSampleSource* createSampleSourcePluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplesource/sigmffileinput/sigmffileinputplugin.cpp b/plugins/samplesource/sigmffileinput/sigmffileinputplugin.cpp index 4d6854268..50c0f7177 100644 --- a/plugins/samplesource/sigmffileinput/sigmffileinputplugin.cpp +++ b/plugins/samplesource/sigmffileinput/sigmffileinputplugin.cpp @@ -38,8 +38,8 @@ const PluginDescriptor SigMFFileInputPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString SigMFFileInputPlugin::m_hardwareID = "SigMFFileInput"; -const QString SigMFFileInputPlugin::m_deviceTypeID = FILEINPUT_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "SigMFFileInput"; +static constexpr const char* const m_deviceTypeID = FILEINPUT_DEVICE_TYPE_ID; SigMFFileInputPlugin::SigMFFileInputPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesource/sigmffileinput/sigmffileinputplugin.h b/plugins/samplesource/sigmffileinput/sigmffileinputplugin.h index aae460833..7d7116e09 100644 --- a/plugins/samplesource/sigmffileinput/sigmffileinputplugin.h +++ b/plugins/samplesource/sigmffileinput/sigmffileinputplugin.h @@ -45,9 +45,6 @@ public: virtual DeviceSampleSource* createSampleSourcePluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp b/plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp index 692de13f3..1ebe90a5a 100644 --- a/plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp +++ b/plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp @@ -39,8 +39,8 @@ const PluginDescriptor SoapySDRInputPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString SoapySDRInputPlugin::m_hardwareID = "SoapySDR"; -const QString SoapySDRInputPlugin::m_deviceTypeID = SOAPYSDRINPUT_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "SoapySDR"; +static constexpr const char* const m_deviceTypeID = SOAPYSDRINPUT_DEVICE_TYPE_ID; SoapySDRInputPlugin::SoapySDRInputPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputplugin.h b/plugins/samplesource/soapysdrinput/soapysdrinputplugin.h index 2899e139d..31ceb6f9f 100644 --- a/plugins/samplesource/soapysdrinput/soapysdrinputplugin.h +++ b/plugins/samplesource/soapysdrinput/soapysdrinputplugin.h @@ -47,9 +47,6 @@ public: virtual DeviceSampleSource* createSampleSourcePluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplesource/testsource/testsourceplugin.cpp b/plugins/samplesource/testsource/testsourceplugin.cpp index 140affa1b..5fd5414a0 100644 --- a/plugins/samplesource/testsource/testsourceplugin.cpp +++ b/plugins/samplesource/testsource/testsourceplugin.cpp @@ -38,8 +38,8 @@ const PluginDescriptor TestSourcePlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString TestSourcePlugin::m_hardwareID = "TestSource"; -const QString TestSourcePlugin::m_deviceTypeID = TESTSOURCE_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "TestSource"; +static constexpr const char* const m_deviceTypeID = TESTSOURCE_DEVICE_TYPE_ID; TestSourcePlugin::TestSourcePlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesource/testsource/testsourceplugin.h b/plugins/samplesource/testsource/testsourceplugin.h index 265dd6d0e..819a20354 100644 --- a/plugins/samplesource/testsource/testsourceplugin.h +++ b/plugins/samplesource/testsource/testsourceplugin.h @@ -45,9 +45,6 @@ public: virtual DeviceSampleSource* createSampleSourcePluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplesource/usrpinput/usrpinputplugin.cpp b/plugins/samplesource/usrpinput/usrpinputplugin.cpp index eb93ebf65..43ac46939 100644 --- a/plugins/samplesource/usrpinput/usrpinputplugin.cpp +++ b/plugins/samplesource/usrpinput/usrpinputplugin.cpp @@ -42,8 +42,8 @@ const PluginDescriptor USRPInputPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString USRPInputPlugin::m_hardwareID = "USRP"; -const QString USRPInputPlugin::m_deviceTypeID = USRP_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "USRP"; +static constexpr const char* const m_deviceTypeID = USRP_DEVICE_TYPE_ID; USRPInputPlugin::USRPInputPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesource/usrpinput/usrpinputplugin.h b/plugins/samplesource/usrpinput/usrpinputplugin.h index 40b0644b1..0f61d664d 100644 --- a/plugins/samplesource/usrpinput/usrpinputplugin.h +++ b/plugins/samplesource/usrpinput/usrpinputplugin.h @@ -46,9 +46,6 @@ public: virtual DeviceSampleSource* createSampleSourcePluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; }; diff --git a/plugins/samplesource/xtrxinput/xtrxinputplugin.cpp b/plugins/samplesource/xtrxinput/xtrxinputplugin.cpp index a0a4b70a4..f361f9b63 100644 --- a/plugins/samplesource/xtrxinput/xtrxinputplugin.cpp +++ b/plugins/samplesource/xtrxinput/xtrxinputplugin.cpp @@ -45,8 +45,8 @@ const PluginDescriptor XTRXInputPlugin::m_pluginDescriptor = { QStringLiteral("https://github.com/f4exb/sdrangel") }; -const QString XTRXInputPlugin::m_hardwareID = "XTRX"; -const QString XTRXInputPlugin::m_deviceTypeID = XTRX_DEVICE_TYPE_ID; +static constexpr const char* const m_hardwareID = "XTRX"; +static constexpr const char* const m_deviceTypeID = XTRX_DEVICE_TYPE_ID; XTRXInputPlugin::XTRXInputPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesource/xtrxinput/xtrxinputplugin.h b/plugins/samplesource/xtrxinput/xtrxinputplugin.h index 88c6efae4..59887b9ed 100644 --- a/plugins/samplesource/xtrxinput/xtrxinputplugin.h +++ b/plugins/samplesource/xtrxinput/xtrxinputplugin.h @@ -46,9 +46,6 @@ public: virtual DeviceSampleSource* createSampleSourcePluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; - static const QString m_hardwareID; - static const QString m_deviceTypeID; - private: static const PluginDescriptor m_pluginDescriptor; };