Merge pull request #717 from kasper93/lto

Fixes for clang-cl build

CMakeLists.txt

@@ -61,11 +61,6 @@ add_definitions("-DCOPYRIGHT=\"${COPYRIGHT}\"")
 set(IDENTIFIER "com.${COMPANY}.${APPLICATION_NAME}")
 add_definitions("-DIDENTIFIER=\"${IDENTIFIER}\"")
 
-add_compile_definitions(_USE_MATH_DEFINES)
-if(WIN32)
-  add_compile_definitions(NOMINMAX)
-endif()
-
 find_package(Git)
 if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git/")
   execute_process(COMMAND "${GIT_EXECUTABLE}" describe --tags

cmake/Modules/CompilerOptions.cmake

@@ -2,9 +2,18 @@ include_guard(GLOBAL)
 
 include(DetectArchitecture)
 
-if(MSVC)
-  add_compile_options(/MP)
-else()
+set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)
+
+if(WIN32)
+  add_compile_definitions(
+    NOMINMAX
+    _USE_MATH_DEFINES
+    _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES
+    _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT
+  )
+endif()
+
+if(NOT MSVC)
   add_compile_options(-Wall -Wextra -Wvla -Woverloaded-virtual -ffast-math -ftree-vectorize)
 endif()
 

cmake/Modules/DetectArchitecture.cmake

@@ -141,8 +141,12 @@ endif()
 if (MSVC)
   # Glue to make ARCH_OPT more flexible for MSVC
   if (ARCH_OPT STREQUAL "native")
-    detect_msvc_native_opt()
-    FILE(REMOVE_RECURSE ${CMAKE_BINARY_DIR}/tmp)
+    # Some compilers simulating MSVC supports the march flag, so use it if we can
+    check_cxx_compiler_flag("-march=native" MARCH_NATIVE_SUPPORTED)
+    if (NOT MARCH_NATIVE_SUPPORTED)
+      detect_msvc_native_opt()
+      FILE(REMOVE_RECURSE ${CMAKE_BINARY_DIR}/tmp)
+    endif()
   elseif(ARCH_OPT STREQUAL "SSE4_2")
     force_ext_available(SSE4_2)
     set(ARCH_OPT "")
@@ -165,7 +169,7 @@ message(STATUS "Target architecture: ${ARCHITECTURE}-${ARCH_OPT}")
 
 cmake_push_check_state(RESET)
 if (ARCH_OPT)
-  if(MSVC)
+  if(MSVC AND NOT MARCH_NATIVE_SUPPORTED)
     set(CMAKE_REQUIRED_FLAGS "/arch:${ARCH_OPT}")
     add_compile_options(${CMAKE_REQUIRED_FLAGS})
   else()

exports/export.h

@@ -127,4 +127,17 @@
 #  define SWG_API
 #endif
 
+/* the 'SDRBENCH_API' controls the import/export of 'sdrbench' symbols
+ */
+#if !defined(sdrangel_STATIC)
+#  ifdef sdrbench_EXPORTS
+#    define SDRBENCH_API __SDR_EXPORT
+#  else
+#    define SDRBENCH_API __SDR_IMPORT
+#  endif
+#else
+#  define SDRBENCH_API
+#endif
+
+
 #endif /* __SDRANGEL_EXPORT_H */

external/CMakeLists.txt

@@ -68,7 +68,6 @@ elseif (LINUX)
             )
 endif ()
 
-list(APPEND COMMON_CMAKE_ARGS -DCMAKE_POLICY_DEFAULT_CMP0069:STRING=NEW)
 if(CMAKE_MSVC_RUNTIME_LIBRARY)
   list(APPEND COMMON_CMAKE_ARGS -DCMAKE_POLICY_DEFAULT_CMP0091:STRING=NEW)
   list(APPEND COMMON_CMAKE_ARGS -DCMAKE_MSVC_RUNTIME_LIBRARY=${CMAKE_MSVC_RUNTIME_LIBRARY})
