From ac4d1d11028f23121a7c7c1d1d134f8f43ff6f8f Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Wed, 25 Mar 2026 19:06:11 +0000 Subject: [PATCH] Fix warnings --- sdrbase/channel/channelwebapiutils.cpp | 2 +- sdrgui/gui/glspectrumview.cpp | 26 +++++++++++++------------- sdrgui/gui/glspectrumview.h | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sdrbase/channel/channelwebapiutils.cpp b/sdrbase/channel/channelwebapiutils.cpp index 987c0cbd3..6731f00b7 100644 --- a/sdrbase/channel/channelwebapiutils.cpp +++ b/sdrbase/channel/channelwebapiutils.cpp @@ -2167,7 +2167,7 @@ void DeviceOpener::deviceSetAdded(int index, DeviceAPI *device) void DeviceOpener::deviceChanged(int index) { - (int) index; + (void) index; // Apply device settings QString errorMessage; diff --git a/sdrgui/gui/glspectrumview.cpp b/sdrgui/gui/glspectrumview.cpp index 8ed6924ee..cf26f5f1c 100644 --- a/sdrgui/gui/glspectrumview.cpp +++ b/sdrgui/gui/glspectrumview.cpp @@ -970,9 +970,9 @@ bool GLSpectrumView::writeImage(const QString& filename) // Get center frequency for currently displayed spectrum (which is selected via the scroll bar) qint64 GLSpectrumView::getDisplayedCenterFrequency() const { - std::size_t idx = m_spectrumBuffer.size() - 1 - scrollBarValue(); + int idx = m_spectrumBuffer.size() - 1 - scrollBarValue(); - if ((idx >= 0) && (idx < m_spectrumBuffer.size())) { + if ((idx >= 0) && (idx < (int) m_spectrumBuffer.size())) { return m_spectrumBuffer[idx].m_centerFrequency; } else { return m_centerFrequency; @@ -982,9 +982,9 @@ qint64 GLSpectrumView::getDisplayedCenterFrequency() const // Get sample rate for currently displayed spectrum (which is selected via the scroll bar) quint32 GLSpectrumView::getDisplayedSampleRate() const { - std::size_t idx = m_spectrumBuffer.size() - 1 - scrollBarValue(); + int idx = m_spectrumBuffer.size() - 1 - scrollBarValue(); - if ((idx >= 0) && (idx < m_spectrumBuffer.size())) { + if ((idx >= 0) && (idx < (int) m_spectrumBuffer.size())) { return m_spectrumBuffer[idx].m_sampleRate; } else { return m_sampleRate; @@ -995,11 +995,11 @@ void GLSpectrumView::redrawSpectrum() { if (m_spectrumBuffer.size() > 0) { - std::size_t idx = m_spectrumBuffer.size() - 1 - scrollBarValue(); + int idx = m_spectrumBuffer.size() - 1 - scrollBarValue(); - if (idx >= 0 && idx < m_spectrumBuffer.size()) + if (idx >= 0 && idx < (int) m_spectrumBuffer.size()) { - updateHistogram(m_spectrumBuffer[idx].m_spectrum, m_fftSize, m_fftMin, m_nbBins); + updateHistogram(m_spectrumBuffer[idx].m_spectrum, m_fftMin, m_nbBins); m_currentSpectrum = m_spectrumBuffer[idx].m_spectrum; } } @@ -1009,7 +1009,7 @@ void GLSpectrumView::redrawWaterfallAnd3DSpectrogram() { if (m_waterfallBuffer && m_spectrumBuffer.size() > 0) { - std::size_t idx = m_spectrumBuffer.size() - 1 - m_waterfallBuffer->height() - scrollBarValue(); + int idx = m_spectrumBuffer.size() - 1 - m_waterfallBuffer->height() - scrollBarValue(); m_waterfallBufferPos = 0; m_waterfallTexturePos = 0; @@ -1116,13 +1116,13 @@ void GLSpectrumView::newSpectrum(const Real *spectrum, int fftSize, quint32 samp { updateWaterfall(spectrum, m_fftSize, m_fftMin, m_nbBins); update3DSpectrogram(spectrum, m_fftSize, m_fftMin, m_nbBins); - updateHistogram(spectrum, m_fftSize, m_fftMin, m_nbBins); + updateHistogram(spectrum, m_fftMin, m_nbBins); } else { updateWaterfall(m_spectrumBuffer[idx].m_spectrum, m_fftSize, m_fftMin, m_nbBins); update3DSpectrogram(m_spectrumBuffer[idx].m_spectrum, m_fftSize, m_fftMin, m_nbBins); - updateHistogram(m_spectrumBuffer[idx].m_spectrum, m_fftSize, m_fftMin, m_nbBins); + updateHistogram(m_spectrumBuffer[idx].m_spectrum, m_fftMin, m_nbBins); } } @@ -1238,7 +1238,7 @@ void GLSpectrumView::update3DSpectrogram(const Real *spectrum, int fftSize, int } } -void GLSpectrumView::updateHistogram(const Real *spectrum, int fftSize, int fftMin, int nbBins) +void GLSpectrumView::updateHistogram(const Real *spectrum, int fftMin, int nbBins) { quint8* b = m_histogram; int fftMulSize = 100 * nbBins; @@ -3248,9 +3248,9 @@ void GLSpectrumView::stopDrag() // value is [0,m_waterfallHeight], as set in setTimeScaleRange() QString GLSpectrumView::formatTick(double value) const { - std::size_t idx = value - scrollBarValue() + m_spectrumBuffer.size() - 1 - m_waterfallHeight; + int idx = value - scrollBarValue() + m_spectrumBuffer.size() - 1 - m_waterfallHeight; - if ((idx >= 0) && (idx < m_spectrumBuffer.size())) + if ((idx >= 0) && (idx < (int) m_spectrumBuffer.size())) { QDateTime dt = m_spectrumBuffer[idx].m_dateTime; diff --git a/sdrgui/gui/glspectrumview.h b/sdrgui/gui/glspectrumview.h index 7e73de90b..c06107d50 100644 --- a/sdrgui/gui/glspectrumview.h +++ b/sdrgui/gui/glspectrumview.h @@ -525,7 +525,7 @@ private: void updateWaterfall(const Real *spectrum, int fftSize, int fftMin, int nbBins); void clear3DSpectrogramRow(int nbBins); void update3DSpectrogram(const Real *spectrum, int fftSize, int fftMin, int nbBins); - void updateHistogram(const Real *spectrum, int fftSize, int fftMin, int nbBins); + void updateHistogram(const Real *spectrum, int fftMin, int nbBins); void initializeGL(); void resizeGL(int width, int height);