ChannelAPI: Added more convenient getIdentifier pure virtual method

plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h

@@ -99,6 +99,7 @@ public:
     virtual QString getMIMOName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = "BeamSteeringCWMod"; }
     virtual qint64 getCenterFrequency() const { return m_frequencyOffset; }
     virtual void setCenterFrequency(qint64) {}

plugins/channelmimo/interferometer/interferometer.h

@@ -99,6 +99,7 @@ public:
     virtual QString getMIMOName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = "Interferometer"; }
     virtual qint64 getCenterFrequency() const { return m_frequencyOffset; }
     virtual void setCenterFrequency(qint64) {}

plugins/channelrx/chanalyzer/chanalyzer.h

@@ -84,6 +84,7 @@ public:
     virtual QString getSinkName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = objectName(); }
     virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
     virtual void setCenterFrequency(qint64 frequency);

plugins/channelrx/demodadsb/adsbdemod.h

@@ -74,6 +74,7 @@ public:
     virtual QString getSinkName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = m_settings.m_title; }
     virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
     virtual void setCenterFrequency(qint64 frequency);

plugins/channelrx/demodais/aisdemod.h

@@ -102,6 +102,7 @@ public:
     virtual QString getSinkName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return 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; }

plugins/channelrx/demodam/amdemod.h

@@ -73,6 +73,7 @@ public:
     virtual QString getSinkName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = m_settings.m_title; }
     virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
     virtual void setCenterFrequency(qint64 frequency);

plugins/channelrx/demodapt/aptdemod.h

@@ -207,6 +207,7 @@ public:
     }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return 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; }

plugins/channelrx/demodatv/atvdemod.h

@@ -72,6 +72,7 @@ public:
     virtual QString getSinkName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = objectName(); }
     virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
     virtual void setCenterFrequency(qint64 frequency);

plugins/channelrx/demodbfm/bfmdemod.h

@@ -81,6 +81,7 @@ public:
     virtual QString getSinkName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = m_settings.m_title; }
     virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
     virtual void setCenterFrequency(qint64 frequency);

plugins/channelrx/demodchirpchat/chirpchatdemod.h

@@ -212,6 +212,7 @@ public:
     virtual QString getSinkName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = m_settings.m_title; }
     virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
     virtual void setCenterFrequency(qint64 frequency);

plugins/channelrx/demoddab/dabdemod.h

@@ -322,6 +322,7 @@ public:
     virtual QString getSinkName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return 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; }

plugins/channelrx/demoddatv/datvdemod.h

@@ -46,6 +46,7 @@ public:
 
     virtual void destroy() { delete this; }
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = objectName(); }
     virtual qint64 getCenterFrequency() const { return m_settings.m_centerFrequency; }
     virtual void setCenterFrequency(qint64 frequency);

plugins/channelrx/demoddsd/dsddemod.h

@@ -74,6 +74,7 @@ public:
     virtual QString getSinkName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = m_settings.m_title; }
     virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
     virtual void setCenterFrequency(qint64 frequency);

plugins/channelrx/demodfreedv/freedvdemod.h

@@ -87,6 +87,7 @@ public:
     virtual QString getSinkName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = m_settings.m_title; }
     virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
     virtual void setCenterFrequency(qint64 frequency);

plugins/channelrx/demodnfm/nfmdemod.h

@@ -73,6 +73,7 @@ public:
     virtual QString getSinkName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = m_settings.m_title; }
     virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
     virtual void setCenterFrequency(qint64 frequency);

plugins/channelrx/demodpacket/packetdemod.h

@@ -76,6 +76,7 @@ public:
     virtual QString getSinkName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return 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; }

plugins/channelrx/demodpager/pagerdemod.h

@@ -131,6 +131,7 @@ public:
     virtual QString getSinkName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return 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; }

plugins/channelrx/demodradiosonde/radiosondedemod.h

@@ -111,6 +111,7 @@ public:
     virtual QString getSinkName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return 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; }

plugins/channelrx/demodssb/ssbdemod.h

@@ -76,6 +76,7 @@ public:
     virtual QString getSinkName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = m_settings.m_title; }
     virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
     virtual void setCenterFrequency(qint64 frequency);