@@ -78,6 +77,20 @@ if(CMAKE_BUILD_TYPE)
   list(APPEND COMMON_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
 endif()
 
+if(CMAKE_INTERPROCEDURAL_OPTIMIZATION)
+  list(APPEND COMMON_CMAKE_ARGS -DCMAKE_POLICY_DEFAULT_CMP0069:STRING=NEW)
+  list(APPEND COMMON_CMAKE_ARGS -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=${CMAKE_INTERPROCEDURAL_OPTIMIZATION})
+endif()
+
+list(APPEND COMMON_CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
+list(APPEND COMMON_CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
+if (CMAKE_LINKER)
+  list(APPEND COMMON_CMAKE_ARGS -DCMAKE_LINKER=${CMAKE_LINKER})
+endif()
+if (CMAKE_AR)
+  list(APPEND COMMON_CMAKE_ARGS -DCMAKE_AR=${CMAKE_AR})
+endif()
+
 list(APPEND COMMON_CMAKE_ARGS -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD})
 list(APPEND COMMON_CMAKE_ARGS -DCMAKE_CXX_STANDARD_REQUIRED=${CMAKE_CXX_STANDARD_REQUIRED})
 list(APPEND COMMON_CMAKE_ARGS -DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS})

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),

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:

plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodplugin.cpp

@@ -27,13 +27,13 @@
 #include "beamsteeringcwmodplugin.h"
 
 const PluginDescriptor BeamSteeringCWModPlugin::m_pluginDescriptor = {
-    QString(BeamSteeringCWMod::m_channelId),
-    QString("BeamSteeringCWMod"),
-    QString("6.0.0"),
-    QString("(c) Edouard Griffiths, F4EXB"),
-    QString("https://github.com/f4exb/sdrangel"),
+    BeamSteeringCWMod::m_channelId,
+    QStringLiteral("BeamSteeringCWMod"),
+    QStringLiteral("6.0.0"),
+    QStringLiteral("(c) Edouard Griffiths, F4EXB"),
+    QStringLiteral("https://github.com/f4exb/sdrangel"),
     true,
-    QString("https://github.com/f4exb/sdrangel")
+    QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 BeamSteeringCWModPlugin::BeamSteeringCWModPlugin(QObject* parent) :

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) :

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:

plugins/channelmimo/interferometer/interferometerplugin.cpp

@@ -28,13 +28,13 @@
 #include "interferometerplugin.h"
 
 const PluginDescriptor InterferometerPlugin::m_pluginDescriptor = {
-    QString(Interferometer::m_channelId),
-    QString("Interferometer"),
-    QString("6.0.0"),
-    QString("(c) Edouard Griffiths, F4EXB"),
-    QString("https://github.com/f4exb/sdrangel"),
+    Interferometer::m_channelId,
+    QStringLiteral("Interferometer"),
+    QStringLiteral("6.0.0"),
+    QStringLiteral("(c) Edouard Griffiths, F4EXB"),
+    QStringLiteral("https://github.com/f4exb/sdrangel"),
     true,
-    QString("https://github.com/f4exb/sdrangel")
+    QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 InterferometerPlugin::InterferometerPlugin(QObject* parent) :

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),

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;

plugins/channelrx/chanalyzer/chanalyzerplugin.cpp

@@ -25,12 +25,12 @@
 
 const PluginDescriptor ChannelAnalyzerPlugin::m_pluginDescriptor = {
     ChannelAnalyzer::m_channelId,
-	QString("Channel Analyzer"),
-	QString("4.21.1"),
-	QString("(c) Edouard Griffiths, F4EXB"),
-	QString("https://github.com/f4exb/sdrangel"),
+	QStringLiteral("Channel Analyzer"),
+	QStringLiteral("4.21.1"),
+	QStringLiteral("(c) Edouard Griffiths, F4EXB"),
+	QStringLiteral("https://github.com/f4exb/sdrangel"),
 	true,
-	QString("https://github.com/f4exb/sdrangel")
+	QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 ChannelAnalyzerPlugin::ChannelAnalyzerPlugin(QObject* parent) :

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),

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;

plugins/channelrx/demodadsb/adsbplugin.cpp

@@ -29,12 +29,12 @@
 
 const PluginDescriptor ADSBPlugin::m_pluginDescriptor = {
     ADSBDemod::m_channelId,
-    QString("ADS-B Demodulator"),
-    QString("6.0.0"),
-    QString("(c) Jon Beniston, M7RCE"),
-    QString("https://github.com/f4exb/sdrangel"),
+    QStringLiteral("ADS-B Demodulator"),
+    QStringLiteral("6.0.0"),
+    QStringLiteral("(c) Jon Beniston, M7RCE"),
+    QStringLiteral("https://github.com/f4exb/sdrangel"),
     true,
-    QString("https://github.com/f4exb/sdrangel")
+    QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 ADSBPlugin::ADSBPlugin(QObject* parent) :

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) :

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;

