diff --git a/devices/usrp/deviceusrp.cpp b/devices/usrp/deviceusrp.cpp index 0887fcc7d..537652dab 100644 --- a/devices/usrp/deviceusrp.cpp +++ b/devices/usrp/deviceusrp.cpp @@ -283,7 +283,7 @@ bool DeviceUSRP::setMasterClockRateForSampleRate(uhd::usrp::multi_usrp::sptr usr return true; } -void DeviceUSRP::enableAutoMasterClockRate(uhd::usrp::multi_usrp::sptr usrp) +void DeviceUSRP::enableAutoMasterClockRate(const uhd::usrp::multi_usrp::sptr& usrp) { usrp->get_device()->get_tree()->access("/mboards/0/auto_tick_rate").set(true); } diff --git a/devices/usrp/deviceusrp.h b/devices/usrp/deviceusrp.h index b345e72e0..b1de216af 100644 --- a/devices/usrp/deviceusrp.h +++ b/devices/usrp/deviceusrp.h @@ -56,7 +56,7 @@ public: * Returns true if automatic selection should be re-enabled with enableAutoMasterClockRate() once the sample rates have been set. */ static bool setMasterClockRateForSampleRate(uhd::usrp::multi_usrp::sptr usrp, double sampleRate, size_t nbChannels); - static void enableAutoMasterClockRate(uhd::usrp::multi_usrp::sptr usrp); + static void enableAutoMasterClockRate(const uhd::usrp::multi_usrp::sptr& usrp); /** * Set sample rate of a single channel. If it can't be achieved with a master clock rate UHD chooses automatically diff --git a/devices/usrp/deviceusrpparam.cpp b/devices/usrp/deviceusrpparam.cpp index 2fb2ab337..e21396c7f 100644 --- a/devices/usrp/deviceusrpparam.cpp +++ b/devices/usrp/deviceusrpparam.cpp @@ -17,6 +17,7 @@ /////////////////////////////////////////////////////////////////////////////////// #include +#include #include #include "deviceusrpparam.h" @@ -132,7 +133,7 @@ bool DeviceUSRPParams::open(const QString &deviceStr, bool channelNumOnly) } catch (...) { } } - } restoreAutoTickRate{properties, autoTickRatePath}; + } restoreAutoTickRate{std::move(properties), autoTickRatePath}; // Find max and min sample rate, for max and min master clock rates m_dev->set_master_clock_rate(clockRange.start()); diff --git a/modemdvb/dvbt2receiver.cpp b/modemdvb/dvbt2receiver.cpp index 45614801f..59f17e31b 100644 --- a/modemdvb/dvbt2receiver.cpp +++ b/modemdvb/dvbt2receiver.cpp @@ -946,7 +946,6 @@ void Receiver::decodeFrame(InterleavingFrame& frame, FEC& fec, Turn& turn) } const int ncells = cellsPerFECBlock(plp.m_fecType, plp.m_constellation); - const int eta = bitsPerCell(plp.m_constellation); const int nblocks = plp.m_numBlocks; const bool ti = plp.m_timeIlLength > 0; const int nti = ti ? plp.tiBlocks() : nblocks; // Without time interleaving, each FEC block is on its own diff --git a/plugins/channelrx/demoddrm/drmdemodsettings.cpp b/plugins/channelrx/demoddrm/drmdemodsettings.cpp index 2654e7c70..fc5940177 100644 --- a/plugins/channelrx/demoddrm/drmdemodsettings.cpp +++ b/plugins/channelrx/demoddrm/drmdemodsettings.cpp @@ -106,7 +106,7 @@ void DRMDemodSettings::sanitize() m_volume = std::clamp(m_volume, 0.0f, 10.0f); m_streamIndex = std::max(m_streamIndex, 0); - if (m_reverseAPIPort <= 1023 || m_reverseAPIPort > 65535) { + if (m_reverseAPIPort <= 1023) { m_reverseAPIPort = 8888; } @@ -261,7 +261,7 @@ void DRMDemodSettings::applySettings(const QStringList& settingsKeys, const DRMD } if (settingsKeys.contains("reverseAPIPort")) { - m_reverseAPIPort = settings.m_reverseAPIPort > 1023 && settings.m_reverseAPIPort < 65536 + m_reverseAPIPort = settings.m_reverseAPIPort > 1023 ? settings.m_reverseAPIPort : 8888; } if (settingsKeys.contains("reverseAPIDeviceIndex")) { diff --git a/plugins/channelrx/demoddvb/dvbdemodsink.cpp b/plugins/channelrx/demoddvb/dvbdemodsink.cpp index ea82921fd..56964c0df 100644 --- a/plugins/channelrx/demoddvb/dvbdemodsink.cpp +++ b/plugins/channelrx/demoddvb/dvbdemodsink.cpp @@ -206,11 +206,11 @@ DVBDemodSink::DVBDemodSink() : m_active(0), m_unlockedSamples(0), m_autoRate(0.0), - m_autoUnlockedSamples(0), m_spectrumBinHz(0.0), m_minSignalWidth(0.0), m_rateSearches(0), m_bandGeneration(0), + m_autoUnlockedSamples(0), m_s2GoodFrames(0), m_sGoodPackets(0), m_ncoShift(false), diff --git a/plugins/channelrx/demodwefax/wefaxdemodsink.cpp b/plugins/channelrx/demodwefax/wefaxdemodsink.cpp index 29b62cfc5..cd51d5ea6 100644 --- a/plugins/channelrx/demodwefax/wefaxdemodsink.cpp +++ b/plugins/channelrx/demodwefax/wefaxdemodsink.cpp @@ -347,6 +347,7 @@ void WefaxDemodSink::processOneSample(const Complex& sample) void WefaxDemodSink::processAcquisitionSample(float video, float frequencyHz, double magnitudeSquared) { + Q_UNUSED(frequencyHz); const WefaxDecoder::State state = m_decoder.state(); ++m_acquisitionSampleCount; diff --git a/plugins/feature/denoiser/vst3effect.cpp b/plugins/feature/denoiser/vst3effect.cpp index 103f98861..987fef13b 100644 --- a/plugins/feature/denoiser/vst3effect.cpp +++ b/plugins/feature/denoiser/vst3effect.cpp @@ -568,7 +568,7 @@ struct Vst3Effect::Impl { Module module; QByteArray classId; - ComponentHandler handler = {{&handlerVtbl}, {}}; + ComponentHandler handler = {{&handlerVtbl}, {}, {}}; std::function detachEditor; Steinberg_Vst_IComponent *component = nullptr; Steinberg_Vst_IAudioProcessor *processor = nullptr; diff --git a/sdrbench/test_psk31.cpp b/sdrbench/test_psk31.cpp index 5e529603d..7fa306aa9 100644 --- a/sdrbench/test_psk31.cpp +++ b/sdrbench/test_psk31.cpp @@ -338,7 +338,7 @@ QString runChannelTrial( } constexpr int blockSize = 1000; - for (int i = 0; i < samples.size(); i += blockSize) { + for (std::size_t i = 0; i < samples.size(); i += blockSize) { demod.feed(samples.begin() + i, samples.begin() + std::min(i + blockSize, samples.size())); }