From a88556d6f69f731629e7857596c9fb700e7648a2 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Mon, 5 Aug 2019 03:42:04 +0200
Subject: [PATCH] REST API: config: GET (13): corrected missing return in
 deserialize methods of the adapters

---
 .../channelrx/demodam/amdemodwebapiadapter.cpp | 10 ----------
 .../channelrx/demodam/amdemodwebapiadapter.h   |  4 ++--
 .../channelrx/demodbfm/bfmdemodwebapiadapter.h |  2 +-
 .../demoddsd/dsddemodwebapiadapter.cpp         | 10 ----------
 .../channelrx/demoddsd/dsddemodwebapiadapter.h |  4 ++--
 .../demodfreedv/freedvdemodwebapiadapter.h     |  2 +-
 .../channelrx/demodnfm/nfmdemodwebapiadapter.h |  2 +-
 .../channelrx/demodssb/ssbdemodwebapiadapter.h |  2 +-
 .../channelrx/demodwfm/wfmdemodwebapiadapter.h |  2 +-
 .../freqtracker/freqtrackerwebapiadapter.h     |  2 +-
 .../localsink/localsinkwebapiadapter.h         |  2 +-
 .../remotesink/remotesinkwebapiadapter.h       |  2 +-
 .../channelrx/udpsink/udpsinkwebapiadapter.h   |  2 +-
 .../filesource/filesourcewebapiadapter.h       |  2 +-
 .../localsource/localsourcewebapiadapter.h     |  2 +-
 plugins/channeltx/modam/ammodwebapiadapter.h   |  2 +-
 plugins/channeltx/modatv/atvmodwebapiadapter.h |  2 +-
 .../modfreedv/freedvmodwebapiadapter.h         |  2 +-
 plugins/channeltx/modnfm/nfmmodwebapiadapter.h |  2 +-
 plugins/channeltx/modssb/ssbmodwebapiadapter.h | 18 +-----------------
 plugins/channeltx/modwfm/wfmmodwebapiadapter.h |  2 +-
 .../remotesource/remotesourcewebapiadapter.h   |  2 +-
 .../udpsource/udpsourcewebapiadapter.h         |  2 +-
 23 files changed, 23 insertions(+), 59 deletions(-)

diff --git a/plugins/channelrx/demodam/amdemodwebapiadapter.cpp b/plugins/channelrx/demodam/amdemodwebapiadapter.cpp
index 580cd7d72..365d6051e 100644
--- a/plugins/channelrx/demodam/amdemodwebapiadapter.cpp
+++ b/plugins/channelrx/demodam/amdemodwebapiadapter.cpp
@@ -25,16 +25,6 @@ AMDemodWebAPIAdapter::AMDemodWebAPIAdapter()
 AMDemodWebAPIAdapter::~AMDemodWebAPIAdapter()
 {}
 
-QByteArray AMDemodWebAPIAdapter::serialize() const
-{
-    return m_settings.serialize();
-}
-
-bool AMDemodWebAPIAdapter::deserialize(const QByteArray& data)
-{
-    return m_settings.deserialize(data);
-}
-
 int AMDemodWebAPIAdapter::webapiSettingsGet(
         SWGSDRangel::SWGChannelSettings& response,
         QString& errorMessage)
diff --git a/plugins/channelrx/demodam/amdemodwebapiadapter.h b/plugins/channelrx/demodam/amdemodwebapiadapter.h
index c90b00e8e..1b0d94dc2 100644
--- a/plugins/channelrx/demodam/amdemodwebapiadapter.h
+++ b/plugins/channelrx/demodam/amdemodwebapiadapter.h
@@ -29,8 +29,8 @@ public:
     AMDemodWebAPIAdapter();
     virtual ~AMDemodWebAPIAdapter();
 