plugins/channelrx/demodvor/vordemod.h

@@ -74,6 +74,7 @@ public:
     virtual QString getSinkName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual const QString& getURI() const { return getName(); }
     virtual void getTitle(QString& title) { title = m_settings.m_title; }
     virtual qint64 getCenterFrequency() const { return 0; }

plugins/channelrx/demodvorsc/vordemodsc.h

@@ -74,6 +74,7 @@ public:
     virtual QString getSinkName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return 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; }

plugins/channelrx/demodwfm/wfmdemod.h

@@ -72,6 +72,7 @@ public:
     virtual QString getSinkName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = m_settings.m_title; }
     virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
     virtual void setCenterFrequency(qint64 frequency);

plugins/channelrx/filesink/filesink.h

@@ -93,6 +93,7 @@ public:
     virtual QString getSinkName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = "File Sink"; }
     virtual qint64 getCenterFrequency() const { return m_frequencyOffset; }
     virtual void setCenterFrequency(qint64) {}

plugins/channelrx/freqtracker/freqtracker.h

@@ -72,6 +72,7 @@ public:
     virtual QString getSinkName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = m_settings.m_title; }
     virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
     virtual void setCenterFrequency(qint64 frequency);

plugins/channelrx/localsink/localsink.h

@@ -93,6 +93,7 @@ public:
     virtual QString getSinkName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = "Local Sink"; }
     virtual qint64 getCenterFrequency() const { return m_frequencyOffset; }
     virtual void setCenterFrequency(qint64) {}

plugins/channelrx/noisefigure/noisefigure.h

@@ -181,6 +181,7 @@ public:
     virtual QString getSinkName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return 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; }

plugins/channelrx/radioastronomy/radioastronomy.h

@@ -319,6 +319,7 @@ public:
     virtual QString getSinkName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return 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; }

plugins/channelrx/radioclock/radioclock.h

@@ -121,6 +121,7 @@ public:
     virtual QString getSinkName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return 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; }

plugins/channelrx/remotesink/remotesink.h

@@ -74,6 +74,7 @@ public:
     virtual QString getSinkName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = "Remote Sink"; }
     virtual qint64 getCenterFrequency() const { return m_frequencyOffset; }
     virtual void setCenterFrequency(qint64) {}

plugins/channelrx/sigmffilesink/sigmffilesink.h

@@ -93,6 +93,7 @@ public:
     virtual QString getSinkName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = "SigMF File Sink"; }
     virtual qint64 getCenterFrequency() const { return m_frequencyOffset; }
     virtual void setCenterFrequency(qint64) {}

plugins/channelrx/udpsink/udpsink.h

@@ -79,6 +79,7 @@ public:
     virtual QString getSinkName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = m_settings.m_title; }
     virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
     virtual void setCenterFrequency(qint64 frequency);

plugins/channeltx/filesource/filesource.h

@@ -175,6 +175,7 @@ public:
     virtual QString getSourceName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = m_settings.m_title; }
     virtual qint64 getCenterFrequency() const { return 0; }
     virtual void setCenterFrequency(qint64) {}

plugins/channeltx/localsource/localsource.h

@@ -91,6 +91,7 @@ public:
     virtual QString getSourceName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = "Local Sink"; }
     virtual qint64 getCenterFrequency() const { return m_frequencyOffset; }
     virtual void setCenterFrequency(qint64) {}

plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.h

@@ -99,6 +99,7 @@ public:
     virtual QString getSourceName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = m_settings.m_title; }
     virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
     virtual void setCenterFrequency(qint64 frequency);

plugins/channeltx/modais/aismod.h

@@ -160,6 +160,7 @@ public:
     virtual QString getSourceName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = m_settings.m_title; }
     virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
     virtual void setCenterFrequency(qint64 frequency);

plugins/channeltx/modam/ammod.h

@@ -182,6 +182,7 @@ public:
     virtual QString getSourceName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = m_settings.m_title; }
     virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
     virtual void setCenterFrequency(qint64 frequency);

plugins/channeltx/modatv/atvmod.h

@@ -254,6 +254,7 @@ public:
     virtual QString getSourceName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = m_settings.m_title; }
     virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
     virtual void setCenterFrequency(qint64 frequency);