plugins/channelrx/demodam/amdemodplugin.cpp

@@ -10,12 +10,12 @@
 
 const PluginDescriptor AMDemodPlugin::m_pluginDescriptor = {
     AMDemod::m_channelId,
-	QString("AM Demodulator"),
-	QString("4.19.0"),
-	QString("(c) Edouard Griffiths, F4EXB"),
-	QString("https://github.com/f4exb/sdrangel"),
+	QStringLiteral("AM Demodulator"),
+	QStringLiteral("4.19.0"),
+	QStringLiteral("(c) Edouard Griffiths, F4EXB"),
+	QStringLiteral("https://github.com/f4exb/sdrangel"),
 	true,
-	QString("https://github.com/f4exb/sdrangel")
+	QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 AMDemodPlugin::AMDemodPlugin(QObject* parent) :

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),

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;

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) :

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;

plugins/channelrx/demodbfm/bfmplugin.cpp

@@ -30,12 +30,12 @@
 
 const PluginDescriptor BFMPlugin::m_pluginDescriptor = {
     BFMDemod::m_channelId,
-	QString("Broadcast FM Demodulator"),
-	QString("4.19.0"),
-	QString("(c) Edouard Griffiths, F4EXB"),
-	QString("https://github.com/f4exb/sdrangel"),
+	QStringLiteral("Broadcast FM Demodulator"),
+	QStringLiteral("4.19.0"),
+	QStringLiteral("(c) Edouard Griffiths, F4EXB"),
+	QStringLiteral("https://github.com/f4exb/sdrangel"),
 	true,
-	QString("https://github.com/f4exb/sdrangel")
+	QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 BFMPlugin::BFMPlugin(QObject* parent) :

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),

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;

plugins/channelrx/demodchirpchat/chirpchatplugin.cpp

@@ -26,12 +26,12 @@
 
 const PluginDescriptor ChirpChatPlugin::m_pluginDescriptor = {
     ChirpChatDemod::m_channelId,
-	QString("ChirpChat Demodulator"),
-	QString("6.0.0"),
-	QString("(c) Edouard Griffiths, F4EXB"),
-	QString("https://github.com/f4exb/sdrangel"),
+	QStringLiteral("ChirpChat Demodulator"),
+	QStringLiteral("6.0.0"),
+	QStringLiteral("(c) Edouard Griffiths, F4EXB"),
+	QStringLiteral("https://github.com/f4exb/sdrangel"),
 	true,
-	QString("https://github.com/f4exb/sdrangel")
+	QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 ChirpChatPlugin::ChirpChatPlugin(QObject* parent) :

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)
 

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

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,

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();

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) :

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;

plugins/channelrx/demoddsd/dsddemodplugin.cpp

@@ -29,12 +29,12 @@
 
 const PluginDescriptor DSDDemodPlugin::m_pluginDescriptor = {
     DSDDemod::m_channelId,
-	QString("DSD Demodulator"),
-    QString("4.19.0"),
-	QString("(c) Edouard Griffiths, F4EXB"),
-	QString("https://github.com/f4exb/sdrangel"),
+	QStringLiteral("DSD Demodulator"),
+    QStringLiteral("4.19.0"),
+	QStringLiteral("(c) Edouard Griffiths, F4EXB"),
+	QStringLiteral("https://github.com/f4exb/sdrangel"),
 	true,
-	QString("https://github.com/f4exb/sdrangel")
+	QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 DSDDemodPlugin::DSDDemodPlugin(QObject* parent) :

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),

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;

plugins/channelrx/demodfreedv/freedvplugin.cpp

