Fix PR comments

f4exb · Sep 9, 2024 · d2e89b7 · d2e89b7
1 parent 60e1d1c
commit d2e89b7
Show file tree

Hide file tree

Showing 59 changed files with 60 additions and 95 deletions.
diff --git a/plugins/channelrx/channelpower/channelpower.cpp b/plugins/channelrx/channelpower/channelpower.cpp
@@ -49,7 +49,7 @@ ChannelPower::ChannelPower(DeviceAPI *deviceAPI) :
 {
     setObjectName(m_channelId);
 
-    m_basebandSink = new ChannelPowerBaseband(this);
+    m_basebandSink = new ChannelPowerBaseband();
     m_basebandSink->setChannel(this);
     m_basebandSink->moveToThread(&m_thread);
 

diff --git a/plugins/channelrx/channelpower/channelpowerbaseband.cpp b/plugins/channelrx/channelpower/channelpowerbaseband.cpp
@@ -25,8 +25,7 @@
 
 MESSAGE_CLASS_DEFINITION(ChannelPowerBaseband::MsgConfigureChannelPowerBaseband, Message)
 
-ChannelPowerBaseband::ChannelPowerBaseband(ChannelPower *channelPower) :
-    m_sink(channelPower),
+ChannelPowerBaseband::ChannelPowerBaseband() :
     m_running(false)
 {
     qDebug("ChannelPowerBaseband::ChannelPowerBaseband");

diff --git a/plugins/channelrx/channelpower/channelpowerbaseband.h b/plugins/channelrx/channelpower/channelpowerbaseband.h
@@ -62,7 +62,7 @@ class ChannelPowerBaseband : public QObject
         { }
     };
 
-    ChannelPowerBaseband(ChannelPower *channelPower);
+    ChannelPowerBaseband();
     ~ChannelPowerBaseband();
     void reset();
     void startWork();

diff --git a/plugins/channelrx/channelpower/channelpowersink.cpp b/plugins/channelrx/channelpower/channelpowersink.cpp
@@ -20,14 +20,12 @@
 
 #include "channelpowersink.h"
 
-ChannelPowerSink::ChannelPowerSink(ChannelPower *channelPower) :
+ChannelPowerSink::ChannelPowerSink() :
         m_channelSampleRate(10000),
         m_channelFrequencyOffset(0),
         m_lowpassFFT(nullptr),
         m_lowpassBufferIdx(0)
 {
-    (void)channelPower;
-
     resetMagLevels();
 
     applySettings(m_settings, QStringList(), true);

diff --git a/plugins/channelrx/channelpower/channelpowersink.h b/plugins/channelrx/channelpower/channelpowersink.h
@@ -32,7 +32,7 @@ class ChannelPower;
 
 class ChannelPowerSink : public ChannelSampleSink {
 public:
-    ChannelPowerSink(ChannelPower *channelPower);
+    ChannelPowerSink();
     ~ChannelPowerSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);

diff --git a/plugins/channelrx/demodadsb/adsbdemodgui.h b/plugins/channelrx/demodadsb/adsbdemodgui.h
@@ -812,9 +812,7 @@ class ModelMatch {
         m_aircraftRegExp.optimize();
     }
 
-    virtual ~ModelMatch()
-    {
-    }
+    virtual ~ModelMatch() = default;
 
     virtual bool match(const QString &aircraft, const QString &manufacturer, QString &model)
     {

diff --git a/plugins/channelrx/demodapt/aptdemod.cpp b/plugins/channelrx/demodapt/aptdemod.cpp
@@ -55,7 +55,7 @@ APTDemod::APTDemod(DeviceAPI *deviceAPI) :
 {
     setObjectName(m_channelId);
 
-    m_basebandSink = new APTDemodBaseband(this);
+    m_basebandSink = new APTDemodBaseband();
     m_basebandSink->moveToThread(&m_thread);
 
     m_imageWorker = new APTDemodImageWorker(this);

diff --git a/plugins/channelrx/demodapt/aptdemodbaseband.cpp b/plugins/channelrx/demodapt/aptdemodbaseband.cpp
@@ -26,8 +26,7 @@
 
 MESSAGE_CLASS_DEFINITION(APTDemodBaseband::MsgConfigureAPTDemodBaseband, Message)
 
-APTDemodBaseband::APTDemodBaseband(APTDemod *packetDemod) :
-    m_sink(packetDemod),
+APTDemodBaseband::APTDemodBaseband() :
     m_running(false)
 {
     qDebug("APTDemodBaseband::APTDemodBaseband");

diff --git a/plugins/channelrx/demodapt/aptdemodbaseband.h b/plugins/channelrx/demodapt/aptdemodbaseband.h
@@ -58,7 +58,7 @@ class APTDemodBaseband : public QObject
         { }
     };
 
-    APTDemodBaseband(APTDemod *packetDemod);
+    APTDemodBaseband();
     ~APTDemodBaseband();
     void reset();
     void startWork();

diff --git a/plugins/channelrx/demodapt/aptdemodsink.cpp b/plugins/channelrx/demodapt/aptdemodsink.cpp
@@ -23,7 +23,7 @@
 #include "aptdemod.h"
 #include "aptdemodsink.h"
 
-APTDemodSink::APTDemodSink(APTDemod *packetDemod) :
+APTDemodSink::APTDemodSink() :
         m_channelSampleRate(APTDEMOD_AUDIO_SAMPLE_RATE),
         m_channelFrequencyOffset(0),
         m_magsqSum(0.0f),
@@ -32,7 +32,6 @@ APTDemodSink::APTDemodSink(APTDemod *packetDemod) :
         m_imageWorkerMessageQueue(nullptr),
         m_samples(nullptr)
 {
-    (void)packetDemod;
 
     m_magsq = 0.0;
 

diff --git a/plugins/channelrx/demodapt/aptdemodsink.h b/plugins/channelrx/demodapt/aptdemodsink.h
@@ -44,7 +44,7 @@ class APTDemod;
 
 class APTDemodSink : public ChannelSampleSink {
 public:
-    APTDemodSink(APTDemod *packetDemod);
+    APTDemodSink();
     ~APTDemodSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);

diff --git a/plugins/channelrx/demoddab/dabdemod.cpp b/plugins/channelrx/demoddab/dabdemod.cpp
@@ -64,7 +64,7 @@ DABDemod::DABDemod(DeviceAPI *deviceAPI) :
 {
     setObjectName(m_channelId);
 
-    m_basebandSink = new DABDemodBaseband(this);
+    m_basebandSink = new DABDemodBaseband();
     m_basebandSink->setMessageQueueToChannel(getInputMessageQueue());
     m_basebandSink->setChannel(this);
     m_basebandSink->moveToThread(&m_thread);

diff --git a/plugins/channelrx/demoddab/dabdemodbaseband.cpp b/plugins/channelrx/demoddab/dabdemodbaseband.cpp
@@ -28,8 +28,7 @@
 
 MESSAGE_CLASS_DEFINITION(DABDemodBaseband::MsgConfigureDABDemodBaseband, Message)
 
-DABDemodBaseband::DABDemodBaseband(DABDemod *packetDemod) :
-    m_sink(packetDemod),
+DABDemodBaseband::DABDemodBaseband() :
     m_running(false)
 {
     qDebug("DABDemodBaseband::DABDemodBaseband");

diff --git a/plugins/channelrx/demoddab/dabdemodbaseband.h b/plugins/channelrx/demoddab/dabdemodbaseband.h
@@ -60,7 +60,7 @@ class DABDemodBaseband : public QObject
         { }
     };
 
-    DABDemodBaseband(DABDemod *packetDemod);
+    DABDemodBaseband();
     ~DABDemodBaseband();
     void reset();
     void startWork();

diff --git a/plugins/channelrx/demoddab/dabdemodsink.cpp b/plugins/channelrx/demoddab/dabdemodsink.cpp
@@ -487,7 +487,7 @@ void DABDemodSink::processOneAudioSample(Complex &ci)
     }
 }
 
-DABDemodSink::DABDemodSink(DABDemod *packetDemod) :
+DABDemodSink::DABDemodSink() :
         m_audioSampleRate(48000),
         m_dabAudioSampleRate(10000), // Unused value to begin with
         m_channelSampleRate(DABDEMOD_CHANNEL_SAMPLE_RATE),
@@ -499,8 +499,6 @@ DABDemodSink::DABDemodSink(DABDemod *packetDemod) :
         m_messageQueueToChannel(nullptr),
         m_audioFifo(48000)
 {
-    (void)packetDemod;
-
     m_audioBuffer.resize(1<<14);
     m_audioBufferFill = 0;
 

diff --git a/plugins/channelrx/demoddab/dabdemodsink.h b/plugins/channelrx/demoddab/dabdemodsink.h
@@ -43,7 +43,7 @@ class DABDemod;
 
 class DABDemodSink : public ChannelSampleSink {
 public:
-    DABDemodSink(DABDemod *packetDemod);
+    DABDemodSink();
     ~DABDemodSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);

diff --git a/plugins/channelrx/demodils/ilsdemod.cpp b/plugins/channelrx/demodils/ilsdemod.cpp
@@ -61,7 +61,7 @@ ILSDemod::ILSDemod(DeviceAPI *deviceAPI) :
 {
     setObjectName(m_channelId);
 
-    m_basebandSink = new ILSDemodBaseband(this);
+    m_basebandSink = new ILSDemodBaseband();
     m_basebandSink->setMessageQueueToChannel(getInputMessageQueue());
     m_basebandSink->setChannel(this);
     m_basebandSink->moveToThread(&m_thread);

diff --git a/plugins/channelrx/demodils/ilsdemodbaseband.cpp b/plugins/channelrx/demodils/ilsdemodbaseband.cpp
@@ -27,8 +27,7 @@
 
 MESSAGE_CLASS_DEFINITION(ILSDemodBaseband::MsgConfigureILSDemodBaseband, Message)
 
-ILSDemodBaseband::ILSDemodBaseband(ILSDemod *packetDemod) :
-    m_sink(packetDemod),
+ILSDemodBaseband::ILSDemodBaseband() :
     m_running(false)
 {
     qDebug("ILSDemodBaseband::ILSDemodBaseband");

diff --git a/plugins/channelrx/demodils/ilsdemodbaseband.h b/plugins/channelrx/demodils/ilsdemodbaseband.h
@@ -63,7 +63,7 @@ class ILSDemodBaseband : public QObject
         { }
     };
 
-    ILSDemodBaseband(ILSDemod *packetDemod);
+    ILSDemodBaseband();
     ~ILSDemodBaseband();
     void reset();
     void startWork();

diff --git a/plugins/channelrx/demodils/ilsdemodsink.cpp b/plugins/channelrx/demodils/ilsdemodsink.cpp
@@ -28,7 +28,7 @@
 #include "ilsdemod.h"
 #include "ilsdemodsink.h"
 
-ILSDemodSink::ILSDemodSink(ILSDemod *ilsDemod) :
+ILSDemodSink::ILSDemodSink() :
         m_spectrumSink(nullptr),
         m_scopeSink(nullptr),
         m_channel(nullptr),
@@ -50,8 +50,6 @@ ILSDemodSink::ILSDemodSink(ILSDemod *ilsDemod) :
         m_audioFifo(48000),
         m_sampleBufferIndex(0)
 {
-	(void)ilsDemod;
-
 	m_audioBuffer.resize(1<<14);
 	m_audioBufferFill = 0;
 

diff --git a/plugins/channelrx/demodils/ilsdemodsink.h b/plugins/channelrx/demodils/ilsdemodsink.h
@@ -44,7 +44,7 @@ class SpectrumVis;
 
 class ILSDemodSink : public ChannelSampleSink {
 public:
-    ILSDemodSink(ILSDemod *packetDemod);
+    ILSDemodSink();
     ~ILSDemodSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);

diff --git a/plugins/channelrx/demodnavtex/navtexdemod.cpp b/plugins/channelrx/demodnavtex/navtexdemod.cpp
@@ -53,7 +53,7 @@ NavtexDemod::NavtexDemod(DeviceAPI *deviceAPI) :
 {
     setObjectName(m_channelId);
 
-    m_basebandSink = new NavtexDemodBaseband(this);
+    m_basebandSink = new NavtexDemodBaseband();
     m_basebandSink->setMessageQueueToChannel(getInputMessageQueue());
     m_basebandSink->setChannel(this);
     m_basebandSink->moveToThread(&m_thread);

diff --git a/plugins/channelrx/demodnavtex/navtexdemodbaseband.cpp b/plugins/channelrx/demodnavtex/navtexdemodbaseband.cpp
@@ -26,8 +26,7 @@
 
 MESSAGE_CLASS_DEFINITION(NavtexDemodBaseband::MsgConfigureNavtexDemodBaseband, Message)
 
-NavtexDemodBaseband::NavtexDemodBaseband(NavtexDemod *navtexDemod) :
-    m_sink(navtexDemod),
+NavtexDemodBaseband::NavtexDemodBaseband() :
     m_running(false)
 {
     qDebug("NavtexDemodBaseband::NavtexDemodBaseband");

diff --git a/plugins/channelrx/demodnavtex/navtexdemodbaseband.h b/plugins/channelrx/demodnavtex/navtexdemodbaseband.h
@@ -62,7 +62,7 @@ class NavtexDemodBaseband : public QObject
         { }
     };
 
-    NavtexDemodBaseband(NavtexDemod *navtexDemod);
+    NavtexDemodBaseband();
     ~NavtexDemodBaseband();
     void reset();
     void startWork();

diff --git a/plugins/channelrx/demodnavtex/navtexdemodsink.cpp b/plugins/channelrx/demodnavtex/navtexdemodsink.cpp
@@ -27,7 +27,7 @@
 #include "navtexdemod.h"
 #include "navtexdemodsink.h"
 
-NavtexDemodSink::NavtexDemodSink(NavtexDemod *packetDemod) :
+NavtexDemodSink::NavtexDemodSink() :
         m_channelSampleRate(NavtexDemodSettings::NAVTEXDEMOD_CHANNEL_SAMPLE_RATE),
         m_channelFrequencyOffset(0),
         m_magsqSum(0.0f),
@@ -37,7 +37,6 @@ NavtexDemodSink::NavtexDemodSink(NavtexDemod *packetDemod) :
         m_exp(nullptr),
         m_sampleBufferIndex(0)
 {
-    (void)packetDemod;
     m_magsq = 0.0;
 
     m_sampleBuffer.resize(m_sampleBufferSize);

diff --git a/plugins/channelrx/demodnavtex/navtexdemodsink.h b/plugins/channelrx/demodnavtex/navtexdemodsink.h
@@ -39,7 +39,7 @@ class ScopeVis;
 
 class NavtexDemodSink : public ChannelSampleSink {
 public:
-    NavtexDemodSink(NavtexDemod *packetDemod);
+    NavtexDemodSink();
     ~NavtexDemodSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);

diff --git a/plugins/channelrx/demodpager/pagerdemod.cpp b/plugins/channelrx/demodpager/pagerdemod.cpp
@@ -46,7 +46,7 @@ PagerDemod::PagerDemod(DeviceAPI *deviceAPI) :
 {
     setObjectName(m_channelId);
 
-    m_basebandSink = new PagerDemodBaseband(this);
+    m_basebandSink = new PagerDemodBaseband();
     m_basebandSink->setMessageQueueToChannel(getInputMessageQueue());
     m_basebandSink->setChannel(this);
     m_basebandSink->moveToThread(&m_thread);

diff --git a/plugins/channelrx/demodpager/pagerdemodbaseband.cpp b/plugins/channelrx/demodpager/pagerdemodbaseband.cpp
@@ -26,8 +26,7 @@
 
 MESSAGE_CLASS_DEFINITION(PagerDemodBaseband::MsgConfigurePagerDemodBaseband, Message)
 
-PagerDemodBaseband::PagerDemodBaseband(PagerDemod *pagerDemod) :
-    m_sink(pagerDemod),
+PagerDemodBaseband::PagerDemodBaseband() :
     m_running(false)
 {
     qDebug("PagerDemodBaseband::PagerDemodBaseband");

diff --git a/plugins/channelrx/demodpager/pagerdemodbaseband.h b/plugins/channelrx/demodpager/pagerdemodbaseband.h
@@ -62,7 +62,7 @@ class PagerDemodBaseband : public QObject
         { }
     };
 
-    PagerDemodBaseband(PagerDemod *pagerDemod);
+    PagerDemodBaseband();
     ~PagerDemodBaseband();
     void reset();
     void startWork();

diff --git a/plugins/channelrx/demodpager/pagerdemodsink.cpp b/plugins/channelrx/demodpager/pagerdemodsink.cpp
@@ -28,7 +28,7 @@
 #include "pagerdemod.h"
 #include "pagerdemodsink.h"
 
-PagerDemodSink::PagerDemodSink(PagerDemod *pagerDemod) :
+PagerDemodSink::PagerDemodSink() :
         m_scopeSink(nullptr),
         m_channelSampleRate(PagerDemodSettings::m_channelSampleRate),
         m_channelFrequencyOffset(0),
@@ -49,8 +49,6 @@ PagerDemodSink::PagerDemodSink(PagerDemod *pagerDemod) :
         m_addressValid(0),
         m_sampleBufferIndex(0)
 {
-    (void)pagerDemod;
-
     m_magsq = 0.0;
 
     m_demodBuffer.resize(1<<12);

diff --git a/plugins/channelrx/demodpager/pagerdemodsink.h b/plugins/channelrx/demodpager/pagerdemodsink.h
@@ -45,7 +45,7 @@ class ScopeVis;
 
 class PagerDemodSink : public ChannelSampleSink {
 public:
-    PagerDemodSink(PagerDemod *pagerDemod);
+    PagerDemodSink();
     ~PagerDemodSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);

diff --git a/plugins/channelrx/demodrtty/rttydemod.cpp b/plugins/channelrx/demodrtty/rttydemod.cpp
@@ -53,7 +53,7 @@ RttyDemod::RttyDemod(DeviceAPI *deviceAPI) :
 {
     setObjectName(m_channelId);
 
-    m_basebandSink = new RttyDemodBaseband(this);
+    m_basebandSink = new RttyDemodBaseband();
     m_basebandSink->setMessageQueueToChannel(getInputMessageQueue());
     m_basebandSink->setChannel(this);
     m_basebandSink->moveToThread(&m_thread);

diff --git a/plugins/channelrx/demodrtty/rttydemodbaseband.cpp b/plugins/channelrx/demodrtty/rttydemodbaseband.cpp
@@ -26,8 +26,7 @@
 
 MESSAGE_CLASS_DEFINITION(RttyDemodBaseband::MsgConfigureRttyDemodBaseband, Message)
 
-RttyDemodBaseband::RttyDemodBaseband(RttyDemod *rttyDemod) :
-    m_sink(rttyDemod),
+RttyDemodBaseband::RttyDemodBaseband() :
     m_running(false)
 {
     qDebug("RttyDemodBaseband::RttyDemodBaseband");

diff --git a/plugins/channelrx/demodrtty/rttydemodbaseband.h b/plugins/channelrx/demodrtty/rttydemodbaseband.h
@@ -62,7 +62,7 @@ class RttyDemodBaseband : public QObject
         { }
     };
 
-    RttyDemodBaseband(RttyDemod *rttyDemod);
+    RttyDemodBaseband();
     ~RttyDemodBaseband();
     void reset();
     void startWork();

diff --git a/plugins/channelrx/demodrtty/rttydemodsink.cpp b/plugins/channelrx/demodrtty/rttydemodsink.cpp
@@ -28,7 +28,7 @@
 #include "rttydemod.h"
 #include "rttydemodsink.h"
 
-RttyDemodSink::RttyDemodSink(RttyDemod *packetDemod) :
+RttyDemodSink::RttyDemodSink() :
         m_channelSampleRate(RttyDemodSettings::RTTYDEMOD_CHANNEL_SAMPLE_RATE),
         m_channelFrequencyOffset(0),
         m_magsqSum(0.0f),
@@ -47,8 +47,6 @@ RttyDemodSink::RttyDemodSink(RttyDemod *packetDemod) :
         m_fftCounter(0),
         m_sampleBufferIndex(0)
 {
-    (void)packetDemod;
-
     m_magsq = 0.0;
 
     m_sampleBuffer.resize(m_sampleBufferSize);

diff --git a/plugins/channelrx/demodrtty/rttydemodsink.h b/plugins/channelrx/demodrtty/rttydemodsink.h
@@ -39,7 +39,7 @@ class ScopeVis;
 
 class RttyDemodSink : public ChannelSampleSink {
 public:
-    RttyDemodSink(RttyDemod *packetDemod);
+    RttyDemodSink();
     ~RttyDemodSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);