plugins/channeltx/modchirpchat/chirpchatmod.h

@@ -97,6 +97,7 @@ public:
     virtual QString getSourceName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = m_settings.m_title; }
     virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
     virtual void setCenterFrequency(qint64 frequency);

plugins/channeltx/moddatv/datvmod.h

@@ -210,6 +210,7 @@ public:
     virtual QString getSourceName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = m_settings.m_title; }
     virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
     virtual void setCenterFrequency(qint64 frequency);

plugins/channeltx/modfreedv/freedvmod.h

@@ -186,6 +186,7 @@ public:
     virtual QString getSourceName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = m_settings.m_title; }
     virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
     virtual void setCenterFrequency(qint64 frequency);

plugins/channeltx/modnfm/nfmmod.h

@@ -182,6 +182,7 @@ public:
     virtual QString getSourceName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = m_settings.m_title; }
     virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
     virtual void setCenterFrequency(qint64 frequency);

plugins/channeltx/modpacket/packetmod.h

@@ -150,6 +150,7 @@ public:
     virtual QString getSourceName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = m_settings.m_title; }
     virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
     virtual void setCenterFrequency(qint64 frequency);

plugins/channeltx/modssb/ssbmod.h

@@ -184,6 +184,7 @@ public:
     virtual QString getSourceName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = m_settings.m_title; }
     virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
     virtual void setCenterFrequency(qint64 frequency);

plugins/channeltx/modwfm/wfmmod.h

@@ -182,6 +182,7 @@ public:
     virtual QString getSourceName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = m_settings.m_title; }
     virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
     virtual void setCenterFrequency(qint64 frequency);

plugins/channeltx/remotesource/remotesource.h

@@ -186,6 +186,7 @@ public:
     virtual QString getSourceName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = m_settings.m_title; }
     virtual qint64 getCenterFrequency() const { return m_frequencyOffset; }
     virtual void setCenterFrequency(qint64) {}

plugins/channeltx/udpsource/udpsource.h

@@ -103,6 +103,7 @@ public:
     virtual QString getSourceName() { return objectName(); }
 
     virtual void getIdentifier(QString& id) { id = objectName(); }
+    virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = m_settings.m_title; }
     virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
     virtual void setCenterFrequency(qint64 frequency);

plugins/feature/jogdialcontroller/jogdialcontroller.cpp

@@ -132,11 +132,9 @@ bool JogdialController::handleMessage(const Message& cmd)
         {
             DeviceAPI *selectedDevice = m_availableChannels[cfg.getIndex()].m_deviceAPI;
             ChannelAPI *selectedChannel = m_availableChannels[cfg.getIndex()].m_channelAPI;
-            QString channelId;
-            selectedChannel->getIdentifier(channelId);
             qDebug() << "JogdialController::handleMessage: MsgSelectChannel"
                 << "device:" << selectedDevice->getHardwareId()
-                << "channel:" << channelId;
+                << "channel:" << selectedChannel->getIdentifier();
             m_selectedDevice = selectedDevice;
             m_selectedChannel = selectedChannel;
             m_selectedIndex = index;
@@ -236,8 +234,6 @@ void JogdialController::updateChannels()
             for (int chi = 0; chi < (*it)->getNumberOfChannels(); chi++)
             {
                 ChannelAPI *channel = (*it)->getChannelAt(chi);
-                QString channelId;
-                channel->getIdentifier(channelId);
                 JogdialControllerSettings::AvailableChannel availableChannel =
                     JogdialControllerSettings::AvailableChannel{
                         deviceSinkEngine != nullptr,
@@ -246,7 +242,7 @@ void JogdialController::updateChannels()
                         device,
                         channel,
                         device->getHardwareId(),
-                        channelId
+                        channel->getIdentifier()
                     };
                 m_availableChannels.push_back(availableChannel);
             }

sdrbase/channel/channelapi.h

@@ -55,6 +55,7 @@ public:
     virtual void destroy() = 0;
 
     virtual void getIdentifier(QString& id) = 0;
+    virtual QString getIdentifier() const = 0;
     const QString& getURI() const { return m_uri; }
     virtual void getTitle(QString& title) = 0;
     virtual void setName(const QString& name) { m_name = name; }