From 2c3ccc49af1ec5861dac1fb22b435f2fac481c47 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 24 Jul 2022 21:48:02 +0200 Subject: [PATCH] Some clang warnong fixes --- plugins/channelrx/demodadsb/adsbdemodgui.cpp | 1 - plugins/channelrx/demoddab/dabdemodsink.h | 1 - plugins/channelrx/demodpager/pagerdemodsink.cpp | 2 -- .../channelrx/demodradiosonde/radiosondedemodsink.cpp | 2 -- plugins/channelrx/radioastronomy/radioastronomy.h | 1 - plugins/channelrx/radioclock/radioclocksink.cpp | 2 -- sdrbase/device/deviceset.cpp | 4 ++-- sdrbase/pipes/objectpipe.h | 2 -- sdrgui/gui/glspectrum.cpp | 10 ++++++---- 9 files changed, 8 insertions(+), 17 deletions(-) diff --git a/plugins/channelrx/demodadsb/adsbdemodgui.cpp b/plugins/channelrx/demodadsb/adsbdemodgui.cpp index 80f1c865f..1fe3db93a 100644 --- a/plugins/channelrx/demodadsb/adsbdemodgui.cpp +++ b/plugins/channelrx/demodadsb/adsbdemodgui.cpp @@ -3362,7 +3362,6 @@ void ADSBDemodGUI::updateAirports() ++i; } // Save settings we've just used so we know if they've changed - m_currentAirportRange = m_currentAirportRange; m_currentAirportMinimumSize = m_settings.m_airportMinimumSize; m_currentDisplayHeliports = m_settings.m_displayHeliports; } diff --git a/plugins/channelrx/demoddab/dabdemodsink.h b/plugins/channelrx/demoddab/dabdemodsink.h index 6ab1b780d..3021875c9 100644 --- a/plugins/channelrx/demoddab/dabdemodsink.h +++ b/plugins/channelrx/demoddab/dabdemodsink.h @@ -115,7 +115,6 @@ private: void *m_dab; DABDemodDevice m_device; audiodata m_ad; - packetdata m_pd; API_struct m_api; NCO m_nco; diff --git a/plugins/channelrx/demodpager/pagerdemodsink.cpp b/plugins/channelrx/demodpager/pagerdemodsink.cpp index c1e662bbf..af023831c 100644 --- a/plugins/channelrx/demodpager/pagerdemodsink.cpp +++ b/plugins/channelrx/demodpager/pagerdemodsink.cpp @@ -370,8 +370,6 @@ void PagerDemodSink::decodeBatch() void PagerDemodSink::processOneSample(Complex &ci) { - Complex ca; - // FM demodulation double magsqRaw; Real deviation; diff --git a/plugins/channelrx/demodradiosonde/radiosondedemodsink.cpp b/plugins/channelrx/demodradiosonde/radiosondedemodsink.cpp index 9c985386a..f8135c989 100644 --- a/plugins/channelrx/demodradiosonde/radiosondedemodsink.cpp +++ b/plugins/channelrx/demodradiosonde/radiosondedemodsink.cpp @@ -119,8 +119,6 @@ void RadiosondeDemodSink::feed(const SampleVector::const_iterator& begin, const void RadiosondeDemodSink::processOneSample(Complex &ci) { - Complex ca; - // FM demodulation double magsqRaw; Real deviation; diff --git a/plugins/channelrx/radioastronomy/radioastronomy.h b/plugins/channelrx/radioastronomy/radioastronomy.h index 7a2e5ac93..9b4b78f03 100644 --- a/plugins/channelrx/radioastronomy/radioastronomy.h +++ b/plugins/channelrx/radioastronomy/radioastronomy.h @@ -441,7 +441,6 @@ private: int m_rotatorFeatureSetIndex; int m_rotatorFeatureIndex; - void (*sweepState)(); float m_sweep1; // Current sweep position float m_sweep2; float m_sweep1Stop; diff --git a/plugins/channelrx/radioclock/radioclocksink.cpp b/plugins/channelrx/radioclock/radioclocksink.cpp index 7a3f5df8e..18decb958 100644 --- a/plugins/channelrx/radioclock/radioclocksink.cpp +++ b/plugins/channelrx/radioclock/radioclocksink.cpp @@ -796,8 +796,6 @@ void RadioClockSink::wwvb() void RadioClockSink::processOneSample(Complex &ci) { - Complex ca; - // Calculate average and peak levels for level meter Real re = ci.real() / SDR_RX_SCALEF; Real im = ci.imag() / SDR_RX_SCALEF; diff --git a/sdrbase/device/deviceset.cpp b/sdrbase/device/deviceset.cpp index cb2b2c463..0302f3f1d 100644 --- a/sdrbase/device/deviceset.cpp +++ b/sdrbase/device/deviceset.cpp @@ -248,7 +248,7 @@ void DeviceSet::loadTxChannelSettings(const Preset *preset, PluginAPI *pluginAPI for (int i = 0; i < preset->getChannelCount(); i++) { const Preset::ChannelConfig& channelConfig = preset->getChannelConfig(i); - ChannelAPI *channelAPI; + ChannelAPI *channelAPI = nullptr; // if we have one instance available already, use it @@ -346,7 +346,7 @@ void DeviceSet::loadMIMOChannelSettings(const Preset *preset, PluginAPI *pluginA for (int i = 0; i < preset->getChannelCount(); i++) { const Preset::ChannelConfig& channelConfig = preset->getChannelConfig(i); - ChannelAPI *channelAPI; + ChannelAPI *channelAPI = nullptr; // if we have one instance available already, use it diff --git a/sdrbase/pipes/objectpipe.h b/sdrbase/pipes/objectpipe.h index 3d26935a5..be2757b90 100644 --- a/sdrbase/pipes/objectpipe.h +++ b/sdrbase/pipes/objectpipe.h @@ -27,8 +27,6 @@ class SDRBASE_API ObjectPipe : public QObject Q_OBJECT public: ObjectPipe(); - ObjectPipe(const ObjectPipe&) = default; - ObjectPipe& operator=(const ObjectPipe&) = default; void setToBeDeleted(int reason, QObject *object); void unsetToBeDeleted(); diff --git a/sdrgui/gui/glspectrum.cpp b/sdrgui/gui/glspectrum.cpp index 9de614980..772137315 100644 --- a/sdrgui/gui/glspectrum.cpp +++ b/sdrgui/gui/glspectrum.cpp @@ -3337,6 +3337,8 @@ void GLSpectrum::mousePressEvent(QMouseEvent* event) case SpectrumAnnotationMarker::ShowFull: (*iMarker)->m_show = SpectrumAnnotationMarker::ShowTop; break; + case SpectrumAnnotationMarker::Hidden: + break; } selected = true; } @@ -3836,13 +3838,13 @@ QString GLSpectrum::displayScaledF(float value, char type, int precision, bool s } else { - if (posValue < 1000) { + if (posValue < 1e3) { return tr("%1").arg(QString::number(value, type, precision)); - } else if (posValue < 1000000) { + } else if (posValue < 1e6) { return tr("%1%2").arg(QString::number(value / 1000.0, type, precision)).arg(showMult ? "k" : ""); - } else if (posValue < 1000000000) { + } else if (posValue < 1e9) { return tr("%1%2").arg(QString::number(value / 1000000.0, type, precision)).arg(showMult ? "M" : ""); - } else if (posValue < 1000000000000) { + } else if (posValue < 1e12) { return tr("%1%2").arg(QString::number(value / 1000000000.0, type, precision)).arg(showMult ? "G" : ""); } else { return tr("%1").arg(QString::number(value, 'e', precision));