From 55eb6cc9514fca66c8e965c2b8183372aec42169 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 14 Nov 2020 11:13:32 +0100 Subject: [PATCH] Fixed -Wunused-parameter warnings --- .../beamsteeringcwmodplugin.cpp | 2 + .../beamsteeringcwmodstreamsource.h | 2 +- .../beamsteeringcwmodwebapiadapter.cpp | 1 + .../interferometer/interferometercorr.cpp | 5 ++- .../interferometerwebapiadapter.cpp | 4 +- .../demodadsb/adsbdemoddisplaydialog.cpp | 2 +- .../demodadsb/adsbdemoddisplaydialog.h | 10 ++--- plugins/channelrx/demodadsb/adsbdemodgui.cpp | 10 +++-- plugins/channelrx/demodadsb/adsbdemodgui.h | 22 +++++----- .../demodadsb/adsbdemodwebapiadapter.cpp | 1 + plugins/channelrx/demodadsb/adsbplugin.cpp | 4 +- plugins/channelrx/demodam/amdemodplugin.cpp | 4 +- .../demodam/amdemodwebapiadapter.cpp | 1 + .../demodbfm/bfmdemodwebapiadapter.cpp | 1 + plugins/channelrx/demodbfm/bfmplugin.cpp | 4 +- .../chirpchatdemodwebapiadapter.cpp | 1 + .../demodchirpchat/chirpchatplugin.cpp | 4 +- plugins/channelrx/demoddatv/leansdr/dvbs2.h | 2 + .../channelrx/demoddatv/leansdr/softword.h | 3 ++ plugins/channelrx/demoddsd/dsddemodplugin.cpp | 4 +- .../demoddsd/dsddemodwebapiadapter.cpp | 1 + .../demodfreedv/freedvdemodwebapiadapter.cpp | 1 + .../channelrx/demodfreedv/freedvplugin.cpp | 4 +- .../demodnfm/nfmdemodwebapiadapter.cpp | 1 + plugins/channelrx/demodnfm/nfmplugin.cpp | 4 +- .../demodssb/ssbdemodwebapiadapter.cpp | 1 + plugins/channelrx/demodssb/ssbplugin.cpp | 4 +- .../demodwfm/wfmdemodwebapiadapter.cpp | 1 + plugins/channelrx/demodwfm/wfmplugin.cpp | 4 +- plugins/channelrx/filesink/filesinkplugin.cpp | 2 + .../filesink/filesinkwebapiadapter.cpp | 1 + .../freqtracker/freqtrackerplugin.cpp | 4 +- .../freqtracker/freqtrackerwebapiadapter.cpp | 1 + .../channelrx/localsink/localsinkplugin.cpp | 4 +- .../localsink/localsinkwebapiadapter.cpp | 1 + .../channelrx/remotesink/remotesinkplugin.cpp | 4 +- .../remotesink/remotesinkwebapiadapter.cpp | 1 + .../sigmffilesink/sigmffilesinkplugin.cpp | 4 +- .../sigmffilesinkwebapiadapter.cpp | 1 + plugins/channelrx/udpsink/udpsinkplugin.cpp | 4 +- .../udpsink/udpsinkwebapiadapter.cpp | 1 + .../channeltx/filesource/filesourceplugin.cpp | 4 +- .../channeltx/filesource/filesourcesource.h | 2 +- .../filesource/filesourcewebapiadapter.cpp | 1 + .../localsource/localsourceplugin.cpp | 4 +- .../channeltx/localsource/localsourcesource.h | 2 +- .../localsource/localsourcewebapiadapter.cpp | 1 + .../mod802.15.4/ieee_802_15_4_modgui.cpp | 2 +- .../mod802.15.4/ieee_802_15_4_modgui.h | 2 +- .../mod802.15.4/ieee_802_15_4_modplugin.cpp | 4 +- .../mod802.15.4/ieee_802_15_4_modsource.cpp | 4 -- .../mod802.15.4/ieee_802_15_4_modsource.h | 12 +++--- .../ieee_802_15_4_modwebapiadapter.cpp | 1 + plugins/channeltx/modam/ammodplugin.cpp | 4 +- .../channeltx/modam/ammodwebapiadapter.cpp | 1 + plugins/channeltx/modatv/atvmodplugin.cpp | 4 +- .../channeltx/modatv/atvmodwebapiadapter.cpp | 1 + .../modchirpchat/chirpchatmodplugin.cpp | 4 +- .../modchirpchat/chirpchatmodsource.cpp | 4 -- .../modchirpchat/chirpchatmodsource.h | 3 +- .../chirpchatmodwebapiadapter.cpp | 1 + .../channeltx/modfreedv/freedvmodplugin.cpp | 4 +- .../modfreedv/freedvmodwebapiadapter.cpp | 1 + plugins/channeltx/modnfm/nfmmodplugin.cpp | 4 +- .../channeltx/modnfm/nfmmodwebapiadapter.cpp | 1 + plugins/channeltx/modpacket/packetmodgui.cpp | 4 +- plugins/channeltx/modpacket/packetmodgui.h | 4 +- .../channeltx/modpacket/packetmodplugin.cpp | 4 +- .../channeltx/modpacket/packetmodsource.cpp | 4 -- plugins/channeltx/modpacket/packetmodsource.h | 2 +- .../modpacket/packetmodwebapiadapter.cpp | 1 + plugins/channeltx/modssb/ssbmodplugin.cpp | 4 +- .../channeltx/modssb/ssbmodwebapiadapter.cpp | 1 + plugins/channeltx/modwfm/wfmmodplugin.cpp | 4 +- .../channeltx/modwfm/wfmmodwebapiadapter.cpp | 1 + .../remotesource/remotesourceplugin.cpp | 4 +- .../remotesource/remotesourcesource.h | 2 +- .../remotesourcewebapiadapter.cpp | 1 + .../channeltx/udpsource/udpsourceplugin.cpp | 4 +- plugins/channeltx/udpsource/udpsourcesource.h | 2 +- .../udpsource/udpsourcewebapiadapter.cpp | 1 + plugins/feature/afc/afc.cpp | 1 + plugins/feature/afc/afcwebapiadapter.cpp | 1 + plugins/feature/afc/afcworker.cpp | 7 ++-- plugins/feature/afc/afcworker.h | 5 +-- .../gs232controller/gs232controller.cpp | 1 + .../gs232controller/gs232controllergui.cpp | 2 + .../gs232controllerwebapiadapter.cpp | 1 + plugins/feature/rigctlserver/rigctlserver.cpp | 1 + .../rigctlserverwebapiadapter.cpp | 1 + plugins/feature/simpleptt/simpleptt.cpp | 1 + .../simpleptt/simplepttwebapiadapter.cpp | 1 + .../bladerf2mimowebapiadapter.cpp | 1 + .../samplemimo/limesdrmimo/limesdrmimo.cpp | 3 +- .../limesdrmimo/limesdrmimowebapiadapter.cpp | 2 +- plugins/samplemimo/metismiso/metismiso.cpp | 2 +- .../metismiso/metismisowebapiadapter.cpp | 1 + .../samplemimo/testmi/testmiwebapiadapter.cpp | 1 + plugins/samplemimo/testmosync/testmosync.cpp | 3 +- plugins/samplemimo/xtrxmimo/xtrxmimo.cpp | 12 +++--- plugins/samplemimo/xtrxmimo/xtrxmimo.h | 4 +- .../bladerf1outputwebapiadapter.cpp | 1 + .../bladerf2outputwebapiadapter.cpp | 1 + .../hackrfoutputwebapiadapter.cpp | 1 + .../limesdroutputwebapiadapter.cpp | 1 + .../localoutput/localoutputwebapiadapter.cpp | 1 + .../plutosdroutputwebapiadapter.cpp | 1 + .../remoteoutputwebapiadapter.cpp | 1 + .../soapysdroutputwebapiadapter.cpp | 1 + .../samplesink/usrpoutput/usrpoutputgui.cpp | 2 + .../usrpoutput/usrpoutputwebapiadapter.cpp | 1 + .../airspy/airspywebapiadapter.cpp | 1 + .../airspyhf/airspyhfwebapiadapter.cpp | 1 + .../samplesource/audioinput/audioinput.cpp | 11 +++-- plugins/samplesource/audioinput/audioinput.h | 4 +- .../samplesource/audioinput/audioinputgui.cpp | 2 + .../audioinput/audioinputwebapiadapter.cpp | 1 + .../bladerf1inputwebapiadapter.cpp | 1 + .../bladerf2inputwebapiadapter.cpp | 1 + .../fcdpro/fcdprowebapiadapter.cpp | 1 + .../fcdproplus/fcdpropluswebapiadapter.cpp | 1 + .../fileinput/fileinputwebapiadapter.cpp | 1 + .../hackrfinput/hackrfinputwebapiadapter.cpp | 1 + .../kiwisdr/kiwisdrwebapiadapter.cpp | 1 + .../samplesource/kiwisdr/kiwisdrworker.cpp | 1 + .../limesdrinputwebapiadapter.cpp | 1 + .../localinput/localinputwebapiadapter.cpp | 1 + .../perseus/perseuswebapiadapter.cpp | 1 + .../plutosdrinputwebapiadapter.cpp | 1 + .../remoteinput/remoteinputwebapiadapter.cpp | 1 + .../rtlsdr/rtlsdrwebapiadapter.cpp | 1 + .../sdrplay/sdrplaywebapiadapter.cpp | 1 + .../sigmffileinputwebapiadapter.cpp | 1 + .../soapysdrinputwebapiadapter.cpp | 1 + .../testsource/testsourcewebapiadapter.cpp | 1 + .../samplesource/usrpinput/usrpinputgui.cpp | 2 + .../usrpinput/usrpinputwebapiadapter.cpp | 1 + sdrbase/dsp/ctcssdetector.cpp | 16 -------- sdrbase/dsp/ctcssdetector.h | 1 - sdrbase/dsp/glspectruminterface.h | 6 ++- sdrbase/feature/feature.cpp | 1 + sdrbase/plugin/plugininterface.h | 4 ++ sdrbase/settings/preset.cpp | 2 +- sdrbase/webapi/webapiadapter.cpp | 3 ++ sdrgui/CMakeLists.txt | 2 - sdrgui/device/deviceuiset.cpp | 2 +- sdrgui/device/deviceuiset.h | 2 +- sdrgui/gui/ambedevicesdialog.cpp | 15 +++---- sdrgui/gui/ambedevicesdialog.h | 14 +++---- sdrgui/gui/comboboxnoarrow.cpp | 36 ----------------- sdrgui/gui/comboboxnoarrow.h | 40 ------------------- sdrgui/gui/deviceuserargsdialog.cpp | 8 ++-- sdrgui/gui/deviceuserargsdialog.h | 8 ++-- sdrgui/gui/doublevalidator.h | 2 +- sdrgui/mainwindow.cpp | 6 +-- sdrsrv/mainserver.cpp | 4 +- sdrsrv/mainserver.h | 2 +- 157 files changed, 290 insertions(+), 237 deletions(-) delete mode 100644 sdrgui/gui/comboboxnoarrow.cpp delete mode 100644 sdrgui/gui/comboboxnoarrow.h diff --git a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodplugin.cpp b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodplugin.cpp index d8189f0f2..f50f5bd84 100644 --- a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodplugin.cpp +++ b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodplugin.cpp @@ -76,6 +76,8 @@ ChannelGUI* BeamSteeringCWModPlugin::createMIMOChannelGUI( DeviceUISet *deviceUISet, MIMOChannel *mimoChannel) const { + (void) deviceUISet; + (void) mimoChannel; return nullptr; } #else diff --git a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodstreamsource.h b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodstreamsource.h index d189a4064..af5a922bc 100644 --- a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodstreamsource.h +++ b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodstreamsource.h @@ -28,7 +28,7 @@ public: virtual void pull(SampleVector::iterator begin, unsigned int nbSamples); virtual void pullOne(Sample& sample); - virtual void prefetch(unsigned int nbSamples) {} // prefetching of samples is not implemented + virtual void prefetch(unsigned int nbSamples) { (void) nbSamples; } // prefetching of samples is not implemented void reset(); void setPhase(float phase); diff --git a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodwebapiadapter.cpp b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodwebapiadapter.cpp index faf74b1da..c1f1dce41 100644 --- a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodwebapiadapter.cpp +++ b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodwebapiadapter.cpp @@ -43,6 +43,7 @@ int BeamSteeringCWModWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; BeamSteeringCWMod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); diff --git a/plugins/channelmimo/interferometer/interferometercorr.cpp b/plugins/channelmimo/interferometer/interferometercorr.cpp index dc77f9dc5..b04e95b81 100644 --- a/plugins/channelmimo/interferometer/interferometercorr.cpp +++ b/plugins/channelmimo/interferometer/interferometercorr.cpp @@ -38,14 +38,17 @@ std::complex s2cNorm(const Sample& s) } Sample sFirst(const Sample& a, const Sample& b) { + (void) b; return a; } Sample sSecond(const Sample& a, const Sample& b) { + (void) a; return b; } Sample sSecondInv(const Sample& a, const Sample& b) { + (void) a; return Sample{-b.real(), -b.imag()}; } @@ -719,4 +722,4 @@ void InterferometerCorrelator::setPhase(int phase) m_sin = d_sin; m_cos = d_cos; } -} \ No newline at end of file +} diff --git a/plugins/channelmimo/interferometer/interferometerwebapiadapter.cpp b/plugins/channelmimo/interferometer/interferometerwebapiadapter.cpp index 6089f91bd..789e54e05 100644 --- a/plugins/channelmimo/interferometer/interferometerwebapiadapter.cpp +++ b/plugins/channelmimo/interferometer/interferometerwebapiadapter.cpp @@ -140,7 +140,7 @@ int InterferometerWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { - (void) force; + (void) force; // no action (void) errorMessage; webapiUpdateChannelSettings(m_settings, m_glScopeSettings, m_glSpectrumSettings, channelSettingsKeys, response); return 200; @@ -384,4 +384,4 @@ QColor InterferometerWebAPIAdapter::intToQColor(int intColor) int g = bg % 256; int b = bg / 256; return QColor(r, g, b); -} \ No newline at end of file +} diff --git a/plugins/channelrx/demodadsb/adsbdemoddisplaydialog.cpp b/plugins/channelrx/demodadsb/adsbdemoddisplaydialog.cpp index 836c9a455..4b29c5b17 100644 --- a/plugins/channelrx/demodadsb/adsbdemoddisplaydialog.cpp +++ b/plugins/channelrx/demodadsb/adsbdemoddisplaydialog.cpp @@ -56,7 +56,7 @@ void ADSBDemodDisplayDialog::accept() QDialog::accept(); } -void ADSBDemodDisplayDialog::on_font_clicked(bool checked) +void ADSBDemodDisplayDialog::on_font_clicked() { bool ok; QFont font = QFontDialog::getFont(&ok, QFont(m_fontName, m_fontSize), this); diff --git a/plugins/channelrx/demodadsb/adsbdemoddisplaydialog.h b/plugins/channelrx/demodadsb/adsbdemoddisplaydialog.h index 6ee9fb9c9..c420ff7c5 100644 --- a/plugins/channelrx/demodadsb/adsbdemoddisplaydialog.h +++ b/plugins/channelrx/demodadsb/adsbdemoddisplaydialog.h @@ -25,24 +25,24 @@ class ADSBDemodDisplayDialog : public QDialog { Q_OBJECT public: - explicit ADSBDemodDisplayDialog(int removeTimeout, float airportRange, ADSBDemodSettings::AirportType airportMinimumSize, + explicit ADSBDemodDisplayDialog(int removeTimeout, float airportRange, ADSBDemodSettings::AirportType airportMinimumSize, bool displayHeliports, bool siUnits, QString fontName, int fontSize, bool displayDemodStats, bool autoResizeTableColumns, QWidget* parent = 0); ~ADSBDemodDisplayDialog(); int m_removeTimeout; float m_airportRange; - ADSBDemodSettings::AirportType m_airportMinimumSize; + ADSBDemodSettings::AirportType m_airportMinimumSize; bool m_displayHeliports; - bool m_siUnits; + bool m_siUnits; QString m_fontName; int m_fontSize; bool m_displayDemodStats; bool m_autoResizeTableColumns; - + private slots: void accept(); - void on_font_clicked(bool checked = false); + void on_font_clicked(); private: Ui::ADSBDemodDisplayDialog* ui; diff --git a/plugins/channelrx/demodadsb/adsbdemodgui.cpp b/plugins/channelrx/demodadsb/adsbdemodgui.cpp index f0e23aeef..e79d83e96 100644 --- a/plugins/channelrx/demodadsb/adsbdemodgui.cpp +++ b/plugins/channelrx/demodadsb/adsbdemodgui.cpp @@ -1238,6 +1238,7 @@ void ADSBDemodGUI::on_feed_clicked(bool checked) void ADSBDemodGUI::on_adsbData_cellClicked(int row, int column) { + (void) column; // Get ICAO of aircraft in row clicked int icao = ui->adsbData->item(row, 0)->text().toInt(nullptr, 16); if (m_aircraft.contains(icao)) @@ -1292,12 +1293,14 @@ void ADSBDemodGUI::on_adsbData_cellDoubleClicked(int row, int column) // Columns in table reordered void ADSBDemodGUI::adsbData_sectionMoved(int logicalIndex, int oldVisualIndex, int newVisualIndex) { + (void) oldVisualIndex; m_settings.m_columnIndexes[logicalIndex] = newVisualIndex; } // Column in table resized (when hidden size is 0) void ADSBDemodGUI::adsbData_sectionResized(int logicalIndex, int oldSize, int newSize) { + (void) oldSize; m_settings.m_columnSizes[logicalIndex] = newSize; } @@ -1310,6 +1313,7 @@ void ADSBDemodGUI::columnSelectMenu(QPoint pos) // Hide/show column when menu selected void ADSBDemodGUI::columnSelectMenuChecked(bool checked) { + (void) checked; QAction* action = qobject_cast(sender()); if (action != nullptr) { @@ -1347,7 +1351,7 @@ void ADSBDemodGUI::on_demodModeS_clicked(bool checked) applySettings(); } -void ADSBDemodGUI::on_getOSNDB_clicked(bool checked) +void ADSBDemodGUI::on_getOSNDB_clicked() { // Don't try to download while already in progress if (m_progressDialog == nullptr) @@ -1367,7 +1371,7 @@ void ADSBDemodGUI::on_getOSNDB_clicked(bool checked) } } -void ADSBDemodGUI::on_getAirportDB_clicked(bool checked) +void ADSBDemodGUI::on_getAirportDB_clicked() { // Don't try to download while already in progress if (m_progressDialog == nullptr) @@ -1735,7 +1739,7 @@ void ADSBDemodGUI::feedSelect() } // Show display settings dialog -void ADSBDemodGUI::on_displaySettings_clicked(bool checked) +void ADSBDemodGUI::on_displaySettings_clicked() { ADSBDemodDisplayDialog dialog(m_settings.m_removeTimeout, m_settings.m_airportRange, m_settings.m_airportMinimumSize, m_settings.m_displayHeliports, m_settings.m_siUnits, diff --git a/plugins/channelrx/demodadsb/adsbdemodgui.h b/plugins/channelrx/demodadsb/adsbdemodgui.h index 834252b79..512dd8ed7 100644 --- a/plugins/channelrx/demodadsb/adsbdemodgui.h +++ b/plugins/channelrx/demodadsb/adsbdemodgui.h @@ -242,7 +242,9 @@ public: bool setData(const QModelIndex &index, const QVariant& value, int role = Qt::EditRole) override; - Qt::ItemFlags flags(const QModelIndex &index) const override { + Qt::ItemFlags flags(const QModelIndex &index) const override + { + (void) index; return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable; } @@ -374,7 +376,9 @@ public: bool setData(const QModelIndex &index, const QVariant& value, int role = Qt::EditRole) override; - Qt::ItemFlags flags(const QModelIndex &index) const override { + Qt::ItemFlags flags(const QModelIndex &index) const override + { + (void) index; return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable; } @@ -537,12 +541,12 @@ private slots: void columnSelectMenu(QPoint pos); void columnSelectMenuChecked(bool checked = false); void on_spb_currentIndexChanged(int value); - void on_correlateFullPreamble_clicked(bool checked=false); - void on_demodModeS_clicked(bool checked=false); - void on_feed_clicked(bool checked=false); - void on_getOSNDB_clicked(bool checked = false); - void on_getAirportDB_clicked(bool checked = false); - void on_flightPaths_clicked(bool checked = false); + void on_correlateFullPreamble_clicked(bool checked); + void on_demodModeS_clicked(bool checked); + void on_feed_clicked(bool checked); + void on_getOSNDB_clicked(); + void on_getAirportDB_clicked(); + void on_flightPaths_clicked(bool checked); void onWidgetRolled(QWidget* widget, bool rollDown); void onMenuDialogCalled(const QPoint& p); void handleInputMessages(); @@ -552,7 +556,7 @@ private slots: void on_devicesRefresh_clicked(); void on_device_currentIndexChanged(int index); void feedSelect(); - void on_displaySettings_clicked(bool checked=false); + void on_displaySettings_clicked(); signals: void homePositionChanged(); }; diff --git a/plugins/channelrx/demodadsb/adsbdemodwebapiadapter.cpp b/plugins/channelrx/demodadsb/adsbdemodwebapiadapter.cpp index d18add79d..7d8d80def 100644 --- a/plugins/channelrx/demodadsb/adsbdemodwebapiadapter.cpp +++ b/plugins/channelrx/demodadsb/adsbdemodwebapiadapter.cpp @@ -44,6 +44,7 @@ int ADSBDemodWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; ADSBDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); diff --git a/plugins/channelrx/demodadsb/adsbplugin.cpp b/plugins/channelrx/demodadsb/adsbplugin.cpp index 0c83b7e01..169816b15 100644 --- a/plugins/channelrx/demodadsb/adsbplugin.cpp +++ b/plugins/channelrx/demodadsb/adsbplugin.cpp @@ -77,7 +77,9 @@ ChannelGUI* ADSBPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { - return 0; + (void) deviceUISet; + (void) rxChannel; + return nullptr; } #else ChannelGUI* ADSBPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const diff --git a/plugins/channelrx/demodam/amdemodplugin.cpp b/plugins/channelrx/demodam/amdemodplugin.cpp index 24ba579dc..71cd98bc8 100644 --- a/plugins/channelrx/demodam/amdemodplugin.cpp +++ b/plugins/channelrx/demodam/amdemodplugin.cpp @@ -58,7 +58,9 @@ ChannelGUI* AMDemodPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { - return 0; + (void) deviceUISet; + (void) rxChannel; + return nullptr; } #else ChannelGUI* AMDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const diff --git a/plugins/channelrx/demodam/amdemodwebapiadapter.cpp b/plugins/channelrx/demodam/amdemodwebapiadapter.cpp index 365d6051e..cc12e0e02 100644 --- a/plugins/channelrx/demodam/amdemodwebapiadapter.cpp +++ b/plugins/channelrx/demodam/amdemodwebapiadapter.cpp @@ -43,6 +43,7 @@ int AMDemodWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; AMDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); diff --git a/plugins/channelrx/demodbfm/bfmdemodwebapiadapter.cpp b/plugins/channelrx/demodbfm/bfmdemodwebapiadapter.cpp index 7e27a8a14..df8f898f7 100644 --- a/plugins/channelrx/demodbfm/bfmdemodwebapiadapter.cpp +++ b/plugins/channelrx/demodbfm/bfmdemodwebapiadapter.cpp @@ -43,6 +43,7 @@ int BFMDemodWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; BFMDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); diff --git a/plugins/channelrx/demodbfm/bfmplugin.cpp b/plugins/channelrx/demodbfm/bfmplugin.cpp index 52d9deb21..92f4b71f5 100644 --- a/plugins/channelrx/demodbfm/bfmplugin.cpp +++ b/plugins/channelrx/demodbfm/bfmplugin.cpp @@ -78,7 +78,9 @@ ChannelGUI* BFMPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { - return 0; + (void) deviceUISet; + (void) rxChannel; + return nullptr; } #else ChannelGUI* BFMPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const diff --git a/plugins/channelrx/demodchirpchat/chirpchatdemodwebapiadapter.cpp b/plugins/channelrx/demodchirpchat/chirpchatdemodwebapiadapter.cpp index 5a065c1ed..05a4234e3 100644 --- a/plugins/channelrx/demodchirpchat/chirpchatdemodwebapiadapter.cpp +++ b/plugins/channelrx/demodchirpchat/chirpchatdemodwebapiadapter.cpp @@ -42,6 +42,7 @@ int ChirpChatDemodWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; ChirpChatDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); ChirpChatDemod::webapiFormatChannelSettings(response, m_settings); diff --git a/plugins/channelrx/demodchirpchat/chirpchatplugin.cpp b/plugins/channelrx/demodchirpchat/chirpchatplugin.cpp index b58cf7175..82b29ee6c 100644 --- a/plugins/channelrx/demodchirpchat/chirpchatplugin.cpp +++ b/plugins/channelrx/demodchirpchat/chirpchatplugin.cpp @@ -74,7 +74,9 @@ ChannelGUI* ChirpChatPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { - return 0; + (void) deviceUISet; + (void) rxChannel; + return nullptr; } #else ChannelGUI* ChirpChatPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const diff --git a/plugins/channelrx/demoddatv/leansdr/dvbs2.h b/plugins/channelrx/demoddatv/leansdr/dvbs2.h index 7f7259d6c..a25fe01ca 100644 --- a/plugins/channelrx/demoddatv/leansdr/dvbs2.h +++ b/plugins/channelrx/demoddatv/leansdr/dvbs2.h @@ -1782,6 +1782,7 @@ struct s2_deinterleaver : runnable hard_sb accs[/*bps*/], int nacc, bool msb_first) { + (void) nacc; if (msb_first) { for (int b = 0; b < bps; ++b) @@ -1847,6 +1848,7 @@ struct s2_deinterleaver : runnable static inline void pack_qpsk_symbol(const llr_ss &ps, hard_sb *acc, int nacc) { + (void) nacc; // TBD Must match LLR law, see softsymb_harden. uint8_t s = llr_harden(ps.bits[0]) | (llr_harden(ps.bits[1]) << 1); *acc = (*acc << 2) | s; diff --git a/plugins/channelrx/demoddatv/leansdr/softword.h b/plugins/channelrx/demoddatv/leansdr/softword.h index a4a58dfd2..e38b8a9dd 100644 --- a/plugins/channelrx/demoddatv/leansdr/softword.h +++ b/plugins/channelrx/demoddatv/leansdr/softword.h @@ -32,6 +32,7 @@ inline void softword_set(hard_sb *p, int b, bool v) inline void softword_clear(hard_sb *p) { *p = 0; } inline bool softword_weight(const bool &l) { + (void) l; return true; } inline void softbit_set(bool *p, bool v) { *p = v; } @@ -66,6 +67,8 @@ inline void softwords_flip(hard_sb p[], int b) } uint8_t *softbytes_harden(hard_sb p[], int nbytes, uint8_t storage[]) { + (void) nbytes; + (void) storage; return p; } diff --git a/plugins/channelrx/demoddsd/dsddemodplugin.cpp b/plugins/channelrx/demoddsd/dsddemodplugin.cpp index 912ed6a04..cca8dcdb5 100644 --- a/plugins/channelrx/demoddsd/dsddemodplugin.cpp +++ b/plugins/channelrx/demoddsd/dsddemodplugin.cpp @@ -77,7 +77,9 @@ ChannelGUI* DSDDemodPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { - return 0; + (void) deviceUISet; + (void) rxChannel; + return nullptr; } #else ChannelGUI* DSDDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const diff --git a/plugins/channelrx/demoddsd/dsddemodwebapiadapter.cpp b/plugins/channelrx/demoddsd/dsddemodwebapiadapter.cpp index d42a806c6..64b954f4f 100644 --- a/plugins/channelrx/demoddsd/dsddemodwebapiadapter.cpp +++ b/plugins/channelrx/demoddsd/dsddemodwebapiadapter.cpp @@ -43,6 +43,7 @@ int DSDDemodWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; DSDDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); diff --git a/plugins/channelrx/demodfreedv/freedvdemodwebapiadapter.cpp b/plugins/channelrx/demodfreedv/freedvdemodwebapiadapter.cpp index 862694cc9..00870cdd6 100644 --- a/plugins/channelrx/demodfreedv/freedvdemodwebapiadapter.cpp +++ b/plugins/channelrx/demodfreedv/freedvdemodwebapiadapter.cpp @@ -43,6 +43,7 @@ int FreeDVDemodWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; FreeDVDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); diff --git a/plugins/channelrx/demodfreedv/freedvplugin.cpp b/plugins/channelrx/demodfreedv/freedvplugin.cpp index 86eed766f..56997af62 100644 --- a/plugins/channelrx/demodfreedv/freedvplugin.cpp +++ b/plugins/channelrx/demodfreedv/freedvplugin.cpp @@ -75,7 +75,9 @@ ChannelGUI* FreeDVPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { - return 0; + (void) deviceUISet; + (void) rxChannel; + return nullptr; } #else ChannelGUI* FreeDVPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const diff --git a/plugins/channelrx/demodnfm/nfmdemodwebapiadapter.cpp b/plugins/channelrx/demodnfm/nfmdemodwebapiadapter.cpp index 4630b4e67..592918621 100644 --- a/plugins/channelrx/demodnfm/nfmdemodwebapiadapter.cpp +++ b/plugins/channelrx/demodnfm/nfmdemodwebapiadapter.cpp @@ -43,6 +43,7 @@ int NFMDemodWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; NFMDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); diff --git a/plugins/channelrx/demodnfm/nfmplugin.cpp b/plugins/channelrx/demodnfm/nfmplugin.cpp index c53193bcb..c40236556 100644 --- a/plugins/channelrx/demodnfm/nfmplugin.cpp +++ b/plugins/channelrx/demodnfm/nfmplugin.cpp @@ -59,7 +59,9 @@ ChannelGUI* NFMPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { - return 0; + (void) deviceUISet; + (void) rxChannel; + return nullptr; } #else ChannelGUI* NFMPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const diff --git a/plugins/channelrx/demodssb/ssbdemodwebapiadapter.cpp b/plugins/channelrx/demodssb/ssbdemodwebapiadapter.cpp index 2afd2b9fd..cba5243ef 100644 --- a/plugins/channelrx/demodssb/ssbdemodwebapiadapter.cpp +++ b/plugins/channelrx/demodssb/ssbdemodwebapiadapter.cpp @@ -43,6 +43,7 @@ int SSBDemodWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; SSBDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); diff --git a/plugins/channelrx/demodssb/ssbplugin.cpp b/plugins/channelrx/demodssb/ssbplugin.cpp index 18c4c2b50..94a864744 100644 --- a/plugins/channelrx/demodssb/ssbplugin.cpp +++ b/plugins/channelrx/demodssb/ssbplugin.cpp @@ -59,7 +59,9 @@ ChannelGUI* SSBPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { - return 0; + (void) deviceUISet; + (void) rxChannel; + return nullptr; } #else ChannelGUI* SSBPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const diff --git a/plugins/channelrx/demodwfm/wfmdemodwebapiadapter.cpp b/plugins/channelrx/demodwfm/wfmdemodwebapiadapter.cpp index a1657e446..f48c26964 100644 --- a/plugins/channelrx/demodwfm/wfmdemodwebapiadapter.cpp +++ b/plugins/channelrx/demodwfm/wfmdemodwebapiadapter.cpp @@ -43,6 +43,7 @@ int WFMDemodWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; WFMDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); diff --git a/plugins/channelrx/demodwfm/wfmplugin.cpp b/plugins/channelrx/demodwfm/wfmplugin.cpp index 107555001..9542d2d90 100644 --- a/plugins/channelrx/demodwfm/wfmplugin.cpp +++ b/plugins/channelrx/demodwfm/wfmplugin.cpp @@ -60,7 +60,9 @@ ChannelGUI* WFMPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { - return 0; + (void) deviceUISet; + (void) rxChannel; + return nullptr; } #else ChannelGUI* WFMPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const diff --git a/plugins/channelrx/filesink/filesinkplugin.cpp b/plugins/channelrx/filesink/filesinkplugin.cpp index f932837a7..47865efb7 100644 --- a/plugins/channelrx/filesink/filesinkplugin.cpp +++ b/plugins/channelrx/filesink/filesinkplugin.cpp @@ -76,6 +76,8 @@ ChannelGUI* FileSinkPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { + (void) deviceUISet; + (void) rxChannel; return nullptr; } #else diff --git a/plugins/channelrx/filesink/filesinkwebapiadapter.cpp b/plugins/channelrx/filesink/filesinkwebapiadapter.cpp index 7226b860a..7d826d25a 100644 --- a/plugins/channelrx/filesink/filesinkwebapiadapter.cpp +++ b/plugins/channelrx/filesink/filesinkwebapiadapter.cpp @@ -44,6 +44,7 @@ int FileSinkWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; FileSink::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); diff --git a/plugins/channelrx/freqtracker/freqtrackerplugin.cpp b/plugins/channelrx/freqtracker/freqtrackerplugin.cpp index 93c94f12d..e70c2bb29 100644 --- a/plugins/channelrx/freqtracker/freqtrackerplugin.cpp +++ b/plugins/channelrx/freqtracker/freqtrackerplugin.cpp @@ -75,7 +75,9 @@ ChannelGUI* FreqTrackerPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { - return 0; + (void) deviceUISet; + (void) rxChannel; + return nullptr; } #else ChannelGUI* FreqTrackerPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const diff --git a/plugins/channelrx/freqtracker/freqtrackerwebapiadapter.cpp b/plugins/channelrx/freqtracker/freqtrackerwebapiadapter.cpp index 1f2a77ff1..c30bd9e90 100644 --- a/plugins/channelrx/freqtracker/freqtrackerwebapiadapter.cpp +++ b/plugins/channelrx/freqtracker/freqtrackerwebapiadapter.cpp @@ -43,6 +43,7 @@ int FreqTrackerWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; FreqTracker::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); diff --git a/plugins/channelrx/localsink/localsinkplugin.cpp b/plugins/channelrx/localsink/localsinkplugin.cpp index d6c9eefc5..61bf8aef6 100644 --- a/plugins/channelrx/localsink/localsinkplugin.cpp +++ b/plugins/channelrx/localsink/localsinkplugin.cpp @@ -77,7 +77,9 @@ ChannelGUI* LocalSinkPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { - return 0; + (void) deviceUISet; + (void) rxChannel; + return nullptr; } #else ChannelGUI* LocalSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const diff --git a/plugins/channelrx/localsink/localsinkwebapiadapter.cpp b/plugins/channelrx/localsink/localsinkwebapiadapter.cpp index 63e784e8a..5eb7c5390 100644 --- a/plugins/channelrx/localsink/localsinkwebapiadapter.cpp +++ b/plugins/channelrx/localsink/localsinkwebapiadapter.cpp @@ -43,6 +43,7 @@ int LocalSinkWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; LocalSink::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); diff --git a/plugins/channelrx/remotesink/remotesinkplugin.cpp b/plugins/channelrx/remotesink/remotesinkplugin.cpp index 5b6c491ad..5991b4d11 100644 --- a/plugins/channelrx/remotesink/remotesinkplugin.cpp +++ b/plugins/channelrx/remotesink/remotesinkplugin.cpp @@ -77,7 +77,9 @@ ChannelGUI* RemoteSinkPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { - return 0; + (void) deviceUISet; + (void) rxChannel; + return nullptr; } #else ChannelGUI* RemoteSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const diff --git a/plugins/channelrx/remotesink/remotesinkwebapiadapter.cpp b/plugins/channelrx/remotesink/remotesinkwebapiadapter.cpp index 97242d201..aa971a14c 100644 --- a/plugins/channelrx/remotesink/remotesinkwebapiadapter.cpp +++ b/plugins/channelrx/remotesink/remotesinkwebapiadapter.cpp @@ -43,6 +43,7 @@ int RemoteSinkWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; RemoteSink::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); diff --git a/plugins/channelrx/sigmffilesink/sigmffilesinkplugin.cpp b/plugins/channelrx/sigmffilesink/sigmffilesinkplugin.cpp index dc216d696..eec963cc1 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesinkplugin.cpp +++ b/plugins/channelrx/sigmffilesink/sigmffilesinkplugin.cpp @@ -76,7 +76,9 @@ ChannelGUI* SigMFFileSinkPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { - return 0; + (void) deviceUISet; + (void) rxChannel; + return nullptr; } #else ChannelGUI* SigMFFileSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const diff --git a/plugins/channelrx/sigmffilesink/sigmffilesinkwebapiadapter.cpp b/plugins/channelrx/sigmffilesink/sigmffilesinkwebapiadapter.cpp index a06b4d6b8..bfe41578e 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesinkwebapiadapter.cpp +++ b/plugins/channelrx/sigmffilesink/sigmffilesinkwebapiadapter.cpp @@ -44,6 +44,7 @@ int SigMFFileSinkWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; SigMFFileSink::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); diff --git a/plugins/channelrx/udpsink/udpsinkplugin.cpp b/plugins/channelrx/udpsink/udpsinkplugin.cpp index cee9bc762..6755bcf10 100644 --- a/plugins/channelrx/udpsink/udpsinkplugin.cpp +++ b/plugins/channelrx/udpsink/udpsinkplugin.cpp @@ -76,7 +76,9 @@ ChannelGUI* UDPSinkPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { - return 0; + (void) deviceUISet; + (void) rxChannel; + return nullptr; } #else ChannelGUI* UDPSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const diff --git a/plugins/channelrx/udpsink/udpsinkwebapiadapter.cpp b/plugins/channelrx/udpsink/udpsinkwebapiadapter.cpp index b5e529340..2884971f6 100644 --- a/plugins/channelrx/udpsink/udpsinkwebapiadapter.cpp +++ b/plugins/channelrx/udpsink/udpsinkwebapiadapter.cpp @@ -43,6 +43,7 @@ int UDPSinkWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; UDPSink::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); diff --git a/plugins/channeltx/filesource/filesourceplugin.cpp b/plugins/channeltx/filesource/filesourceplugin.cpp index 427124846..5353d1244 100644 --- a/plugins/channeltx/filesource/filesourceplugin.cpp +++ b/plugins/channeltx/filesource/filesourceplugin.cpp @@ -75,7 +75,9 @@ ChannelGUI* FileSourcePlugin::createTxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { - return 0; + (void) deviceUISet; + (void) txChannel; + return nullptr; } #else ChannelGUI* FileSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const diff --git a/plugins/channeltx/filesource/filesourcesource.h b/plugins/channeltx/filesource/filesourcesource.h index 0ada2c395..59ac65e92 100644 --- a/plugins/channeltx/filesource/filesourcesource.h +++ b/plugins/channeltx/filesource/filesourcesource.h @@ -40,7 +40,7 @@ public: virtual void pull(SampleVector::iterator begin, unsigned int nbSamples); virtual void pullOne(Sample& sample); - virtual void prefetch(unsigned int nbSamples) {} + virtual void prefetch(unsigned int nbSamples) { (void) nbSamples; } /** Set center frequency given in Hz */ void setCenterFrequency(uint64_t centerFrequency) { m_centerFrequency = centerFrequency; } diff --git a/plugins/channeltx/filesource/filesourcewebapiadapter.cpp b/plugins/channeltx/filesource/filesourcewebapiadapter.cpp index eac2188ed..cfcadb78a 100644 --- a/plugins/channeltx/filesource/filesourcewebapiadapter.cpp +++ b/plugins/channeltx/filesource/filesourcewebapiadapter.cpp @@ -43,6 +43,7 @@ int FileSourceWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; FileSource::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); diff --git a/plugins/channeltx/localsource/localsourceplugin.cpp b/plugins/channeltx/localsource/localsourceplugin.cpp index af5872d95..f47771d4f 100644 --- a/plugins/channeltx/localsource/localsourceplugin.cpp +++ b/plugins/channeltx/localsource/localsourceplugin.cpp @@ -77,7 +77,9 @@ ChannelGUI* LocalSourcePlugin::createTxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { - return 0; + (void) deviceUISet; + (void) txChannel; + return nullptr; } #else ChannelGUI* LocalSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const diff --git a/plugins/channeltx/localsource/localsourcesource.h b/plugins/channeltx/localsource/localsourcesource.h index 680a2da99..dd978327d 100644 --- a/plugins/channeltx/localsource/localsourcesource.h +++ b/plugins/channeltx/localsource/localsourcesource.h @@ -36,7 +36,7 @@ public: virtual void pull(SampleVector::iterator begin, unsigned int nbSamples); virtual void pullOne(Sample& sample); - virtual void prefetch(unsigned int nbSamples) {} + virtual void prefetch(unsigned int nbSamples) { (void) nbSamples; } void start(DeviceSampleSink *deviceSink); void stop(); diff --git a/plugins/channeltx/localsource/localsourcewebapiadapter.cpp b/plugins/channeltx/localsource/localsourcewebapiadapter.cpp index 467be944b..f07141189 100644 --- a/plugins/channeltx/localsource/localsourcewebapiadapter.cpp +++ b/plugins/channeltx/localsource/localsourcewebapiadapter.cpp @@ -43,6 +43,7 @@ int LocalSourceWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; LocalSource::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.cpp b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.cpp index ff9067a3d..7f33ae557 100644 --- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.cpp +++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.cpp @@ -205,7 +205,7 @@ void IEEE_802_15_4_ModGUI::on_channelMute_toggled(bool checked) applySettings(); } -void IEEE_802_15_4_ModGUI::on_txButton_clicked(bool checked) +void IEEE_802_15_4_ModGUI::on_txButton_clicked() { transmit(); } diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.h b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.h index fec671a95..e679fa0fd 100644 --- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.h +++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.h @@ -96,7 +96,7 @@ private slots: void on_rfBW_valueChanged(int index); void on_gain_valueChanged(int value); void on_channelMute_toggled(bool checked); - void on_txButton_clicked(bool checked); + void on_txButton_clicked(); void on_frame_editingFinished(); void on_frame_returnPressed(); void on_repeat_toggled(bool checked); diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modplugin.cpp b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modplugin.cpp index 54980c341..2d7cf754e 100644 --- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modplugin.cpp +++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modplugin.cpp @@ -75,7 +75,9 @@ ChannelGUI* IEEE_802_15_4_ModPlugin::createTxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { - return 0; + (void) deviceUISet; + (void) txChannel; + return nullptr; } #else ChannelGUI* IEEE_802_15_4_ModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modsource.cpp b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modsource.cpp index 2aa87699a..cd2e08a0d 100644 --- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modsource.cpp +++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modsource.cpp @@ -93,10 +93,6 @@ void IEEE_802_15_4_ModSource::pullOne(Sample& sample) sample.m_imag = (FixReal) (ci.imag() * SDR_TX_SCALEF); } -void IEEE_802_15_4_ModSource::prefetch(unsigned int nbSamples) -{ -} - void IEEE_802_15_4_ModSource::sampleToSpectrum(Complex sample) { if (m_spectrumSink && (m_settings.m_spectrumRate > 0)) diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modsource.h b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modsource.h index ef174b0b9..94ba492d2 100644 --- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modsource.h +++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modsource.h @@ -47,7 +47,7 @@ public: virtual void pull(SampleVector::iterator begin, unsigned int nbSamples); virtual void pullOne(Sample& sample); - virtual void prefetch(unsigned int nbSamples); + virtual void prefetch(unsigned int nbSamples) { (void) nbSamples; } double getMagSq() const { return m_magsq; } void getLevels(qreal& rmsLevel, qreal& peakLevel, int& numSamples) const @@ -60,7 +60,7 @@ public: void setScopeSink(BasebandSampleSink* scopeSink) { m_scopeSink = scopeSink; } void applySettings(const IEEE_802_15_4_ModSettings& settings, bool force = false); void applyChannelSettings(int channelSampleRate, int channelFrequencyOffset, bool force = false); - + uint8_t *hexToBin(uint8_t *p, QString data); void addTXFrame(QString data); @@ -76,7 +76,7 @@ private: double *m_sinLUT; int m_chips[2]; // Chips. Odd/even for O-QPSK - bool m_chipOdd; + bool m_chipOdd; int m_diffBit; // Output of differential coder RaisedCosine m_pulseShapeI; // Pulse shaping filters RaisedCosine m_pulseShapeQ; @@ -107,10 +107,10 @@ private: int m_chipsPerSymbol; // Number of chips per symbol int m_bitsPerSymbol; // Number of bits per symbol int m_chipRate; - + int m_symbol; int m_chipIdx; - + Real m_pow; // In dB Real m_powRamp; // In dB enum IEEE_802_15_4_ModState { @@ -128,7 +128,7 @@ private: std::ofstream m_basebandFile; // For debug output of baseband waveform bool chipsValid(); // Are there any chips to transmit - int getSymbol(); + int getSymbol(); int getChip(); void initTX(); void createHalfSine(int sampleRate, int chipRate); diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modwebapiadapter.cpp b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modwebapiadapter.cpp index a377186bd..0ae369b88 100644 --- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modwebapiadapter.cpp +++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modwebapiadapter.cpp @@ -44,6 +44,7 @@ int IEEE_802_15_4_ModWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; IEEE_802_15_4_Mod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); diff --git a/plugins/channeltx/modam/ammodplugin.cpp b/plugins/channeltx/modam/ammodplugin.cpp index 38d2211f6..7dc7785bb 100644 --- a/plugins/channeltx/modam/ammodplugin.cpp +++ b/plugins/channeltx/modam/ammodplugin.cpp @@ -75,7 +75,9 @@ ChannelGUI* AMModPlugin::createTxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { - return 0; + (void) deviceUISet; + (void) txChannel; + return nullptr; } #else ChannelGUI* AMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const diff --git a/plugins/channeltx/modam/ammodwebapiadapter.cpp b/plugins/channeltx/modam/ammodwebapiadapter.cpp index e6a6a8443..8cf59cf67 100644 --- a/plugins/channeltx/modam/ammodwebapiadapter.cpp +++ b/plugins/channeltx/modam/ammodwebapiadapter.cpp @@ -49,6 +49,7 @@ int AMModWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; AMMod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); diff --git a/plugins/channeltx/modatv/atvmodplugin.cpp b/plugins/channeltx/modatv/atvmodplugin.cpp index 0f721f8fb..9aaa1abc7 100644 --- a/plugins/channeltx/modatv/atvmodplugin.cpp +++ b/plugins/channeltx/modatv/atvmodplugin.cpp @@ -75,7 +75,9 @@ ChannelGUI* ATVModPlugin::createTxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { - return 0; + (void) deviceUISet; + (void) txChannel; + return nullptr; } #else ChannelGUI* ATVModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const diff --git a/plugins/channeltx/modatv/atvmodwebapiadapter.cpp b/plugins/channeltx/modatv/atvmodwebapiadapter.cpp index f5b65a3a2..36ecd28d5 100644 --- a/plugins/channeltx/modatv/atvmodwebapiadapter.cpp +++ b/plugins/channeltx/modatv/atvmodwebapiadapter.cpp @@ -43,6 +43,7 @@ int ATVModWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; ATVMod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); diff --git a/plugins/channeltx/modchirpchat/chirpchatmodplugin.cpp b/plugins/channeltx/modchirpchat/chirpchatmodplugin.cpp index 76c75be42..8cb8786ec 100644 --- a/plugins/channeltx/modchirpchat/chirpchatmodplugin.cpp +++ b/plugins/channeltx/modchirpchat/chirpchatmodplugin.cpp @@ -75,7 +75,9 @@ ChannelGUI* ChirpChatModPlugin::createTxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { - return 0; + (void) deviceUISet; + (void) txChannel; + return nullptr; } #else ChannelGUI* ChirpChatModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const diff --git a/plugins/channeltx/modchirpchat/chirpchatmodsource.cpp b/plugins/channeltx/modchirpchat/chirpchatmodsource.cpp index fd55b63fb..bccc3b55f 100644 --- a/plugins/channeltx/modchirpchat/chirpchatmodsource.cpp +++ b/plugins/channeltx/modchirpchat/chirpchatmodsource.cpp @@ -327,10 +327,6 @@ unsigned short ChirpChatModSource::encodeSymbol(unsigned short symbol) // return deWidth*baseSymbol + (deWidth/2) - 1; } -void ChirpChatModSource::processOneSample(Complex& ci) -{ -} - void ChirpChatModSource::calculateLevel(Real& sample) { if (m_levelCalcCount < m_levelNbSamples) diff --git a/plugins/channeltx/modchirpchat/chirpchatmodsource.h b/plugins/channeltx/modchirpchat/chirpchatmodsource.h index 8e1b00b95..aa8edc4a8 100644 --- a/plugins/channeltx/modchirpchat/chirpchatmodsource.h +++ b/plugins/channeltx/modchirpchat/chirpchatmodsource.h @@ -36,7 +36,7 @@ public: virtual void pull(SampleVector::iterator begin, unsigned int nbSamples); virtual void pullOne(Sample& sample); - virtual void prefetch(unsigned int nbSamples) {} + virtual void prefetch(unsigned int nbSamples) { (void) nbSamples; } double getMagSq() const { return m_magsq; } void getLevels(qreal& rmsLevel, qreal& peakLevel, int& numSamples) const @@ -104,7 +104,6 @@ private: void initSF(unsigned int sf); //!< Init tables, FFTs, depending on spread factor void initTest(unsigned int sf, unsigned int deBits); void reset(); - void processOneSample(Complex& ci); void calculateLevel(Real& sample); void modulateSample(); unsigned short encodeSymbol(unsigned short symbol); //!< Encodes symbol with possible DE bits spacing diff --git a/plugins/channeltx/modchirpchat/chirpchatmodwebapiadapter.cpp b/plugins/channeltx/modchirpchat/chirpchatmodwebapiadapter.cpp index 6674b0e46..bf6d94d89 100644 --- a/plugins/channeltx/modchirpchat/chirpchatmodwebapiadapter.cpp +++ b/plugins/channeltx/modchirpchat/chirpchatmodwebapiadapter.cpp @@ -42,6 +42,7 @@ int ChirpChatModWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; ChirpChatMod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); ChirpChatMod::webapiFormatChannelSettings(response, m_settings); diff --git a/plugins/channeltx/modfreedv/freedvmodplugin.cpp b/plugins/channeltx/modfreedv/freedvmodplugin.cpp index 51a3e627d..f5ddea2bd 100644 --- a/plugins/channeltx/modfreedv/freedvmodplugin.cpp +++ b/plugins/channeltx/modfreedv/freedvmodplugin.cpp @@ -75,7 +75,9 @@ ChannelGUI* FreeDVModPlugin::createTxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { - return 0; + (void) deviceUISet; + (void) txChannel; + return nullptr; } #else ChannelGUI* FreeDVModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const diff --git a/plugins/channeltx/modfreedv/freedvmodwebapiadapter.cpp b/plugins/channeltx/modfreedv/freedvmodwebapiadapter.cpp index 5695e8f7d..88ecce739 100644 --- a/plugins/channeltx/modfreedv/freedvmodwebapiadapter.cpp +++ b/plugins/channeltx/modfreedv/freedvmodwebapiadapter.cpp @@ -49,6 +49,7 @@ int FreeDVModWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; FreeDVMod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); diff --git a/plugins/channeltx/modnfm/nfmmodplugin.cpp b/plugins/channeltx/modnfm/nfmmodplugin.cpp index ca5893fbf..39cd8375e 100644 --- a/plugins/channeltx/modnfm/nfmmodplugin.cpp +++ b/plugins/channeltx/modnfm/nfmmodplugin.cpp @@ -75,7 +75,9 @@ ChannelGUI* NFMModPlugin::createTxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { - return 0; + (void) deviceUISet; + (void) txChannel; + return nullptr; } #else ChannelGUI* NFMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const diff --git a/plugins/channeltx/modnfm/nfmmodwebapiadapter.cpp b/plugins/channeltx/modnfm/nfmmodwebapiadapter.cpp index 646d21f52..115755e3e 100644 --- a/plugins/channeltx/modnfm/nfmmodwebapiadapter.cpp +++ b/plugins/channeltx/modnfm/nfmmodwebapiadapter.cpp @@ -49,6 +49,7 @@ int NFMModWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; NFMMod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); diff --git a/plugins/channeltx/modpacket/packetmodgui.cpp b/plugins/channeltx/modpacket/packetmodgui.cpp index 82bed0f53..dbee80ecf 100644 --- a/plugins/channeltx/modpacket/packetmodgui.cpp +++ b/plugins/channeltx/modpacket/packetmodgui.cpp @@ -172,7 +172,7 @@ void PacketModGUI::on_channelMute_toggled(bool checked) applySettings(); } -void PacketModGUI::on_txButton_clicked(bool checked) +void PacketModGUI::on_txButton_clicked() { transmit(); } @@ -206,7 +206,7 @@ void PacketModGUI::on_packet_editingFinished() applySettings(); } -void PacketModGUI::on_insertPosition_clicked(bool checked) +void PacketModGUI::on_insertPosition_clicked() { float latitude = MainCore::instance()->getSettings().getLatitude(); float longitude = MainCore::instance()->getSettings().getLongitude(); diff --git a/plugins/channeltx/modpacket/packetmodgui.h b/plugins/channeltx/modpacket/packetmodgui.h index 34f30d673..18b7d41da 100644 --- a/plugins/channeltx/modpacket/packetmodgui.h +++ b/plugins/channeltx/modpacket/packetmodgui.h @@ -87,12 +87,12 @@ private slots: void on_fmDev_valueChanged(int value); void on_gain_valueChanged(int value); void on_channelMute_toggled(bool checked); - void on_txButton_clicked(bool checked); + void on_txButton_clicked(); void on_callsign_editingFinished(); void on_to_currentTextChanged(const QString &text); void on_via_currentTextChanged(const QString &text); void on_packet_editingFinished(); - void on_insertPosition_clicked(bool checked); + void on_insertPosition_clicked(); void on_packet_returnPressed(); void on_repeat_toggled(bool checked); void on_preEmphasis_toggled(bool checked); diff --git a/plugins/channeltx/modpacket/packetmodplugin.cpp b/plugins/channeltx/modpacket/packetmodplugin.cpp index 651b2e888..98f5c090a 100644 --- a/plugins/channeltx/modpacket/packetmodplugin.cpp +++ b/plugins/channeltx/modpacket/packetmodplugin.cpp @@ -75,7 +75,9 @@ ChannelGUI* PacketModPlugin::createTxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { - return 0; + (void) deviceUISet; + (void) txChannel; + return nullptr; } #else ChannelGUI* PacketModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const diff --git a/plugins/channeltx/modpacket/packetmodsource.cpp b/plugins/channeltx/modpacket/packetmodsource.cpp index bfc384197..82cbd5126 100644 --- a/plugins/channeltx/modpacket/packetmodsource.cpp +++ b/plugins/channeltx/modpacket/packetmodsource.cpp @@ -91,10 +91,6 @@ void PacketModSource::pullOne(Sample& sample) sample.m_imag = (FixReal) (ci.imag() * SDR_TX_SCALEF); } -void PacketModSource::prefetch(unsigned int nbSamples) -{ -} - void PacketModSource::sampleToSpectrum(Real sample) { if (m_spectrumSink) diff --git a/plugins/channeltx/modpacket/packetmodsource.h b/plugins/channeltx/modpacket/packetmodsource.h index 07c433c48..0a9028dee 100644 --- a/plugins/channeltx/modpacket/packetmodsource.h +++ b/plugins/channeltx/modpacket/packetmodsource.h @@ -53,7 +53,7 @@ public: virtual void pull(SampleVector::iterator begin, unsigned int nbSamples); virtual void pullOne(Sample& sample); - virtual void prefetch(unsigned int nbSamples); + virtual void prefetch(unsigned int nbSamples) { (void) nbSamples; } double getMagSq() const { return m_magsq; } void getLevels(qreal& rmsLevel, qreal& peakLevel, int& numSamples) const diff --git a/plugins/channeltx/modpacket/packetmodwebapiadapter.cpp b/plugins/channeltx/modpacket/packetmodwebapiadapter.cpp index ca8f2be83..f7ca75bd4 100644 --- a/plugins/channeltx/modpacket/packetmodwebapiadapter.cpp +++ b/plugins/channeltx/modpacket/packetmodwebapiadapter.cpp @@ -44,6 +44,7 @@ int PacketModWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; PacketMod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); diff --git a/plugins/channeltx/modssb/ssbmodplugin.cpp b/plugins/channeltx/modssb/ssbmodplugin.cpp index c0fd6abf3..e89cc538c 100644 --- a/plugins/channeltx/modssb/ssbmodplugin.cpp +++ b/plugins/channeltx/modssb/ssbmodplugin.cpp @@ -75,7 +75,9 @@ ChannelGUI* SSBModPlugin::createTxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { - return 0; + (void) deviceUISet; + (void) txChannel; + return nullptr; } #else ChannelGUI* SSBModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const diff --git a/plugins/channeltx/modssb/ssbmodwebapiadapter.cpp b/plugins/channeltx/modssb/ssbmodwebapiadapter.cpp index 902327cf3..119f42e4b 100644 --- a/plugins/channeltx/modssb/ssbmodwebapiadapter.cpp +++ b/plugins/channeltx/modssb/ssbmodwebapiadapter.cpp @@ -49,6 +49,7 @@ int SSBModWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; SSBMod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); diff --git a/plugins/channeltx/modwfm/wfmmodplugin.cpp b/plugins/channeltx/modwfm/wfmmodplugin.cpp index 4efd55386..3a25c2dc5 100644 --- a/plugins/channeltx/modwfm/wfmmodplugin.cpp +++ b/plugins/channeltx/modwfm/wfmmodplugin.cpp @@ -75,7 +75,9 @@ ChannelGUI* WFMModPlugin::createTxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { - return 0; + (void) deviceUISet; + (void) txChannel; + return nullptr; } #else ChannelGUI* WFMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const diff --git a/plugins/channeltx/modwfm/wfmmodwebapiadapter.cpp b/plugins/channeltx/modwfm/wfmmodwebapiadapter.cpp index 1665e8309..8dc86cf17 100644 --- a/plugins/channeltx/modwfm/wfmmodwebapiadapter.cpp +++ b/plugins/channeltx/modwfm/wfmmodwebapiadapter.cpp @@ -49,6 +49,7 @@ int WFMModWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; WFMMod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); diff --git a/plugins/channeltx/remotesource/remotesourceplugin.cpp b/plugins/channeltx/remotesource/remotesourceplugin.cpp index c0d49bf7d..e473bb36c 100644 --- a/plugins/channeltx/remotesource/remotesourceplugin.cpp +++ b/plugins/channeltx/remotesource/remotesourceplugin.cpp @@ -75,7 +75,9 @@ ChannelGUI* RemoteSourcePlugin::createTxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { - return 0; + (void) deviceUISet; + (void) txChannel; + return nullptr; } #else ChannelGUI* RemoteSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const diff --git a/plugins/channeltx/remotesource/remotesourcesource.h b/plugins/channeltx/remotesource/remotesourcesource.h index 4d586251f..83b7fd07c 100644 --- a/plugins/channeltx/remotesource/remotesourcesource.h +++ b/plugins/channeltx/remotesource/remotesourcesource.h @@ -41,7 +41,7 @@ public: virtual void pull(SampleVector::iterator begin, unsigned int nbSamples); virtual void pullOne(Sample& sample); - virtual void prefetch(unsigned int nbSamples) {} + virtual void prefetch(unsigned int nbSamples) { (void) nbSamples; } void start(); void stop(); diff --git a/plugins/channeltx/remotesource/remotesourcewebapiadapter.cpp b/plugins/channeltx/remotesource/remotesourcewebapiadapter.cpp index 660be24d7..db08e1b16 100644 --- a/plugins/channeltx/remotesource/remotesourcewebapiadapter.cpp +++ b/plugins/channeltx/remotesource/remotesourcewebapiadapter.cpp @@ -43,6 +43,7 @@ int RemoteSourceWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; RemoteSource::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); diff --git a/plugins/channeltx/udpsource/udpsourceplugin.cpp b/plugins/channeltx/udpsource/udpsourceplugin.cpp index 8041e84dd..cfad2ae98 100644 --- a/plugins/channeltx/udpsource/udpsourceplugin.cpp +++ b/plugins/channeltx/udpsource/udpsourceplugin.cpp @@ -78,7 +78,9 @@ ChannelGUI* UDPSourcePlugin::createTxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { - return 0; + (void) deviceUISet; + (void) txChannel; + return nullptr; } #else ChannelGUI* UDPSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const diff --git a/plugins/channeltx/udpsource/udpsourcesource.h b/plugins/channeltx/udpsource/udpsourcesource.h index adb3aa91e..b9c148efc 100644 --- a/plugins/channeltx/udpsource/udpsourcesource.h +++ b/plugins/channeltx/udpsource/udpsourcesource.h @@ -40,7 +40,7 @@ public: virtual void pull(SampleVector::iterator begin, unsigned int nbSamples); virtual void pullOne(Sample& sample); - virtual void prefetch(unsigned int nbSamples) {}; + virtual void prefetch(unsigned int nbSamples) { (void) nbSamples; }; void setUDPFeedbackMessageQueue(MessageQueue *messageQueue); void setSpectrumSink(BasebandSampleSink* spectrumSink) { m_spectrumSink = spectrumSink; } diff --git a/plugins/channeltx/udpsource/udpsourcewebapiadapter.cpp b/plugins/channeltx/udpsource/udpsourcewebapiadapter.cpp index 633b1576f..19f1648a3 100644 --- a/plugins/channeltx/udpsource/udpsourcewebapiadapter.cpp +++ b/plugins/channeltx/udpsource/udpsourcewebapiadapter.cpp @@ -43,6 +43,7 @@ int UDPSourceWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; UDPSource::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); diff --git a/plugins/feature/afc/afc.cpp b/plugins/feature/afc/afc.cpp index 48f2ecdd0..bf073d2ea 100644 --- a/plugins/feature/afc/afc.cpp +++ b/plugins/feature/afc/afc.cpp @@ -259,6 +259,7 @@ int AFC::webapiRun(bool run, SWGSDRangel::SWGDeviceState& response, QString& errorMessage) { + (void) errorMessage; getFeatureStateStr(*response.getState()); MsgStartStop *msg = MsgStartStop::create(run); getInputMessageQueue()->push(msg); diff --git a/plugins/feature/afc/afcwebapiadapter.cpp b/plugins/feature/afc/afcwebapiadapter.cpp index a34c36ed1..644bb9bd0 100644 --- a/plugins/feature/afc/afcwebapiadapter.cpp +++ b/plugins/feature/afc/afcwebapiadapter.cpp @@ -43,6 +43,7 @@ int AFCWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGFeatureSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; AFC::webapiUpdateFeatureSettings(m_settings, featureSettingsKeys, response); diff --git a/plugins/feature/afc/afcworker.cpp b/plugins/feature/afc/afcworker.cpp index 6d6c2aec4..7470c9c3f 100644 --- a/plugins/feature/afc/afcworker.cpp +++ b/plugins/feature/afc/afcworker.cpp @@ -112,7 +112,7 @@ bool AFCWorker::handleMessage(const Message& cmd) Feature::MsgChannelSettings& cfg = (Feature::MsgChannelSettings&) cmd; SWGSDRangel::SWGChannelSettings *swgChannelSettings = cfg.getSWGSettings(); qDebug() << "AFCWorker::handleMessage: Feature::MsgChannelSettings:" << *swgChannelSettings->getChannelType(); - processChannelSettings(cfg.getChannelAPI(), cfg.getChannelSettingsKeys(), swgChannelSettings); + processChannelSettings(cfg.getChannelAPI(), swgChannelSettings); delete swgChannelSettings; return true; @@ -280,7 +280,6 @@ void AFCWorker::initTrackedDeviceSet(int deviceSetIndex) void AFCWorker::processChannelSettings( const ChannelAPI *channelAPI, - const QList &channelSettingsKeys, SWGSDRangel::SWGChannelSettings *swgChannelSettings) { MainCore *mainCore = MainCore::instance(); @@ -322,7 +321,7 @@ void AFCWorker::processChannelSettings( } } -bool AFCWorker::updateChannelOffset(ChannelAPI *channelAPI, int direction, int offset, unsigned int blockCount) +bool AFCWorker::updateChannelOffset(ChannelAPI *channelAPI, int direction, int offset) { SWGSDRangel::SWGChannelSettings swgChannelSettings; SWGSDRangel::SWGErrorResponse errorResponse; @@ -419,7 +418,7 @@ void AFCWorker::updateTarget() } // adjust tracker offset - if (updateChannelOffset(m_freqTracker, 0, m_trackerChannelOffset + correction, 1)) { + if (updateChannelOffset(m_freqTracker, 0, m_trackerChannelOffset + correction)) { m_trackerChannelOffset += correction; } diff --git a/plugins/feature/afc/afcworker.h b/plugins/feature/afc/afcworker.h index 862e22607..f977e01c3 100644 --- a/plugins/feature/afc/afcworker.h +++ b/plugins/feature/afc/afcworker.h @@ -131,7 +131,7 @@ private: ChannelTracking(int channelOffset, int trackerOffset, int channelDirection) : m_channelOffset(channelOffset), m_trackerOffset(trackerOffset), - m_channelDirection(m_channelDirection) + m_channelDirection(channelDirection) {} ChannelTracking(const ChannelTracking& other) : @@ -161,10 +161,9 @@ private: void initTrackedDeviceSet(int deviceSetIndex); void processChannelSettings( const ChannelAPI *channelAPI, - const QList &channelSettingsKeys, SWGSDRangel::SWGChannelSettings *swgChannelSettings ); - bool updateChannelOffset(ChannelAPI *channelAPI, int direction, int offset, unsigned int blockCount = 0); + bool updateChannelOffset(ChannelAPI *channelAPI, int direction, int offset); bool updateDeviceFrequency(DeviceSet *deviceSet, const QString& key, int64_t frequency); int getDeviceDirection(DeviceAPI *deviceAPI); void getDeviceSettingsKey(DeviceAPI *deviceAPI, QString& settingsKey); diff --git a/plugins/feature/gs232controller/gs232controller.cpp b/plugins/feature/gs232controller/gs232controller.cpp index d88b3dc90..06577d36b 100644 --- a/plugins/feature/gs232controller/gs232controller.cpp +++ b/plugins/feature/gs232controller/gs232controller.cpp @@ -221,6 +221,7 @@ int GS232Controller::webapiRun(bool run, SWGSDRangel::SWGDeviceState& response, QString& errorMessage) { + (void) errorMessage; getFeatureStateStr(*response.getState()); MsgStartStop *msg = MsgStartStop::create(run); getInputMessageQueue()->push(msg); diff --git a/plugins/feature/gs232controller/gs232controllergui.cpp b/plugins/feature/gs232controller/gs232controllergui.cpp index cecc9564c..f9e1576a0 100644 --- a/plugins/feature/gs232controller/gs232controllergui.cpp +++ b/plugins/feature/gs232controller/gs232controllergui.cpp @@ -376,12 +376,14 @@ void GS232ControllerGUI::on_channel_currentIndexChanged(int index) void GS232ControllerGUI::on_serialPort_currentIndexChanged(int index) { + (void) index; m_settings.m_serialPort = ui->serialPort->currentText(); applySettings(); } void GS232ControllerGUI::on_baudRate_currentIndexChanged(int index) { + (void) index; m_settings.m_baudRate = ui->baudRate->currentText().toInt(); applySettings(); } diff --git a/plugins/feature/gs232controller/gs232controllerwebapiadapter.cpp b/plugins/feature/gs232controller/gs232controllerwebapiadapter.cpp index 2bfd5de86..b638a0060 100644 --- a/plugins/feature/gs232controller/gs232controllerwebapiadapter.cpp +++ b/plugins/feature/gs232controller/gs232controllerwebapiadapter.cpp @@ -44,6 +44,7 @@ int GS232ControllerWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGFeatureSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; GS232Controller::webapiUpdateFeatureSettings(m_settings, featureSettingsKeys, response); diff --git a/plugins/feature/rigctlserver/rigctlserver.cpp b/plugins/feature/rigctlserver/rigctlserver.cpp index 0587f7eab..b3956ece2 100644 --- a/plugins/feature/rigctlserver/rigctlserver.cpp +++ b/plugins/feature/rigctlserver/rigctlserver.cpp @@ -212,6 +212,7 @@ int RigCtlServer::webapiRun(bool run, SWGSDRangel::SWGDeviceState& response, QString& errorMessage) { + (void) errorMessage; getFeatureStateStr(*response.getState()); MsgStartStop *msg = MsgStartStop::create(run); getInputMessageQueue()->push(msg); diff --git a/plugins/feature/rigctlserver/rigctlserverwebapiadapter.cpp b/plugins/feature/rigctlserver/rigctlserverwebapiadapter.cpp index a24244aa6..30cb59dee 100644 --- a/plugins/feature/rigctlserver/rigctlserverwebapiadapter.cpp +++ b/plugins/feature/rigctlserver/rigctlserverwebapiadapter.cpp @@ -44,6 +44,7 @@ int RigCtlServerWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGFeatureSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; RigCtlServer::webapiUpdateFeatureSettings(m_settings, featureSettingsKeys, response); diff --git a/plugins/feature/simpleptt/simpleptt.cpp b/plugins/feature/simpleptt/simpleptt.cpp index 1b927b539..96020316f 100644 --- a/plugins/feature/simpleptt/simpleptt.cpp +++ b/plugins/feature/simpleptt/simpleptt.cpp @@ -196,6 +196,7 @@ int SimplePTT::webapiRun(bool run, SWGSDRangel::SWGDeviceState& response, QString& errorMessage) { + (void) errorMessage; getFeatureStateStr(*response.getState()); MsgStartStop *msg = MsgStartStop::create(run); getInputMessageQueue()->push(msg); diff --git a/plugins/feature/simpleptt/simplepttwebapiadapter.cpp b/plugins/feature/simpleptt/simplepttwebapiadapter.cpp index e5d45f547..9794ea419 100644 --- a/plugins/feature/simpleptt/simplepttwebapiadapter.cpp +++ b/plugins/feature/simpleptt/simplepttwebapiadapter.cpp @@ -43,6 +43,7 @@ int SimplePTTWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGFeatureSettings& response, QString& errorMessage) { + (void) force; // no action (void) errorMessage; SimplePTT::webapiUpdateFeatureSettings(m_settings, featureSettingsKeys, response); diff --git a/plugins/samplemimo/bladerf2mimo/bladerf2mimowebapiadapter.cpp b/plugins/samplemimo/bladerf2mimo/bladerf2mimowebapiadapter.cpp index 7fa0fe2d6..5c7fff0e2 100644 --- a/plugins/samplemimo/bladerf2mimo/bladerf2mimowebapiadapter.cpp +++ b/plugins/samplemimo/bladerf2mimo/bladerf2mimowebapiadapter.cpp @@ -45,6 +45,7 @@ int BladeRF2MIMOWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; BladeRF2MIMO::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplemimo/limesdrmimo/limesdrmimo.cpp b/plugins/samplemimo/limesdrmimo/limesdrmimo.cpp index b6b0e6c7d..cc91a7791 100644 --- a/plugins/samplemimo/limesdrmimo/limesdrmimo.cpp +++ b/plugins/samplemimo/limesdrmimo/limesdrmimo.cpp @@ -1753,6 +1753,7 @@ int LimeSDRMIMO::webapiRunGet( SWGSDRangel::SWGDeviceState& response, QString& errorMessage) { + (void) subsystemIndex; (void) errorMessage; m_deviceAPI->getDeviceEngineStateStr(*response.getState()); return 200; @@ -2334,4 +2335,4 @@ void LimeSDRMIMO::networkManagerFinished(QNetworkReply *reply) } reply->deleteLater(); -} \ No newline at end of file +} diff --git a/plugins/samplemimo/limesdrmimo/limesdrmimowebapiadapter.cpp b/plugins/samplemimo/limesdrmimo/limesdrmimowebapiadapter.cpp index 9375a3798..7a82eaa13 100644 --- a/plugins/samplemimo/limesdrmimo/limesdrmimowebapiadapter.cpp +++ b/plugins/samplemimo/limesdrmimo/limesdrmimowebapiadapter.cpp @@ -43,9 +43,9 @@ int LimeSDRMIMOWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { - (void) errorMessage; (void) force; (void) deviceSettingsKeys; (void) response; + (void) errorMessage; return 501; } diff --git a/plugins/samplemimo/metismiso/metismiso.cpp b/plugins/samplemimo/metismiso/metismiso.cpp index 6c1632c86..87aa46d26 100644 --- a/plugins/samplemimo/metismiso/metismiso.cpp +++ b/plugins/samplemimo/metismiso/metismiso.cpp @@ -207,7 +207,7 @@ void MetisMISO::setSourceCenterFrequency(qint64 centerFrequency, int index) if (index < MetisMISOSettings::m_maxReceivers) { - settings.m_rxCenterFrequencies[index]; + settings.m_rxCenterFrequencies[index] = centerFrequency; MsgConfigureMetisMISO* message = MsgConfigureMetisMISO::create(settings, false); m_inputMessageQueue.push(message); diff --git a/plugins/samplemimo/metismiso/metismisowebapiadapter.cpp b/plugins/samplemimo/metismiso/metismisowebapiadapter.cpp index 49db41806..7376c5bb8 100644 --- a/plugins/samplemimo/metismiso/metismisowebapiadapter.cpp +++ b/plugins/samplemimo/metismiso/metismisowebapiadapter.cpp @@ -45,6 +45,7 @@ int MetisMISOWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; MetisMISO::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplemimo/testmi/testmiwebapiadapter.cpp b/plugins/samplemimo/testmi/testmiwebapiadapter.cpp index 06811ff75..779281793 100644 --- a/plugins/samplemimo/testmi/testmiwebapiadapter.cpp +++ b/plugins/samplemimo/testmi/testmiwebapiadapter.cpp @@ -45,6 +45,7 @@ int TestMIWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; TestMI::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplemimo/testmosync/testmosync.cpp b/plugins/samplemimo/testmosync/testmosync.cpp index b1244b915..dccbb91df 100644 --- a/plugins/samplemimo/testmosync/testmosync.cpp +++ b/plugins/samplemimo/testmosync/testmosync.cpp @@ -155,6 +155,7 @@ const QString& TestMOSync::getDeviceDescription() const int TestMOSync::getSourceSampleRate(int index) const { + (void) index; return 0; } @@ -424,4 +425,4 @@ void TestMOSync::webapiUpdateDeviceSettings( if (deviceSettingsKeys.contains("sampleRate")) { settings.m_sampleRate = response.getTestMoSyncSettings()->getSampleRate(); } -} \ No newline at end of file +} diff --git a/plugins/samplemimo/xtrxmimo/xtrxmimo.cpp b/plugins/samplemimo/xtrxmimo/xtrxmimo.cpp index 0463294a7..9521a4b87 100644 --- a/plugins/samplemimo/xtrxmimo/xtrxmimo.cpp +++ b/plugins/samplemimo/xtrxmimo/xtrxmimo.cpp @@ -983,7 +983,7 @@ bool XTRXMIMO::applySettings(const XTRXMIMOSettings& settings, bool force) m_settings.m_rxDevSampleRate, DeviceSampleSource::FrequencyShiftScheme::FSHIFT_STD, false); - setRxDeviceCenterFrequency(m_deviceShared.m_dev->getDevice(), deviceCenterFrequency, 0); + setRxDeviceCenterFrequency(m_deviceShared.m_dev->getDevice(), deviceCenterFrequency); } } @@ -1083,7 +1083,7 @@ bool XTRXMIMO::applySettings(const XTRXMIMOSettings& settings, bool force) DeviceSampleSink::FC_POS_CENTER, m_settings.m_txDevSampleRate, false); - setTxDeviceCenterFrequency(m_deviceShared.m_dev->getDevice(), deviceCenterFrequency, 0); + setTxDeviceCenterFrequency(m_deviceShared.m_dev->getDevice(), deviceCenterFrequency); } } @@ -1271,14 +1271,14 @@ void XTRXMIMO::getLPRange(float& minF, float& maxF, float& stepF) const minF, maxF, stepF); } -void XTRXMIMO::setRxDeviceCenterFrequency(xtrx_dev *dev, quint64 freq_hz, int loPpmTenths) +void XTRXMIMO::setRxDeviceCenterFrequency(xtrx_dev *dev, quint64 freq_hz) { if (dev) { if (xtrx_tune(dev, XTRX_TUNE_RX_FDD, freq_hz, - 0) < 0) { + nullptr) < 0) { qCritical("XTRXMIMO::setRxDeviceCenterFrequency: could not set Rx frequency to %llu", freq_hz); } else { qDebug("XTRXMIMO::setRxDeviceCenterFrequency: Rx frequency set to %llu", freq_hz); @@ -1286,14 +1286,14 @@ void XTRXMIMO::setRxDeviceCenterFrequency(xtrx_dev *dev, quint64 freq_hz, int lo } } -void XTRXMIMO::setTxDeviceCenterFrequency(xtrx_dev *dev, quint64 freq_hz, int loPpmTenths) +void XTRXMIMO::setTxDeviceCenterFrequency(xtrx_dev *dev, quint64 freq_hz) { if (dev) { if (xtrx_tune(dev, XTRX_TUNE_TX_FDD, freq_hz, - 0) < 0) { + nullptr) < 0) { qCritical("XTRXMIMO::setTxDeviceCenterFrequency: could not set Tx frequency to %llu", freq_hz); } else { qDebug("XTRXMIMO::setTxDeviceCenterFrequency: Tx frequency set to %llu", freq_hz); diff --git a/plugins/samplemimo/xtrxmimo/xtrxmimo.h b/plugins/samplemimo/xtrxmimo/xtrxmimo.h index eef166737..f7270548c 100644 --- a/plugins/samplemimo/xtrxmimo/xtrxmimo.h +++ b/plugins/samplemimo/xtrxmimo/xtrxmimo.h @@ -286,8 +286,8 @@ private: void applyGainLNA(unsigned int channel, double gain); void applyGainTIA(unsigned int channel, double gain); void applyGainPGA(unsigned int channel, double gain); - void setRxDeviceCenterFrequency(xtrx_dev *dev, quint64 freq_hz, int loPpmTenths); - void setTxDeviceCenterFrequency(xtrx_dev *dev, quint64 freq_hz, int loPpmTenths); + void setRxDeviceCenterFrequency(xtrx_dev *dev, quint64 freq_hz); + void setTxDeviceCenterFrequency(xtrx_dev *dev, quint64 freq_hz); void webapiReverseSendSettings(QList& deviceSettingsKeys, const XTRXMIMOSettings& settings, bool force); void webapiReverseSendStartStop(bool start); diff --git a/plugins/samplesink/bladerf1output/bladerf1outputwebapiadapter.cpp b/plugins/samplesink/bladerf1output/bladerf1outputwebapiadapter.cpp index f2999ce30..ab9473bfc 100644 --- a/plugins/samplesink/bladerf1output/bladerf1outputwebapiadapter.cpp +++ b/plugins/samplesink/bladerf1output/bladerf1outputwebapiadapter.cpp @@ -45,6 +45,7 @@ int BladeRF1OutputWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; Bladerf1Output::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesink/bladerf2output/bladerf2outputwebapiadapter.cpp b/plugins/samplesink/bladerf2output/bladerf2outputwebapiadapter.cpp index 67b15d95c..5a39a183c 100644 --- a/plugins/samplesink/bladerf2output/bladerf2outputwebapiadapter.cpp +++ b/plugins/samplesink/bladerf2output/bladerf2outputwebapiadapter.cpp @@ -45,6 +45,7 @@ int BladeRF2OutputWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; BladeRF2Output::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputwebapiadapter.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputwebapiadapter.cpp index 76f9476c7..087284928 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputwebapiadapter.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutputwebapiadapter.cpp @@ -45,6 +45,7 @@ int HackRFOutputWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; HackRFOutput::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesink/limesdroutput/limesdroutputwebapiadapter.cpp b/plugins/samplesink/limesdroutput/limesdroutputwebapiadapter.cpp index 88abfe511..0ac19e645 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputwebapiadapter.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputwebapiadapter.cpp @@ -45,6 +45,7 @@ int LimeSDROutputWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; LimeSDROutput::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesink/localoutput/localoutputwebapiadapter.cpp b/plugins/samplesink/localoutput/localoutputwebapiadapter.cpp index 74f058028..9a912debe 100644 --- a/plugins/samplesink/localoutput/localoutputwebapiadapter.cpp +++ b/plugins/samplesink/localoutput/localoutputwebapiadapter.cpp @@ -45,6 +45,7 @@ int LocalOutputWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; LocalOutput::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputwebapiadapter.cpp b/plugins/samplesink/plutosdroutput/plutosdroutputwebapiadapter.cpp index 29f02eea5..aaa7bb2d2 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutputwebapiadapter.cpp +++ b/plugins/samplesink/plutosdroutput/plutosdroutputwebapiadapter.cpp @@ -45,6 +45,7 @@ int PlutoSDROutputWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; PlutoSDROutput::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesink/remoteoutput/remoteoutputwebapiadapter.cpp b/plugins/samplesink/remoteoutput/remoteoutputwebapiadapter.cpp index 928088332..d0da4a9c8 100644 --- a/plugins/samplesink/remoteoutput/remoteoutputwebapiadapter.cpp +++ b/plugins/samplesink/remoteoutput/remoteoutputwebapiadapter.cpp @@ -45,6 +45,7 @@ int RemoteOutputWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; RemoteOutput::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesink/soapysdroutput/soapysdroutputwebapiadapter.cpp b/plugins/samplesink/soapysdroutput/soapysdroutputwebapiadapter.cpp index a72aaf822..9c26da7c0 100644 --- a/plugins/samplesink/soapysdroutput/soapysdroutputwebapiadapter.cpp +++ b/plugins/samplesink/soapysdroutput/soapysdroutputwebapiadapter.cpp @@ -45,6 +45,7 @@ int SoapySDROutputWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; SoapySDROutput::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesink/usrpoutput/usrpoutputgui.cpp b/plugins/samplesink/usrpoutput/usrpoutputgui.cpp index ac82612db..7e8c52e24 100644 --- a/plugins/samplesink/usrpoutput/usrpoutputgui.cpp +++ b/plugins/samplesink/usrpoutput/usrpoutputgui.cpp @@ -528,12 +528,14 @@ void USRPOutputGUI::on_gain_valueChanged(int value) void USRPOutputGUI::on_antenna_currentIndexChanged(int index) { + (void) index; m_settings.m_antennaPath = ui->antenna->currentText(); sendSettings(); } void USRPOutputGUI::on_clockSource_currentIndexChanged(int index) { + (void) index; m_settings.m_clockSource = ui->clockSource->currentText(); sendSettings(); } diff --git a/plugins/samplesink/usrpoutput/usrpoutputwebapiadapter.cpp b/plugins/samplesink/usrpoutput/usrpoutputwebapiadapter.cpp index 25b29988f..f1460a382 100644 --- a/plugins/samplesink/usrpoutput/usrpoutputwebapiadapter.cpp +++ b/plugins/samplesink/usrpoutput/usrpoutputwebapiadapter.cpp @@ -46,6 +46,7 @@ int USRPOutputWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; USRPOutput::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesource/airspy/airspywebapiadapter.cpp b/plugins/samplesource/airspy/airspywebapiadapter.cpp index 0495d596a..a8749f583 100644 --- a/plugins/samplesource/airspy/airspywebapiadapter.cpp +++ b/plugins/samplesource/airspy/airspywebapiadapter.cpp @@ -45,6 +45,7 @@ int AirspyWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; AirspyInput::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesource/airspyhf/airspyhfwebapiadapter.cpp b/plugins/samplesource/airspyhf/airspyhfwebapiadapter.cpp index f1dad90fd..a7e751be4 100644 --- a/plugins/samplesource/airspyhf/airspyhfwebapiadapter.cpp +++ b/plugins/samplesource/airspyhf/airspyhfwebapiadapter.cpp @@ -45,6 +45,7 @@ int AirspyHFWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; AirspyHFInput::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesource/audioinput/audioinput.cpp b/plugins/samplesource/audioinput/audioinput.cpp index 2a1dc2bf9..4fa6f87f2 100644 --- a/plugins/samplesource/audioinput/audioinput.cpp +++ b/plugins/samplesource/audioinput/audioinput.cpp @@ -40,7 +40,8 @@ AudioInput::AudioInput(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_settings(), m_deviceDescription("AudioInput"), - m_running(false) + m_running(false), + m_centerFrequency(0) { m_fifo.setSize(20*AudioInputWorker::m_convBufSamples); openDevice(); @@ -189,11 +190,7 @@ int AudioInput::getSampleRate() const quint64 AudioInput::getCenterFrequency() const { - return 0; -} - -void AudioInput::setCenterFrequency(qint64 centerFrequency) -{ + return m_centerFrequency; } bool AudioInput::handleMessage(const Message& message) @@ -312,6 +309,8 @@ void AudioInput::applySettings(const AudioInputSettings& settings, bool force, b (m_settings.m_iqMapping == AudioInputSettings::IQMapping::R)) ? m_settings.m_sampleRate / 4 : 0; DSPSignalNotification *notif = new DSPSignalNotification(m_settings.m_sampleRate/(1<getSampleRate(); + m_centerFrequency = notif->getCenterFrequency(); m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif); } } diff --git a/plugins/samplesource/audioinput/audioinput.h b/plugins/samplesource/audioinput/audioinput.h index 9e5c13349..b57b16c36 100644 --- a/plugins/samplesource/audioinput/audioinput.h +++ b/plugins/samplesource/audioinput/audioinput.h @@ -98,7 +98,7 @@ public: virtual int getSampleRate() const; virtual void setSampleRate(int sampleRate) { (void) sampleRate; } virtual quint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); + virtual void setCenterFrequency(qint64 centerFrequency) { (void) centerFrequency; } virtual bool handleMessage(const Message& message); @@ -140,6 +140,8 @@ private: QThread m_workerThread; QString m_deviceDescription; bool m_running; + int m_sampleRate; + qint64 m_centerFrequency; QNetworkAccessManager *m_networkManager; QNetworkRequest m_networkRequest; diff --git a/plugins/samplesource/audioinput/audioinputgui.cpp b/plugins/samplesource/audioinput/audioinputgui.cpp index a4deece7b..10983f562 100644 --- a/plugins/samplesource/audioinput/audioinputgui.cpp +++ b/plugins/samplesource/audioinput/audioinputgui.cpp @@ -225,6 +225,7 @@ void AudioInputGui::displaySettings() void AudioInputGui::on_device_currentIndexChanged(int index) { + (void) index; m_settings.m_deviceName = ui->device->currentText(); refreshSampleRates(m_settings.m_deviceName); sendSettings(); @@ -232,6 +233,7 @@ void AudioInputGui::on_device_currentIndexChanged(int index) void AudioInputGui::on_sampleRate_currentIndexChanged(int index) { + (void) index; m_settings.m_sampleRate = ui->sampleRate->currentText().toInt(); sendSettings(); } diff --git a/plugins/samplesource/audioinput/audioinputwebapiadapter.cpp b/plugins/samplesource/audioinput/audioinputwebapiadapter.cpp index c88dee9c8..699069191 100644 --- a/plugins/samplesource/audioinput/audioinputwebapiadapter.cpp +++ b/plugins/samplesource/audioinput/audioinputwebapiadapter.cpp @@ -43,6 +43,7 @@ int AudioInputWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; AudioInput::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesource/bladerf1input/bladerf1inputwebapiadapter.cpp b/plugins/samplesource/bladerf1input/bladerf1inputwebapiadapter.cpp index 8db19171c..8789f39e8 100644 --- a/plugins/samplesource/bladerf1input/bladerf1inputwebapiadapter.cpp +++ b/plugins/samplesource/bladerf1input/bladerf1inputwebapiadapter.cpp @@ -45,6 +45,7 @@ int BladeRF1InputWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; Bladerf1Input::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesource/bladerf2input/bladerf2inputwebapiadapter.cpp b/plugins/samplesource/bladerf2input/bladerf2inputwebapiadapter.cpp index 368ef681d..496e1b12c 100644 --- a/plugins/samplesource/bladerf2input/bladerf2inputwebapiadapter.cpp +++ b/plugins/samplesource/bladerf2input/bladerf2inputwebapiadapter.cpp @@ -45,6 +45,7 @@ int BladeRF2InputWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; BladeRF2Input::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesource/fcdpro/fcdprowebapiadapter.cpp b/plugins/samplesource/fcdpro/fcdprowebapiadapter.cpp index c8bff69af..95bcdcdbd 100644 --- a/plugins/samplesource/fcdpro/fcdprowebapiadapter.cpp +++ b/plugins/samplesource/fcdpro/fcdprowebapiadapter.cpp @@ -45,6 +45,7 @@ int FCDProWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; FCDProInput::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesource/fcdproplus/fcdpropluswebapiadapter.cpp b/plugins/samplesource/fcdproplus/fcdpropluswebapiadapter.cpp index 7e47a0484..3b70222ce 100644 --- a/plugins/samplesource/fcdproplus/fcdpropluswebapiadapter.cpp +++ b/plugins/samplesource/fcdproplus/fcdpropluswebapiadapter.cpp @@ -45,6 +45,7 @@ int FCDProPlusWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; FCDProPlusInput::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesource/fileinput/fileinputwebapiadapter.cpp b/plugins/samplesource/fileinput/fileinputwebapiadapter.cpp index 54cb57959..6423802aa 100644 --- a/plugins/samplesource/fileinput/fileinputwebapiadapter.cpp +++ b/plugins/samplesource/fileinput/fileinputwebapiadapter.cpp @@ -45,6 +45,7 @@ int FileInputWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; FileInput::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesource/hackrfinput/hackrfinputwebapiadapter.cpp b/plugins/samplesource/hackrfinput/hackrfinputwebapiadapter.cpp index 448ee811a..2a0d95102 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputwebapiadapter.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinputwebapiadapter.cpp @@ -45,6 +45,7 @@ int HackRFInputWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; HackRFInput::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesource/kiwisdr/kiwisdrwebapiadapter.cpp b/plugins/samplesource/kiwisdr/kiwisdrwebapiadapter.cpp index c9d8bed89..0a6d0b1c3 100644 --- a/plugins/samplesource/kiwisdr/kiwisdrwebapiadapter.cpp +++ b/plugins/samplesource/kiwisdr/kiwisdrwebapiadapter.cpp @@ -45,6 +45,7 @@ int KiwiSDRWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; KiwiSDRInput::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesource/kiwisdr/kiwisdrworker.cpp b/plugins/samplesource/kiwisdr/kiwisdrworker.cpp index 4a2fd4e38..ae21f539b 100644 --- a/plugins/samplesource/kiwisdr/kiwisdrworker.cpp +++ b/plugins/samplesource/kiwisdr/kiwisdrworker.cpp @@ -55,6 +55,7 @@ void KiwiSDRWorker::onDisconnected() void KiwiSDRWorker::onSocketError(QAbstractSocket::SocketError error) { + (void) error; m_status = 3; emit updateStatus(3); } diff --git a/plugins/samplesource/limesdrinput/limesdrinputwebapiadapter.cpp b/plugins/samplesource/limesdrinput/limesdrinputwebapiadapter.cpp index 1568c36f1..bf6b9ada0 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputwebapiadapter.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputwebapiadapter.cpp @@ -45,6 +45,7 @@ int LimeSDRInputWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; LimeSDRInput::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesource/localinput/localinputwebapiadapter.cpp b/plugins/samplesource/localinput/localinputwebapiadapter.cpp index f59d338e2..87a687479 100644 --- a/plugins/samplesource/localinput/localinputwebapiadapter.cpp +++ b/plugins/samplesource/localinput/localinputwebapiadapter.cpp @@ -45,6 +45,7 @@ int LocalInputWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; LocalInput::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesource/perseus/perseuswebapiadapter.cpp b/plugins/samplesource/perseus/perseuswebapiadapter.cpp index 902e2751e..d152f011f 100644 --- a/plugins/samplesource/perseus/perseuswebapiadapter.cpp +++ b/plugins/samplesource/perseus/perseuswebapiadapter.cpp @@ -45,6 +45,7 @@ int PerseusWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; PerseusInput::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputwebapiadapter.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputwebapiadapter.cpp index 65022c965..8b010f952 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputwebapiadapter.cpp +++ b/plugins/samplesource/plutosdrinput/plutosdrinputwebapiadapter.cpp @@ -45,6 +45,7 @@ int PlutoSDRInputWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; PlutoSDRInput::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesource/remoteinput/remoteinputwebapiadapter.cpp b/plugins/samplesource/remoteinput/remoteinputwebapiadapter.cpp index 93bc953f4..2abbe5fd3 100644 --- a/plugins/samplesource/remoteinput/remoteinputwebapiadapter.cpp +++ b/plugins/samplesource/remoteinput/remoteinputwebapiadapter.cpp @@ -45,6 +45,7 @@ int RemoteInputWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; RemoteInput::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesource/rtlsdr/rtlsdrwebapiadapter.cpp b/plugins/samplesource/rtlsdr/rtlsdrwebapiadapter.cpp index 7b0324bb1..9d6f8eda5 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrwebapiadapter.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrwebapiadapter.cpp @@ -45,6 +45,7 @@ int RTLSDRWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; RTLSDRInput::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesource/sdrplay/sdrplaywebapiadapter.cpp b/plugins/samplesource/sdrplay/sdrplaywebapiadapter.cpp index 39776b2a4..f6a74c707 100644 --- a/plugins/samplesource/sdrplay/sdrplaywebapiadapter.cpp +++ b/plugins/samplesource/sdrplay/sdrplaywebapiadapter.cpp @@ -45,6 +45,7 @@ int SDRPlayWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; SDRPlayInput::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesource/sigmffileinput/sigmffileinputwebapiadapter.cpp b/plugins/samplesource/sigmffileinput/sigmffileinputwebapiadapter.cpp index dfab72d1c..32992a944 100644 --- a/plugins/samplesource/sigmffileinput/sigmffileinputwebapiadapter.cpp +++ b/plugins/samplesource/sigmffileinput/sigmffileinputwebapiadapter.cpp @@ -45,6 +45,7 @@ int SigMFFileInputWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; SigMFFileInput::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputwebapiadapter.cpp b/plugins/samplesource/soapysdrinput/soapysdrinputwebapiadapter.cpp index 4a05678cc..ef7d5aa91 100644 --- a/plugins/samplesource/soapysdrinput/soapysdrinputwebapiadapter.cpp +++ b/plugins/samplesource/soapysdrinput/soapysdrinputwebapiadapter.cpp @@ -45,6 +45,7 @@ int SoapySDRInputWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; SoapySDRInput::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesource/testsource/testsourcewebapiadapter.cpp b/plugins/samplesource/testsource/testsourcewebapiadapter.cpp index 5a51bdbb5..108fe3ff6 100644 --- a/plugins/samplesource/testsource/testsourcewebapiadapter.cpp +++ b/plugins/samplesource/testsource/testsourcewebapiadapter.cpp @@ -45,6 +45,7 @@ int TestSourceWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; TestSourceInput::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/plugins/samplesource/usrpinput/usrpinputgui.cpp b/plugins/samplesource/usrpinput/usrpinputgui.cpp index 485d9ef1e..db606d134 100644 --- a/plugins/samplesource/usrpinput/usrpinputgui.cpp +++ b/plugins/samplesource/usrpinput/usrpinputgui.cpp @@ -574,12 +574,14 @@ void USRPInputGUI::on_gain_valueChanged(int value) void USRPInputGUI::on_antenna_currentIndexChanged(int index) { + (void) index; m_settings.m_antennaPath = ui->antenna->currentText(); sendSettings(); } void USRPInputGUI::on_clockSource_currentIndexChanged(int index) { + (void) index; m_settings.m_clockSource = ui->clockSource->currentText(); sendSettings(); } diff --git a/plugins/samplesource/usrpinput/usrpinputwebapiadapter.cpp b/plugins/samplesource/usrpinput/usrpinputwebapiadapter.cpp index 071161575..c301b1f5d 100644 --- a/plugins/samplesource/usrpinput/usrpinputwebapiadapter.cpp +++ b/plugins/samplesource/usrpinput/usrpinputwebapiadapter.cpp @@ -46,6 +46,7 @@ int USRPInputWebAPIAdapter::webapiSettingsPutPatch( SWGSDRangel::SWGDeviceSettings& response, // query + response QString& errorMessage) { + (void) force; // no action (void) errorMessage; USRPInput::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); return 200; diff --git a/sdrbase/dsp/ctcssdetector.cpp b/sdrbase/dsp/ctcssdetector.cpp index 019c5a418..d193c5331 100644 --- a/sdrbase/dsp/ctcssdetector.cpp +++ b/sdrbase/dsp/ctcssdetector.cpp @@ -36,22 +36,6 @@ CTCSSDetector::CTCSSDetector() : m_power = new Real[CTCSSFrequencies::m_nbFreqs]; } -CTCSSDetector::CTCSSDetector(int _nTones, Real *tones) : - m_N(0), - m_sampleRate(0), - m_samplesProcessed(0), - m_maxPowerIndex(0), - m_toneDetected(false), - m_maxPower(0.0) -{ - m_k = new Real[CTCSSFrequencies::m_nbFreqs]; - m_coef = new Real[CTCSSFrequencies::m_nbFreqs]; - m_u0 = new Real[CTCSSFrequencies::m_nbFreqs]; - m_u1 = new Real[CTCSSFrequencies::m_nbFreqs]; - m_power = new Real[CTCSSFrequencies::m_nbFreqs]; -} - - CTCSSDetector::~CTCSSDetector() { delete[] m_k; diff --git a/sdrbase/dsp/ctcssdetector.h b/sdrbase/dsp/ctcssdetector.h index b3d4b7736..c326ce0fc 100644 --- a/sdrbase/dsp/ctcssdetector.h +++ b/sdrbase/dsp/ctcssdetector.h @@ -31,7 +31,6 @@ class SDRBASE_API CTCSSDetector { public: CTCSSDetector(); - CTCSSDetector(int _nTones, Real *tones); //!< allows user defined CTCSS tone set virtual ~CTCSSDetector(); // setup the basic parameters and coefficients diff --git a/sdrbase/dsp/glspectruminterface.h b/sdrbase/dsp/glspectruminterface.h index 1e1e0446c..c8cd56307 100644 --- a/sdrbase/dsp/glspectruminterface.h +++ b/sdrbase/dsp/glspectruminterface.h @@ -26,7 +26,11 @@ class GLSpectrumInterface public: GLSpectrumInterface() {} virtual ~GLSpectrumInterface() {} - virtual void newSpectrum(const std::vector& spectrum, int fftSize) {} + virtual void newSpectrum(const std::vector& spectrum, int fftSize) + { + (void) spectrum; + (void) fftSize; + } }; #endif // SDRBASE_DSP_GLSPECTRUMINTERFACE_H_ diff --git a/sdrbase/feature/feature.cpp b/sdrbase/feature/feature.cpp index b02341aac..5cf9c8036 100644 --- a/sdrbase/feature/feature.cpp +++ b/sdrbase/feature/feature.cpp @@ -50,6 +50,7 @@ int Feature::webapiRunGet( SWGSDRangel::SWGDeviceState& response, QString& errorMessage) const { + (void) errorMessage; getFeatureStateStr(*response.getState()); return 200; } diff --git a/sdrbase/plugin/plugininterface.h b/sdrbase/plugin/plugininterface.h index cccf0a311..2ca1b6851 100644 --- a/sdrbase/plugin/plugininterface.h +++ b/sdrbase/plugin/plugininterface.h @@ -322,6 +322,7 @@ public: virtual bool deserializeGlobalSettings(const QByteArray& data) { + (void) data; return true; } @@ -335,11 +336,14 @@ public: virtual FeatureGUI* createFeatureGUI(FeatureUISet *featureUISet, Feature *feature) const { + (void) featureUISet; + (void) feature; return nullptr; } virtual Feature* createFeature(WebAPIAdapterInterface *webAPIAdapterInterface) const { + (void) webAPIAdapterInterface; return nullptr; } }; diff --git a/sdrbase/settings/preset.cpp b/sdrbase/settings/preset.cpp index dd8a19955..f2dac69a6 100644 --- a/sdrbase/settings/preset.cpp +++ b/sdrbase/settings/preset.cpp @@ -243,7 +243,7 @@ const QByteArray* Preset::findDeviceConfig( for (; it != m_deviceConfigs.end(); ++it) { - if ((it->m_deviceId == deviceId) && (it->m_deviceSerial == deviceSerial) && (it->m_deviceSerial == deviceSerial)) { + if ((it->m_deviceId == deviceId) && (it->m_deviceSerial == deviceSerial) && (it->m_deviceSequence == deviceSequence)) { return &it->m_config; } } diff --git a/sdrbase/webapi/webapiadapter.cpp b/sdrbase/webapi/webapiadapter.cpp index 682fc036e..8ae61ee4c 100644 --- a/sdrbase/webapi/webapiadapter.cpp +++ b/sdrbase/webapi/webapiadapter.cpp @@ -137,6 +137,7 @@ int WebAPIAdapter::instanceConfigGet( SWGSDRangel::SWGInstanceConfigResponse& response, SWGSDRangel::SWGErrorResponse& error) { + (void) error; response.init(); WebAPIAdapterBase webAPIAdapterBase; webAPIAdapterBase.setPluginManager(m_mainCore->getPluginManager()); @@ -187,6 +188,8 @@ int WebAPIAdapter::instanceConfigPutPatch( SWGSDRangel::SWGSuccessResponse& response, SWGSDRangel::SWGErrorResponse& error) { + (void) response; + (void) error; WebAPIAdapterBase webAPIAdapterBase; webAPIAdapterBase.setPluginManager(m_mainCore->getPluginManager()); diff --git a/sdrgui/CMakeLists.txt b/sdrgui/CMakeLists.txt index 1a66d67b4..ce3abb021 100644 --- a/sdrgui/CMakeLists.txt +++ b/sdrgui/CMakeLists.txt @@ -23,7 +23,6 @@ set(sdrgui_SOURCES gui/commanditem.cpp gui/commandkeyreceiver.cpp gui/commandoutputdialog.cpp - gui/comboboxnoarrow.cpp gui/crightclickenabler.cpp gui/customtextedit.cpp gui/cwkeyergui.cpp @@ -107,7 +106,6 @@ set(sdrgui_HEADERS gui/commanditem.h gui/commandkeyreceiver.h gui/commandoutputdialog.h - gui/comboboxnoarrow.h gui/crightclickenabler.h gui/customtextedit.h gui/cwkeyergui.h diff --git a/sdrgui/device/deviceuiset.cpp b/sdrgui/device/deviceuiset.cpp index 32d843db1..9b306de18 100644 --- a/sdrgui/device/deviceuiset.cpp +++ b/sdrgui/device/deviceuiset.cpp @@ -36,7 +36,7 @@ #include "deviceuiset.h" -DeviceUISet::DeviceUISet(int tabIndex, DeviceSet *deviceSet, int deviceType, QTimer& timer) +DeviceUISet::DeviceUISet(int tabIndex, DeviceSet *deviceSet, QTimer& timer) { m_spectrum = new GLSpectrum; m_spectrumVis = deviceSet->m_spectrumVis; diff --git a/sdrgui/device/deviceuiset.h b/sdrgui/device/deviceuiset.h index d76530e1e..5c77b053e 100644 --- a/sdrgui/device/deviceuiset.h +++ b/sdrgui/device/deviceuiset.h @@ -61,7 +61,7 @@ public: DSPDeviceMIMOEngine *m_deviceMIMOEngine; QByteArray m_mainWindowState; - DeviceUISet(int tabIndex, DeviceSet *deviceSet, int deviceType, QTimer& timer); + DeviceUISet(int tabIndex, DeviceSet *deviceSet, QTimer& timer); ~DeviceUISet(); GLSpectrum *getSpectrum() { return m_spectrum; } //!< Direct spectrum getter diff --git a/sdrgui/gui/ambedevicesdialog.cpp b/sdrgui/gui/ambedevicesdialog.cpp index 63c855550..3c8195a61 100644 --- a/sdrgui/gui/ambedevicesdialog.cpp +++ b/sdrgui/gui/ambedevicesdialog.cpp @@ -64,9 +64,8 @@ void AMBEDevicesDialog::refreshInUseList() } } -void AMBEDevicesDialog::on_importSerial_clicked(bool checked) +void AMBEDevicesDialog::on_importSerial_clicked() { - (void) checked; QListWidgetItem *serialItem = ui->ambeSerialDevices->currentItem(); if (!serialItem) @@ -96,9 +95,8 @@ void AMBEDevicesDialog::on_importSerial_clicked(bool checked) } } -void AMBEDevicesDialog::on_importAllSerial_clicked(bool checked) +void AMBEDevicesDialog::on_importAllSerial_clicked() { - (void) checked; int count = 0; for (int i = 0; i < ui->ambeSerialDevices->count(); i++) @@ -120,9 +118,8 @@ void AMBEDevicesDialog::on_importAllSerial_clicked(bool checked) ui->statusText->setText(tr("%1 devices added").arg(count)); } -void AMBEDevicesDialog::on_removeAmbeDevice_clicked(bool checked) +void AMBEDevicesDialog::on_removeAmbeDevice_clicked() { - (void) checked; QListWidgetItem *deviceItem = ui->ambeDeviceRefs->currentItem(); if (!deviceItem) @@ -137,13 +134,13 @@ void AMBEDevicesDialog::on_removeAmbeDevice_clicked(bool checked) refreshInUseList(); } -void AMBEDevicesDialog::on_refreshAmbeList_clicked(bool checked) +void AMBEDevicesDialog::on_refreshAmbeList_clicked() { refreshInUseList(); ui->statusText->setText("In use refreshed"); } -void AMBEDevicesDialog::on_clearAmbeList_clicked(bool checked) +void AMBEDevicesDialog::on_clearAmbeList_clicked() { if (ui->ambeDeviceRefs->count() == 0) { @@ -156,7 +153,7 @@ void AMBEDevicesDialog::on_clearAmbeList_clicked(bool checked) ui->statusText->setText("All items released"); } -void AMBEDevicesDialog::on_importAddress_clicked(bool checked) +void AMBEDevicesDialog::on_importAddress_clicked() { QString addressAndPort = ui->ambeAddressText->text(); diff --git a/sdrgui/gui/ambedevicesdialog.h b/sdrgui/gui/ambedevicesdialog.h index c0309f395..d32009e5a 100644 --- a/sdrgui/gui/ambedevicesdialog.h +++ b/sdrgui/gui/ambedevicesdialog.h @@ -45,12 +45,12 @@ private: AMBEEngine* m_ambeEngine; private slots: - void on_importSerial_clicked(bool checked); - void on_importAllSerial_clicked(bool checked); - void on_removeAmbeDevice_clicked(bool checked); - void on_refreshAmbeList_clicked(bool checked); - void on_clearAmbeList_clicked(bool checked); - void on_importAddress_clicked(bool checked); + void on_importSerial_clicked(); + void on_importAllSerial_clicked(); + void on_removeAmbeDevice_clicked(); + void on_refreshAmbeList_clicked(); + void on_clearAmbeList_clicked(); + void on_importAddress_clicked(); }; -#endif // SDRGUI_GUI_AMBEDEVICESDIALOG_H_ \ No newline at end of file +#endif // SDRGUI_GUI_AMBEDEVICESDIALOG_H_ diff --git a/sdrgui/gui/comboboxnoarrow.cpp b/sdrgui/gui/comboboxnoarrow.cpp deleted file mode 100644 index c255852fd..000000000 --- a/sdrgui/gui/comboboxnoarrow.cpp +++ /dev/null @@ -1,36 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2018 F4EXB // -// written by Edouard Griffiths // -// // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation as version 3 of the License, or // -// (at your option) any later version. // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License V3 for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -/////////////////////////////////////////////////////////////////////////////////// - -#include - -#include "comboboxnoarrow.h" - -// MSVC doesn't support __attribute__ -// maybe use #ifdef and __declspec(unused) as prefix for windows -void ComboBoxNoArrow::paintEvent (QPaintEvent *ev) -{ - QPainter p; - p.begin (this); - QStyleOptionComboBox opt; - opt.initFrom (this); - style()->drawPrimitive (QStyle::PE_PanelButtonBevel, &opt, &p, this); - style()->drawPrimitive (QStyle::PE_PanelButtonCommand, &opt, &p, this); - style()->drawItemText (&p, rect(), Qt::AlignCenter, palette(), isEnabled(), currentText()); - p.end(); -} - diff --git a/sdrgui/gui/comboboxnoarrow.h b/sdrgui/gui/comboboxnoarrow.h deleted file mode 100644 index 0908b12b0..000000000 --- a/sdrgui/gui/comboboxnoarrow.h +++ /dev/null @@ -1,40 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2018 F4EXB // -// written by Edouard Griffiths // -// // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation as version 3 of the License, or // -// (at your option) any later version. // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License V3 for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -/////////////////////////////////////////////////////////////////////////////////// - -#ifndef SDRGUI_GUI_COMBOBOXNOARROW_H_ -#define SDRGUI_GUI_COMBOBOXNOARROW_H_ - -#include - -/////////////////////////////////////////////////////////////////////////////////////////////////// -/// This class is a custom QComboBox which does NOT display the down arrow. The down arrow takes -/// a lot of real estate when you're trying to make them narrow. So much real estate that you can't -/// see short lines of text such as "CH 1" without the digit cut off. The only thing that this -/// custom widget does is to override the paint function. The new paint function draws the combo -/// box (using all style sheet info) without the down arrow. -/////////////////////////////////////////////////////////////////////////////////////////////////// -class ComboBoxNoArrow : public QComboBox -{ - Q_OBJECT -public: - ComboBoxNoArrow (QWidget *parent) : QComboBox(parent) {} - virtual ~ComboBoxNoArrow() {} - void paintEvent (QPaintEvent *ev); -}; - -#endif /* SDRGUI_GUI_COMBOBOXNOARROW_H_ */ diff --git a/sdrgui/gui/deviceuserargsdialog.cpp b/sdrgui/gui/deviceuserargsdialog.cpp index 128348820..ab62d02df 100644 --- a/sdrgui/gui/deviceuserargsdialog.cpp +++ b/sdrgui/gui/deviceuserargsdialog.cpp @@ -125,9 +125,8 @@ void DeviceUserArgsDialog::reject() QDialog::reject(); } -void DeviceUserArgsDialog::on_importDevice_clicked(bool checked) +void DeviceUserArgsDialog::on_importDevice_clicked() { - (void) checked; QTreeWidgetItem *deviceItem = ui->deviceTree->currentItem(); if (deviceItem) @@ -139,9 +138,8 @@ void DeviceUserArgsDialog::on_importDevice_clicked(bool checked) } } -void DeviceUserArgsDialog::on_deleteArgs_clicked(bool checked) +void DeviceUserArgsDialog::on_deleteArgs_clicked() { - (void) checked; QTreeWidgetItem *deviceItem = ui->argsTree->currentItem(); if (deviceItem) @@ -188,7 +186,7 @@ void DeviceUserArgsDialog::on_addDeviceSeqEdit_editingFinished() } } -void DeviceUserArgsDialog::on_addDevice_clicked(bool checked) +void DeviceUserArgsDialog::on_addDevice_clicked() { m_deviceUserArgsCopy.addDeviceArgs(m_xDeviceHardwareId, m_xDeviceSequence, "", true); displayArgsByDevice(); diff --git a/sdrgui/gui/deviceuserargsdialog.h b/sdrgui/gui/deviceuserargsdialog.h index 34bcbd618..d2bd91729 100644 --- a/sdrgui/gui/deviceuserargsdialog.h +++ b/sdrgui/gui/deviceuserargsdialog.h @@ -67,13 +67,13 @@ private: private slots: void accept(); void reject(); - void on_importDevice_clicked(bool checked); - void on_deleteArgs_clicked(bool checked); + void on_importDevice_clicked(); + void on_deleteArgs_clicked(); void on_argsTree_currentItemChanged(QTreeWidgetItem* currentItem, QTreeWidgetItem* previousItem); void on_argStringEdit_editingFinished(); void on_addDeviceHwIDEdit_editingFinished(); void on_addDeviceSeqEdit_editingFinished(); - void on_addDevice_clicked(bool checked); + void on_addDevice_clicked(); }; -#endif // SDRGUI_GUI_DEVICEUSERARGSDIALOG_H \ No newline at end of file +#endif // SDRGUI_GUI_DEVICEUSERARGSDIALOG_H diff --git a/sdrgui/gui/doublevalidator.h b/sdrgui/gui/doublevalidator.h index 675132f5e..3d1fb6a2b 100644 --- a/sdrgui/gui/doublevalidator.h +++ b/sdrgui/gui/doublevalidator.h @@ -29,7 +29,7 @@ public: { } - QValidator::State validate(QString &s, int &i) const + QValidator::State validate(QString &s) const { if (s.isEmpty() || s == "-") { return QValidator::Intermediate; diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp index 39e3ee7c3..da953deab 100644 --- a/sdrgui/mainwindow.cpp +++ b/sdrgui/mainwindow.cpp @@ -299,7 +299,7 @@ void MainWindow::addSourceDevice(int deviceIndex) ui->inputViewDock->addDevice(0, deviceTabIndex); m_mainCore->appendDeviceSet(0); - m_deviceUIs.push_back(new DeviceUISet(deviceTabIndex, m_mainCore->m_deviceSets.back(), 0, m_mainCore->m_masterTimer)); + m_deviceUIs.push_back(new DeviceUISet(deviceTabIndex, m_mainCore->m_deviceSets.back(), m_mainCore->m_masterTimer)); m_deviceUIs.back()->m_deviceSourceEngine = dspDeviceSourceEngine; m_mainCore->m_deviceSets.back()->m_deviceSourceEngine = dspDeviceSourceEngine; m_deviceUIs.back()->m_deviceSinkEngine = nullptr; @@ -378,7 +378,7 @@ void MainWindow::addSinkDevice() ui->inputViewDock->addDevice(1, deviceTabIndex); m_mainCore->appendDeviceSet(1); - m_deviceUIs.push_back(new DeviceUISet(deviceTabIndex, m_mainCore->m_deviceSets.back(), 1, m_mainCore->m_masterTimer)); + m_deviceUIs.push_back(new DeviceUISet(deviceTabIndex, m_mainCore->m_deviceSets.back(), m_mainCore->m_masterTimer)); m_deviceUIs.back()->m_deviceSourceEngine = nullptr; m_mainCore->m_deviceSets.back()->m_deviceSourceEngine = nullptr; m_deviceUIs.back()->m_deviceSinkEngine = dspDeviceSinkEngine; @@ -455,7 +455,7 @@ void MainWindow::addMIMODevice() ui->inputViewDock->addDevice(2, deviceTabIndex); m_mainCore->appendDeviceSet(2); - m_deviceUIs.push_back(new DeviceUISet(deviceTabIndex, m_mainCore->m_deviceSets.back(), 2, m_mainCore->m_masterTimer)); + m_deviceUIs.push_back(new DeviceUISet(deviceTabIndex, m_mainCore->m_deviceSets.back(), m_mainCore->m_masterTimer)); m_deviceUIs.back()->m_deviceSourceEngine = nullptr; m_mainCore->m_deviceSets.back()->m_deviceSourceEngine = nullptr; m_deviceUIs.back()->m_deviceSinkEngine = nullptr; diff --git a/sdrsrv/mainserver.cpp b/sdrsrv/mainserver.cpp index 077eb6ede..24c7f04bb 100644 --- a/sdrsrv/mainserver.cpp +++ b/sdrsrv/mainserver.cpp @@ -682,12 +682,12 @@ void MainServer::deleteChannel(int deviceSetIndex, int channelIndex) } } -void MainServer::addFeature(int featureSetIndex, int featureIndex) +void MainServer::addFeature(int featureSetIndex, int selectedFeatureIndex) { if (featureSetIndex >= 0) { FeatureSet *featureSet = m_mainCore->m_featureSets[featureSetIndex]; - featureSet->addFeature(featureSetIndex, m_mainCore->m_pluginManager->getPluginAPI(), m_apiAdapter); + featureSet->addFeature(selectedFeatureIndex, m_mainCore->m_pluginManager->getPluginAPI(), m_apiAdapter); } } diff --git a/sdrsrv/mainserver.h b/sdrsrv/mainserver.h index 2a05e6feb..6da13e499 100644 --- a/sdrsrv/mainserver.h +++ b/sdrsrv/mainserver.h @@ -66,7 +66,7 @@ public: void changeSampleMIMO(int deviceSetIndex, int selectedDeviceIndex); void addChannel(int deviceSetIndex, int selectedChannelIndex); void deleteChannel(int deviceSetIndex, int channelIndex); - void addFeature(int featureSetIndex, int featureIndex); + void addFeature(int featureSetIndex, int selectedFeatureIndex); void deleteFeature(int featureSetIndex, int featureIndex); friend class WebAPIAdapter;