@@ -27,12 +27,12 @@
 
 const PluginDescriptor FreeDVPlugin::m_pluginDescriptor = {
     FreeDVDemod::m_channelId,
-	QString("FreeDV Demodulator"),
-	QString("4.19.0"),
-	QString("(c) Edouard Griffiths, F4EXB"),
-	QString("https://github.com/f4exb/sdrangel"),
+	QStringLiteral("FreeDV Demodulator"),
+	QStringLiteral("4.19.0"),
+	QStringLiteral("(c) Edouard Griffiths, F4EXB"),
+	QStringLiteral("https://github.com/f4exb/sdrangel"),
 	true,
-	QString("https://github.com/f4exb/sdrangel")
+	QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 FreeDVPlugin::FreeDVPlugin(QObject* parent) :

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;
 

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;

plugins/channelrx/demodnfm/nfmplugin.cpp

@@ -11,12 +11,12 @@
 
 const PluginDescriptor NFMPlugin::m_pluginDescriptor = {
     NFMDemod::m_channelId,
-	QString("NFM Demodulator"),
-	QString("6.0.0"),
-	QString("(c) Edouard Griffiths, F4EXB"),
-	QString("https://github.com/f4exb/sdrangel"),
+	QStringLiteral("NFM Demodulator"),
+	QStringLiteral("6.0.0"),
+	QStringLiteral("(c) Edouard Griffiths, F4EXB"),
+	QStringLiteral("https://github.com/f4exb/sdrangel"),
 	true,
-	QString("https://github.com/f4exb/sdrangel")
+	QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 NFMPlugin::NFMPlugin(QObject* parent) :

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),

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;

plugins/channelrx/demodssb/ssbplugin.cpp

@@ -11,12 +11,12 @@
 
 const PluginDescriptor SSBPlugin::m_pluginDescriptor = {
     SSBDemod::m_channelId,
-	QString("SSB Demodulator"),
-	QString("4.19.0"),
-	QString("(c) Edouard Griffiths, F4EXB"),
-	QString("https://github.com/f4exb/sdrangel"),
+	QStringLiteral("SSB Demodulator"),
+	QStringLiteral("4.19.0"),
+	QStringLiteral("(c) Edouard Griffiths, F4EXB"),
+	QStringLiteral("https://github.com/f4exb/sdrangel"),
 	true,
-	QString("https://github.com/f4exb/sdrangel")
+	QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 SSBPlugin::SSBPlugin(QObject* parent) :

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) :

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;

plugins/channelrx/demodwfm/wfmplugin.cpp

@@ -12,12 +12,12 @@
 
 const PluginDescriptor WFMPlugin::m_pluginDescriptor = {
     WFMDemod::m_channelId,
-	QString("WFM Demodulator"),
-	QString("4.19.0"),
-	QString("(c) Edouard Griffiths, F4EXB"),
-	QString("https://github.com/f4exb/sdrangel"),
+	QStringLiteral("WFM Demodulator"),
+	QStringLiteral("4.19.0"),
+	QStringLiteral("(c) Edouard Griffiths, F4EXB"),
+	QStringLiteral("https://github.com/f4exb/sdrangel"),
 	true,
-	QString("https://github.com/f4exb/sdrangel")
+	QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 WFMPlugin::WFMPlugin(QObject* parent) :

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),

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;

plugins/channelrx/filesink/filesinkplugin.cpp

@@ -28,12 +28,12 @@
 
 const PluginDescriptor FileSinkPlugin::m_pluginDescriptor = {
     FileSink::m_channelId,
-    QString("File Sink"),
-    QString("4.19.0"),
-    QString("(c) Edouard Griffiths, F4EXB"),
-    QString("https://github.com/f4exb/sdrangel"),
+    QStringLiteral("File Sink"),
+    QStringLiteral("4.19.0"),
+    QStringLiteral("(c) Edouard Griffiths, F4EXB"),
+    QStringLiteral("https://github.com/f4exb/sdrangel"),
     true,
-    QString("https://github.com/f4exb/sdrangel")
+    QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 FileSinkPlugin::FileSinkPlugin(QObject* parent) :

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) :

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;

plugins/channelrx/freqtracker/freqtrackerplugin.cpp

@@ -27,12 +27,12 @@
 
 const PluginDescriptor FreqTrackerPlugin::m_pluginDescriptor = {
     FreqTracker::m_channelId,
-	QString("Frequency Tracker"),
-	QString("4.21.0"),
-	QString("(c) Edouard Griffiths, F4EXB"),
-	QString("https://github.com/f4exb/sdrangel"),
+	QStringLiteral("Frequency Tracker"),
+	QStringLiteral("4.21.0"),
+	QStringLiteral("(c) Edouard Griffiths, F4EXB"),
+	QStringLiteral("https://github.com/f4exb/sdrangel"),
 	true,
-	QString("https://github.com/f4exb/sdrangel")
+	QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 FreqTrackerPlugin::FreqTrackerPlugin(QObject* parent) :

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),

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<uint32_t>& 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;

plugins/channelrx/localsink/localsinkplugin.cpp

@@ -29,12 +29,12 @@
 
 const PluginDescriptor LocalSinkPlugin::m_pluginDescriptor = {
     LocalSink::m_channelId,
-    QString("Local channel sink"),
-    QString("4.19.0"),
-    QString("(c) Edouard Griffiths, F4EXB"),
-    QString("https://github.com/f4exb/sdrangel"),
+    QStringLiteral("Local channel sink"),
+    QStringLiteral("4.19.0"),
+    QStringLiteral("(c) Edouard Griffiths, F4EXB"),
+    QStringLiteral("https://github.com/f4exb/sdrangel"),
     true,
-    QString("https://github.com/f4exb/sdrangel")
+    QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 LocalSinkPlugin::LocalSinkPlugin(QObject* parent) :

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),

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);

