From 570c1f6877814ce09b2ca6e56570eac041476d9c Mon Sep 17 00:00:00 2001 From: Daniele Forsi Date: Sat, 20 Apr 2024 11:51:29 +0200 Subject: [PATCH 1/4] Remove unused includes and use more direct includes --- devices/bladerf1/devicebladerf1shared.h | 1 - modemm17/Trellis.h | 3 --- modemm17/Viterbi.h | 1 - plugins/channelmimo/doa2/doa2baseband.h | 1 + plugins/channelmimo/doa2/doa2corr.h | 1 - plugins/channelmimo/doa2/doa2webapiadapter.h | 1 - plugins/channelmimo/interferometer/interferometerbaseband.h | 1 + plugins/channelmimo/interferometer/interferometercorr.h | 1 - plugins/channelrx/chanalyzer/chanalyzer.h | 1 - plugins/channelrx/chanalyzer/chanalyzergui.h | 1 - plugins/channelrx/chanalyzer/chanalyzerwebapiadapter.h | 2 -- plugins/channelrx/demodadsb/adsbdemodgui.h | 2 -- plugins/channelrx/demodadsb/adsbdemodreport.h | 1 - plugins/channelrx/demodais/aisdemodsink.h | 2 -- plugins/channelrx/demodam/amdemodgui.h | 1 - plugins/channelrx/demodam/amdemodsettings.h | 1 + plugins/channelrx/demodatv/atvdemod.cpp | 1 + plugins/channelrx/demodatv/atvdemod.h | 2 -- plugins/channelrx/demodatv/atvdemodgui.cpp | 1 + plugins/channelrx/demodatv/atvdemodsink.h | 2 -- plugins/channelrx/demodbfm/bfmdemodsink.h | 1 - plugins/channelrx/demodchirpchat/chirpchatdemodsink.h | 1 - plugins/channelrx/demoddatv/datvconstellation.h | 1 + plugins/channelrx/demoddatv/datvdemod.cpp | 1 + plugins/channelrx/demoddatv/datvdemod.h | 2 -- plugins/channelrx/demoddatv/datvdemodgui.h | 1 - plugins/channelrx/demoddatv/datvdemodsink.h | 2 -- plugins/channelrx/demoddatv/datvdvbs2constellation.h | 1 + plugins/channelrx/demoddsc/dscdemod.h | 1 - plugins/channelrx/demoddsc/dscdemodgui.h | 1 - plugins/channelrx/demodfreedv/freedvdemod.h | 1 - plugins/channelrx/demodfreedv/freedvdemodgui.h | 1 - plugins/channelrx/demodfreedv/freedvdemodsettings.h | 2 ++ plugins/channelrx/demodft8/ft8demodgui.h | 1 - plugins/channelrx/demodft8/ft8demodsink.h | 1 - plugins/channelrx/demodils/ilsdemodgui.h | 1 - plugins/channelrx/demodils/ilsdemodsettings.h | 1 + plugins/channelrx/demodils/ilsdemodsink.h | 1 - plugins/channelrx/demodm17/m17demodfilters.h | 1 - plugins/channelrx/demodm17/m17demodgui.h | 2 -- plugins/channelrx/demodm17/m17demodsink.h | 3 --- plugins/channelrx/demodnavtex/navtexdemodgui.h | 1 - plugins/channelrx/demodnavtex/navtexdemodsettings.h | 2 ++ plugins/channelrx/demodnfm/nfmdemodgui.h | 1 - plugins/channelrx/demodnfm/nfmdemodsettings.h | 2 ++ plugins/channelrx/demodnfm/nfmdemodsink.h | 1 - plugins/channelrx/demodpacket/packetdemodgui.h | 1 - plugins/channelrx/demodpacket/packetdemodsettings.h | 2 ++ plugins/channelrx/demodpacket/packetdemodsink.h | 1 - plugins/channelrx/demodradiosonde/radiosondedemodsink.h | 1 - plugins/channelrx/demodrtty/rttydemodgui.h | 1 - plugins/channelrx/demodrtty/rttydemodsettings.h | 1 + plugins/channelrx/demodrtty/rttydemodsink.cpp | 1 + plugins/channelrx/demodrtty/rttydemodsink.h | 2 -- plugins/channelrx/demodssb/ssbdemodgui.h | 1 - plugins/channelrx/demodvor/vordemodgui.h | 1 - plugins/channelrx/demodvor/vordemodsettings.h | 2 ++ plugins/channelrx/demodwfm/wfmdemodsettings.h | 2 ++ plugins/channelrx/demodwfm/wfmdemodsink.h | 2 -- plugins/channelrx/freqscanner/freqscannersink.cpp | 1 + plugins/channelrx/freqscanner/freqscannersink.h | 1 - plugins/channelrx/freqtracker/freqtrackergui.h | 1 - plugins/channelrx/freqtracker/freqtrackersink.h | 4 ---- plugins/channelrx/heatmap/heatmapgui.cpp | 1 + plugins/channelrx/heatmap/heatmapgui.h | 1 - plugins/channelrx/heatmap/heatmapsink.h | 5 ----- plugins/channelrx/localsink/localsinkworker.h | 1 - plugins/channelrx/noisefigure/noisefigure.cpp | 1 + plugins/channelrx/noisefigure/noisefigurebaseband.h | 1 - plugins/channelrx/noisefigure/noisefiguresink.cpp | 1 + plugins/channelrx/noisefigure/noisefiguresink.h | 1 - plugins/channelrx/radioastronomy/radioastronomy.cpp | 1 + plugins/channelrx/radioastronomy/radioastronomybaseband.h | 1 - plugins/channelrx/radioastronomy/radioastronomysettings.h | 2 -- plugins/channelrx/radioclock/radioclocksink.h | 5 ----- plugins/channelrx/remotetcpsink/remotetcpsinksink.h | 1 - plugins/channeltx/filesource/filesource.cpp | 1 + plugins/channeltx/filesource/filesource.h | 2 -- plugins/channeltx/mod802.15.4/ieee_802_15_4_modsource.h | 2 -- plugins/channeltx/modais/aismodsource.h | 2 -- plugins/channeltx/moddatv/datvmodsource.h | 2 -- plugins/channeltx/modfreedv/freedvmod.h | 1 - plugins/channeltx/modfreedv/freedvmodsource.h | 1 - plugins/channeltx/modm17/m17modprocessor.h | 1 - plugins/channeltx/modnfm/nfmmodsettings.h | 1 + plugins/channeltx/modnfm/nfmmodsource.cpp | 1 + plugins/channeltx/modpacket/packetmodsource.h | 1 - plugins/channeltx/modpsk31/psk31modsource.h | 1 - plugins/channeltx/modrtty/rttymodsource.h | 1 - plugins/channeltx/modssb/ssbmod.h | 1 - plugins/channeltx/modssb/ssbmodsettings.h | 1 + plugins/channeltx/modwfm/wfmmodsettings.h | 1 + plugins/channeltx/udpsource/udpsource.h | 1 - plugins/feature/ais/aissettings.h | 2 -- plugins/feature/antennatools/antennatoolssettings.h | 2 -- plugins/feature/aprs/aprssettings.h | 2 -- plugins/feature/demodanalyzer/demodanalyzersettings.h | 2 -- plugins/feature/gs232controller/gs232controller.h | 1 - plugins/feature/gs232controller/gs232controllergui.cpp | 1 + plugins/feature/gs232controller/gs232controllersettings.h | 1 - .../feature/jogdialcontroller/jogdialcontrollersettings.h | 2 -- plugins/feature/map/beacon.h | 1 - plugins/feature/map/map.h | 1 - plugins/feature/map/mapgui.h | 2 ++ plugins/feature/pertester/pertestersettings.h | 2 -- plugins/feature/radiosonde/radiosondegui.cpp | 1 + plugins/feature/radiosonde/radiosondesettings.h | 2 -- plugins/feature/remotecontrol/remotecontrolsettings.h | 1 - .../feature/remotecontrol/remotecontrolsettingsdialog.cpp | 3 +-- plugins/feature/remotecontrol/remotecontrolsettingsdialog.h | 1 - plugins/feature/sid/sidaddchannelsdialog.h | 1 + plugins/feature/sid/sidsettings.h | 2 -- plugins/feature/simpleptt/simplepttcommandoutputdialog.h | 2 -- plugins/feature/simpleptt/simplepttworker.h | 1 + plugins/feature/skymap/webview.h | 2 -- plugins/feature/startracker/startrackergui.h | 1 - plugins/feature/startracker/startrackerreport.h | 1 - plugins/feature/startracker/startrackersettings.h | 2 -- plugins/feature/vorlocalizer/vorlocalizergui.h | 2 +- plugins/samplemimo/limesdrmimo/limesdrmothread.cpp | 1 + plugins/samplemimo/limesdrmimo/limesdrmothread.h | 1 - plugins/samplemimo/testmi/testmiworker.h | 1 - .../samplesink/aaroniartsaoutput/aaroniartsaoutputworker.h | 2 -- plugins/samplesink/fileoutput/fileoutputworker.h | 1 - plugins/samplesink/testsink/testsinkworker.h | 1 - plugins/samplesource/fileinput/fileinputworker.h | 1 - plugins/samplesource/remotetcpinput/remotetcpinput.h | 1 - plugins/samplesource/testsource/testsourceworker.h | 1 - qrtplib/rtcpapppacket.h | 1 - qrtplib/rtcpcompoundpacket.h | 1 - qrtplib/rtcppacket.h | 1 - qrtplib/rtcppacketbuilder.h | 1 - qrtplib/rtcprrpacket.h | 1 - qrtplib/rtcpscheduler.h | 1 - qrtplib/rtcpsrpacket.h | 1 - qrtplib/rtcpunknownpacket.h | 1 - qrtplib/rtpaddress.h | 1 - qrtplib/rtpcollisionlist.h | 1 - qrtplib/rtperrors.h | 1 - qrtplib/rtpinternalutils.h | 2 -- qrtplib/rtpkeyhashtable.h | 1 - qrtplib/rtppacket.h | 1 - qrtplib/rtppacketbuilder.h | 1 - qrtplib/rtprandom.h | 1 - qrtplib/rtprandomrand48.h | 1 - qrtplib/rtprandomrands.h | 1 - qrtplib/rtprandomurandom.h | 1 - qrtplib/rtprawpacket.h | 1 - qrtplib/rtpsession.cpp | 5 +---- qrtplib/rtpsession.h | 1 - qrtplib/rtpsessionparams.h | 4 ++-- qrtplib/rtpsocketutil.h | 1 - qrtplib/rtpsourcedata.h | 1 - qrtplib/rtpstructs.h | 1 - qrtplib/rtptransmitter.h | 1 - qrtplib/rtptypes.h | 2 -- sdrbase/audio/audiofifo.h | 1 - sdrbase/audio/audionetsink.h | 1 - sdrbase/availablechannelorfeaturehandler.h | 2 +- sdrbase/dsp/afsquelch.cpp | 3 +++ sdrbase/dsp/afsquelch.h | 1 - sdrbase/dsp/agc.h | 2 +- sdrbase/dsp/basebandsamplesink.h | 1 - sdrbase/dsp/basebandsamplesource.h | 1 - sdrbase/dsp/datafifo.h | 1 - sdrbase/dsp/downchannelizer.h | 1 - sdrbase/dsp/dspcommands.h | 2 +- sdrbase/dsp/dspdevicesinkengine.h | 1 - sdrbase/dsp/dspdevicesourceengine.h | 1 - sdrbase/dsp/fftengine.h | 1 - sdrbase/dsp/fftfactory.h | 1 - sdrbase/dsp/fftwengine.cpp | 2 ++ sdrbase/dsp/firfilter.h | 1 - sdrbase/dsp/glscopeinterface.h | 2 -- sdrbase/dsp/inthalfbandfiltereof.h | 1 - sdrbase/dsp/kissengine.cpp | 1 + sdrbase/dsp/mimochannel.h | 1 - sdrbase/dsp/movingaverage.h | 1 - sdrbase/dsp/scopevis.h | 1 - sdrbase/dsp/upchannelizer.h | 1 - sdrbase/feature/featurewebapiutils.h | 1 + sdrbase/util/aprs.h | 1 + sdrbase/util/ourairportsdb.h | 1 - sdrbase/util/radiosonde.h | 2 -- sdrbase/util/rtpsink.h | 3 --- sdrgui/gui/basicchannelsettingsdialog.cpp | 1 + sdrgui/gui/cwkeyergui.h | 1 - sdrgui/gui/glscope.h | 3 --- sdrgui/gui/glscopegui.h | 1 - sdrgui/gui/levelmeter.h | 1 - sdrgui/gui/profiledialog.h | 1 - sdrgui/gui/tabletapandhold.h | 2 ++ sdrgui/mainspectrum/mainspectrumgui.h | 1 - sdrsrv/mainserver.h | 1 - 194 files changed, 59 insertions(+), 209 deletions(-) diff --git a/devices/bladerf1/devicebladerf1shared.h b/devices/bladerf1/devicebladerf1shared.h index e4070ca4e..8b52e4b8f 100644 --- a/devices/bladerf1/devicebladerf1shared.h +++ b/devices/bladerf1/devicebladerf1shared.h @@ -20,7 +20,6 @@ #ifndef DEVICES_BLADERF_DEVICEHACKRFSHARED_H_ #define DEVICES_BLADERF_DEVICEHACKRFSHARED_H_ -#include "util/message.h" #include "export.h" class DEVICES_API DeviceBladeRF1Shared diff --git a/modemm17/Trellis.h b/modemm17/Trellis.h index dcc74ce52..74e494197 100644 --- a/modemm17/Trellis.h +++ b/modemm17/Trellis.h @@ -4,9 +4,6 @@ #pragma once -#include "Util.h" -#include "Convolution.h" - #include #include #include diff --git a/modemm17/Viterbi.h b/modemm17/Viterbi.h index 58bbaf98a..427f46408 100644 --- a/modemm17/Viterbi.h +++ b/modemm17/Viterbi.h @@ -2,7 +2,6 @@ #pragma once -#include "Trellis.h" #include "Convolution.h" #include "Util.h" diff --git a/plugins/channelmimo/doa2/doa2baseband.h b/plugins/channelmimo/doa2/doa2baseband.h index b060d2aa1..b00518bf0 100644 --- a/plugins/channelmimo/doa2/doa2baseband.h +++ b/plugins/channelmimo/doa2/doa2baseband.h @@ -25,6 +25,7 @@ #include #include "dsp/samplemififo.h" +#include "util/message.h" #include "util/messagequeue.h" #include "doa2streamsink.h" #include "doa2corr.h" diff --git a/plugins/channelmimo/doa2/doa2corr.h b/plugins/channelmimo/doa2/doa2corr.h index cc6cce3e8..665d77daf 100644 --- a/plugins/channelmimo/doa2/doa2corr.h +++ b/plugins/channelmimo/doa2/doa2corr.h @@ -23,7 +23,6 @@ #include "dsp/dsptypes.h" #include "dsp/fftwindow.h" -#include "util/message.h" #include "doa2settings.h" diff --git a/plugins/channelmimo/doa2/doa2webapiadapter.h b/plugins/channelmimo/doa2/doa2webapiadapter.h index b01b61440..e323f1f89 100644 --- a/plugins/channelmimo/doa2/doa2webapiadapter.h +++ b/plugins/channelmimo/doa2/doa2webapiadapter.h @@ -20,7 +20,6 @@ #include "channel/channelwebapiadapter.h" #include "dsp/glscopesettings.h" -#include "dsp/spectrumsettings.h" #include "doa2settings.h" /** diff --git a/plugins/channelmimo/interferometer/interferometerbaseband.h b/plugins/channelmimo/interferometer/interferometerbaseband.h index 08d2e1612..9528ec549 100644 --- a/plugins/channelmimo/interferometer/interferometerbaseband.h +++ b/plugins/channelmimo/interferometer/interferometerbaseband.h @@ -25,6 +25,7 @@ #include #include "dsp/samplemififo.h" +#include "util/message.h" #include "util/messagequeue.h" #include "interferometerstreamsink.h" #include "interferometercorr.h" diff --git a/plugins/channelmimo/interferometer/interferometercorr.h b/plugins/channelmimo/interferometer/interferometercorr.h index 037f57c41..efacd303f 100644 --- a/plugins/channelmimo/interferometer/interferometercorr.h +++ b/plugins/channelmimo/interferometer/interferometercorr.h @@ -23,7 +23,6 @@ #include "dsp/dsptypes.h" #include "dsp/fftwindow.h" -#include "util/message.h" #include "interferometersettings.h" diff --git a/plugins/channelrx/chanalyzer/chanalyzer.h b/plugins/channelrx/chanalyzer/chanalyzer.h index 018720ce2..f38e2f03f 100644 --- a/plugins/channelrx/chanalyzer/chanalyzer.h +++ b/plugins/channelrx/chanalyzer/chanalyzer.h @@ -33,7 +33,6 @@ #include "dsp/scopevis.h" #include "channel/channelapi.h" #include "util/message.h" -#include "util/movingaverage.h" #include "chanalyzerbaseband.h" diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.h b/plugins/channelrx/chanalyzer/chanalyzergui.h index 1339b5eb7..1a09c69fe 100644 --- a/plugins/channelrx/chanalyzer/chanalyzergui.h +++ b/plugins/channelrx/chanalyzer/chanalyzergui.h @@ -23,7 +23,6 @@ #include "channel/channelgui.h" #include "dsp/channelmarker.h" -#include "dsp/dsptypes.h" #include "util/movingaverage.h" #include "util/messagequeue.h" #include "settings/rollupstate.h" diff --git a/plugins/channelrx/chanalyzer/chanalyzerwebapiadapter.h b/plugins/channelrx/chanalyzer/chanalyzerwebapiadapter.h index d4fa6ca58..3ac02c896 100644 --- a/plugins/channelrx/chanalyzer/chanalyzerwebapiadapter.h +++ b/plugins/channelrx/chanalyzer/chanalyzerwebapiadapter.h @@ -19,8 +19,6 @@ #define INCLUDE_CHANALYZER_WEBAPIADAPTER_H #include "channel/channelwebapiadapter.h" -#include "dsp/glscopesettings.h" -#include "dsp/spectrumsettings.h" #include "chanalyzersettings.h" /** diff --git a/plugins/channelrx/demodadsb/adsbdemodgui.h b/plugins/channelrx/demodadsb/adsbdemodgui.h index 2df3c69ac..cb98b56e7 100644 --- a/plugins/channelrx/demodadsb/adsbdemodgui.h +++ b/plugins/channelrx/demodadsb/adsbdemodgui.h @@ -32,7 +32,6 @@ #include "channel/channelgui.h" #include "dsp/dsptypes.h" #include "dsp/channelmarker.h" -#include "dsp/movingaverage.h" #include "util/aviationweather.h" #include "util/messagequeue.h" #include "util/azel.h" @@ -48,7 +47,6 @@ #include "adsbdemodsettings.h" #include "util/ourairportsdb.h" #include "util/osndb.h" -#include "util/airlines.h" class PluginAPI; class DeviceUISet; diff --git a/plugins/channelrx/demodadsb/adsbdemodreport.h b/plugins/channelrx/demodadsb/adsbdemodreport.h index 9885b18ab..5509fd8d7 100644 --- a/plugins/channelrx/demodadsb/adsbdemodreport.h +++ b/plugins/channelrx/demodadsb/adsbdemodreport.h @@ -23,7 +23,6 @@ #include #include -#include "dsp/dsptypes.h" #include "util/message.h" #include "adsbdemodstats.h" diff --git a/plugins/channelrx/demodais/aisdemodsink.h b/plugins/channelrx/demodais/aisdemodsink.h index 3f0a9f667..741cdf5d0 100644 --- a/plugins/channelrx/demodais/aisdemodsink.h +++ b/plugins/channelrx/demodais/aisdemodsink.h @@ -26,10 +26,8 @@ #include "dsp/phasediscri.h" #include "dsp/nco.h" #include "dsp/interpolator.h" -#include "dsp/firfilter.h" #include "dsp/gaussian.h" #include "util/movingaverage.h" -#include "util/doublebufferfifo.h" #include "util/messagequeue.h" #include "util/crc.h" diff --git a/plugins/channelrx/demodam/amdemodgui.h b/plugins/channelrx/demodam/amdemodgui.h index 790f341bc..95710ce83 100644 --- a/plugins/channelrx/demodam/amdemodgui.h +++ b/plugins/channelrx/demodam/amdemodgui.h @@ -24,7 +24,6 @@ #include "channel/channelgui.h" #include "dsp/channelmarker.h" -#include "dsp/movingaverage.h" #include "util/messagequeue.h" #include "settings/rollupstate.h" #include "amdemodsettings.h" diff --git a/plugins/channelrx/demodam/amdemodsettings.h b/plugins/channelrx/demodam/amdemodsettings.h index e9e50069d..52f43884b 100644 --- a/plugins/channelrx/demodam/amdemodsettings.h +++ b/plugins/channelrx/demodam/amdemodsettings.h @@ -21,6 +21,7 @@ #ifndef PLUGINS_CHANNELRX_DEMODAM_AMDEMODSETTINGS_H_ #define PLUGINS_CHANNELRX_DEMODAM_AMDEMODSETTINGS_H_ +#include "dsp/dsptypes.h" #include class Serializable; diff --git a/plugins/channelrx/demodatv/atvdemod.cpp b/plugins/channelrx/demodatv/atvdemod.cpp index 00c2025f3..b1f7ba191 100644 --- a/plugins/channelrx/demodatv/atvdemod.cpp +++ b/plugins/channelrx/demodatv/atvdemod.cpp @@ -26,6 +26,7 @@ #include "device/deviceapi.h" #include "atvdemod.h" +#include "dsp/dspcommands.h" MESSAGE_CLASS_DEFINITION(ATVDemod::MsgConfigureATVDemod, Message) diff --git a/plugins/channelrx/demodatv/atvdemod.h b/plugins/channelrx/demodatv/atvdemod.h index 09eddbcf3..3844d54c1 100644 --- a/plugins/channelrx/demodatv/atvdemod.h +++ b/plugins/channelrx/demodatv/atvdemod.h @@ -27,8 +27,6 @@ #include "dsp/basebandsamplesink.h" #include "channel/channelapi.h" -#include "dsp/devicesamplesource.h" -#include "dsp/dspcommands.h" #include "util/message.h" #include "atvdemodbaseband.h" diff --git a/plugins/channelrx/demodatv/atvdemodgui.cpp b/plugins/channelrx/demodatv/atvdemodgui.cpp index 10391cfc2..d8b9f0128 100644 --- a/plugins/channelrx/demodatv/atvdemodgui.cpp +++ b/plugins/channelrx/demodatv/atvdemodgui.cpp @@ -24,6 +24,7 @@ #include "atvdemodgui.h" #include "device/deviceuiset.h" +#include "dsp/dspcommands.h" #include "dsp/scopevis.h" #include "dsp/glscopesettings.h" #include "gui/basicchannelsettingsdialog.h" diff --git a/plugins/channelrx/demodatv/atvdemodsink.h b/plugins/channelrx/demodatv/atvdemodsink.h index cbcf29012..221fd6932 100644 --- a/plugins/channelrx/demodatv/atvdemodsink.h +++ b/plugins/channelrx/demodatv/atvdemodsink.h @@ -25,9 +25,7 @@ #include "dsp/channelsamplesink.h" #include "dsp/nco.h" -#include "dsp/interpolator.h" #include "dsp/fftfilt.h" -#include "dsp/agc.h" #include "dsp/phaselock.h" #include "dsp/recursivefilters.h" #include "dsp/phasediscri.h" diff --git a/plugins/channelrx/demodbfm/bfmdemodsink.h b/plugins/channelrx/demodbfm/bfmdemodsink.h index 2a4d453c2..4855437c3 100644 --- a/plugins/channelrx/demodbfm/bfmdemodsink.h +++ b/plugins/channelrx/demodbfm/bfmdemodsink.h @@ -27,7 +27,6 @@ #include "dsp/nco.h" #include "dsp/interpolator.h" #include "dsp/firfilter.h" -#include "dsp/movingaverage.h" #include "dsp/fftfilt.h" #include "dsp/phaselock.h" #include "dsp/filterrc.h" diff --git a/plugins/channelrx/demodchirpchat/chirpchatdemodsink.h b/plugins/channelrx/demodchirpchat/chirpchatdemodsink.h index c8313f802..c3860dff5 100644 --- a/plugins/channelrx/demodchirpchat/chirpchatdemodsink.h +++ b/plugins/channelrx/demodchirpchat/chirpchatdemodsink.h @@ -25,7 +25,6 @@ #include "dsp/nco.h" #include "dsp/interpolator.h" #include "dsp/fftwindow.h" -#include "util/message.h" #include "util/movingaverage.h" #include "chirpchatdemodsettings.h" diff --git a/plugins/channelrx/demoddatv/datvconstellation.h b/plugins/channelrx/demoddatv/datvconstellation.h index e7def070a..3b4838cad 100644 --- a/plugins/channelrx/demoddatv/datvconstellation.h +++ b/plugins/channelrx/demoddatv/datvconstellation.h @@ -23,6 +23,7 @@ #include +#include "leansdr/dvb.h" #include "leansdr/framework.h" #include "gui/tvscreen.h" diff --git a/plugins/channelrx/demoddatv/datvdemod.cpp b/plugins/channelrx/demoddatv/datvdemod.cpp index fdce7e730..9252966a6 100644 --- a/plugins/channelrx/demoddatv/datvdemod.cpp +++ b/plugins/channelrx/demoddatv/datvdemod.cpp @@ -30,6 +30,7 @@ #include "SWGChannelReport.h" #include "device/deviceapi.h" +#include "dsp/dspcommands.h" #include "settings/serializable.h" #include "datvdemod.h" diff --git a/plugins/channelrx/demoddatv/datvdemod.h b/plugins/channelrx/demoddatv/datvdemod.h index a3785b712..ebb7d6135 100644 --- a/plugins/channelrx/demoddatv/datvdemod.h +++ b/plugins/channelrx/demoddatv/datvdemod.h @@ -29,8 +29,6 @@ class DeviceAPI; #include "channel/channelapi.h" #include "dsp/basebandsamplesink.h" -#include "dsp/devicesamplesource.h" -#include "dsp/dspcommands.h" #include "util/message.h" #include "datvdemodbaseband.h" diff --git a/plugins/channelrx/demoddatv/datvdemodgui.h b/plugins/channelrx/demoddatv/datvdemodgui.h index 75d57964c..0a4780e30 100644 --- a/plugins/channelrx/demoddatv/datvdemodgui.h +++ b/plugins/channelrx/demoddatv/datvdemodgui.h @@ -25,7 +25,6 @@ #include "channel/channelgui.h" #include "dsp/channelmarker.h" -#include "dsp/movingaverage.h" #include "settings/rollupstate.h" #include "datvdemod.h" diff --git a/plugins/channelrx/demoddatv/datvdemodsink.h b/plugins/channelrx/demoddatv/datvdemodsink.h index bf92c0678..70af99272 100644 --- a/plugins/channelrx/demoddatv/datvdemodsink.h +++ b/plugins/channelrx/demoddatv/datvdemodsink.h @@ -43,8 +43,6 @@ #include "dsp/fftfilt.h" #include "dsp/nco.h" #include "dsp/interpolator.h" -#include "dsp/movingaverage.h" -#include "dsp/agc.h" #include "dsp/interpolator.h" #include "audio/audiofifo.h" #include "util/messagequeue.h" diff --git a/plugins/channelrx/demoddatv/datvdvbs2constellation.h b/plugins/channelrx/demoddatv/datvdvbs2constellation.h index 591de6e74..33150ed55 100644 --- a/plugins/channelrx/demoddatv/datvdvbs2constellation.h +++ b/plugins/channelrx/demoddatv/datvdvbs2constellation.h @@ -24,6 +24,7 @@ #include #include "leansdr/framework.h" +#include "leansdr/sdr.h" #include "gui/tvscreen.h" namespace leansdr { diff --git a/plugins/channelrx/demoddsc/dscdemod.h b/plugins/channelrx/demoddsc/dscdemod.h index bcd768b2b..4fd4c1201 100644 --- a/plugins/channelrx/demoddsc/dscdemod.h +++ b/plugins/channelrx/demoddsc/dscdemod.h @@ -36,7 +36,6 @@ #include "dsp/basebandsamplesink.h" #include "channel/channelapi.h" #include "util/message.h" -#include "util/navtex.h" #include "dscdemodbaseband.h" #include "dscdemodsettings.h" diff --git a/plugins/channelrx/demoddsc/dscdemodgui.h b/plugins/channelrx/demoddsc/dscdemodgui.h index 9ebed006c..fe79df7e2 100644 --- a/plugins/channelrx/demoddsc/dscdemodgui.h +++ b/plugins/channelrx/demoddsc/dscdemodgui.h @@ -21,7 +21,6 @@ #include "channel/channelgui.h" #include "dsp/channelmarker.h" -#include "dsp/movingaverage.h" #include "util/aprsfi.h" #include "util/messagequeue.h" #include "settings/rollupstate.h" diff --git a/plugins/channelrx/demodfreedv/freedvdemod.h b/plugins/channelrx/demodfreedv/freedvdemod.h index 61e13041e..3e76f100d 100644 --- a/plugins/channelrx/demodfreedv/freedvdemod.h +++ b/plugins/channelrx/demodfreedv/freedvdemod.h @@ -30,7 +30,6 @@ #include "dsp/spectrumvis.h" #include "channel/channelapi.h" #include "util/message.h" -#include "util/doublebufferfifo.h" #include "freedvdemodbaseband.h" diff --git a/plugins/channelrx/demodfreedv/freedvdemodgui.h b/plugins/channelrx/demodfreedv/freedvdemodgui.h index d58f95cc3..4639e2c4e 100644 --- a/plugins/channelrx/demodfreedv/freedvdemodgui.h +++ b/plugins/channelrx/demodfreedv/freedvdemodgui.h @@ -25,7 +25,6 @@ #include "channel/channelgui.h" #include "dsp/channelmarker.h" -#include "dsp/movingaverage.h" #include "util/messagequeue.h" #include "settings/rollupstate.h" #include "freedvdemodsettings.h" diff --git a/plugins/channelrx/demodfreedv/freedvdemodsettings.h b/plugins/channelrx/demodfreedv/freedvdemodsettings.h index fd47a7683..a775e6513 100644 --- a/plugins/channelrx/demodfreedv/freedvdemodsettings.h +++ b/plugins/channelrx/demodfreedv/freedvdemodsettings.h @@ -25,6 +25,8 @@ #include #include +#include "dsp/dsptypes.h" + class Serializable; struct FreeDVDemodSettings diff --git a/plugins/channelrx/demodft8/ft8demodgui.h b/plugins/channelrx/demodft8/ft8demodgui.h index 5c2aabdfe..1505e1f6a 100644 --- a/plugins/channelrx/demodft8/ft8demodgui.h +++ b/plugins/channelrx/demodft8/ft8demodgui.h @@ -24,7 +24,6 @@ #include "channel/channelgui.h" #include "dsp/channelmarker.h" -#include "dsp/movingaverage.h" #include "util/messagequeue.h" #include "util/ft8message.h" #include "settings/rollupstate.h" diff --git a/plugins/channelrx/demodft8/ft8demodsink.h b/plugins/channelrx/demodft8/ft8demodsink.h index dea520a62..2672967b5 100644 --- a/plugins/channelrx/demodft8/ft8demodsink.h +++ b/plugins/channelrx/demodft8/ft8demodsink.h @@ -25,7 +25,6 @@ #include "dsp/interpolator.h" #include "dsp/fftfilt.h" #include "dsp/agc.h" -#include "util/doublebufferfifo.h" #include "ft8demodsettings.h" diff --git a/plugins/channelrx/demodils/ilsdemodgui.h b/plugins/channelrx/demodils/ilsdemodgui.h index 543e7a73a..b4771d06c 100644 --- a/plugins/channelrx/demodils/ilsdemodgui.h +++ b/plugins/channelrx/demodils/ilsdemodgui.h @@ -20,7 +20,6 @@ #include "channel/channelgui.h" #include "dsp/channelmarker.h" -#include "dsp/movingaverage.h" #include "util/messagequeue.h" #include "settings/rollupstate.h" #include "ilsdemod.h" diff --git a/plugins/channelrx/demodils/ilsdemodsettings.h b/plugins/channelrx/demodils/ilsdemodsettings.h index 2dd2c3414..3a50ed2a3 100644 --- a/plugins/channelrx/demodils/ilsdemodsettings.h +++ b/plugins/channelrx/demodils/ilsdemodsettings.h @@ -23,6 +23,7 @@ #include +#include "dsp/dsptypes.h" #include "util/baudot.h" class Serializable; diff --git a/plugins/channelrx/demodils/ilsdemodsink.h b/plugins/channelrx/demodils/ilsdemodsink.h index 4fb957d47..5e179d197 100644 --- a/plugins/channelrx/demodils/ilsdemodsink.h +++ b/plugins/channelrx/demodils/ilsdemodsink.h @@ -32,7 +32,6 @@ #include "dsp/morsedemod.h" #include "audio/audiofifo.h" #include "util/movingaverage.h" -#include "util/movingmaximum.h" #include "util/doublebufferfifo.h" #include "util/messagequeue.h" diff --git a/plugins/channelrx/demodm17/m17demodfilters.h b/plugins/channelrx/demodm17/m17demodfilters.h index 0a328ad0f..3a478362e 100644 --- a/plugins/channelrx/demodm17/m17demodfilters.h +++ b/plugins/channelrx/demodm17/m17demodfilters.h @@ -24,7 +24,6 @@ #define NXZEROS 134 #include "dsp/iirfilter.h" -#include "export.h" /** * This is a 2 pole lowpass Chebyshev (recursive) filter at fc=0.075 using coefficients found in table 20-1 of diff --git a/plugins/channelrx/demodm17/m17demodgui.h b/plugins/channelrx/demodm17/m17demodgui.h index c2ffe417f..1bb80cf1a 100644 --- a/plugins/channelrx/demodm17/m17demodgui.h +++ b/plugins/channelrx/demodm17/m17demodgui.h @@ -26,9 +26,7 @@ #include #include "channel/channelgui.h" -#include "dsp/dsptypes.h" #include "dsp/channelmarker.h" -#include "dsp/movingaverage.h" #include "util/messagequeue.h" #include "settings/rollupstate.h" diff --git a/plugins/channelrx/demodm17/m17demodsink.h b/plugins/channelrx/demodm17/m17demodsink.h index 3442e4f5e..252b6ac9e 100644 --- a/plugins/channelrx/demodm17/m17demodsink.h +++ b/plugins/channelrx/demodm17/m17demodsink.h @@ -24,9 +24,6 @@ #include "dsp/phasediscri.h" #include "dsp/nco.h" #include "dsp/interpolator.h" -#include "dsp/firfilter.h" -#include "dsp/afsquelch.h" -#include "dsp/afsquelch.h" #include "audio/audiofifo.h" #include "util/movingaverage.h" #include "util/doublebufferfifo.h" diff --git a/plugins/channelrx/demodnavtex/navtexdemodgui.h b/plugins/channelrx/demodnavtex/navtexdemodgui.h index 39d2a5339..4c993d6fb 100644 --- a/plugins/channelrx/demodnavtex/navtexdemodgui.h +++ b/plugins/channelrx/demodnavtex/navtexdemodgui.h @@ -21,7 +21,6 @@ #include "channel/channelgui.h" #include "dsp/channelmarker.h" -#include "dsp/movingaverage.h" #include "util/messagequeue.h" #include "settings/rollupstate.h" #include "navtexdemod.h" diff --git a/plugins/channelrx/demodnavtex/navtexdemodsettings.h b/plugins/channelrx/demodnavtex/navtexdemodsettings.h index 4daa18471..e7e324fc0 100644 --- a/plugins/channelrx/demodnavtex/navtexdemodsettings.h +++ b/plugins/channelrx/demodnavtex/navtexdemodsettings.h @@ -23,6 +23,8 @@ #include +#include "dsp/dsptypes.h" + class Serializable; // Number of columns in the table diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.h b/plugins/channelrx/demodnfm/nfmdemodgui.h index 2726989cd..6a592e79b 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.h +++ b/plugins/channelrx/demodnfm/nfmdemodgui.h @@ -23,7 +23,6 @@ #include "channel/channelgui.h" #include "dsp/dsptypes.h" #include "dsp/channelmarker.h" -#include "dsp/movingaverage.h" #include "util/messagequeue.h" #include "settings/rollupstate.h" diff --git a/plugins/channelrx/demodnfm/nfmdemodsettings.h b/plugins/channelrx/demodnfm/nfmdemodsettings.h index af2b23b7c..be65ec9a6 100644 --- a/plugins/channelrx/demodnfm/nfmdemodsettings.h +++ b/plugins/channelrx/demodnfm/nfmdemodsettings.h @@ -23,6 +23,8 @@ #include +#include "dsp/dsptypes.h" + class Serializable; struct NFMDemodSettings diff --git a/plugins/channelrx/demodnfm/nfmdemodsink.h b/plugins/channelrx/demodnfm/nfmdemodsink.h index 2f9ba7e9f..04b9225d1 100644 --- a/plugins/channelrx/demodnfm/nfmdemodsink.h +++ b/plugins/channelrx/demodnfm/nfmdemodsink.h @@ -28,7 +28,6 @@ #include "dsp/fftfilt.h" #include "dsp/firfilter.h" #include "dsp/afsquelch.h" -#include "dsp/agc.h" #include "dsp/ctcssdetector.h" #include "dsp/dcscodes.h" #include "util/movingaverage.h" diff --git a/plugins/channelrx/demodpacket/packetdemodgui.h b/plugins/channelrx/demodpacket/packetdemodgui.h index b4a0c0d3c..58c74b3e6 100644 --- a/plugins/channelrx/demodpacket/packetdemodgui.h +++ b/plugins/channelrx/demodpacket/packetdemodgui.h @@ -31,7 +31,6 @@ #include "channel/channelgui.h" #include "dsp/channelmarker.h" -#include "dsp/movingaverage.h" #include "util/messagequeue.h" #include "settings/rollupstate.h" #include "packetdemodsettings.h" diff --git a/plugins/channelrx/demodpacket/packetdemodsettings.h b/plugins/channelrx/demodpacket/packetdemodsettings.h index f9514f512..a5eef7f7a 100644 --- a/plugins/channelrx/demodpacket/packetdemodsettings.h +++ b/plugins/channelrx/demodpacket/packetdemodsettings.h @@ -24,6 +24,8 @@ #include #include +#include "dsp/dsptypes.h" + class Serializable; // Number of columns in the table diff --git a/plugins/channelrx/demodpacket/packetdemodsink.h b/plugins/channelrx/demodpacket/packetdemodsink.h index 6cf58ed02..561f9bd6c 100644 --- a/plugins/channelrx/demodpacket/packetdemodsink.h +++ b/plugins/channelrx/demodpacket/packetdemodsink.h @@ -28,7 +28,6 @@ #include "dsp/interpolator.h" #include "dsp/firfilter.h" #include "util/movingaverage.h" -#include "util/doublebufferfifo.h" #include "util/messagequeue.h" #include "util/crc.h" diff --git a/plugins/channelrx/demodradiosonde/radiosondedemodsink.h b/plugins/channelrx/demodradiosonde/radiosondedemodsink.h index 2c586c4f2..72549b1d9 100644 --- a/plugins/channelrx/demodradiosonde/radiosondedemodsink.h +++ b/plugins/channelrx/demodradiosonde/radiosondedemodsink.h @@ -29,7 +29,6 @@ #include "dsp/firfilter.h" #include "dsp/gaussian.h" #include "util/movingaverage.h" -#include "util/doublebufferfifo.h" #include "util/messagequeue.h" #include "util/crc.h" diff --git a/plugins/channelrx/demodrtty/rttydemodgui.h b/plugins/channelrx/demodrtty/rttydemodgui.h index f20650a27..736de1b4c 100644 --- a/plugins/channelrx/demodrtty/rttydemodgui.h +++ b/plugins/channelrx/demodrtty/rttydemodgui.h @@ -21,7 +21,6 @@ #include "channel/channelgui.h" #include "dsp/channelmarker.h" -#include "dsp/movingaverage.h" #include "util/messagequeue.h" #include "settings/rollupstate.h" #include "rttydemod.h" diff --git a/plugins/channelrx/demodrtty/rttydemodsettings.h b/plugins/channelrx/demodrtty/rttydemodsettings.h index 363e93cf0..8864f6080 100644 --- a/plugins/channelrx/demodrtty/rttydemodsettings.h +++ b/plugins/channelrx/demodrtty/rttydemodsettings.h @@ -23,6 +23,7 @@ #include +#include "dsp/dsptypes.h" #include "util/baudot.h" class Serializable; diff --git a/plugins/channelrx/demodrtty/rttydemodsink.cpp b/plugins/channelrx/demodrtty/rttydemodsink.cpp index f011bf6bf..0130afd19 100644 --- a/plugins/channelrx/demodrtty/rttydemodsink.cpp +++ b/plugins/channelrx/demodrtty/rttydemodsink.cpp @@ -21,6 +21,7 @@ #include #include "dsp/dspengine.h" +#include "dsp/fftfactory.h" #include "dsp/scopevis.h" #include "util/db.h" diff --git a/plugins/channelrx/demodrtty/rttydemodsink.h b/plugins/channelrx/demodrtty/rttydemodsink.h index 6c5520c9c..31b4f44e7 100644 --- a/plugins/channelrx/demodrtty/rttydemodsink.h +++ b/plugins/channelrx/demodrtty/rttydemodsink.h @@ -25,11 +25,9 @@ #include "dsp/interpolator.h" #include "dsp/firfilter.h" #include "dsp/raisedcosine.h" -#include "dsp/fftfactory.h" #include "dsp/fftengine.h" #include "util/movingaverage.h" #include "util/movingmaximum.h" -#include "util/doublebufferfifo.h" #include "util/messagequeue.h" #include "rttydemodsettings.h" diff --git a/plugins/channelrx/demodssb/ssbdemodgui.h b/plugins/channelrx/demodssb/ssbdemodgui.h index b4a64ccc2..d4eeaae51 100644 --- a/plugins/channelrx/demodssb/ssbdemodgui.h +++ b/plugins/channelrx/demodssb/ssbdemodgui.h @@ -24,7 +24,6 @@ #include "channel/channelgui.h" #include "dsp/channelmarker.h" -#include "dsp/movingaverage.h" #include "gui/fftnrdialog.h" #include "util/messagequeue.h" #include "settings/rollupstate.h" diff --git a/plugins/channelrx/demodvor/vordemodgui.h b/plugins/channelrx/demodvor/vordemodgui.h index a89116a9c..c8e9b9a41 100644 --- a/plugins/channelrx/demodvor/vordemodgui.h +++ b/plugins/channelrx/demodvor/vordemodgui.h @@ -21,7 +21,6 @@ #include "channel/channelgui.h" #include "dsp/channelmarker.h" -#include "dsp/movingaverage.h" #include "util/messagequeue.h" #include "settings/rollupstate.h" #include "vordemodsettings.h" diff --git a/plugins/channelrx/demodvor/vordemodsettings.h b/plugins/channelrx/demodvor/vordemodsettings.h index ca5d97e6e..981b0de84 100644 --- a/plugins/channelrx/demodvor/vordemodsettings.h +++ b/plugins/channelrx/demodvor/vordemodsettings.h @@ -24,6 +24,8 @@ #include #include +#include "dsp/dsptypes.h" + class Serializable; struct VORDemodSettings diff --git a/plugins/channelrx/demodwfm/wfmdemodsettings.h b/plugins/channelrx/demodwfm/wfmdemodsettings.h index c778d9265..c30dd7ed8 100644 --- a/plugins/channelrx/demodwfm/wfmdemodsettings.h +++ b/plugins/channelrx/demodwfm/wfmdemodsettings.h @@ -23,6 +23,8 @@ #include "dsp/dsptypes.h" +#include "dsp/dsptypes.h" + class Serializable; struct WFMDemodSettings diff --git a/plugins/channelrx/demodwfm/wfmdemodsink.h b/plugins/channelrx/demodwfm/wfmdemodsink.h index cf0a15870..2ad0d16b5 100644 --- a/plugins/channelrx/demodwfm/wfmdemodsink.h +++ b/plugins/channelrx/demodwfm/wfmdemodsink.h @@ -23,12 +23,10 @@ #include "dsp/channelsamplesink.h" #include "dsp/nco.h" #include "dsp/interpolator.h" -#include "dsp/firfilter.h" #include "util/movingaverage.h" #include "dsp/fftfilt.h" #include "dsp/phasediscri.h" #include "audio/audiofifo.h" -#include "util/message.h" #include "wfmdemodsettings.h" diff --git a/plugins/channelrx/freqscanner/freqscannersink.cpp b/plugins/channelrx/freqscanner/freqscannersink.cpp index 263b7b5e8..a98e214fb 100644 --- a/plugins/channelrx/freqscanner/freqscannersink.cpp +++ b/plugins/channelrx/freqscanner/freqscannersink.cpp @@ -20,6 +20,7 @@ #include #include "dsp/dspengine.h" +#include "dsp/fftfactory.h" #include "util/db.h" #include "freqscanner.h" diff --git a/plugins/channelrx/freqscanner/freqscannersink.h b/plugins/channelrx/freqscanner/freqscannersink.h index 2c84f0310..1bff72143 100644 --- a/plugins/channelrx/freqscanner/freqscannersink.h +++ b/plugins/channelrx/freqscanner/freqscannersink.h @@ -25,7 +25,6 @@ #include "dsp/channelsamplesink.h" #include "dsp/nco.h" #include "dsp/interpolator.h" -#include "dsp/fftfactory.h" #include "dsp/fftengine.h" #include "dsp/fftwindow.h" #include "util/fixedaverage2d.h" diff --git a/plugins/channelrx/freqtracker/freqtrackergui.h b/plugins/channelrx/freqtracker/freqtrackergui.h index 7e4595620..a2d15a571 100644 --- a/plugins/channelrx/freqtracker/freqtrackergui.h +++ b/plugins/channelrx/freqtracker/freqtrackergui.h @@ -25,7 +25,6 @@ #include "channel/channelgui.h" #include "dsp/channelmarker.h" -#include "dsp/movingaverage.h" #include "util/messagequeue.h" #include "settings/rollupstate.h" diff --git a/plugins/channelrx/freqtracker/freqtrackersink.h b/plugins/channelrx/freqtracker/freqtrackersink.h index 448e25db6..7e3e18459 100644 --- a/plugins/channelrx/freqtracker/freqtrackersink.h +++ b/plugins/channelrx/freqtracker/freqtrackersink.h @@ -26,12 +26,8 @@ #include "dsp/ncof.h" #include "dsp/interpolator.h" #include "util/movingaverage.h" -#include "dsp/agc.h" -#include "dsp/firfilter.h" #include "dsp/phaselockcomplex.h" #include "dsp/freqlockcomplex.h" -#include "util/message.h" -#include "util/doublebufferfifo.h" #include "freqtrackersettings.h" diff --git a/plugins/channelrx/heatmap/heatmapgui.cpp b/plugins/channelrx/heatmap/heatmapgui.cpp index c9ca22db1..7bbdb5022 100644 --- a/plugins/channelrx/heatmap/heatmapgui.cpp +++ b/plugins/channelrx/heatmap/heatmapgui.cpp @@ -36,6 +36,7 @@ #include "plugin/pluginapi.h" #include "util/astronomy.h" #include "util/csv.h" +#include "util/colormap.h" #include "util/db.h" #include "util/units.h" #include "gui/basicchannelsettingsdialog.h" diff --git a/plugins/channelrx/heatmap/heatmapgui.h b/plugins/channelrx/heatmap/heatmapgui.h index aeb035de4..b3f8d9409 100644 --- a/plugins/channelrx/heatmap/heatmapgui.h +++ b/plugins/channelrx/heatmap/heatmapgui.h @@ -30,7 +30,6 @@ #include "channel/channelgui.h" #include "dsp/channelmarker.h" #include "util/messagequeue.h" -#include "util/colormap.h" #include "settings/rollupstate.h" #include "heatmapsettings.h" diff --git a/plugins/channelrx/heatmap/heatmapsink.h b/plugins/channelrx/heatmap/heatmapsink.h index ea126f775..02588db6d 100644 --- a/plugins/channelrx/heatmap/heatmapsink.h +++ b/plugins/channelrx/heatmap/heatmapsink.h @@ -24,15 +24,10 @@ #include #include "dsp/channelsamplesink.h" -#include "dsp/phasediscri.h" #include "dsp/nco.h" #include "dsp/interpolator.h" -#include "dsp/firfilter.h" -#include "dsp/gaussian.h" #include "util/movingaverage.h" -#include "util/doublebufferfifo.h" #include "util/messagequeue.h" -#include "util/crc.h" #include "heatmapsettings.h" diff --git a/plugins/channelrx/localsink/localsinkworker.h b/plugins/channelrx/localsink/localsinkworker.h index 5c2ef4eba..637da54f5 100644 --- a/plugins/channelrx/localsink/localsinkworker.h +++ b/plugins/channelrx/localsink/localsinkworker.h @@ -26,7 +26,6 @@ #include #include -#include "dsp/dsptypes.h" #include "util/message.h" #include "util/messagequeue.h" diff --git a/plugins/channelrx/noisefigure/noisefigure.cpp b/plugins/channelrx/noisefigure/noisefigure.cpp index 48e86014c..2c4ff78be 100644 --- a/plugins/channelrx/noisefigure/noisefigure.cpp +++ b/plugins/channelrx/noisefigure/noisefigure.cpp @@ -35,6 +35,7 @@ #include "dsp/dspcommands.h" #include "device/deviceapi.h" +#include "settings/serializable.h" #include "util/interpolation.h" #include "channel/channelwebapiutils.h" diff --git a/plugins/channelrx/noisefigure/noisefigurebaseband.h b/plugins/channelrx/noisefigure/noisefigurebaseband.h index bc7b6e04d..0944ce5fe 100644 --- a/plugins/channelrx/noisefigure/noisefigurebaseband.h +++ b/plugins/channelrx/noisefigure/noisefigurebaseband.h @@ -24,7 +24,6 @@ #include #include "dsp/samplesinkfifo.h" -#include "dsp/scopevis.h" #include "util/message.h" #include "util/messagequeue.h" diff --git a/plugins/channelrx/noisefigure/noisefiguresink.cpp b/plugins/channelrx/noisefigure/noisefiguresink.cpp index 2d2d46f58..72d7b348c 100644 --- a/plugins/channelrx/noisefigure/noisefiguresink.cpp +++ b/plugins/channelrx/noisefigure/noisefiguresink.cpp @@ -21,6 +21,7 @@ #include "dsp/dspengine.h" +#include "dsp/fftfactory.h" #include "noisefigure.h" #include "noisefiguresink.h" diff --git a/plugins/channelrx/noisefigure/noisefiguresink.h b/plugins/channelrx/noisefigure/noisefiguresink.h index 4ba2516a6..2bf11bb0f 100644 --- a/plugins/channelrx/noisefigure/noisefiguresink.h +++ b/plugins/channelrx/noisefigure/noisefiguresink.h @@ -23,7 +23,6 @@ #include #include "dsp/channelsamplesink.h" -#include "dsp/fftfactory.h" #include "dsp/fftengine.h" #include "util/movingaverage.h" #include "util/messagequeue.h" diff --git a/plugins/channelrx/radioastronomy/radioastronomy.cpp b/plugins/channelrx/radioastronomy/radioastronomy.cpp index 2a4bfe2f3..2254f7401 100644 --- a/plugins/channelrx/radioastronomy/radioastronomy.cpp +++ b/plugins/channelrx/radioastronomy/radioastronomy.cpp @@ -37,6 +37,7 @@ #include "dsp/dspcommands.h" #include "device/deviceapi.h" #include "channel/channelwebapiutils.h" +#include "settings/serializable.h" #include "util/astronomy.h" #include "maincore.h" diff --git a/plugins/channelrx/radioastronomy/radioastronomybaseband.h b/plugins/channelrx/radioastronomy/radioastronomybaseband.h index ab4d7530d..50967cafa 100644 --- a/plugins/channelrx/radioastronomy/radioastronomybaseband.h +++ b/plugins/channelrx/radioastronomy/radioastronomybaseband.h @@ -23,7 +23,6 @@ #include #include "dsp/samplesinkfifo.h" -#include "dsp/scopevis.h" #include "util/message.h" #include "util/messagequeue.h" diff --git a/plugins/channelrx/radioastronomy/radioastronomysettings.h b/plugins/channelrx/radioastronomy/radioastronomysettings.h index 509bb9048..a18bcc181 100644 --- a/plugins/channelrx/radioastronomy/radioastronomysettings.h +++ b/plugins/channelrx/radioastronomy/radioastronomysettings.h @@ -23,8 +23,6 @@ #include #include -#include "dsp/dsptypes.h" - class Serializable; // Number of columns in the tables diff --git a/plugins/channelrx/radioclock/radioclocksink.h b/plugins/channelrx/radioclock/radioclocksink.h index b79a6956a..bbd18d39a 100644 --- a/plugins/channelrx/radioclock/radioclocksink.h +++ b/plugins/channelrx/radioclock/radioclocksink.h @@ -27,12 +27,7 @@ #include "dsp/phasediscri.h" #include "dsp/nco.h" #include "dsp/interpolator.h" -#include "dsp/firfilter.h" -#include "dsp/fftfactory.h" -#include "dsp/fftengine.h" -#include "dsp/fftwindow.h" #include "util/movingaverage.h" -#include "util/doublebufferfifo.h" #include "util/messagequeue.h" #include "radioclocksettings.h" diff --git a/plugins/channelrx/remotetcpsink/remotetcpsinksink.h b/plugins/channelrx/remotetcpsink/remotetcpsinksink.h index be2f37970..d012bdc6d 100644 --- a/plugins/channelrx/remotetcpsink/remotetcpsinksink.h +++ b/plugins/channelrx/remotetcpsink/remotetcpsinksink.h @@ -28,7 +28,6 @@ #include "dsp/channelsamplesink.h" #include "dsp/nco.h" #include "dsp/interpolator.h" -#include "channel/remotedatablock.h" #include "util/messagequeue.h" #include "remotetcpsinksettings.h" diff --git a/plugins/channeltx/filesource/filesource.cpp b/plugins/channeltx/filesource/filesource.cpp index 3526e632d..846e07251 100644 --- a/plugins/channeltx/filesource/filesource.cpp +++ b/plugins/channeltx/filesource/filesource.cpp @@ -39,6 +39,7 @@ #include "maincore.h" #include "filesourcebaseband.h" +#include "filesourcereport.h" MESSAGE_CLASS_DEFINITION(FileSource::MsgConfigureFileSource, Message) MESSAGE_CLASS_DEFINITION(FileSource::MsgConfigureFileSourceWork, Message) diff --git a/plugins/channeltx/filesource/filesource.h b/plugins/channeltx/filesource/filesource.h index 20bb8e0b4..bf89c4b69 100644 --- a/plugins/channeltx/filesource/filesource.h +++ b/plugins/channeltx/filesource/filesource.h @@ -36,9 +36,7 @@ #include "dsp/basebandsamplesource.h" #include "channel/channelapi.h" #include "util/message.h" -#include "util/movingaverage.h" #include "filesourcesettings.h" -#include "filesourcereport.h" class QNetworkAccessManager; class QNetworkReply; 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 79ff63937..c7c18d885 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 @@ -27,11 +27,9 @@ #include "dsp/channelsamplesource.h" #include "dsp/nco.h" -#include "dsp/ncof.h" #include "dsp/interpolator.h" #include "dsp/firfilter.h" #include "dsp/raisedcosine.h" -#include "dsp/fmpreemphasis.h" #include "util/lfsr.h" #include "util/movingaverage.h" #include "util/message.h" diff --git a/plugins/channeltx/modais/aismodsource.h b/plugins/channeltx/modais/aismodsource.h index 5ca49810c..6bc964399 100644 --- a/plugins/channeltx/modais/aismodsource.h +++ b/plugins/channeltx/modais/aismodsource.h @@ -28,9 +28,7 @@ #include "dsp/channelsamplesource.h" #include "dsp/nco.h" -#include "dsp/ncof.h" #include "dsp/interpolator.h" -#include "dsp/firfilter.h" #include "dsp/gaussian.h" #include "util/movingaverage.h" diff --git a/plugins/channeltx/moddatv/datvmodsource.h b/plugins/channeltx/moddatv/datvmodsource.h index 2e92c6381..8864c84dc 100644 --- a/plugins/channeltx/moddatv/datvmodsource.h +++ b/plugins/channeltx/moddatv/datvmodsource.h @@ -32,8 +32,6 @@ #include "dsp/interpolator.h" #include "dsp/rootraisedcosine.h" #include "util/movingaverage.h" -#include "dsp/fftfilt.h" -#include "util/message.h" #include "datvmodsettings.h" diff --git a/plugins/channeltx/modfreedv/freedvmod.h b/plugins/channeltx/modfreedv/freedvmod.h index 698dee921..a4bdb1fa3 100644 --- a/plugins/channeltx/modfreedv/freedvmod.h +++ b/plugins/channeltx/modfreedv/freedvmod.h @@ -28,7 +28,6 @@ #include #include "dsp/basebandsamplesource.h" -#include "dsp/basebandsamplesink.h" #include "dsp/spectrumvis.h" #include "channel/channelapi.h" #include "util/message.h" diff --git a/plugins/channeltx/modfreedv/freedvmodsource.h b/plugins/channeltx/modfreedv/freedvmodsource.h index e1e9426d7..44ab803ad 100644 --- a/plugins/channeltx/modfreedv/freedvmodsource.h +++ b/plugins/channeltx/modfreedv/freedvmodsource.h @@ -26,7 +26,6 @@ #include #include "dsp/channelsamplesource.h" -#include "dsp/nco.h" #include "dsp/ncof.h" #include "dsp/interpolator.h" #include "dsp/fftfilt.h" diff --git a/plugins/channeltx/modm17/m17modprocessor.h b/plugins/channeltx/modm17/m17modprocessor.h index dd638a71e..1f2e30501 100644 --- a/plugins/channeltx/modm17/m17modprocessor.h +++ b/plugins/channeltx/modm17/m17modprocessor.h @@ -26,7 +26,6 @@ #include #include "M17Modulator.h" -#include "dsp/dsptypes.h" #include "util/message.h" #include "util/messagequeue.h" #include "m17modfifo.h" diff --git a/plugins/channeltx/modnfm/nfmmodsettings.h b/plugins/channeltx/modnfm/nfmmodsettings.h index c090ddf40..536d2295d 100644 --- a/plugins/channeltx/modnfm/nfmmodsettings.h +++ b/plugins/channeltx/modnfm/nfmmodsettings.h @@ -24,6 +24,7 @@ #include #include "dsp/cwkeyersettings.h" +#include "dsp/dsptypes.h" class Serializable; diff --git a/plugins/channeltx/modnfm/nfmmodsource.cpp b/plugins/channeltx/modnfm/nfmmodsource.cpp index c6016e33d..5db3b2f52 100644 --- a/plugins/channeltx/modnfm/nfmmodsource.cpp +++ b/plugins/channeltx/modnfm/nfmmodsource.cpp @@ -19,6 +19,7 @@ #include #include "dsp/datafifo.h" +#include "dsp/misc.h" #include "util/messagequeue.h" #include "maincore.h" diff --git a/plugins/channeltx/modpacket/packetmodsource.h b/plugins/channeltx/modpacket/packetmodsource.h index 46ff742a1..8a1e9e467 100644 --- a/plugins/channeltx/modpacket/packetmodsource.h +++ b/plugins/channeltx/modpacket/packetmodsource.h @@ -28,7 +28,6 @@ #include "dsp/channelsamplesource.h" #include "dsp/nco.h" -#include "dsp/ncof.h" #include "dsp/interpolator.h" #include "dsp/firfilter.h" #include "dsp/raisedcosine.h" diff --git a/plugins/channeltx/modpsk31/psk31modsource.h b/plugins/channeltx/modpsk31/psk31modsource.h index 70a89778d..dbf766b6e 100644 --- a/plugins/channeltx/modpsk31/psk31modsource.h +++ b/plugins/channeltx/modpsk31/psk31modsource.h @@ -25,7 +25,6 @@ #include "dsp/channelsamplesource.h" #include "dsp/nco.h" -#include "dsp/ncof.h" #include "dsp/interpolator.h" #include "dsp/firfilter.h" #include "dsp/raisedcosine.h" diff --git a/plugins/channeltx/modrtty/rttymodsource.h b/plugins/channeltx/modrtty/rttymodsource.h index d28744f0f..245da2921 100644 --- a/plugins/channeltx/modrtty/rttymodsource.h +++ b/plugins/channeltx/modrtty/rttymodsource.h @@ -25,7 +25,6 @@ #include "dsp/channelsamplesource.h" #include "dsp/nco.h" -#include "dsp/ncof.h" #include "dsp/interpolator.h" #include "dsp/firfilter.h" #include "dsp/raisedcosine.h" diff --git a/plugins/channeltx/modssb/ssbmod.h b/plugins/channeltx/modssb/ssbmod.h index 2587bf1e0..549221c14 100644 --- a/plugins/channeltx/modssb/ssbmod.h +++ b/plugins/channeltx/modssb/ssbmod.h @@ -30,7 +30,6 @@ #include "dsp/basebandsamplesource.h" #include "dsp/spectrumvis.h" #include "channel/channelapi.h" -#include "dsp/basebandsamplesink.h" #include "util/message.h" #include "ssbmodsettings.h" diff --git a/plugins/channeltx/modssb/ssbmodsettings.h b/plugins/channeltx/modssb/ssbmodsettings.h index 5425e61eb..2bdc6d603 100644 --- a/plugins/channeltx/modssb/ssbmodsettings.h +++ b/plugins/channeltx/modssb/ssbmodsettings.h @@ -26,6 +26,7 @@ #include #include "dsp/cwkeyersettings.h" +#include "dsp/dsptypes.h" class Serializable; diff --git a/plugins/channeltx/modwfm/wfmmodsettings.h b/plugins/channeltx/modwfm/wfmmodsettings.h index 35bdd31e6..2185d74f0 100644 --- a/plugins/channeltx/modwfm/wfmmodsettings.h +++ b/plugins/channeltx/modwfm/wfmmodsettings.h @@ -24,6 +24,7 @@ #include #include "dsp/cwkeyersettings.h" +#include "dsp/dsptypes.h" class Serializable; diff --git a/plugins/channeltx/udpsource/udpsource.h b/plugins/channeltx/udpsource/udpsource.h index c633b5fcc..9bbe81a2b 100644 --- a/plugins/channeltx/udpsource/udpsource.h +++ b/plugins/channeltx/udpsource/udpsource.h @@ -26,7 +26,6 @@ #include "dsp/basebandsamplesource.h" #include "dsp/spectrumvis.h" #include "channel/channelapi.h" -#include "dsp/basebandsamplesink.h" #include "util/message.h" #include "udpsourcesettings.h" diff --git a/plugins/feature/ais/aissettings.h b/plugins/feature/ais/aissettings.h index 2648010c0..9b0d48d26 100644 --- a/plugins/feature/ais/aissettings.h +++ b/plugins/feature/ais/aissettings.h @@ -24,8 +24,6 @@ #include #include -#include "util/message.h" - class Serializable; // Number of columns in the tables diff --git a/plugins/feature/antennatools/antennatoolssettings.h b/plugins/feature/antennatools/antennatoolssettings.h index 05d18af7b..93bef9ea1 100644 --- a/plugins/feature/antennatools/antennatoolssettings.h +++ b/plugins/feature/antennatools/antennatoolssettings.h @@ -24,8 +24,6 @@ #include #include -#include "util/message.h" - class Serializable; struct AntennaToolsSettings diff --git a/plugins/feature/aprs/aprssettings.h b/plugins/feature/aprs/aprssettings.h index 4117df599..d06d7d9fb 100644 --- a/plugins/feature/aprs/aprssettings.h +++ b/plugins/feature/aprs/aprssettings.h @@ -24,8 +24,6 @@ #include #include -#include "util/message.h" - class Serializable; // Number of columns in the tables diff --git a/plugins/feature/demodanalyzer/demodanalyzersettings.h b/plugins/feature/demodanalyzer/demodanalyzersettings.h index 23deb498d..acf504dd3 100644 --- a/plugins/feature/demodanalyzer/demodanalyzersettings.h +++ b/plugins/feature/demodanalyzer/demodanalyzersettings.h @@ -24,8 +24,6 @@ #include #include -#include "util/message.h" - class Serializable; class ChannelAPI; diff --git a/plugins/feature/gs232controller/gs232controller.h b/plugins/feature/gs232controller/gs232controller.h index 83cd3272d..e52d0a6fd 100644 --- a/plugins/feature/gs232controller/gs232controller.h +++ b/plugins/feature/gs232controller/gs232controller.h @@ -28,7 +28,6 @@ #include "feature/feature.h" #include "util/message.h" #include "availablechannelorfeaturehandler.h" -#include "maincore.h" #include "gs232controllersettings.h" diff --git a/plugins/feature/gs232controller/gs232controllergui.cpp b/plugins/feature/gs232controller/gs232controllergui.cpp index 4d8a0593f..2f1eb4410 100644 --- a/plugins/feature/gs232controller/gs232controllergui.cpp +++ b/plugins/feature/gs232controller/gs232controllergui.cpp @@ -33,6 +33,7 @@ #include "gs232controllergui.h" #include "gs232controllerreport.h" #include "dfmprotocol.h" +#include "maincore.h" GS232ControllerGUI* GS232ControllerGUI::create(PluginAPI* pluginAPI, FeatureUISet *featureUISet, Feature *feature) { diff --git a/plugins/feature/gs232controller/gs232controllersettings.h b/plugins/feature/gs232controller/gs232controllersettings.h index 9d6e3b81b..438b3d2d2 100644 --- a/plugins/feature/gs232controller/gs232controllersettings.h +++ b/plugins/feature/gs232controller/gs232controllersettings.h @@ -24,7 +24,6 @@ #include #include -#include "util/message.h" #include "inputcontrollersettings.h" class Serializable; diff --git a/plugins/feature/jogdialcontroller/jogdialcontrollersettings.h b/plugins/feature/jogdialcontroller/jogdialcontrollersettings.h index 0560f5dc5..1ab625d31 100644 --- a/plugins/feature/jogdialcontroller/jogdialcontrollersettings.h +++ b/plugins/feature/jogdialcontroller/jogdialcontrollersettings.h @@ -24,8 +24,6 @@ #include #include -#include "util/message.h" - class Serializable; class ChannelAPI; class DeviceAPI; diff --git a/plugins/feature/map/beacon.h b/plugins/feature/map/beacon.h index b817bef93..4c1add716 100644 --- a/plugins/feature/map/beacon.h +++ b/plugins/feature/map/beacon.h @@ -24,7 +24,6 @@ #include #include -#include "util/units.h" #include "util/maidenhead.h" #include "util/csv.h" diff --git a/plugins/feature/map/map.h b/plugins/feature/map/map.h index 6f68f557a..5ede97e65 100644 --- a/plugins/feature/map/map.h +++ b/plugins/feature/map/map.h @@ -29,7 +29,6 @@ #include "feature/feature.h" #include "util/message.h" #include "availablechannelorfeaturehandler.h" -#include "maincore.h" #include "mapsettings.h" diff --git a/plugins/feature/map/mapgui.h b/plugins/feature/map/mapgui.h index 5e0a12746..f54bda778 100644 --- a/plugins/feature/map/mapgui.h +++ b/plugins/feature/map/mapgui.h @@ -62,6 +62,8 @@ #include "webserver.h" #include "mapmodel.h" +#include "maincore.h" + class PluginAPI; class FeatureUISet; class Map; diff --git a/plugins/feature/pertester/pertestersettings.h b/plugins/feature/pertester/pertestersettings.h index 6aac2e442..34b3fb480 100644 --- a/plugins/feature/pertester/pertestersettings.h +++ b/plugins/feature/pertester/pertestersettings.h @@ -24,8 +24,6 @@ #include #include -#include "util/message.h" - class Serializable; struct PERTesterSettings diff --git a/plugins/feature/radiosonde/radiosondegui.cpp b/plugins/feature/radiosonde/radiosondegui.cpp index 1aa3e1af6..5cd6a9a43 100644 --- a/plugins/feature/radiosonde/radiosondegui.cpp +++ b/plugins/feature/radiosonde/radiosondegui.cpp @@ -31,6 +31,7 @@ #include "gui/dialogpositioner.h" #include "gui/crightclickenabler.h" #include "device/deviceapi.h" +#include "util/units.h" #include "maincore.h" #include "ui_radiosondegui.h" diff --git a/plugins/feature/radiosonde/radiosondesettings.h b/plugins/feature/radiosonde/radiosondesettings.h index cc9ffc914..1f7071027 100644 --- a/plugins/feature/radiosonde/radiosondesettings.h +++ b/plugins/feature/radiosonde/radiosondesettings.h @@ -24,8 +24,6 @@ #include #include -#include "util/message.h" - class Serializable; // Number of columns in the table diff --git a/plugins/feature/remotecontrol/remotecontrolsettings.h b/plugins/feature/remotecontrol/remotecontrolsettings.h index aff116272..131ecd4b1 100644 --- a/plugins/feature/remotecontrol/remotecontrolsettings.h +++ b/plugins/feature/remotecontrol/remotecontrolsettings.h @@ -21,7 +21,6 @@ #include #include -#include "util/message.h" #include "util/iot/device.h" class Serializable; diff --git a/plugins/feature/remotecontrol/remotecontrolsettingsdialog.cpp b/plugins/feature/remotecontrol/remotecontrolsettingsdialog.cpp index 65bfb57b2..b395412ae 100644 --- a/plugins/feature/remotecontrol/remotecontrolsettingsdialog.cpp +++ b/plugins/feature/remotecontrol/remotecontrolsettingsdialog.cpp @@ -17,10 +17,9 @@ #include +#include "remotecontroldevicedialog.h" #include "remotecontrolsettingsdialog.h" -#include "channel/channelwebapiutils.h" - RemoteControlSettingsDialog::RemoteControlSettingsDialog(RemoteControlSettings *settings, QWidget* parent) : QDialog(parent), ui(new Ui::RemoteControlSettingsDialog), diff --git a/plugins/feature/remotecontrol/remotecontrolsettingsdialog.h b/plugins/feature/remotecontrol/remotecontrolsettingsdialog.h index 9d75a7598..08e58287a 100644 --- a/plugins/feature/remotecontrol/remotecontrolsettingsdialog.h +++ b/plugins/feature/remotecontrol/remotecontrolsettingsdialog.h @@ -23,7 +23,6 @@ #include "ui_remotecontrolsettingsdialog.h" #include "remotecontrolsettings.h" -#include "remotecontroldevicedialog.h" class RemoteControlSettingsDialog : public QDialog { Q_OBJECT diff --git a/plugins/feature/sid/sidaddchannelsdialog.h b/plugins/feature/sid/sidaddchannelsdialog.h index f19592ea7..82f33fd4a 100644 --- a/plugins/feature/sid/sidaddchannelsdialog.h +++ b/plugins/feature/sid/sidaddchannelsdialog.h @@ -18,6 +18,7 @@ #ifndef INCLUDE_SIDADDCHANNELSDIALOG_H #define INCLUDE_SIDADDCHANNELSDIALOG_H +#include "channel/channelapi.h" #include "ui_sidaddchannelsdialog.h" #include "sidsettings.h" diff --git a/plugins/feature/sid/sidsettings.h b/plugins/feature/sid/sidsettings.h index 10414ee33..f6b148ed1 100644 --- a/plugins/feature/sid/sidsettings.h +++ b/plugins/feature/sid/sidsettings.h @@ -24,8 +24,6 @@ #include #include -#include "util/message.h" - class Serializable; struct SIDSettings diff --git a/plugins/feature/simpleptt/simplepttcommandoutputdialog.h b/plugins/feature/simpleptt/simplepttcommandoutputdialog.h index e23648c8d..b25dc44b0 100644 --- a/plugins/feature/simpleptt/simplepttcommandoutputdialog.h +++ b/plugins/feature/simpleptt/simplepttcommandoutputdialog.h @@ -24,8 +24,6 @@ #include #include -#include "export.h" - namespace Ui { class SimplePTTCommandOutputDialog; } diff --git a/plugins/feature/simpleptt/simplepttworker.h b/plugins/feature/simpleptt/simplepttworker.h index 808864530..095f8d5bf 100644 --- a/plugins/feature/simpleptt/simplepttworker.h +++ b/plugins/feature/simpleptt/simplepttworker.h @@ -23,6 +23,7 @@ #include #include +#include "dsp/dsptypes.h" #include "util/message.h" #include "util/messagequeue.h" #include "audio/audiofifo.h" diff --git a/plugins/feature/skymap/webview.h b/plugins/feature/skymap/webview.h index d0ed1a157..085133ee1 100644 --- a/plugins/feature/skymap/webview.h +++ b/plugins/feature/skymap/webview.h @@ -20,8 +20,6 @@ #include -#include "websocketserver.h" - class QTabWidget; class WebView : public QWebEngineView diff --git a/plugins/feature/startracker/startrackergui.h b/plugins/feature/startracker/startrackergui.h index d607f603a..1a5b1d4d5 100644 --- a/plugins/feature/startracker/startrackergui.h +++ b/plugins/feature/startracker/startrackergui.h @@ -30,7 +30,6 @@ #include "feature/featuregui.h" #include "util/messagequeue.h" -#include "util/fits.h" #include "gui/httpdownloadmanagergui.h" #include "settings/rollupstate.h" #include "availablechannelorfeature.h" diff --git a/plugins/feature/startracker/startrackerreport.h b/plugins/feature/startracker/startrackerreport.h index 38e0321a2..cf8000ad4 100644 --- a/plugins/feature/startracker/startrackerreport.h +++ b/plugins/feature/startracker/startrackerreport.h @@ -25,7 +25,6 @@ #include #include "util/message.h" -#include "util/astronomy.h" class StarTrackerReport : public QObject { diff --git a/plugins/feature/startracker/startrackersettings.h b/plugins/feature/startracker/startrackersettings.h index 1bd2afa55..c8bd33222 100644 --- a/plugins/feature/startracker/startrackersettings.h +++ b/plugins/feature/startracker/startrackersettings.h @@ -24,8 +24,6 @@ #include #include -#include "util/message.h" - class Serializable; struct StarTrackerSettings diff --git a/plugins/feature/vorlocalizer/vorlocalizergui.h b/plugins/feature/vorlocalizer/vorlocalizergui.h index 58c590776..2c3ac99b8 100644 --- a/plugins/feature/vorlocalizer/vorlocalizergui.h +++ b/plugins/feature/vorlocalizer/vorlocalizergui.h @@ -32,8 +32,8 @@ #include #include +#include "dsp/dsptypes.h" #include "feature/featuregui.h" -#include "dsp/movingaverage.h" #include "util/messagequeue.h" #include "util/httpdownloadmanager.h" #include "util/azel.h" diff --git a/plugins/samplemimo/limesdrmimo/limesdrmothread.cpp b/plugins/samplemimo/limesdrmimo/limesdrmothread.cpp index 15c14ac34..4c9e8951c 100644 --- a/plugins/samplemimo/limesdrmimo/limesdrmothread.cpp +++ b/plugins/samplemimo/limesdrmimo/limesdrmothread.cpp @@ -17,6 +17,7 @@ #include "dsp/samplemofifo.h" +#include "limesdr/devicelimesdr.h" #include "limesdrmothread.h" LimeSDRMOThread::LimeSDRMOThread(lms_stream_t* stream0, lms_stream_t* stream1, QObject* parent) : diff --git a/plugins/samplemimo/limesdrmimo/limesdrmothread.h b/plugins/samplemimo/limesdrmimo/limesdrmothread.h index 314e79be7..b06790605 100644 --- a/plugins/samplemimo/limesdrmimo/limesdrmothread.h +++ b/plugins/samplemimo/limesdrmimo/limesdrmothread.h @@ -27,7 +27,6 @@ #include "lime/LimeSuite.h" -#include "limesdr/devicelimesdr.h" #include "dsp/interpolators.h" class SampleMOFifo; diff --git a/plugins/samplemimo/testmi/testmiworker.h b/plugins/samplemimo/testmi/testmiworker.h index 1bd7d9899..3822c8236 100644 --- a/plugins/samplemimo/testmi/testmiworker.h +++ b/plugins/samplemimo/testmi/testmiworker.h @@ -26,7 +26,6 @@ #include "dsp/decimators.h" #include "dsp/ncof.h" -#include "util/message.h" #include "util/messagequeue.h" #include "testmisettings.h" diff --git a/plugins/samplesink/aaroniartsaoutput/aaroniartsaoutputworker.h b/plugins/samplesink/aaroniartsaoutput/aaroniartsaoutputworker.h index 7efe6e6af..2fd7b9c17 100644 --- a/plugins/samplesink/aaroniartsaoutput/aaroniartsaoutputworker.h +++ b/plugins/samplesink/aaroniartsaoutput/aaroniartsaoutputworker.h @@ -21,7 +21,6 @@ #include #include "dsp/samplesourcefifo.h" -#include "util/message.h" #include #include @@ -29,7 +28,6 @@ #include #include #include -#include "dsp/decimatorsfi.h" class AaroniaRTSAOutputWorker : public QObject { Q_OBJECT diff --git a/plugins/samplesink/fileoutput/fileoutputworker.h b/plugins/samplesink/fileoutput/fileoutputworker.h index 66ddf9552..44f44119c 100644 --- a/plugins/samplesink/fileoutput/fileoutputworker.h +++ b/plugins/samplesink/fileoutput/fileoutputworker.h @@ -29,7 +29,6 @@ #include #include -#include "dsp/inthalfbandfilter.h" #include "dsp/interpolators.h" #define FILEOUTPUT_THROTTLE_MS 50 diff --git a/plugins/samplesink/testsink/testsinkworker.h b/plugins/samplesink/testsink/testsinkworker.h index c7c08c2ef..1ba48922e 100644 --- a/plugins/samplesink/testsink/testsinkworker.h +++ b/plugins/samplesink/testsink/testsinkworker.h @@ -29,7 +29,6 @@ #include #include -#include "dsp/inthalfbandfilter.h" #include "dsp/interpolators.h" #include "util/incrementalvector.h" diff --git a/plugins/samplesource/fileinput/fileinputworker.h b/plugins/samplesource/fileinput/fileinputworker.h index bd242a592..6e9cb4a33 100644 --- a/plugins/samplesource/fileinput/fileinputworker.h +++ b/plugins/samplesource/fileinput/fileinputworker.h @@ -28,7 +28,6 @@ #include #include -#include "dsp/inthalfbandfilter.h" #include "util/message.h" #define FILESOURCE_THROTTLE_MS 50 diff --git a/plugins/samplesource/remotetcpinput/remotetcpinput.h b/plugins/samplesource/remotetcpinput/remotetcpinput.h index 97e935f08..56a1e4f37 100644 --- a/plugins/samplesource/remotetcpinput/remotetcpinput.h +++ b/plugins/samplesource/remotetcpinput/remotetcpinput.h @@ -31,7 +31,6 @@ #include #include "dsp/devicesamplesource.h" -#include "channel/remotedatablock.h" #include "remotetcpinputsettings.h" diff --git a/plugins/samplesource/testsource/testsourceworker.h b/plugins/samplesource/testsource/testsourceworker.h index bfbaf1196..b565882a3 100644 --- a/plugins/samplesource/testsource/testsourceworker.h +++ b/plugins/samplesource/testsource/testsourceworker.h @@ -29,7 +29,6 @@ #include "dsp/samplesinkfifo.h" #include "dsp/decimators.h" #include "dsp/ncof.h" -#include "util/message.h" #include "util/messagequeue.h" #include "testsourcesettings.h" diff --git a/qrtplib/rtcpapppacket.h b/qrtplib/rtcpapppacket.h index 6a94597e4..958273261 100644 --- a/qrtplib/rtcpapppacket.h +++ b/qrtplib/rtcpapppacket.h @@ -38,7 +38,6 @@ #define RTCPAPPPACKET_H -#include "rtpconfig.h" #include "rtcppacket.h" #include "rtpstructs.h" #include "rtpendian.h" diff --git a/qrtplib/rtcpcompoundpacket.h b/qrtplib/rtcpcompoundpacket.h index 461a263b8..045da434a 100644 --- a/qrtplib/rtcpcompoundpacket.h +++ b/qrtplib/rtcpcompoundpacket.h @@ -38,7 +38,6 @@ #define RTCPCOMPOUNDPACKET_H -#include "rtpconfig.h" #include "rtptypes.h" #include "rtpendian.h" #include diff --git a/qrtplib/rtcppacket.h b/qrtplib/rtcppacket.h index 84092e340..3cbc03169 100644 --- a/qrtplib/rtcppacket.h +++ b/qrtplib/rtcppacket.h @@ -38,7 +38,6 @@ #define RTCPPACKET_H -#include "rtpconfig.h" #include "rtptypes.h" #include diff --git a/qrtplib/rtcppacketbuilder.h b/qrtplib/rtcppacketbuilder.h index 593e477c5..9c173337c 100644 --- a/qrtplib/rtcppacketbuilder.h +++ b/qrtplib/rtcppacketbuilder.h @@ -38,7 +38,6 @@ #define RTCPPACKETBUILDER_H -#include "rtpconfig.h" #include "rtptypes.h" #include "rtperrors.h" #include "rtcpsdesinfo.h" diff --git a/qrtplib/rtcprrpacket.h b/qrtplib/rtcprrpacket.h index 2b49ad40b..68ba98020 100644 --- a/qrtplib/rtcprrpacket.h +++ b/qrtplib/rtcprrpacket.h @@ -38,7 +38,6 @@ #define RTCPRRPACKET_H -#include "rtpconfig.h" #include "rtcppacket.h" #include "rtpstructs.h" #include "rtpendian.h" diff --git a/qrtplib/rtcpscheduler.h b/qrtplib/rtcpscheduler.h index 7557414bb..8518aeb68 100644 --- a/qrtplib/rtcpscheduler.h +++ b/qrtplib/rtcpscheduler.h @@ -38,7 +38,6 @@ #define RTCPSCHEDULER_H -#include "rtpconfig.h" #include "rtptimeutilities.h" #include "rtprandom.h" #include diff --git a/qrtplib/rtcpsrpacket.h b/qrtplib/rtcpsrpacket.h index 5f8f9172f..9caf202a4 100644 --- a/qrtplib/rtcpsrpacket.h +++ b/qrtplib/rtcpsrpacket.h @@ -38,7 +38,6 @@ #define RTCPSRPACKET_H -#include "rtpconfig.h" #include "rtcppacket.h" #include "rtptimeutilities.h" #include "rtpstructs.h" diff --git a/qrtplib/rtcpunknownpacket.h b/qrtplib/rtcpunknownpacket.h index 8bb3e3e4a..0e3daf377 100644 --- a/qrtplib/rtcpunknownpacket.h +++ b/qrtplib/rtcpunknownpacket.h @@ -38,7 +38,6 @@ #define RTCPUNKNOWNPACKET_H -#include "rtpconfig.h" #include "rtcppacket.h" namespace qrtplib diff --git a/qrtplib/rtpaddress.h b/qrtplib/rtpaddress.h index aaee32cc0..99b5c9139 100644 --- a/qrtplib/rtpaddress.h +++ b/qrtplib/rtpaddress.h @@ -38,7 +38,6 @@ #define RTPADDRESS_H -#include "rtpconfig.h" #include #include #include diff --git a/qrtplib/rtpcollisionlist.h b/qrtplib/rtpcollisionlist.h index e17e01c28..aa974f5a7 100644 --- a/qrtplib/rtpcollisionlist.h +++ b/qrtplib/rtpcollisionlist.h @@ -38,7 +38,6 @@ #define RTPCOLLISIONLIST_H -#include "rtpconfig.h" #include "rtpaddress.h" #include "rtptimeutilities.h" #include diff --git a/qrtplib/rtperrors.h b/qrtplib/rtperrors.h index fba59d681..7435612be 100644 --- a/qrtplib/rtperrors.h +++ b/qrtplib/rtperrors.h @@ -39,7 +39,6 @@ #define RTPERRORS_H #include "export.h" -#include "rtpconfig.h" #include namespace qrtplib diff --git a/qrtplib/rtpinternalutils.h b/qrtplib/rtpinternalutils.h index bbe0e34b7..e83eeb6a4 100644 --- a/qrtplib/rtpinternalutils.h +++ b/qrtplib/rtpinternalutils.h @@ -34,8 +34,6 @@ #define RTPINTERNALUTILS_H -#include "rtpconfig.h" - #if defined(RTP_HAVE_SNPRINTF_S) #include #include diff --git a/qrtplib/rtpkeyhashtable.h b/qrtplib/rtpkeyhashtable.h index cfba38d7c..622d97414 100644 --- a/qrtplib/rtpkeyhashtable.h +++ b/qrtplib/rtpkeyhashtable.h @@ -38,7 +38,6 @@ #define RTPKEYHASHTABLE_H -#include "rtpconfig.h" #include "rtperrors.h" namespace qrtplib diff --git a/qrtplib/rtppacket.h b/qrtplib/rtppacket.h index 46c632540..4600af7ca 100644 --- a/qrtplib/rtppacket.h +++ b/qrtplib/rtppacket.h @@ -38,7 +38,6 @@ #define RTPPACKET_H -#include "rtpconfig.h" #include "rtptypes.h" #include "rtptimeutilities.h" #include "rtpendian.h" diff --git a/qrtplib/rtppacketbuilder.h b/qrtplib/rtppacketbuilder.h index a1cdedb12..ff1c38d51 100644 --- a/qrtplib/rtppacketbuilder.h +++ b/qrtplib/rtppacketbuilder.h @@ -38,7 +38,6 @@ #define RTPPACKETBUILDER_H -#include "rtpconfig.h" #include "rtperrors.h" #include "rtpdefines.h" #include "rtprandom.h" diff --git a/qrtplib/rtprandom.h b/qrtplib/rtprandom.h index 249914c6a..9aac85d88 100644 --- a/qrtplib/rtprandom.h +++ b/qrtplib/rtprandom.h @@ -38,7 +38,6 @@ #define RTPRANDOM_H -#include "rtpconfig.h" #include "rtptypes.h" #include diff --git a/qrtplib/rtprandomrand48.h b/qrtplib/rtprandomrand48.h index a4282166a..b31841c1c 100644 --- a/qrtplib/rtprandomrand48.h +++ b/qrtplib/rtprandomrand48.h @@ -38,7 +38,6 @@ #define RTPRANDOMRAND48_H -#include "rtpconfig.h" #include "rtprandom.h" #include diff --git a/qrtplib/rtprandomrands.h b/qrtplib/rtprandomrands.h index f5a0cf377..3a977d06e 100644 --- a/qrtplib/rtprandomrands.h +++ b/qrtplib/rtprandomrands.h @@ -38,7 +38,6 @@ #define RTPRANDOMRANDS_H -#include "rtpconfig.h" #include "rtprandom.h" #include "export.h" diff --git a/qrtplib/rtprandomurandom.h b/qrtplib/rtprandomurandom.h index 67b2d1647..0c69961c5 100644 --- a/qrtplib/rtprandomurandom.h +++ b/qrtplib/rtprandomurandom.h @@ -38,7 +38,6 @@ #define RTPRANDOMURANDOM_H -#include "rtpconfig.h" #include "rtprandom.h" #include diff --git a/qrtplib/rtprawpacket.h b/qrtplib/rtprawpacket.h index df00af0a6..82ef6d66b 100644 --- a/qrtplib/rtprawpacket.h +++ b/qrtplib/rtprawpacket.h @@ -38,7 +38,6 @@ #define RTPRAWPACKET_H -#include "rtpconfig.h" #include "rtptimeutilities.h" #include "rtpaddress.h" #include "rtptypes.h" diff --git a/qrtplib/rtpsession.cpp b/qrtplib/rtpsession.cpp index 1740409d0..cdf0f3e2a 100644 --- a/qrtplib/rtpsession.cpp +++ b/qrtplib/rtpsession.cpp @@ -31,6 +31,7 @@ */ #include "rtpsession.h" +#include "rtcpcompoundpacketbuilder.h" #include "rtperrors.h" // TODO: this is for Create with transmitter creation. See if we keep it. //#include "rtpudpv4transmitter.h" @@ -41,13 +42,9 @@ #include "rtprawpacket.h" #include "rtppacket.h" #include "rtptimeutilities.h" -#include "rtprandomrand48.h" -#include "rtprandomrands.h" -#include "rtprandomurandom.h" #ifdef RTP_SUPPORT_SENDAPP #include "rtcpcompoundpacket.h" #endif // RTP_SUPPORT_SENDAPP -#include "rtpinternalutils.h" #include diff --git a/qrtplib/rtpsession.h b/qrtplib/rtpsession.h index 179609e8f..54a34ec81 100644 --- a/qrtplib/rtpsession.h +++ b/qrtplib/rtpsession.h @@ -46,7 +46,6 @@ #include "rtcpscheduler.h" #include "rtcppacketbuilder.h" #include "rtptimeutilities.h" -#include "rtcpcompoundpacketbuilder.h" #include #include "export.h" diff --git a/qrtplib/rtpsessionparams.h b/qrtplib/rtpsessionparams.h index b58cc424c..8f3d99866 100644 --- a/qrtplib/rtpsessionparams.h +++ b/qrtplib/rtpsessionparams.h @@ -38,11 +38,11 @@ #define RTPSESSIONPARAMS_H -#include "rtpconfig.h" +#include + #include "rtptypes.h" #include "rtptransmitter.h" #include "rtptimeutilities.h" -#include "rtpsources.h" #include "export.h" diff --git a/qrtplib/rtpsocketutil.h b/qrtplib/rtpsocketutil.h index ea648afc5..8a4cbc06a 100644 --- a/qrtplib/rtpsocketutil.h +++ b/qrtplib/rtpsocketutil.h @@ -38,7 +38,6 @@ #define RTPSOCKETUTIL_H -#include "rtpconfig.h" #ifdef RTP_SOCKETTYPE_WINSOCK #include "rtptypes.h" #endif // RTP_SOCKETTYPE_WINSOCK diff --git a/qrtplib/rtpsourcedata.h b/qrtplib/rtpsourcedata.h index b71256687..8fcb28f50 100644 --- a/qrtplib/rtpsourcedata.h +++ b/qrtplib/rtpsourcedata.h @@ -43,7 +43,6 @@ #include "rtppacket.h" #include "rtcpsdesinfo.h" #include "rtptypes.h" -#include "rtpsources.h" #include #include "export.h" diff --git a/qrtplib/rtpstructs.h b/qrtplib/rtpstructs.h index 152b08819..03edc6288 100644 --- a/qrtplib/rtpstructs.h +++ b/qrtplib/rtpstructs.h @@ -38,7 +38,6 @@ #define RTPSTRUCTS_H -#include "rtpconfig.h" #include "rtptypes.h" namespace qrtplib diff --git a/qrtplib/rtptransmitter.h b/qrtplib/rtptransmitter.h index 595e1bd7b..d554ca9c7 100644 --- a/qrtplib/rtptransmitter.h +++ b/qrtplib/rtptransmitter.h @@ -38,7 +38,6 @@ #define RTPTRANSMITTER_H -#include "rtpconfig.h" #include "rtptypes.h" #include "rtptimeutilities.h" #include diff --git a/qrtplib/rtptypes.h b/qrtplib/rtptypes.h index aa93f8026..b8a4e7727 100644 --- a/qrtplib/rtptypes.h +++ b/qrtplib/rtptypes.h @@ -1,4 +1,2 @@ -#include "rtpconfig.h" - #include #include diff --git a/sdrbase/audio/audiofifo.h b/sdrbase/audio/audiofifo.h index 1a531f37f..ee97ec80f 100644 --- a/sdrbase/audio/audiofifo.h +++ b/sdrbase/audio/audiofifo.h @@ -25,7 +25,6 @@ #include #include -#include "dsp/dsptypes.h" #include "export.h" class SDRBASE_API AudioFifo : public QObject { diff --git a/sdrbase/audio/audionetsink.h b/sdrbase/audio/audionetsink.h index b83dc9944..3e5be2b67 100644 --- a/sdrbase/audio/audionetsink.h +++ b/sdrbase/audio/audionetsink.h @@ -20,7 +20,6 @@ #ifndef SDRBASE_AUDIO_AUDIONETSINK_H_ #define SDRBASE_AUDIO_AUDIONETSINK_H_ -#include "dsp/dsptypes.h" #include "audiofilter.h" #include "audiocompressor.h" #include "audiog722.h" diff --git a/sdrbase/availablechannelorfeaturehandler.h b/sdrbase/availablechannelorfeaturehandler.h index 5568799d5..fce07b430 100644 --- a/sdrbase/availablechannelorfeaturehandler.h +++ b/sdrbase/availablechannelorfeaturehandler.h @@ -18,9 +18,9 @@ #ifndef SDRBASE_AVAILABLECHANNELORFEATUREHANDLER_H_ #define SDRBASE_AVAILABLECHANNELORFEATUREHANDLER_H_ -#include "pipes/messagepipes.h" #include "availablechannelorfeature.h" #include "export.h" +#include "util/messagequeue.h" class ChannelAPI; class Feature; diff --git a/sdrbase/dsp/afsquelch.cpp b/sdrbase/dsp/afsquelch.cpp index f58702a0a..6366c464d 100644 --- a/sdrbase/dsp/afsquelch.cpp +++ b/sdrbase/dsp/afsquelch.cpp @@ -17,6 +17,9 @@ /////////////////////////////////////////////////////////////////////////////////// #include + +#include + #include "dsp/afsquelch.h" diff --git a/sdrbase/dsp/afsquelch.h b/sdrbase/dsp/afsquelch.h index 953a76c9f..59c88ca66 100644 --- a/sdrbase/dsp/afsquelch.h +++ b/sdrbase/dsp/afsquelch.h @@ -18,7 +18,6 @@ #ifndef INCLUDE_GPL_DSP_AFSQUELCH_H_ #define INCLUDE_GPL_DSP_AFSQUELCH_H_ -#include "dsp/dsptypes.h" #include "dsp/movingaverage.h" #include "export.h" diff --git a/sdrbase/dsp/agc.h b/sdrbase/dsp/agc.h index 2a288139e..6c5022676 100644 --- a/sdrbase/dsp/agc.h +++ b/sdrbase/dsp/agc.h @@ -18,8 +18,8 @@ #ifndef INCLUDE_GPL_DSP_AGC_H_ #define INCLUDE_GPL_DSP_AGC_H_ +#include "dsp/dsptypes.h" #include "movingaverage.h" -#include "util/movingaverage.h" #include "export.h" class SDRBASE_API AGC diff --git a/sdrbase/dsp/basebandsamplesink.h b/sdrbase/dsp/basebandsamplesink.h index b3f8e6d69..945602e50 100644 --- a/sdrbase/dsp/basebandsamplesink.h +++ b/sdrbase/dsp/basebandsamplesink.h @@ -22,7 +22,6 @@ #include "dsp/dsptypes.h" #include "export.h" -#include "util/messagequeue.h" class Message; diff --git a/sdrbase/dsp/basebandsamplesource.h b/sdrbase/dsp/basebandsamplesource.h index 10b2bdc30..052807579 100644 --- a/sdrbase/dsp/basebandsamplesource.h +++ b/sdrbase/dsp/basebandsamplesource.h @@ -22,7 +22,6 @@ #include "dsp/dsptypes.h" #include "export.h" -#include "util/messagequeue.h" class Message; diff --git a/sdrbase/dsp/datafifo.h b/sdrbase/dsp/datafifo.h index 29f8e536c..4f9f39cdf 100644 --- a/sdrbase/dsp/datafifo.h +++ b/sdrbase/dsp/datafifo.h @@ -26,7 +26,6 @@ #include #include -#include "dsp/dsptypes.h" #include "export.h" class SDRBASE_API DataFifo : public QObject { diff --git a/sdrbase/dsp/downchannelizer.h b/sdrbase/dsp/downchannelizer.h index caec5c0df..5072f60dd 100644 --- a/sdrbase/dsp/downchannelizer.h +++ b/sdrbase/dsp/downchannelizer.h @@ -24,7 +24,6 @@ #include #include "export.h" -#include "util/message.h" #include "dsp/inthalfbandfiltereo.h" #include "channelsamplesink.h" diff --git a/sdrbase/dsp/dspcommands.h b/sdrbase/dsp/dspcommands.h index 2e2f55732..a5b18ab98 100644 --- a/sdrbase/dsp/dspcommands.h +++ b/sdrbase/dsp/dspcommands.h @@ -21,8 +21,8 @@ #define INCLUDE_DSPCOMMANDS_H #include +#include "dsp/dsptypes.h" #include "util/message.h" -#include "fftwindow.h" #include "export.h" class DeviceSampleSource; diff --git a/sdrbase/dsp/dspdevicesinkengine.h b/sdrbase/dsp/dspdevicesinkengine.h index b5f4f60ea..ed0757648 100644 --- a/sdrbase/dsp/dspdevicesinkengine.h +++ b/sdrbase/dsp/dspdevicesinkengine.h @@ -32,7 +32,6 @@ #include #include "dsp/dsptypes.h" -#include "dsp/fftwindow.h" #include "util/messagequeue.h" #include "util/syncmessenger.h" #include "util/incrementalvector.h" diff --git a/sdrbase/dsp/dspdevicesourceengine.h b/sdrbase/dsp/dspdevicesourceengine.h index d455eceff..fa0731bd4 100644 --- a/sdrbase/dsp/dspdevicesourceengine.h +++ b/sdrbase/dsp/dspdevicesourceengine.h @@ -27,7 +27,6 @@ #include #include #include "dsp/dsptypes.h" -#include "dsp/fftwindow.h" #include "util/messagequeue.h" #include "util/syncmessenger.h" #include "export.h" diff --git a/sdrbase/dsp/fftengine.h b/sdrbase/dsp/fftengine.h index 1249ddbb2..637d684b9 100644 --- a/sdrbase/dsp/fftengine.h +++ b/sdrbase/dsp/fftengine.h @@ -24,7 +24,6 @@ #include #include "dsp/dsptypes.h" -#include "util/profiler.h" #include "export.h" class SDRBASE_API FFTEngine { diff --git a/sdrbase/dsp/fftfactory.h b/sdrbase/dsp/fftfactory.h index e8235e4ad..fcfdb86d3 100644 --- a/sdrbase/dsp/fftfactory.h +++ b/sdrbase/dsp/fftfactory.h @@ -29,7 +29,6 @@ #include #include "export.h" -#include "dsp/dsptypes.h" #include "fftengine.h" class SDRBASE_API FFTFactory { diff --git a/sdrbase/dsp/fftwengine.cpp b/sdrbase/dsp/fftwengine.cpp index 8088e77ee..cf9b36569 100644 --- a/sdrbase/dsp/fftwengine.cpp +++ b/sdrbase/dsp/fftwengine.cpp @@ -19,8 +19,10 @@ /////////////////////////////////////////////////////////////////////////////////// #include +#include #include "dsp/fftwengine.h" +#include "util/profiler.h" FFTWEngine::FFTWEngine(const QString& fftWisdomFileName) : m_fftWisdomFileName(fftWisdomFileName), diff --git a/sdrbase/dsp/firfilter.h b/sdrbase/dsp/firfilter.h index 77cbee39c..b4e917dd8 100644 --- a/sdrbase/dsp/firfilter.h +++ b/sdrbase/dsp/firfilter.h @@ -22,7 +22,6 @@ #include #include #include "dsp/dsptypes.h" -#include "dsp/misc.h" #include "export.h" namespace FirFilterGenerators diff --git a/sdrbase/dsp/glscopeinterface.h b/sdrbase/dsp/glscopeinterface.h index bd6a350ce..d98266581 100644 --- a/sdrbase/dsp/glscopeinterface.h +++ b/sdrbase/dsp/glscopeinterface.h @@ -20,8 +20,6 @@ #ifndef SDRBASE_DSP_GLSCOPEINTERFACE_H_ #define SDRBASE_DSP_GLSCOPEINTERFACE_H_ -#include "dsptypes.h" -#include "physicalunit.h" #include "glscopesettings.h" class GLScopeInterface diff --git a/sdrbase/dsp/inthalfbandfiltereof.h b/sdrbase/dsp/inthalfbandfiltereof.h index ab2ee3e43..f16ac0a63 100644 --- a/sdrbase/dsp/inthalfbandfiltereof.h +++ b/sdrbase/dsp/inthalfbandfiltereof.h @@ -27,7 +27,6 @@ #include #include "dsp/dsptypes.h" #include "dsp/hbfiltertraits.h" -#include "export.h" template class IntHalfbandFilterEOF { diff --git a/sdrbase/dsp/kissengine.cpp b/sdrbase/dsp/kissengine.cpp index 3e4c10f31..559576988 100644 --- a/sdrbase/dsp/kissengine.cpp +++ b/sdrbase/dsp/kissengine.cpp @@ -18,6 +18,7 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////////// #include "dsp/kissengine.h" +#include "util/profiler.h" const QString KissEngine::m_name = "Kiss"; diff --git a/sdrbase/dsp/mimochannel.h b/sdrbase/dsp/mimochannel.h index 2a6f0ac0b..4a22eda1d 100644 --- a/sdrbase/dsp/mimochannel.h +++ b/sdrbase/dsp/mimochannel.h @@ -22,7 +22,6 @@ #include "export.h" #include "dsp/dsptypes.h" -#include "util/messagequeue.h" #include "util/message.h" diff --git a/sdrbase/dsp/movingaverage.h b/sdrbase/dsp/movingaverage.h index ea65151a2..1b6a954ec 100644 --- a/sdrbase/dsp/movingaverage.h +++ b/sdrbase/dsp/movingaverage.h @@ -22,7 +22,6 @@ #include #include #include -#include "dsp/dsptypes.h" template class MovingAverage { public: diff --git a/sdrbase/dsp/scopevis.h b/sdrbase/dsp/scopevis.h index 4e5b5a8ae..2d52e6731 100644 --- a/sdrbase/dsp/scopevis.h +++ b/sdrbase/dsp/scopevis.h @@ -38,7 +38,6 @@ #include "util/message.h" #include "util/messagequeue.h" #include "util/doublebuffer.h" -#include "util/doublebuffermultiple.h" class GLScopeInterface; diff --git a/sdrbase/dsp/upchannelizer.h b/sdrbase/dsp/upchannelizer.h index 3221dbb33..d637a15df 100644 --- a/sdrbase/dsp/upchannelizer.h +++ b/sdrbase/dsp/upchannelizer.h @@ -22,7 +22,6 @@ #include #include "export.h" -#include "util/message.h" #include "channelsamplesource.h" diff --git a/sdrbase/feature/featurewebapiutils.h b/sdrbase/feature/featurewebapiutils.h index 2f8d6b32a..d0448892c 100644 --- a/sdrbase/feature/featurewebapiutils.h +++ b/sdrbase/feature/featurewebapiutils.h @@ -22,6 +22,7 @@ #define SDRBASE_FEATURE_FEATUREWEBAPIUTILS_H_ #include +#include #include "export.h" diff --git a/sdrbase/util/aprs.h b/sdrbase/util/aprs.h index 1f1cf8762..d4cfc4bd3 100644 --- a/sdrbase/util/aprs.h +++ b/sdrbase/util/aprs.h @@ -22,6 +22,7 @@ #include #include #include +#include #include #include "export.h" diff --git a/sdrbase/util/ourairportsdb.h b/sdrbase/util/ourairportsdb.h index 58c89505a..c24179aae 100644 --- a/sdrbase/util/ourairportsdb.h +++ b/sdrbase/util/ourairportsdb.h @@ -26,7 +26,6 @@ #include #include -#include "util/csv.h" #include "util/httpdownloadmanager.h" #include "export.h" diff --git a/sdrbase/util/radiosonde.h b/sdrbase/util/radiosonde.h index 5e75c2627..dc6d7c3f6 100644 --- a/sdrbase/util/radiosonde.h +++ b/sdrbase/util/radiosonde.h @@ -25,8 +25,6 @@ #include #include -#include "util/units.h" - #include "export.h" #define RS41_LENGTH_STD 320 diff --git a/sdrbase/util/rtpsink.h b/sdrbase/util/rtpsink.h index 63a47f6d9..9d85e3d81 100644 --- a/sdrbase/util/rtpsink.h +++ b/sdrbase/util/rtpsink.h @@ -28,12 +28,9 @@ // qrtplib includes #include "rtpsession.h" #include "rtpudptransmitter.h" -#include "rtpaddress.h" #include "rtpsessionparams.h" #include "rtperrors.h" -#include "export.h" - class QUdpSocket; class RTPSink diff --git a/sdrgui/gui/basicchannelsettingsdialog.cpp b/sdrgui/gui/basicchannelsettingsdialog.cpp index 8611d8135..b418a4013 100644 --- a/sdrgui/gui/basicchannelsettingsdialog.cpp +++ b/sdrgui/gui/basicchannelsettingsdialog.cpp @@ -16,6 +16,7 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////////// #include +#include #include "dsp/channelmarker.h" #include "gui/pluginpresetsdialog.h" diff --git a/sdrgui/gui/cwkeyergui.h b/sdrgui/gui/cwkeyergui.h index 456ee0d56..08f62a26c 100644 --- a/sdrgui/gui/cwkeyergui.h +++ b/sdrgui/gui/cwkeyergui.h @@ -22,7 +22,6 @@ #define SDRBASE_GUI_CWKEYERGUI_H_ #include -#include "dsp/dsptypes.h" #include "export.h" #include "settings/serializable.h" #include "dsp/cwkeyersettings.h" diff --git a/sdrgui/gui/glscope.h b/sdrgui/gui/glscope.h index 888cd66ec..e69eb208c 100644 --- a/sdrgui/gui/glscope.h +++ b/sdrgui/gui/glscope.h @@ -27,14 +27,11 @@ #include #include "dsp/glscopeinterface.h" -#include "dsp/dsptypes.h" -#include "dsp/scopevis.h" #include "gui/scaleengine.h" #include "gui/glshadercolors.h" #include "gui/glshadersimple.h" #include "gui/glshadertextured.h" #include "export.h" -#include "util/bitfieldindex.h" #include "util/incrementalarray.h" class QPainter; diff --git a/sdrgui/gui/glscopegui.h b/sdrgui/gui/glscopegui.h index 24fb358ed..25b5c68ba 100644 --- a/sdrgui/gui/glscopegui.h +++ b/sdrgui/gui/glscopegui.h @@ -25,7 +25,6 @@ #include #include -#include "dsp/dsptypes.h" #include "export.h" #include "util/message.h" #include "dsp/scopevis.h" diff --git a/sdrgui/gui/levelmeter.h b/sdrgui/gui/levelmeter.h index b67c7d3da..ca75eb37e 100644 --- a/sdrgui/gui/levelmeter.h +++ b/sdrgui/gui/levelmeter.h @@ -67,7 +67,6 @@ #include #include -#include "dsp/dsptypes.h" #include "gui/scaleengine.h" #include "export.h" diff --git a/sdrgui/gui/profiledialog.h b/sdrgui/gui/profiledialog.h index 37983651f..a6a91e909 100644 --- a/sdrgui/gui/profiledialog.h +++ b/sdrgui/gui/profiledialog.h @@ -24,7 +24,6 @@ #include #include -#include "settings/mainsettings.h" #include "export.h" namespace Ui { diff --git a/sdrgui/gui/tabletapandhold.h b/sdrgui/gui/tabletapandhold.h index 81d412292..e6b57584c 100644 --- a/sdrgui/gui/tabletapandhold.h +++ b/sdrgui/gui/tabletapandhold.h @@ -21,6 +21,8 @@ #ifndef SDRGUI_GUI_TABLETAPANDHOLD_H #define SDRGUI_GUI_TABLETAPANDHOLD_H +#include + #include "export.h" class QTableWidget; diff --git a/sdrgui/mainspectrum/mainspectrumgui.h b/sdrgui/mainspectrum/mainspectrumgui.h index ce8a21b9c..2f7391592 100644 --- a/sdrgui/mainspectrum/mainspectrumgui.h +++ b/sdrgui/mainspectrum/mainspectrumgui.h @@ -24,7 +24,6 @@ #include #include -#include "util/messagequeue.h" #include "gui/framelesswindowresizer.h" #include "export.h" diff --git a/sdrsrv/mainserver.h b/sdrsrv/mainserver.h index 64fcad4d2..42f2d1b97 100644 --- a/sdrsrv/mainserver.h +++ b/sdrsrv/mainserver.h @@ -27,7 +27,6 @@ #include #include "maincore.h" -#include "settings/mainsettings.h" #include "util/messagequeue.h" #include "export.h" From fe84c20aff7eb5ae24451ff2abc6e9bb02a133e0 Mon Sep 17 00:00:00 2001 From: Daniele Forsi Date: Sat, 20 Apr 2024 19:15:25 +0200 Subject: [PATCH 2/4] Make all include directives identical Fixes the 5 includes that are different from the majority: grep -Ehr "#include .+dsptypes" --include=*.h | sort | uniq -c 110 #include "dsp/dsptypes.h" 1 #include 4 #include "dsptypes.h" --- plugins/channelrx/demodm17/m17demodsettings.h | 2 +- sdrbase/dsp/channelsamplesink.h | 2 +- sdrbase/dsp/channelsamplesource.h | 2 +- sdrbase/dsp/glspectruminterface.h | 2 +- sdrbase/dsp/projector.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/channelrx/demodm17/m17demodsettings.h b/plugins/channelrx/demodm17/m17demodsettings.h index 6350293a1..889cf35f7 100644 --- a/plugins/channelrx/demodm17/m17demodsettings.h +++ b/plugins/channelrx/demodm17/m17demodsettings.h @@ -24,7 +24,7 @@ #include #include -#include +#include "dsp/dsptypes.h" class Serializable; diff --git a/sdrbase/dsp/channelsamplesink.h b/sdrbase/dsp/channelsamplesink.h index 04225b12c..34daa100e 100644 --- a/sdrbase/dsp/channelsamplesink.h +++ b/sdrbase/dsp/channelsamplesink.h @@ -23,7 +23,7 @@ #define SDRBASE_DSP_CHANNELSAMPLESINK_H_ #include "export.h" -#include "dsptypes.h" +#include "dsp/dsptypes.h" class Message; diff --git a/sdrbase/dsp/channelsamplesource.h b/sdrbase/dsp/channelsamplesource.h index 9ede68df8..dc3de77b0 100644 --- a/sdrbase/dsp/channelsamplesource.h +++ b/sdrbase/dsp/channelsamplesource.h @@ -23,7 +23,7 @@ #define SDRBASE_DSP_CHANNELSAMPLESOURCE_H_ #include "export.h" -#include "dsptypes.h" +#include "dsp/dsptypes.h" class SDRBASE_API ChannelSampleSource { public: diff --git a/sdrbase/dsp/glspectruminterface.h b/sdrbase/dsp/glspectruminterface.h index f007a2f7a..1644ef9de 100644 --- a/sdrbase/dsp/glspectruminterface.h +++ b/sdrbase/dsp/glspectruminterface.h @@ -21,7 +21,7 @@ #define SDRBASE_DSP_GLSPECTRUMINTERFACE_H_ #include -#include "dsptypes.h" +#include "dsp/dsptypes.h" class GLSpectrumInterface { diff --git a/sdrbase/dsp/projector.h b/sdrbase/dsp/projector.h index cc5a58c7c..10f3a2b79 100644 --- a/sdrbase/dsp/projector.h +++ b/sdrbase/dsp/projector.h @@ -22,7 +22,7 @@ #define SDRBASE_DSP_PROJECTOR_H #include "export.h" -#include "dsptypes.h" +#include "dsp/dsptypes.h" class SDRBASE_API Projector { From 004811d83d83843b41b9cb2e67257488db20a3bf Mon Sep 17 00:00:00 2001 From: Daniele Forsi Date: Sat, 20 Apr 2024 19:18:27 +0200 Subject: [PATCH 3/4] Make all include directives identical Fixes the 5 includes that are different from the majority: grep -Ehr "#include .+export" --include=*.h | sort | uniq -c 769 #include "export.h" 5 #include "../../exports/export.h" --- sdrgui/gui/basicchannelsettingsdialog.h | 2 +- sdrgui/gui/basicdevicesettingsdialog.h | 2 +- sdrgui/gui/basicfeaturesettingsdialog.h | 2 +- sdrgui/gui/devicestreamselectiondialog.h | 2 +- sdrgui/gui/wsspectrumsettingsdialog.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sdrgui/gui/basicchannelsettingsdialog.h b/sdrgui/gui/basicchannelsettingsdialog.h index 0f466ae02..a66716462 100644 --- a/sdrgui/gui/basicchannelsettingsdialog.h +++ b/sdrgui/gui/basicchannelsettingsdialog.h @@ -20,7 +20,7 @@ #include -#include "../../exports/export.h" +#include "export.h" namespace Ui { class BasicChannelSettingsDialog; diff --git a/sdrgui/gui/basicdevicesettingsdialog.h b/sdrgui/gui/basicdevicesettingsdialog.h index 6e485b76e..7e06cdab9 100644 --- a/sdrgui/gui/basicdevicesettingsdialog.h +++ b/sdrgui/gui/basicdevicesettingsdialog.h @@ -20,7 +20,7 @@ #include -#include "../../exports/export.h" +#include "export.h" namespace Ui { class BasicDeviceSettingsDialog; diff --git a/sdrgui/gui/basicfeaturesettingsdialog.h b/sdrgui/gui/basicfeaturesettingsdialog.h index 92dc677f0..0fef8e2a4 100644 --- a/sdrgui/gui/basicfeaturesettingsdialog.h +++ b/sdrgui/gui/basicfeaturesettingsdialog.h @@ -24,7 +24,7 @@ #include -#include "../../exports/export.h" +#include "export.h" namespace Ui { class BasicFeatureSettingsDialog; diff --git a/sdrgui/gui/devicestreamselectiondialog.h b/sdrgui/gui/devicestreamselectiondialog.h index c57594ab5..9fa6d48d1 100644 --- a/sdrgui/gui/devicestreamselectiondialog.h +++ b/sdrgui/gui/devicestreamselectiondialog.h @@ -23,7 +23,7 @@ #include -#include "../../exports/export.h" +#include "export.h" namespace Ui { class DeviceStreamSelectionDialog; diff --git a/sdrgui/gui/wsspectrumsettingsdialog.h b/sdrgui/gui/wsspectrumsettingsdialog.h index c1c8c5732..d0ea6cd76 100644 --- a/sdrgui/gui/wsspectrumsettingsdialog.h +++ b/sdrgui/gui/wsspectrumsettingsdialog.h @@ -23,7 +23,7 @@ #include -#include "../../exports/export.h" +#include "export.h" namespace Ui { class WebsocketSpectrumSettingsDialog; From fd830a0153726739e79cb41c7a47e79fcf539d42 Mon Sep 17 00:00:00 2001 From: Daniele Forsi Date: Sat, 20 Apr 2024 21:56:07 +0200 Subject: [PATCH 4/4] Fix build of DAB demodulation plugin --- plugins/channelrx/demoddab/dabdemodgui.cpp | 1 - plugins/channelrx/demoddab/dabdemodgui.h | 1 - plugins/channelrx/demoddab/dabdemodsettings.h | 3 +++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/channelrx/demoddab/dabdemodgui.cpp b/plugins/channelrx/demoddab/dabdemodgui.cpp index 36f984d48..aad6b2296 100644 --- a/plugins/channelrx/demoddab/dabdemodgui.cpp +++ b/plugins/channelrx/demoddab/dabdemodgui.cpp @@ -40,7 +40,6 @@ #include "maincore.h" #include "dabdemod.h" -#include "dabdemodsink.h" // Table column indexes #define PROGRAMS_COL_NAME 0 diff --git a/plugins/channelrx/demoddab/dabdemodgui.h b/plugins/channelrx/demoddab/dabdemodgui.h index 4337d20e4..65d990053 100644 --- a/plugins/channelrx/demoddab/dabdemodgui.h +++ b/plugins/channelrx/demoddab/dabdemodgui.h @@ -25,7 +25,6 @@ #include "channel/channelgui.h" #include "dsp/channelmarker.h" -#include "dsp/movingaverage.h" #include "util/messagequeue.h" #include "settings/rollupstate.h" #include "dabdemodsettings.h" diff --git a/plugins/channelrx/demoddab/dabdemodsettings.h b/plugins/channelrx/demoddab/dabdemodsettings.h index c96a2796b..b5d24e4c9 100644 --- a/plugins/channelrx/demoddab/dabdemodsettings.h +++ b/plugins/channelrx/demoddab/dabdemodsettings.h @@ -22,6 +22,9 @@ #define INCLUDE_DABDEMODSETTINGS_H #include +#include + +#include "dsp/dsptypes.h" class Serializable;