-    virtual QByteArray serialize() const;
-    virtual bool deserialize(const QByteArray& data);
+    virtual QByteArray serialize() const { return m_settings.serialize(); }
+    virtual bool deserialize(const QByteArray& data) { return m_settings.deserialize(data); }
 
     virtual int webapiSettingsGet(
             SWGSDRangel::SWGChannelSettings& response,
diff --git a/plugins/channelrx/demodbfm/bfmdemodwebapiadapter.h b/plugins/channelrx/demodbfm/bfmdemodwebapiadapter.h
index 50a14167e..7339305fc 100644
--- a/plugins/channelrx/demodbfm/bfmdemodwebapiadapter.h
+++ b/plugins/channelrx/demodbfm/bfmdemodwebapiadapter.h
@@ -30,7 +30,7 @@ public:
     virtual ~BFMDemodWebAPIAdapter();
 
     virtual QByteArray serialize() const { return m_settings.serialize(); }
-    virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); }
+    virtual bool deserialize(const QByteArray& data) { return m_settings.deserialize(data); }
 
     virtual int webapiSettingsGet(
             SWGSDRangel::SWGChannelSettings& response,
diff --git a/plugins/channelrx/demoddsd/dsddemodwebapiadapter.cpp b/plugins/channelrx/demoddsd/dsddemodwebapiadapter.cpp
index 234da7c32..d42a806c6 100644
--- a/plugins/channelrx/demoddsd/dsddemodwebapiadapter.cpp
+++ b/plugins/channelrx/demoddsd/dsddemodwebapiadapter.cpp
@@ -25,16 +25,6 @@ DSDDemodWebAPIAdapter::DSDDemodWebAPIAdapter()
 DSDDemodWebAPIAdapter::~DSDDemodWebAPIAdapter()
 {}
 
-QByteArray DSDDemodWebAPIAdapter::serialize() const
-{
-    return m_settings.serialize();
-}
-
-bool DSDDemodWebAPIAdapter::deserialize(const QByteArray& data)
-{
-    return m_settings.deserialize(data);
-}
-
 int DSDDemodWebAPIAdapter::webapiSettingsGet(
         SWGSDRangel::SWGChannelSettings& response,
         QString& errorMessage)
diff --git a/plugins/channelrx/demoddsd/dsddemodwebapiadapter.h b/plugins/channelrx/demoddsd/dsddemodwebapiadapter.h
index b892f33a5..9f767aa1b 100644
--- a/plugins/channelrx/demoddsd/dsddemodwebapiadapter.h
+++ b/plugins/channelrx/demoddsd/dsddemodwebapiadapter.h
@@ -29,8 +29,8 @@ public:
     DSDDemodWebAPIAdapter();
     virtual ~DSDDemodWebAPIAdapter();
 
-    virtual QByteArray serialize() const;
-    virtual bool deserialize(const QByteArray& data);
+    virtual QByteArray serialize() const { return m_settings.serialize(); }
+    virtual bool deserialize(const QByteArray& data) { return m_settings.deserialize(data); }
 
     virtual int webapiSettingsGet(
             SWGSDRangel::SWGChannelSettings& response,
diff --git a/plugins/channelrx/demodfreedv/freedvdemodwebapiadapter.h b/plugins/channelrx/demodfreedv/freedvdemodwebapiadapter.h
index 6ae4e1cba..8f410728d 100644
--- a/plugins/channelrx/demodfreedv/freedvdemodwebapiadapter.h
+++ b/plugins/channelrx/demodfreedv/freedvdemodwebapiadapter.h
@@ -30,7 +30,7 @@ public:
     virtual ~FreeDVDemodWebAPIAdapter();
 
     virtual QByteArray serialize() const { return m_settings.serialize(); }
-    virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); }
+    virtual bool deserialize(const QByteArray& data) { return m_settings.deserialize(data); }
 
     virtual int webapiSettingsGet(
             SWGSDRangel::SWGChannelSettings& response,
diff --git a/plugins/channelrx/demodnfm/nfmdemodwebapiadapter.h b/plugins/channelrx/demodnfm/nfmdemodwebapiadapter.h
index b13f202a7..27eb876b1 100644
--- a/plugins/channelrx/demodnfm/nfmdemodwebapiadapter.h
+++ b/plugins/channelrx/demodnfm/nfmdemodwebapiadapter.h
@@ -30,7 +30,7 @@ public:
     virtual ~NFMDemodWebAPIAdapter();
 
     virtual QByteArray serialize() const { return m_settings.serialize(); }
-    virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); }
+    virtual bool deserialize(const QByteArray& data) { return m_settings.deserialize(data); }
 
     virtual int webapiSettingsGet(
             SWGSDRangel::SWGChannelSettings& response,
diff --git a/plugins/channelrx/demodssb/ssbdemodwebapiadapter.h b/plugins/channelrx/demodssb/ssbdemodwebapiadapter.h
index ccbc4ba87..8735366c7 100644
--- a/plugins/channelrx/demodssb/ssbdemodwebapiadapter.h
+++ b/plugins/channelrx/demodssb/ssbdemodwebapiadapter.h
@@ -30,7 +30,7 @@ public:
     virtual ~SSBDemodWebAPIAdapter();
 
     virtual QByteArray serialize() const { return m_settings.serialize(); }
-    virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); }
+    virtual bool deserialize(const QByteArray& data) { return m_settings.deserialize(data); }
 
     virtual int webapiSettingsGet(
             SWGSDRangel::SWGChannelSettings& response,
diff --git a/plugins/channelrx/demodwfm/wfmdemodwebapiadapter.h b/plugins/channelrx/demodwfm/wfmdemodwebapiadapter.h
index ef9d4dc3f..105adf257 100644
--- a/plugins/channelrx/demodwfm/wfmdemodwebapiadapter.h
+++ b/plugins/channelrx/demodwfm/wfmdemodwebapiadapter.h
@@ -30,7 +30,7 @@ public:
     virtual ~WFMDemodWebAPIAdapter();
 
     virtual QByteArray serialize() const { return m_settings.serialize(); }
-    virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); }
+    virtual bool deserialize(const QByteArray& data) { return m_settings.deserialize(data); }
 
     virtual int webapiSettingsGet(
             SWGSDRangel::SWGChannelSettings& response,
diff --git a/plugins/channelrx/freqtracker/freqtrackerwebapiadapter.h b/plugins/channelrx/freqtracker/freqtrackerwebapiadapter.h
index 75ee48080..ee10aa659 100644
--- a/plugins/channelrx/freqtracker/freqtrackerwebapiadapter.h
+++ b/plugins/channelrx/freqtracker/freqtrackerwebapiadapter.h
@@ -30,7 +30,7 @@ public:
     virtual ~FreqTrackerWebAPIAdapter();
 
     virtual QByteArray serialize() const { return m_settings.serialize(); }
-    virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); }
+    virtual bool deserialize(const QByteArray& data) { return m_settings.deserialize(data); }
 
     virtual int webapiSettingsGet(
             SWGSDRangel::SWGChannelSettings& response,
diff --git a/plugins/channelrx/localsink/localsinkwebapiadapter.h b/plugins/channelrx/localsink/localsinkwebapiadapter.h
index d3f752769..375f286d9 100644
--- a/plugins/channelrx/localsink/localsinkwebapiadapter.h
+++ b/plugins/channelrx/localsink/localsinkwebapiadapter.h
@@ -30,7 +30,7 @@ public:
     virtual ~LocalSinkWebAPIAdapter();
 
     virtual QByteArray serialize() const { return m_settings.serialize(); }
-    virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); }
+    virtual bool deserialize(const QByteArray& data) { return m_settings.deserialize(data); }
 
     virtual int webapiSettingsGet(
             SWGSDRangel::SWGChannelSettings& response,
diff --git a/plugins/channelrx/remotesink/remotesinkwebapiadapter.h b/plugins/channelrx/remotesink/remotesinkwebapiadapter.h
index 1e3010988..bf89b6ae8 100644
--- a/plugins/channelrx/remotesink/remotesinkwebapiadapter.h
+++ b/plugins/channelrx/remotesink/remotesinkwebapiadapter.h
@@ -30,7 +30,7 @@ public:
     virtual ~RemoteSinkWebAPIAdapter();
 
     virtual QByteArray serialize() const { return m_settings.serialize(); }
-    virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); }
+    virtual bool deserialize(const QByteArray& data) { return m_settings.deserialize(data); }
 
     virtual int webapiSettingsGet(
             SWGSDRangel::SWGChannelSettings& response,
diff --git a/plugins/channelrx/udpsink/udpsinkwebapiadapter.h b/plugins/channelrx/udpsink/udpsinkwebapiadapter.h
index 90eaf772a..2a69f2e27 100644
--- a/plugins/channelrx/udpsink/udpsinkwebapiadapter.h
+++ b/plugins/channelrx/udpsink/udpsinkwebapiadapter.h
@@ -30,7 +30,7 @@ public:
     virtual ~UDPSinkWebAPIAdapter();
 
     virtual QByteArray serialize() const { return m_settings.serialize(); }
-    virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); }
+    virtual bool deserialize(const QByteArray& data) { return m_settings.deserialize(data); }
 
     virtual int webapiSettingsGet(
             SWGSDRangel::SWGChannelSettings& response,
diff --git a/plugins/channeltx/filesource/filesourcewebapiadapter.h b/plugins/channeltx/filesource/filesourcewebapiadapter.h
index 4bf2eb277..1045acbb1 100644
--- a/plugins/channeltx/filesource/filesourcewebapiadapter.h
+++ b/plugins/channeltx/filesource/filesourcewebapiadapter.h
@@ -30,7 +30,7 @@ public:
     virtual ~FileSourceWebAPIAdapter();
 
     virtual QByteArray serialize() const { return m_settings.serialize(); }
-    virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); }
+    virtual bool deserialize(const QByteArray& data) { return m_settings.deserialize(data); }
 
     virtual int webapiSettingsGet(
             SWGSDRangel::SWGChannelSettings& response,
diff --git a/plugins/channeltx/localsource/localsourcewebapiadapter.h b/plugins/channeltx/localsource/localsourcewebapiadapter.h
index 92b937fe6..123f3cf07 100644
--- a/plugins/channeltx/localsource/localsourcewebapiadapter.h
+++ b/plugins/channeltx/localsource/localsourcewebapiadapter.h
@@ -30,7 +30,7 @@ public:
     virtual ~LocalSourceWebAPIAdapter();
 
     virtual QByteArray serialize() const { return m_settings.serialize(); }
-    virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); }
+    virtual bool deserialize(const QByteArray& data) { return m_settings.deserialize(data); }
 
     virtual int webapiSettingsGet(
             SWGSDRangel::SWGChannelSettings& response,
diff --git a/plugins/channeltx/modam/ammodwebapiadapter.h b/plugins/channeltx/modam/ammodwebapiadapter.h
index a095de8c5..6a4e55aac 100644
--- a/plugins/channeltx/modam/ammodwebapiadapter.h
+++ b/plugins/channeltx/modam/ammodwebapiadapter.h
@@ -31,7 +31,7 @@ public:
     virtual ~AMModWebAPIAdapter();
 
     virtual QByteArray serialize() const { return m_settings.serialize(); }
-    virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); }
+    virtual bool deserialize(const QByteArray& data) { return m_settings.deserialize(data); }
 
     virtual int webapiSettingsGet(
             SWGSDRangel::SWGChannelSettings& response,
diff --git a/plugins/channeltx/modatv/atvmodwebapiadapter.h b/plugins/channeltx/modatv/atvmodwebapiadapter.h
index 2f544a986..6dc0ed0f8 100644
--- a/plugins/channeltx/modatv/atvmodwebapiadapter.h
+++ b/plugins/channeltx/modatv/atvmodwebapiadapter.h
@@ -30,7 +30,7 @@ public:
     virtual ~ATVModWebAPIAdapter();
 
     virtual QByteArray serialize() const { return m_settings.serialize(); }
-    virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); }
+    virtual bool deserialize(const QByteArray& data) { return m_settings.deserialize(data); }
 
     virtual int webapiSettingsGet(
             SWGSDRangel::SWGChannelSettings& response,
diff --git a/plugins/channeltx/modfreedv/freedvmodwebapiadapter.h b/plugins/channeltx/modfreedv/freedvmodwebapiadapter.h
index 676cc8d58..bb7965b4e 100644
--- a/plugins/channeltx/modfreedv/freedvmodwebapiadapter.h
+++ b/plugins/channeltx/modfreedv/freedvmodwebapiadapter.h
@@ -30,7 +30,7 @@ public:
     virtual ~FreeDVModWebAPIAdapter();
 
     virtual QByteArray serialize() const { return m_settings.serialize(); }
-    virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); }
+    virtual bool deserialize(const QByteArray& data) { return m_settings.deserialize(data); }
 
     virtual int webapiSettingsGet(
             SWGSDRangel::SWGChannelSettings& response,
diff --git a/plugins/channeltx/modnfm/nfmmodwebapiadapter.h b/plugins/channeltx/modnfm/nfmmodwebapiadapter.h
index 63d1ef0ee..b8f3874c6 100644
--- a/plugins/channeltx/modnfm/nfmmodwebapiadapter.h
+++ b/plugins/channeltx/modnfm/nfmmodwebapiadapter.h
@@ -30,7 +30,7 @@ public:
     virtual ~NFMModWebAPIAdapter();
 
     virtual QByteArray serialize() const { return m_settings.serialize(); }
-    virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); }
+    virtual bool deserialize(const QByteArray& data) { return m_settings.deserialize(data); }
 
     virtual int webapiSettingsGet(
             SWGSDRangel::SWGChannelSettings& response,
diff --git a/plugins/channeltx/modssb/ssbmodwebapiadapter.h b/plugins/channeltx/modssb/ssbmodwebapiadapter.h
index 25af209b4..e3387c02c 100644
--- a/plugins/channeltx/modssb/ssbmodwebapiadapter.h
+++ b/plugins/channeltx/modssb/ssbmodwebapiadapter.h
@@ -29,24 +29,8 @@ public:
     SSBModWebAPIAdapter();
     virtual ~SSBModWebAPIAdapter();
 
-    // unused pure virtual methods
-    virtual void destroy() {}
-    virtual void getIdentifier(QString& id) {}
-    virtual void getTitle(QString& title) {}
-    virtual qint64 getCenterFrequency() const { return 0; }
-    virtual int getNbSinkStreams() const { return 1; }
-    virtual int getNbSourceStreams() const { return 0; }
-
-    virtual qint64 getStreamCenterFrequency(int streamIndex, bool sinkElseSource) const
-    {
-        (void) streamIndex;
-        (void) sinkElseSource;
-        return 0;
-    }
-
-    // virtual methods actually implemented
     virtual QByteArray serialize() const { return m_settings.serialize(); }
-    virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); }
+    virtual bool deserialize(const QByteArray& data) { return m_settings.deserialize(data); }
 
     virtual int webapiSettingsGet(
             SWGSDRangel::SWGChannelSettings& response,
diff --git a/plugins/channeltx/modwfm/wfmmodwebapiadapter.h b/plugins/channeltx/modwfm/wfmmodwebapiadapter.h
index 2bc73fddd..f1143d42a 100644
--- a/plugins/channeltx/modwfm/wfmmodwebapiadapter.h
+++ b/plugins/channeltx/modwfm/wfmmodwebapiadapter.h
@@ -30,7 +30,7 @@ public:
     virtual ~WFMModWebAPIAdapter();
 
     virtual QByteArray serialize() const { return m_settings.serialize(); }
-    virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); }
+    virtual bool deserialize(const QByteArray& data) { return m_settings.deserialize(data); }
 
     virtual int webapiSettingsGet(
             SWGSDRangel::SWGChannelSettings& response,
diff --git a/plugins/channeltx/remotesource/remotesourcewebapiadapter.h b/plugins/channeltx/remotesource/remotesourcewebapiadapter.h
index 7f8bb8330..0e38676f2 100644
--- a/plugins/channeltx/remotesource/remotesourcewebapiadapter.h
+++ b/plugins/channeltx/remotesource/remotesourcewebapiadapter.h
@@ -30,7 +30,7 @@ public:
     virtual ~RemoteSourceWebAPIAdapter();
 
     virtual QByteArray serialize() const { return m_settings.serialize(); }
-    virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); }
+    virtual bool deserialize(const QByteArray& data) { return m_settings.deserialize(data); }
 
     virtual int webapiSettingsGet(
             SWGSDRangel::SWGChannelSettings& response,
diff --git a/plugins/channeltx/udpsource/udpsourcewebapiadapter.h b/plugins/channeltx/udpsource/udpsourcewebapiadapter.h
index d538b2048..d4bf73495 100644
--- a/plugins/channeltx/udpsource/udpsourcewebapiadapter.h
+++ b/plugins/channeltx/udpsource/udpsourcewebapiadapter.h
@@ -30,7 +30,7 @@ public:
     virtual ~UDPSourceWebAPIAdapter();
 
     virtual QByteArray serialize() const { return m_settings.serialize(); }
-    virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); }
+    virtual bool deserialize(const QByteArray& data) { return m_settings.deserialize(data); }
 
     virtual int webapiSettingsGet(
             SWGSDRangel::SWGChannelSettings& response,