plugins/channelrx/remotesink/remotesinkplugin.cpp

@@ -29,12 +29,12 @@
 
 const PluginDescriptor RemoteSinkPlugin::m_pluginDescriptor = {
     RemoteSink::m_channelId,
-    QString("Remote channel sink"),
-    QString("4.19.0"),
-    QString("(c) Edouard Griffiths, F4EXB"),
-    QString("https://github.com/f4exb/sdrangel"),
+    QStringLiteral("Remote channel sink"),
+    QStringLiteral("4.19.0"),
+    QStringLiteral("(c) Edouard Griffiths, F4EXB"),
+    QStringLiteral("https://github.com/f4exb/sdrangel"),
     true,
-    QString("https://github.com/f4exb/sdrangel")
+    QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 RemoteSinkPlugin::RemoteSinkPlugin(QObject* parent) :

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),

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;

plugins/channelrx/sigmffilesink/sigmffilesinkplugin.cpp

@@ -28,12 +28,12 @@
 
 const PluginDescriptor SigMFFileSinkPlugin::m_pluginDescriptor = {
     SigMFFileSink::m_channelId,
-    QString("SigMF File Sink"),
-    QString("6.0.0"),
-    QString("(c) Edouard Griffiths, F4EXB"),
-    QString("https://github.com/f4exb/sdrangel"),
+    QStringLiteral("SigMF File Sink"),
+    QStringLiteral("6.0.0"),
+    QStringLiteral("(c) Edouard Griffiths, F4EXB"),
+    QStringLiteral("https://github.com/f4exb/sdrangel"),
     true,
-    QString("https://github.com/f4exb/sdrangel")
+    QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 SigMFFileSinkPlugin::SigMFFileSinkPlugin(QObject* parent) :

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),

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:

plugins/channelrx/udpsink/udpsinkplugin.cpp

@@ -28,12 +28,12 @@
 
 const PluginDescriptor UDPSinkPlugin::m_pluginDescriptor = {
     UDPSink::m_channelId,
-	QString("UDP Channel Sink"),
-	QString("4.19.0"),
-	QString("(c) Edouard Griffiths, F4EXB"),
-	QString("https://github.com/f4exb/sdrangel"),
+	QStringLiteral("UDP Channel Sink"),
+	QStringLiteral("4.19.0"),
+	QStringLiteral("(c) Edouard Griffiths, F4EXB"),
+	QStringLiteral("https://github.com/f4exb/sdrangel"),
 	true,
-	QString("https://github.com/f4exb/sdrangel")
+	QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 UDPSinkPlugin::UDPSinkPlugin(QObject* parent) :

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),

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;

plugins/channeltx/filesource/filesourceplugin.cpp

@@ -27,12 +27,12 @@
 
 const PluginDescriptor FileSourcePlugin::m_pluginDescriptor = {
     FileSource::m_channelId,
-    QString("File channel source"),
-    QString("4.19.0"),
-    QString("(c) Edouard Griffiths, F4EXB"),
-    QString("https://github.com/f4exb/sdrangel"),
+    QStringLiteral("File channel source"),
+    QStringLiteral("4.19.0"),
+    QStringLiteral("(c) Edouard Griffiths, F4EXB"),
+    QStringLiteral("https://github.com/f4exb/sdrangel"),
     true,
-    QString("https://github.com/f4exb/sdrangel")
+    QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 FileSourcePlugin::FileSourcePlugin(QObject* parent) :

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),

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<uint32_t>& 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;

