From ebe4f4feba7f83ce1baece1f2d0a1f10973adbb5 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Wed, 14 Jan 2026 10:56:18 +0000 Subject: [PATCH] Fix lint warnings. --- plugins/channelrx/demodinmarsat/inmarsatdemod.cpp | 6 +++--- plugins/channelrx/demodinmarsat/inmarsatdemod.h | 2 +- .../channelrx/demodinmarsat/inmarsatdemodbaseband.h | 2 +- plugins/channelrx/demodinmarsat/inmarsatdemodgui.cpp | 6 +++--- plugins/channelrx/demodinmarsat/inmarsatdemodgui.h | 6 +++--- .../channelrx/demodinmarsat/inmarsatdemodplugin.cpp | 2 +- .../demodinmarsat/inmarsatdemodsettings.cpp | 4 ++-- .../channelrx/demodinmarsat/inmarsatdemodsettings.h | 4 ++-- plugins/channelrx/demodinmarsat/inmarsatdemodsink.h | 12 ++++++------ 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/plugins/channelrx/demodinmarsat/inmarsatdemod.cpp b/plugins/channelrx/demodinmarsat/inmarsatdemod.cpp index 19401d045..8ac7b975f 100644 --- a/plugins/channelrx/demodinmarsat/inmarsatdemod.cpp +++ b/plugins/channelrx/demodinmarsat/inmarsatdemod.cpp @@ -143,7 +143,7 @@ bool InmarsatDemod::handleMessage(const Message& cmd) { if (MsgConfigureInmarsatDemod::match(cmd)) { - MsgConfigureInmarsatDemod& cfg = (MsgConfigureInmarsatDemod&) cmd; + const MsgConfigureInmarsatDemod& cfg = (const MsgConfigureInmarsatDemod&) cmd; qDebug() << "InmarsatDemod::handleMessage: MsgConfigureInmarsatDemod"; applySettings(cfg.getSettings(), cfg.getSettingsKeys(), cfg.getForce()); @@ -151,7 +151,7 @@ bool InmarsatDemod::handleMessage(const Message& cmd) } else if (DSPSignalNotification::match(cmd)) { - DSPSignalNotification& notif = (DSPSignalNotification&) cmd; + const DSPSignalNotification& notif = (const DSPSignalNotification&) cmd; m_basebandSampleRate = notif.getSampleRate(); m_centerFrequency = notif.getCenterFrequency(); // Forward to the sink @@ -168,7 +168,7 @@ bool InmarsatDemod::handleMessage(const Message& cmd) else if (MainCore::MsgPacket::match(cmd)) { // Forward to GUI - MainCore::MsgPacket& report = (MainCore::MsgPacket&)cmd; + const MainCore::MsgPacket& report = (const MainCore::MsgPacket&)cmd; if (getMessageQueueToGUI()) { MainCore::MsgPacket *msg = new MainCore::MsgPacket(report); diff --git a/plugins/channelrx/demodinmarsat/inmarsatdemod.h b/plugins/channelrx/demodinmarsat/inmarsatdemod.h index 6be6fffee..6e934edec 100644 --- a/plugins/channelrx/demodinmarsat/inmarsatdemod.h +++ b/plugins/channelrx/demodinmarsat/inmarsatdemod.h @@ -68,7 +68,7 @@ public: { } }; - InmarsatDemod(DeviceAPI *deviceAPI); + explicit InmarsatDemod(DeviceAPI *deviceAPI); virtual ~InmarsatDemod(); virtual void destroy() { delete this; } virtual void setDeviceAPI(DeviceAPI *deviceAPI); diff --git a/plugins/channelrx/demodinmarsat/inmarsatdemodbaseband.h b/plugins/channelrx/demodinmarsat/inmarsatdemodbaseband.h index 8beefc1f4..d6feac73e 100644 --- a/plugins/channelrx/demodinmarsat/inmarsatdemodbaseband.h +++ b/plugins/channelrx/demodinmarsat/inmarsatdemodbaseband.h @@ -64,7 +64,7 @@ public: { } }; - InmarsatDemodBaseband(InmarsatDemod *packetDemod); + explicit InmarsatDemodBaseband(InmarsatDemod *packetDemod); ~InmarsatDemodBaseband(); void reset(); void startWork(); diff --git a/plugins/channelrx/demodinmarsat/inmarsatdemodgui.cpp b/plugins/channelrx/demodinmarsat/inmarsatdemodgui.cpp index e9be80e43..e2c86c973 100644 --- a/plugins/channelrx/demodinmarsat/inmarsatdemodgui.cpp +++ b/plugins/channelrx/demodinmarsat/inmarsatdemodgui.cpp @@ -45,7 +45,7 @@ #include "inmarsatdemod.h" -MultipartMessage::MultipartMessage(int id, std::map params, const QDateTime& dateTime) : +MultipartMessage::MultipartMessage(int id, std::map& params, const QDateTime& dateTime) : m_id(id), m_icon(nullptr), m_latitude(0.0f), @@ -54,7 +54,7 @@ MultipartMessage::MultipartMessage(int id, std::map pa update(params, dateTime); } -void MultipartMessage::update(std::map params, const QDateTime& dateTime) +void MultipartMessage::update(std::map& params, const QDateTime& dateTime) { m_dateTime = dateTime; m_service = QString::fromStdString(params["serviceCodeAndAddressName"]); @@ -1324,7 +1324,7 @@ void InmarsatDemodGUI::handleInputMessages() { Message* message; - while ((message = getInputMessageQueue()->pop()) != 0) + while ((message = getInputMessageQueue()->pop()) != nullptr) { if (handleMessage(*message)) { diff --git a/plugins/channelrx/demodinmarsat/inmarsatdemodgui.h b/plugins/channelrx/demodinmarsat/inmarsatdemodgui.h index af84a326d..d213149cc 100644 --- a/plugins/channelrx/demodinmarsat/inmarsatdemodgui.h +++ b/plugins/channelrx/demodinmarsat/inmarsatdemodgui.h @@ -62,8 +62,8 @@ struct MessagePart { class MultipartMessage { public: - MultipartMessage(int id, std::map params, const QDateTime& dateTime); - void update(std::map params, const QDateTime& dateTime); + explicit MultipartMessage(int id, std::map& params, const QDateTime& dateTime); + void update(std::map& params, const QDateTime& dateTime); void addPart(const MessagePart& part); QString getMessage() const; int getParts() const { return m_parts.size(); } @@ -157,7 +157,7 @@ private: QRegularExpression m_typeRE; QRegularExpression m_messageRE; - explicit InmarsatDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent = 0); + explicit InmarsatDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent = nullptr); virtual ~InmarsatDemodGUI(); void blockApplySettings(bool block); diff --git a/plugins/channelrx/demodinmarsat/inmarsatdemodplugin.cpp b/plugins/channelrx/demodinmarsat/inmarsatdemodplugin.cpp index b6bd1e5ac..b90b84c9e 100644 --- a/plugins/channelrx/demodinmarsat/inmarsatdemodplugin.cpp +++ b/plugins/channelrx/demodinmarsat/inmarsatdemodplugin.cpp @@ -79,7 +79,7 @@ ChannelGUI* InmarsatDemodPlugin::createRxChannelGUI( { (void) deviceUISet; (void) rxChannel; - return 0; + return nullptr; } #else ChannelGUI* InmarsatDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const diff --git a/plugins/channelrx/demodinmarsat/inmarsatdemodsettings.cpp b/plugins/channelrx/demodinmarsat/inmarsatdemodsettings.cpp index f1488d477..c190654a8 100644 --- a/plugins/channelrx/demodinmarsat/inmarsatdemodsettings.cpp +++ b/plugins/channelrx/demodinmarsat/inmarsatdemodsettings.cpp @@ -41,14 +41,14 @@ void InmarsatDemodSettings::appendDefaultColumnSettings() appendDefaultColumnSizes(m_messagesColumnSizes, INMARSATDEMOD_MESSAGES_COLUMNS); } -void InmarsatDemodSettings::appendDefaultColumnIndexes(QList& list, int size) +void InmarsatDemodSettings::appendDefaultColumnIndexes(QList& list, int size) const { while (list.size() < size) { list.append(list.size()); } } -void InmarsatDemodSettings::appendDefaultColumnSizes(QList& list, int size) +void InmarsatDemodSettings::appendDefaultColumnSizes(QList& list, int size) const { while (list.size() < size) { list.append(-1); diff --git a/plugins/channelrx/demodinmarsat/inmarsatdemodsettings.h b/plugins/channelrx/demodinmarsat/inmarsatdemodsettings.h index aaaf3d2f8..6cab74f57 100644 --- a/plugins/channelrx/demodinmarsat/inmarsatdemodsettings.h +++ b/plugins/channelrx/demodinmarsat/inmarsatdemodsettings.h @@ -86,8 +86,8 @@ struct InmarsatDemodSettings void applySettings(const QStringList& settingsKeys, const InmarsatDemodSettings& settings); QString getDebugString(const QStringList& settingsKeys, bool force = false) const; void appendDefaultColumnSettings(); - void appendDefaultColumnIndexes(QList& list, int size); - void appendDefaultColumnSizes(QList& list, int size); + void appendDefaultColumnIndexes(QList& list, int size) const; + void appendDefaultColumnSizes(QList& list, int size) const; }; #endif /* INCLUDE_INMARSATDEMODSETTINGS_H */ diff --git a/plugins/channelrx/demodinmarsat/inmarsatdemodsink.h b/plugins/channelrx/demodinmarsat/inmarsatdemodsink.h index 62d8f0fe9..352339561 100644 --- a/plugins/channelrx/demodinmarsat/inmarsatdemodsink.h +++ b/plugins/channelrx/demodinmarsat/inmarsatdemodsink.h @@ -42,7 +42,7 @@ class ScopeVis; // Automatic Gain Control class AGC { public: - AGC(); + explicit AGC(); Complex processOneSample(const Complex &iq, bool locked); Real getGain() const { return m_gain; } Real getAverage() const { return m_agcMovingAverage.instantAverage(); } @@ -54,7 +54,7 @@ private: class FrequencyOffsetEstimate { public: - FrequencyOffsetEstimate(); + explicit FrequencyOffsetEstimate(); ~FrequencyOffsetEstimate(); void processOneSample(Complex& iq, bool locked); Real getFreqHz() const { return m_freqOffsetHz; } @@ -81,7 +81,7 @@ private: // Circular symbol/bit buffer for unique word detection, EVM calculation and equalizer training class SymbolBuffer { public: - SymbolBuffer(int size=64*162); + explicit SymbolBuffer(int size=64*162); void push(quint8 bit, Complex symbol); bool checkUW() const; Complex getSymbol(int idx) const; @@ -98,7 +98,7 @@ private: class Equalizer { public: - Equalizer(int samplesPerSymbol); + explicit Equalizer(int samplesPerSymbol); virtual ~Equalizer() {} virtual Complex processOneSample(Complex x, bool update, bool training=false) = 0; Complex getError() const { return m_error; } @@ -114,14 +114,14 @@ protected: // Constant Modulus Equalizer class CMAEqualizer : public Equalizer { public: - CMAEqualizer(int samplesPerSymbol); + explicit CMAEqualizer(int samplesPerSymbol); Complex processOneSample(Complex x, bool update, bool training=false) override; }; // Least Mean Square Equalizer class LMSEqualizer : public Equalizer { public: - LMSEqualizer(int samplesPerSymbol); + explicit LMSEqualizer(int samplesPerSymbol); Complex processOneSample(Complex x, bool update, bool training=false) override; };