From b1da29a3c441820cb7ee72fa1745480012f82352 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Wed, 15 Aug 2018 11:24:14 +0200
Subject: [PATCH] Sink plugins: corrected name getters and setters
---
debian/changelog | 3 ++-
plugins/channeltx/modam/ammod.h | 2 --
plugins/channeltx/modam/ammodplugin.cpp | 2 +-
plugins/channeltx/modatv/atvmod.h | 2 --
plugins/channeltx/modatv/atvmodplugin.cpp | 2 +-
plugins/channeltx/modnfm/nfmmod.h | 2 --
plugins/channeltx/modnfm/nfmmodplugin.cpp | 2 +-
plugins/channeltx/modssb/ssbmod.h | 2 --
plugins/channeltx/modssb/ssbmodplugin.cpp | 2 +-
plugins/channeltx/modwfm/wfmmod.h | 2 --
plugins/channeltx/modwfm/wfmmodplugin.cpp | 2 +-
plugins/channeltx/udpsink/udpsink.h | 2 --
sdrbase/channel/channelsourceapi.h | 4 ++--
13 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7f5c48a93..87155db8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ sdrangel (4.0.7-1) unstable; urgency=medium
* Scope: removed old scope objects
* Web API: reduced HTTP server debug messages
+ * Sink plugins: corrected name getters and setters
- -- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Wed, 15 Aug 2018 19:14:18 +0200
+ -- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Sun, 19 Aug 2018 21:14:18 +0200
sdrangel (4.0.6-1) unstable; urgency=medium
diff --git a/plugins/channeltx/modam/ammod.h b/plugins/channeltx/modam/ammod.h
index 5c0e4a6c1..4e41f52bf 100644
--- a/plugins/channeltx/modam/ammod.h
+++ b/plugins/channeltx/modam/ammod.h
@@ -208,8 +208,6 @@ public:
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
- virtual void setName(const QString& name) { setObjectName(name); }
- virtual QString getName() const { return objectName(); }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
virtual QByteArray serialize() const;
diff --git a/plugins/channeltx/modam/ammodplugin.cpp b/plugins/channeltx/modam/ammodplugin.cpp
index cd356c0ab..2aa1bd0f5 100644
--- a/plugins/channeltx/modam/ammodplugin.cpp
+++ b/plugins/channeltx/modam/ammodplugin.cpp
@@ -25,7 +25,7 @@
const PluginDescriptor AMModPlugin::m_pluginDescriptor = {
QString("AM Modulator"),
- QString("4.0.6"),
+ QString("4.0.7"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,
diff --git a/plugins/channeltx/modatv/atvmod.h b/plugins/channeltx/modatv/atvmod.h
index 55ba9d780..1e8913dc9 100644
--- a/plugins/channeltx/modatv/atvmod.h
+++ b/plugins/channeltx/modatv/atvmod.h
@@ -362,8 +362,6 @@ public:
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
- virtual void setName(const QString& name) { setObjectName(name); }
- virtual QString getName() const { return objectName(); }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
virtual QByteArray serialize() const;
diff --git a/plugins/channeltx/modatv/atvmodplugin.cpp b/plugins/channeltx/modatv/atvmodplugin.cpp
index b5bbab39f..4aa4b1919 100644
--- a/plugins/channeltx/modatv/atvmodplugin.cpp
+++ b/plugins/channeltx/modatv/atvmodplugin.cpp
@@ -25,7 +25,7 @@
const PluginDescriptor ATVModPlugin::m_pluginDescriptor = {
QString("ATV Modulator"),
- QString("4.0.6"),
+ QString("4.0.7"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,
diff --git a/plugins/channeltx/modnfm/nfmmod.h b/plugins/channeltx/modnfm/nfmmod.h
index 3505cf71e..8a42d7a8b 100644
--- a/plugins/channeltx/modnfm/nfmmod.h
+++ b/plugins/channeltx/modnfm/nfmmod.h
@@ -210,8 +210,6 @@ public:
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
- virtual void setName(const QString& name) { setObjectName(name); }
- virtual QString getName() const { return objectName(); }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
virtual QByteArray serialize() const;
diff --git a/plugins/channeltx/modnfm/nfmmodplugin.cpp b/plugins/channeltx/modnfm/nfmmodplugin.cpp
index 7498fb2c6..4b628a709 100644
--- a/plugins/channeltx/modnfm/nfmmodplugin.cpp
+++ b/plugins/channeltx/modnfm/nfmmodplugin.cpp
@@ -25,7 +25,7 @@
const PluginDescriptor NFMModPlugin::m_pluginDescriptor = {
QString("NFM Modulator"),
- QString("4.0.6"),
+ QString("4.0.7"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,
diff --git a/plugins/channeltx/modssb/ssbmod.h b/plugins/channeltx/modssb/ssbmod.h
index 72cad1980..6dbd4760c 100644
--- a/plugins/channeltx/modssb/ssbmod.h
+++ b/plugins/channeltx/modssb/ssbmod.h
@@ -211,8 +211,6 @@ public:
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
- virtual void setName(const QString& name) { setObjectName(name); }
- virtual QString getName() const { return objectName(); }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
virtual QByteArray serialize() const;
diff --git a/plugins/channeltx/modssb/ssbmodplugin.cpp b/plugins/channeltx/modssb/ssbmodplugin.cpp
index 228ce21cd..f8b146068 100644
--- a/plugins/channeltx/modssb/ssbmodplugin.cpp
+++ b/plugins/channeltx/modssb/ssbmodplugin.cpp
@@ -25,7 +25,7 @@
const PluginDescriptor SSBModPlugin::m_pluginDescriptor = {
QString("SSB Modulator"),
- QString("4.0.6"),
+ QString("4.0.7"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,
diff --git a/plugins/channeltx/modwfm/wfmmod.h b/plugins/channeltx/modwfm/wfmmod.h
index b5393921e..f742e7b26 100644
--- a/plugins/channeltx/modwfm/wfmmod.h
+++ b/plugins/channeltx/modwfm/wfmmod.h
@@ -209,8 +209,6 @@ public:
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
- virtual void setName(const QString& name) { setObjectName(name); }
- virtual QString getName() const { return objectName(); }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
virtual QByteArray serialize() const;
diff --git a/plugins/channeltx/modwfm/wfmmodplugin.cpp b/plugins/channeltx/modwfm/wfmmodplugin.cpp
index 7a818e78e..afa3545d6 100644
--- a/plugins/channeltx/modwfm/wfmmodplugin.cpp
+++ b/plugins/channeltx/modwfm/wfmmodplugin.cpp
@@ -25,7 +25,7 @@
const PluginDescriptor WFMModPlugin::m_pluginDescriptor = {
QString("WFM Modulator"),
- QString("4.0.6"),
+ QString("4.0.7"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,
diff --git a/plugins/channeltx/udpsink/udpsink.h b/plugins/channeltx/udpsink/udpsink.h
index f2b4bd741..12497aaa2 100644
--- a/plugins/channeltx/udpsink/udpsink.h
+++ b/plugins/channeltx/udpsink/udpsink.h
@@ -99,8 +99,6 @@ public:
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
- virtual void setName(const QString& name) { setObjectName(name); }
- virtual QString getName() const { return objectName(); }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
virtual QByteArray serialize() const;
diff --git a/sdrbase/channel/channelsourceapi.h b/sdrbase/channel/channelsourceapi.h
index 2b5cf8d59..44466bd33 100644
--- a/sdrbase/channel/channelsourceapi.h
+++ b/sdrbase/channel/channelsourceapi.h
@@ -38,8 +38,8 @@ public:
virtual void getIdentifier(QString& id) = 0;
virtual void getTitle(QString& title) = 0;
- virtual void setName(const QString& name) = 0;
- virtual QString getName() const = 0;
+ virtual void setName(const QString& name) { m_name = name; };
+ virtual QString getName() const { return m_name; };
virtual qint64 getCenterFrequency() const = 0;
virtual QByteArray serialize() const = 0;