plugins/channeltx/localsource/localsourceplugin.cpp

@@ -29,12 +29,12 @@
 
 const PluginDescriptor LocalSourcePlugin::m_pluginDescriptor = {
     LocalSource::m_channelId,
-    QString("Local channel source"),
-    QString("4.19.0"),
-    QString("(c) Edouard Griffiths, F4EXB"),
-    QString("https://github.com/f4exb/sdrangel"),
+    QStringLiteral("Local channel source"),
+    QStringLiteral("4.19.0"),
+    QStringLiteral("(c) Edouard Griffiths, F4EXB"),
+    QStringLiteral("https://github.com/f4exb/sdrangel"),
     true,
-    QString("https://github.com/f4exb/sdrangel")
+    QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 LocalSourcePlugin::LocalSourcePlugin(QObject* parent) :

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),

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:
 

plugins/channeltx/mod802.15.4/ieee_802_15_4_modplugin.cpp

@@ -28,12 +28,12 @@
 
 const PluginDescriptor IEEE_802_15_4_ModPlugin::m_pluginDescriptor = {
     IEEE_802_15_4_Mod::m_channelId,
-    QString("802.15.4 Modulator"),
-    QString("4.20.0"),
-    QString("(c) Jon Beniston, M7RCE"),
-    QString("https://github.com/f4exb/sdrangel"),
+    QStringLiteral("802.15.4 Modulator"),
+    QStringLiteral("4.20.0"),
+    QStringLiteral("(c) Jon Beniston, M7RCE"),
+    QStringLiteral("https://github.com/f4exb/sdrangel"),
     true,
-    QString("https://github.com/f4exb/sdrangel")
+    QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 IEEE_802_15_4_ModPlugin::IEEE_802_15_4_ModPlugin(QObject* parent) :

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),

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 {

plugins/channeltx/modam/ammodplugin.cpp

@@ -27,12 +27,12 @@
 
 const PluginDescriptor AMModPlugin::m_pluginDescriptor = {
     AMMod::m_channelId,
-    QString("AM Modulator"),
-    QString("4.19.0"),
-    QString("(c) Edouard Griffiths, F4EXB"),
-    QString("https://github.com/f4exb/sdrangel"),
+    QStringLiteral("AM Modulator"),
+    QStringLiteral("4.19.0"),
+    QStringLiteral("(c) Edouard Griffiths, F4EXB"),
+    QStringLiteral("https://github.com/f4exb/sdrangel"),
     true,
-    QString("https://github.com/f4exb/sdrangel")
+    QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 AMModPlugin::AMModPlugin(QObject* parent) :

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),

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<int>& 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;

plugins/channeltx/modatv/atvmodplugin.cpp

@@ -27,12 +27,12 @@
 
 const PluginDescriptor ATVModPlugin::m_pluginDescriptor = {
     ATVMod::m_channelId,
-    QString("ATV Modulator"),
-    QString("4.19.0"),
-    QString("(c) Edouard Griffiths, F4EXB"),
-    QString("https://github.com/f4exb/sdrangel"),
+    QStringLiteral("ATV Modulator"),
+    QStringLiteral("4.19.0"),
+    QStringLiteral("(c) Edouard Griffiths, F4EXB"),
+    QStringLiteral("https://github.com/f4exb/sdrangel"),
     true,
-    QString("https://github.com/f4exb/sdrangel")
+    QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 ATVModPlugin::ATVModPlugin(QObject* parent) :

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),

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;

plugins/channeltx/modchirpchat/chirpchatmodplugin.cpp

@@ -27,12 +27,12 @@
 
 const PluginDescriptor ChirpChatModPlugin::m_pluginDescriptor = {
     ChirpChatMod::m_channelId,
-    QString("ChirpChat Modulator"),
-    QString("6.0.0"),
-    QString("(c) Edouard Griffiths, F4EXB"),
-    QString("https://github.com/f4exb/sdrangel"),
+    QStringLiteral("ChirpChat Modulator"),
+    QStringLiteral("6.0.0"),
+    QStringLiteral("(c) Edouard Griffiths, F4EXB"),
+    QStringLiteral("https://github.com/f4exb/sdrangel"),
     true,
-    QString("https://github.com/f4exb/sdrangel")
+    QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 ChirpChatModPlugin::ChirpChatModPlugin(QObject* parent) :

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),

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 {

plugins/channeltx/modfreedv/freedvmodplugin.cpp

@@ -27,12 +27,12 @@
 
 const PluginDescriptor FreeDVModPlugin::m_pluginDescriptor = {
     FreeDVMod::m_channelId,
-    QString("FreeDV Modulator"),
-    QString("4.19.0"),
-    QString("(c) Edouard Griffiths, F4EXB"),
-    QString("https://github.com/f4exb/sdrangel"),
+    QStringLiteral("FreeDV Modulator"),
+    QStringLiteral("4.19.0"),
+    QStringLiteral("(c) Edouard Griffiths, F4EXB"),
+    QStringLiteral("https://github.com/f4exb/sdrangel"),
     true,
-    QString("https://github.com/f4exb/sdrangel")
+    QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 FreeDVModPlugin::FreeDVModPlugin(QObject* parent) :

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),

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 {

plugins/channeltx/modnfm/nfmmodplugin.cpp

@@ -27,12 +27,12 @@
 
 const PluginDescriptor NFMModPlugin::m_pluginDescriptor = {
     NFMMod::m_channelId,
-    QString("NFM Modulator"),
-    QString("6.0.0"),
-    QString("(c) Edouard Griffiths, F4EXB"),
-    QString("https://github.com/f4exb/sdrangel"),
+    QStringLiteral("NFM Modulator"),
+    QStringLiteral("6.0.0"),
+    QStringLiteral("(c) Edouard Griffiths, F4EXB"),
+    QStringLiteral("https://github.com/f4exb/sdrangel"),
     true,
-    QString("https://github.com/f4exb/sdrangel")
+    QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 NFMModPlugin::NFMModPlugin(QObject* parent) :

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),

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 {

plugins/channeltx/modpacket/packetmodplugin.cpp

@@ -28,12 +28,12 @@
 
 const PluginDescriptor PacketModPlugin::m_pluginDescriptor = {
     PacketMod::m_channelId,
-    QString("Packet Modulator"),
-    QString("4.20.0"),
-    QString("(c) Jon Beniston, M7RCE"),
-    QString("https://github.com/f4exb/sdrangel"),
+    QStringLiteral("Packet Modulator"),
+    QStringLiteral("4.20.0"),
+    QStringLiteral("(c) Jon Beniston, M7RCE"),
+    QStringLiteral("https://github.com/f4exb/sdrangel"),
     true,
-    QString("https://github.com/f4exb/sdrangel")
+    QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 PacketModPlugin::PacketModPlugin(QObject* parent) :

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),

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 {

plugins/channeltx/modssb/ssbmodplugin.cpp

@@ -27,12 +27,12 @@
 
 const PluginDescriptor SSBModPlugin::m_pluginDescriptor = {
     SSBMod::m_channelId,
-    QString("SSB Modulator"),
-    QString("4.19.0"),
-    QString("(c) Edouard Griffiths, F4EXB"),
-    QString("https://github.com/f4exb/sdrangel"),
+    QStringLiteral("SSB Modulator"),
+    QStringLiteral("4.19.0"),
+    QStringLiteral("(c) Edouard Griffiths, F4EXB"),
+    QStringLiteral("https://github.com/f4exb/sdrangel"),
     true,
-    QString("https://github.com/f4exb/sdrangel")
+    QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 SSBModPlugin::SSBModPlugin(QObject* parent) :

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),

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:
     /**

plugins/channeltx/modwfm/wfmmodplugin.cpp

@@ -27,12 +27,12 @@
 
 const PluginDescriptor WFMModPlugin::m_pluginDescriptor = {
     WFMMod::m_channelId,
-    QString("WFM Modulator"),
-    QString("4.19.0"),
-    QString("(c) Edouard Griffiths, F4EXB"),
-    QString("https://github.com/f4exb/sdrangel"),
+    QStringLiteral("WFM Modulator"),
+    QStringLiteral("4.19.0"),
+    QStringLiteral("(c) Edouard Griffiths, F4EXB"),
+    QStringLiteral("https://github.com/f4exb/sdrangel"),
     true,
-    QString("https://github.com/f4exb/sdrangel")
+    QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
 WFMModPlugin::WFMModPlugin(QObject* parent) :

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),

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;