Merge pull request #2062 from dforsi/fix/includes

Remove includes not used directly

devices/plutosdr/deviceplutosdrbox.cpp

@@ -27,7 +27,6 @@
 #include <boost/lexical_cast.hpp>
 #include <QtGlobal>
 
-#include "dsp/dsptypes.h"
 #include "dsp/wfir.h"
 #include "deviceplutosdr.h"
 #include "deviceplutosdrbox.h"

plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.cpp

@@ -29,7 +29,6 @@
 #include "dsp/hbfilterchainconverter.h"
 #include "dsp/dspcommands.h"
 #include "settings/serializable.h"
-#include "feature/feature.h"
 #include "maincore.h"
 
 #include "beamsteeringcwmodbaseband.h"

plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodbaseband.cpp

@@ -20,7 +20,6 @@
 #include <QDebug>
 
 #include "dsp/upchannelizer.h"
-#include "dsp/dspcommands.h"
 
 #include "beamsteeringcwmodbaseband.h"
 

plugins/channelmimo/doa2/doa2.cpp

@@ -29,7 +29,6 @@
 #include "device/deviceapi.h"
 #include "dsp/hbfilterchainconverter.h"
 #include "dsp/dspcommands.h"
-#include "feature/feature.h"
 #include "util/db.h"
 #include "maincore.h"
 

plugins/channelmimo/doa2/doa2baseband.cpp

@@ -22,9 +22,7 @@
 #include <QDebug>
 
 #include "dsp/downchannelizer.h"
-#include "dsp/basebandsamplesink.h"
 #include "dsp/scopevis.h"
-#include "dsp/dspcommands.h"
 
 #include "doa2baseband.h"
 #include "doa2settings.h"

plugins/channelmimo/doa2/doa2gui.cpp

@@ -25,7 +25,6 @@
 #include "gui/dialogpositioner.h"
 #include "dsp/hbfilterchainconverter.h"
 #include "dsp/scopevis.h"
-#include "dsp/spectrumvis.h"
 #include "maincore.h"
 
 #include "doa2gui.h"

plugins/channelmimo/doa2/doa2settings.cpp

@@ -18,7 +18,6 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 

plugins/channelmimo/interferometer/interferometer.cpp

@@ -28,7 +28,6 @@
 #include "device/deviceapi.h"
 #include "dsp/hbfilterchainconverter.h"
 #include "dsp/dspcommands.h"
-#include "feature/feature.h"
 #include "maincore.h"
 
 #include "interferometerbaseband.h"

plugins/channelmimo/interferometer/interferometerbaseband.cpp

@@ -24,7 +24,6 @@
 #include "dsp/downchannelizer.h"
 #include "dsp/basebandsamplesink.h"
 #include "dsp/scopevis.h"
-#include "dsp/dspcommands.h"
 
 #include "interferometerbaseband.h"
 

plugins/channelmimo/interferometer/interferometersettings.cpp

@@ -18,7 +18,6 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 

plugins/channelrx/chanalyzer/chanalyzerbaseband.cpp

@@ -18,7 +18,6 @@
 
 #include <QDebug>
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/downchannelizer.h"
 

plugins/channelrx/chanalyzer/chanalyzergui.cpp

@@ -31,7 +31,6 @@
 #include "gui/dialpopup.h"
 #include "gui/dialogpositioner.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
 #include "maincore.h"
 

plugins/channelrx/chanalyzer/chanalyzersettings.cpp

@@ -18,7 +18,6 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 

plugins/channelrx/channelpower/channelpower.cpp

@@ -32,13 +32,10 @@
 #include "SWGWorkspaceInfo.h"
 #include "SWGChannelReport.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "device/deviceapi.h"
-#include "feature/feature.h"
 #include "settings/serializable.h"
 #include "util/db.h"
-#include "maincore.h"
 
 MESSAGE_CLASS_DEFINITION(ChannelPower::MsgConfigureChannelPower, Message)
 

plugins/channelrx/channelpower/channelpowerbaseband.cpp

@@ -18,7 +18,6 @@
 
 #include <QDebug>
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/downchannelizer.h"
 

plugins/channelrx/channelpower/channelpowergui.cpp

@@ -24,10 +24,8 @@
 #include "dsp/dspcommands.h"
 #include "ui_channelpowergui.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/dialpopup.h"
 #include "gui/dialogpositioner.h"
 #include "dsp/dspengine.h"

plugins/channelrx/channelpower/channelpowersettings.cpp

@@ -18,7 +18,6 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 #include "channelpowersettings.h"

plugins/channelrx/demodadsb/adsbdemod.cpp

@@ -37,7 +37,6 @@
 #include "SWGADSBDemodReport.h"
 #include "SWGTargetAzimuthElevation.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/devicesamplemimo.h"
 #include "device/deviceapi.h"

plugins/channelrx/demodadsb/adsbdemodgui.cpp

@@ -43,12 +43,10 @@
 #include "plugin/pluginapi.h"
 #include "util/airlines.h"
 #include "util/crc.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
 #include "util/units.h"
 #include "util/morse.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/crightclickenabler.h"
 #include "gui/clickablelabel.h"
 #include "gui/tabletapandhold.h"
@@ -56,7 +54,6 @@
 #include "gui/dialogpositioner.h"
 #include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
-#include "mainwindow.h"
 
 #include "adsbdemodreport.h"
 #include "adsbdemod.h"

plugins/channelrx/demodadsb/adsbdemodsettings.cpp

@@ -20,10 +20,8 @@
 #include <QDataStream>
 #include <QDebug>
 
-#include "dsp/dspengine.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
-#include "settings/rollupstate.h"
 
 #include "adsbdemodsettings.h"
 

plugins/channelrx/demodadsb/adsbdemodsink.cpp

@@ -19,14 +19,6 @@
 #include <QTime>
 #include <QDebug>
 
-#include "util/stepfunctions.h"
-#include "util/db.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspcommands.h"
-#include "dsp/devicesamplemimo.h"
-#include "device/deviceapi.h"
-
-#include "adsbdemodreport.h"
 #include "adsbdemodsink.h"
 #include "adsbdemodsinkworker.h"
 #include "adsb.h"

plugins/channelrx/demodadsb/adsbdemodsink.h

@@ -25,10 +25,8 @@
 #include "dsp/channelsamplesink.h"
 #include "dsp/nco.h"
 #include "dsp/interpolator.h"
-#include "util/movingaverage.h"
 
 #include "adsbdemodsettings.h"
-#include "adsbdemodstats.h"
 #include "adsbdemodsinkworker.h"
 
 class ADSBDemodSink : public ChannelSampleSink {

plugins/channelrx/demodadsb/adsbdemodsinkworker.cpp

@@ -20,11 +20,7 @@
 
 #include <QDebug>
 
-#include "util/stepfunctions.h"
 #include "util/db.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspcommands.h"
-#include "device/deviceapi.h"
 
 #include "adsbdemodreport.h"
 #include "adsbdemodsink.h"

plugins/channelrx/demodadsb/adsbdemodsinkworker.h

@@ -23,6 +23,7 @@
 
 #include "dsp/dsptypes.h"
 #include "util/crc.h"
+#include "util/message.h"
 #include "util/messagequeue.h"
 #include "adsbdemodstats.h"
 

plugins/channelrx/demodais/aisdemod.cpp

@@ -30,14 +30,10 @@
 
 #include "SWGChannelSettings.h"
 #include "SWGWorkspaceInfo.h"
-#include "SWGChannelReport.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "device/deviceapi.h"
-#include "feature/feature.h"
 #include "util/ais.h"
-#include "util/db.h"
 #include "maincore.h"
 
 MESSAGE_CLASS_DEFINITION(AISDemod::MsgConfigureAISDemod, Message)

plugins/channelrx/demodais/aisdemodbaseband.cpp

@@ -19,7 +19,6 @@
 
 #include <QDebug>
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/downchannelizer.h"
 

plugins/channelrx/demodais/aisdemodgui.cpp

@@ -37,25 +37,19 @@
 #include "dsp/dspcommands.h"
 #include "ui_aisdemodgui.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/ais.h"
 #include "util/csv.h"
 #include "util/db.h"
 #include "util/mmsi.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/dialpopup.h"
 #include "gui/dialogpositioner.h"
 #include "dsp/dspengine.h"
 #include "dsp/glscopesettings.h"
-#include "gui/crightclickenabler.h"
 #include "gui/tabletapandhold.h"
-#include "channel/channelwebapiutils.h"
 #include "maincore.h"
-#include "feature/featurewebapiutils.h"
 
 #include "aisdemod.h"
-#include "aisdemodsink.h"
 
 void AISDemodGUI::resizeTable()
 {

plugins/channelrx/demodais/aisdemodsettings.cpp

@@ -20,7 +20,6 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 #include "aisdemodsettings.h"

plugins/channelrx/demodais/aisdemodsink.cpp

@@ -20,13 +20,10 @@
 
 #include <complex.h>
 
-#include "dsp/dspengine.h"
 #include "dsp/datafifo.h"
 #include "dsp/scopevis.h"
 #include "device/deviceapi.h"
 #include "channel/channelwebapiutils.h"
-#include "util/db.h"
-#include "util/stepfunctions.h"
 #include "maincore.h"
 
 #include "aisdemod.h"

plugins/channelrx/demodam/amdemod.cpp

@@ -38,11 +38,8 @@
 #include "SWGChannelReport.h"
 #include "SWGAMDemodReport.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
-#include "dsp/devicesamplesource.h"
 #include "device/deviceapi.h"
-#include "feature/feature.h"
 #include "settings/serializable.h"
 #include "util/db.h"
 #include "maincore.h"

plugins/channelrx/demodam/amdemodgui.cpp

@@ -30,10 +30,8 @@
 #include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/crightclickenabler.h"
 #include "gui/audioselectdialog.h"
 #include "gui/dialogpositioner.h"

plugins/channelrx/demodam/amdemodsettings.cpp

@@ -20,10 +20,9 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
-#include "settings/rollupstate.h"
 #include "amdemodsettings.h"
 
 AMDemodSettings::AMDemodSettings() :

plugins/channelrx/demodam/amdemodsink.cpp

@@ -21,7 +21,6 @@
 
 #include <complex.h>
 
-#include "audio/audiooutputdevice.h"
 #include "dsp/fftfilt.h"
 #include "dsp/datafifo.h"
 #include "util/db.h"

plugins/channelrx/demodapt/aptdemod.cpp

@@ -31,18 +31,12 @@
 #include "SWGChannelSettings.h"
 #include "SWGWorkspaceInfo.h"
 #include "SWGAPTDemodSettings.h"
-#include "SWGChannelReport.h"
 #include "SWGChannelActions.h"
-#include "SWGMapItem.h"
 #include "SWGAPTDemodActions.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "device/deviceapi.h"
-#include "feature/feature.h"
 #include "settings/serializable.h"
-#include "util/db.h"
-#include "maincore.h"
 
 MESSAGE_CLASS_DEFINITION(APTDemod::MsgConfigureAPTDemod, Message)
 MESSAGE_CLASS_DEFINITION(APTDemod::MsgPixels, Message)

plugins/channelrx/demodapt/aptdemodbaseband.cpp

@@ -18,7 +18,6 @@
 
 #include <QDebug>
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/downchannelizer.h"
 

plugins/channelrx/demodapt/aptdemodgui.cpp

@@ -37,22 +37,15 @@
 #include "dsp/dspcommands.h"
 #include "ui_aptdemodgui.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
-#include "util/morse.h"
-#include "util/units.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/dialpopup.h"
 #include "gui/dialogpositioner.h"
 #include "dsp/dspengine.h"
-#include "gui/crightclickenabler.h"
 #include "gui/graphicsviewzoom.h"
-#include "channel/channelwebapiutils.h"
 #include "maincore.h"
 
 #include "aptdemod.h"
-#include "aptdemodsink.h"
 #include "aptdemodsettingsdialog.h"
 #include "aptdemodselectdialog.h"
 

plugins/channelrx/demodapt/aptdemodsettings.cpp

@@ -18,7 +18,6 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 #include "aptdemodsettings.h"

plugins/channelrx/demodapt/aptdemodsink.cpp

@@ -20,12 +20,6 @@
 
 #include <complex.h>
 
-#include "dsp/dspengine.h"
-#include "dsp/dspengine.h"
-#include "util/db.h"
-#include "util/stepfunctions.h"
-#include "maincore.h"
-
 #include "aptdemod.h"
 #include "aptdemodsink.h"
 

plugins/channelrx/demodatv/atvdemod.cpp

@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <complex.h>
 
-#include "dsp/dspengine.h"
 #include "device/deviceapi.h"
 
 #include "atvdemod.h"

plugins/channelrx/demodatv/atvdemodbaseband.cpp

@@ -18,7 +18,6 @@
 
 #include <QDebug>
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/downchannelizer.h"
 

plugins/channelrx/demodatv/atvdemodgui.cpp

@@ -31,7 +31,6 @@
 #include "gui/dialogpositioner.h"
 #include "ui_atvdemodgui.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
 #include "dsp/dspengine.h"
 #include "maincore.h"

plugins/channelrx/demodatv/atvdemodsettings.cpp

@@ -19,7 +19,6 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 #include "atvdemodsettings.h"

plugins/channelrx/demodbfm/bfmdemod.cpp

@@ -36,11 +36,9 @@
 #include "SWGBFMDemodReport.h"
 #include "SWGRDSReport.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/devicesamplemimo.h"
 #include "device/deviceapi.h"
-#include "feature/feature.h"
 #include "util/db.h"
 #include "maincore.h"
 

plugins/channelrx/demodbfm/bfmdemodgui.cpp

@@ -37,10 +37,8 @@
 #include "dsp/dspcommands.h"
 #include "gui/glspectrum.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/crightclickenabler.h"
 #include "gui/audioselectdialog.h"
 #include "gui/dialogpositioner.h"

plugins/channelrx/demodbfm/bfmdemodsettings.cpp

@@ -20,7 +20,7 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 

plugins/channelrx/demodbfm/bfmdemodsink.cpp

@@ -16,21 +16,15 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#include "boost/format.hpp"
 #include <stdio.h>
 #include <complex.h>
 
 #include <QTime>
 #include <QDebug>
 
-#include "audio/audiooutputdevice.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspcommands.h"
-#include "dsp/devicesamplemimo.h"
 #include "dsp/basebandsamplesink.h"
 #include "dsp/datafifo.h"
 #include "pipes/datapipes.h"
-#include "util/db.h"
 #include "maincore.h"
 
 #include "rdsparser.h"

plugins/channelrx/demodchirpchat/chirpchatdemod.cpp

@@ -38,7 +38,6 @@
 
 #include "dsp/dspcommands.h"
 #include "device/deviceapi.h"
-#include "feature/feature.h"
 #include "util/ax25.h"
 #include "util/db.h"
 #include "maincore.h"

plugins/channelrx/demodchirpchat/chirpchatdemodbaseband.cpp

@@ -18,7 +18,6 @@
 
 #include <QDebug>
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/downchannelizer.h"
 

plugins/channelrx/demodchirpchat/chirpchatdemodgui.cpp

@@ -31,11 +31,9 @@
 #include "gui/glspectrum.h"
 #include "gui/glspectrumgui.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/dialpopup.h"
 #include "gui/dialogpositioner.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
 #include "maincore.h"
 

plugins/channelrx/demodchirpchat/chirpchatdemodsettings.cpp

@@ -18,7 +18,6 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 

plugins/channelrx/demoddab/dabdemod.cpp

@@ -34,15 +34,10 @@
 #include "SWGChannelSettings.h"
 #include "SWGWorkspaceInfo.h"
 #include "SWGDABDemodSettings.h"
-#include "SWGChannelReport.h"
-#include "SWGMapItem.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "device/deviceapi.h"
-#include "feature/feature.h"
 #include "settings/serializable.h"
-#include "util/db.h"
 #include "maincore.h"
 
 MESSAGE_CLASS_DEFINITION(DABDemod::MsgConfigureDABDemod, Message)

plugins/channelrx/demoddab/dabdemodgui.cpp

@@ -30,11 +30,9 @@
 #include "dsp/dspcommands.h"
 #include "ui_dabdemodgui.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
 #include "gui/audioselectdialog.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/crightclickenabler.h"
 #include "gui/dialogpositioner.h"
 #include "channel/channelwebapiutils.h"

plugins/channelrx/demoddab/dabdemodsettings.cpp

@@ -20,7 +20,7 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 #include "dabdemodsettings.h"

plugins/channelrx/demoddab/dabdemodsink.cpp

@@ -21,9 +21,7 @@
 
 #include <complex.h>
 
-#include "dsp/dspengine.h"
 #include "dsp/datafifo.h"
-#include "util/db.h"
 #include "maincore.h"
 
 #include "dabdemod.h"

plugins/channelrx/demoddatv/datvdemodgui.cpp

@@ -28,15 +28,13 @@
 #include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
 #include "gui/crightclickenabler.h"
 #include "gui/audioselectdialog.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/dialpopup.h"
 #include "gui/dialogpositioner.h"
-#include "mainwindow.h"
+#include "maincore.h"
 
 #include "ui_datvdemodgui.h"
 #include "datvdemodreport.h"

plugins/channelrx/demoddatv/datvdemodsettings.cpp

@@ -22,7 +22,7 @@
 #include "leansdr/dvb.h"
 #include "leansdr/sdr.h"
 
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 

plugins/channelrx/demoddatv/datvdemodsink.cpp

@@ -26,10 +26,6 @@
 #include <QFileInfo>
 #include <QMutexLocker>
 
-#include "audio/audiooutputdevice.h"
-#include "dsp/dspengine.h"
-#include "device/deviceapi.h"
-
 #include "datvdemodreport.h"
 
 const unsigned int DATVDemodSink::m_rfFilterFftLength = 512;

plugins/channelrx/demoddsc/dscdemod.cpp

@@ -33,12 +33,9 @@
 #include "SWGWorkspaceInfo.h"
 #include "SWGDSCDemodSettings.h"
 #include "SWGChannelReport.h"
-#include "SWGMapItem.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "device/deviceapi.h"
-#include "feature/feature.h"
 #include "settings/serializable.h"
 #include "util/db.h"
 #include "maincore.h"

plugins/channelrx/demoddsc/dscdemodbaseband.cpp

@@ -19,7 +19,6 @@
 
 #include <QDebug>
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/downchannelizer.h"
 

plugins/channelrx/demoddsc/dscdemodgui.cpp

@@ -22,6 +22,7 @@
 #include <QAction>
 #include <QClipboard>
 #include <QFileDialog>
+#include <QRegExp>
 #include <QScrollBar>
 #include <QMenu>
 #include <QDesktopServices>
@@ -36,13 +37,10 @@
 #include "dsp/dspdevicesourceengine.h"
 #include "ui_dscdemodgui.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/csv.h"
 #include "util/db.h"
 #include "util/mmsi.h"
-#include "util/units.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/decimaldelegate.h"
 #include "dsp/dspengine.h"
 #include "dsp/glscopesettings.h"
@@ -55,7 +53,6 @@
 #include "maincore.h"
 
 #include "dscdemod.h"
-#include "dscdemodsink.h"
 
 #include "SWGMapItem.h"
 

plugins/channelrx/demoddsc/dscdemodsettings.cpp

@@ -20,7 +20,6 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 #include "dscdemodsettings.h"

plugins/channelrx/demoddsc/dscdemodsink.cpp

@@ -19,13 +19,10 @@
 
 #include <complex.h>
 
-#include "dsp/dspengine.h"
 #include "dsp/scopevis.h"
 #include "device/deviceapi.h"
 #include "util/db.h"
-#include "util/popcount.h"
 #include "channel/channelwebapiutils.h"
-#include "maincore.h"
 
 #include "dscdemod.h"
 #include "dscdemodsink.h"

plugins/channelrx/demoddsd/dsddecoder.cpp

@@ -18,8 +18,6 @@
 #include "dsddecoder.h"
 
 #include <QtGlobal>
-#include "audio/audiofifo.h"
-
 
 DSDDecoder::DSDDecoder()
 {

plugins/channelrx/demoddsd/dsddemod.cpp

@@ -39,9 +39,7 @@
 #include "SWGDSDDemodSettings.h"
 #include "SWGChannelReport.h"
 #include "SWGDSDDemodReport.h"
-#include "SWGRDSReport.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "device/deviceapi.h"
 #include "feature/feature.h"

plugins/channelrx/demoddsd/dsddemodgui.cpp

@@ -27,10 +27,8 @@
 #include "dsp/scopevisxy.h"
 #include "dsp/dspcommands.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/crightclickenabler.h"
 #include "gui/audioselectdialog.h"
 #include "gui/dialogpositioner.h"

plugins/channelrx/demoddsd/dsddemodsettings.cpp

@@ -18,7 +18,7 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 #include "dsddemodsettings.h"

plugins/channelrx/demoddsd/dsddemodsink.cpp

@@ -25,19 +25,10 @@
 #include <QNetworkReply>
 #include <QBuffer>
 
-#include "SWGChannelSettings.h"
-#include "SWGDSDDemodSettings.h"
-#include "SWGChannelReport.h"
-#include "SWGDSDDemodReport.h"
-#include "SWGRDSReport.h"
-
-#include "dsp/dspengine.h"
 #include "dsp/basebandsamplesink.h"
 #include "dsp/datafifo.h"
 #include "dsp/dspcommands.h"
 #include "feature/feature.h"
-#include "audio/audiooutputdevice.h"
-#include "util/db.h"
 #include "util/messagequeue.h"
 #include "maincore.h"
 

plugins/channelrx/demodendoftrain/endoftraindemod.cpp

@@ -30,7 +30,6 @@
 #include "SWGEndOfTrainDemodSettings.h"
 #include "SWGChannelReport.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "device/deviceapi.h"
 #include "settings/serializable.h"

plugins/channelrx/demodendoftrain/endoftraindemodbaseband.cpp

@@ -19,7 +19,6 @@
 
 #include <QDebug>
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/downchannelizer.h"
 

plugins/channelrx/demodendoftrain/endoftraindemodgui.cpp

@@ -32,21 +32,15 @@
 #include "dsp/dspcommands.h"
 #include "ui_endoftraindemodgui.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/csv.h"
 #include "util/db.h"
-#include "util/units.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "dsp/dspengine.h"
 #include "dsp/glscopesettings.h"
-#include "gui/crightclickenabler.h"
 #include "gui/dialogpositioner.h"
-#include "channel/channelwebapiutils.h"
 #include "maincore.h"
 
 #include "endoftraindemod.h"
-#include "endoftraindemodsink.h"
 
 void EndOfTrainDemodGUI::resizeTable()
 {

plugins/channelrx/demodendoftrain/endoftraindemodsink.cpp

@@ -18,10 +18,8 @@
 
 #include <QDebug>
 
-#include "dsp/dspengine.h"
 #include "dsp/datafifo.h"
 #include "device/deviceapi.h"
-#include "util/db.h"
 #include "channel/channelwebapiutils.h"
 #include "maincore.h"
 

plugins/channelrx/demodfreedv/freedvdemod.cpp

@@ -31,11 +31,9 @@
 #include "SWGChannelReport.h"
 #include "SWGFreeDVDemodReport.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/devicesamplemimo.h"
 #include "device/deviceapi.h"
-#include "feature/feature.h"
 #include "util/db.h"
 #include "maincore.h"
 

plugins/channelrx/demodfreedv/freedvdemodgui.cpp

@@ -29,11 +29,9 @@
 #include "dsp/dspcommands.h"
 #include "gui/glspectrum.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/dialpopup.h"
 #include "gui/dialogpositioner.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
 #include "gui/crightclickenabler.h"
 #include "gui/audioselectdialog.h"

plugins/channelrx/demodfreedv/freedvdemodsettings.cpp

@@ -20,7 +20,7 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 #include "freedvdemodsettings.h"

plugins/channelrx/demodfreedv/freedvdemodsink.cpp

@@ -22,7 +22,6 @@
 #include "codec2/modem_stats.h"
 
 #include "dsp/basebandsamplesink.h"
-#include "audio/audiooutputdevice.h"
 #include "util/db.h"
 
 #include "freedvdemodsink.h"

plugins/channelrx/demodft8/ft8demod.cpp

@@ -36,7 +36,6 @@
 #include "SWGChannelReport.h"
 #include "SWGFT8DemodReport.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspdevicesourceengine.h"
 #include "dsp/dspdevicemimoengine.h"
 #include "dsp/devicesamplesource.h"
@@ -44,7 +43,6 @@
 #include "dsp/dspcommands.h"
 #include "dsp/devicesamplemimo.h"
 #include "device/deviceapi.h"
-#include "feature/feature.h"
 #include "util/db.h"
 #include "maincore.h"
 

plugins/channelrx/demodft8/ft8demodbaseband.cpp

@@ -19,7 +19,6 @@
 #include <QDebug>
 #include <QThread>
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/spectrumvis.h"
 #include "maincore.h"

plugins/channelrx/demodft8/ft8demodgui.cpp

@@ -25,11 +25,8 @@
 #include "dsp/spectrumvis.h"
 #include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
-#include "util/simpleserializer.h"
 #include "gui/glspectrum.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
-#include "gui/crightclickenabler.h"
 #include "gui/dialpopup.h"
 #include "gui/dialogpositioner.h"
 #include "util/db.h"

plugins/channelrx/demodft8/ft8demodsettings.cpp

@@ -20,7 +20,6 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 #include "ft8demodsettings.h"

plugins/channelrx/demodft8/ft8demodsink.cpp

@@ -20,14 +20,8 @@
 #include <QTime>
 #include <QDebug>
 
-#include "audio/audiooutputdevice.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspcommands.h"
-#include "dsp/devicesamplemimo.h"
 #include "dsp/spectrumvis.h"
 #include "dsp/datafifo.h"
-#include "device/deviceapi.h"
-#include "util/db.h"
 #include "util/messagequeue.h"
 #include "maincore.h"
 

plugins/channelrx/demodils/ilsdemod.cpp

@@ -31,13 +31,10 @@
 #include "SWGWorkspaceInfo.h"
 #include "SWGILSDemodSettings.h"
 #include "SWGChannelReport.h"
-#include "SWGMapItem.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/morsedemod.h"
 #include "device/deviceapi.h"
-#include "feature/feature.h"
 #include "settings/serializable.h"
 #include "util/db.h"
 #include "maincore.h"

plugins/channelrx/demodils/ilsdemodgui.cpp

@@ -36,27 +36,22 @@
 #include "dsp/morsedemod.h"
 #include "ui_ilsdemodgui.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
 #include "util/units.h"
 #include "util/morse.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "dsp/dspengine.h"
 #include "dsp/glscopesettings.h"
 #include "dsp/spectrumvis.h"
 #include "gui/crightclickenabler.h"
-#include "gui/tabletapandhold.h"
 #include "gui/dialogpositioner.h"
 #include "gui/audioselectdialog.h"
 #include "channel/channelwebapiutils.h"
 #include "feature/featurewebapiutils.h"
 #include "feature/feature.h"
-#include "feature/featureset.h"
 #include "maincore.h"
 
 #include "ilsdemod.h"
-#include "ilsdemodsink.h"
 
 MESSAGE_CLASS_DEFINITION(ILSDemodGUI::MsgGSAngle, Message)
 

plugins/channelrx/demodils/ilsdemodsettings.cpp

@@ -17,7 +17,7 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 #include "ilsdemodsettings.h"

plugins/channelrx/demodils/ilsdemodsink.cpp

@@ -24,9 +24,6 @@
 #include "dsp/scopevis.h"
 #include "util/stepfunctions.h"
 #include "util/db.h"
-#include "util/morse.h"
-#include "util/units.h"
-#include "maincore.h"
 
 #include "ilsdemod.h"
 #include "ilsdemodsink.h"

plugins/channelrx/demodm17/m17demod.cpp

@@ -36,11 +36,8 @@
 #include "SWGWorkspaceInfo.h"
 #include "SWGChannelReport.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "device/deviceapi.h"
-#include "feature/feature.h"
-#include "feature/featureset.h"
 #include "settings/serializable.h"
 #include "util/db.h"
 #include "maincore.h"

plugins/channelrx/demodm17/m17demodgui.cpp

@@ -33,11 +33,8 @@
 #include "dsp/scopevisxy.h"
 #include "dsp/dspcommands.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
-#include "util/csv.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/crightclickenabler.h"
 #include "gui/audioselectdialog.h"
 #include "gui/dialpopup.h"

plugins/channelrx/demodm17/m17demodsettings.cpp

@@ -18,7 +18,7 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 

plugins/channelrx/demodm17/m17demodsink.cpp

@@ -26,18 +26,8 @@
 #include <QNetworkReply>
 #include <QBuffer>
 
-#include "SWGChannelSettings.h"
-#include "SWGDSDDemodSettings.h"
-#include "SWGChannelReport.h"
-#include "SWGDSDDemodReport.h"
-
-#include "dsp/dspengine.h"
 #include "dsp/basebandsamplesink.h"
 #include "dsp/datafifo.h"
-#include "dsp/dspcommands.h"
-#include "feature/feature.h"
-#include "audio/audiooutputdevice.h"
-#include "util/db.h"
 #include "util/messagequeue.h"
 #include "maincore.h"
 

plugins/channelrx/demodnavtex/navtexdemod.cpp

@@ -32,12 +32,9 @@
 #include "SWGWorkspaceInfo.h"
 #include "SWGNavtexDemodSettings.h"
 #include "SWGChannelReport.h"
-#include "SWGMapItem.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "device/deviceapi.h"
-#include "feature/feature.h"
 #include "settings/serializable.h"
 #include "util/db.h"
 #include "maincore.h"

plugins/channelrx/demodnavtex/navtexdemodbaseband.cpp

@@ -19,7 +19,6 @@
 
 #include <QDebug>
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/downchannelizer.h"
 

plugins/channelrx/demodnavtex/navtexdemodgui.cpp

@@ -33,25 +33,18 @@
 #include "dsp/dspcommands.h"
 #include "ui_navtexdemodgui.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/csv.h"
 #include "util/db.h"
-#include "util/morse.h"
-#include "util/units.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/decimaldelegate.h"
 #include "dsp/dspengine.h"
 #include "dsp/glscopesettings.h"
-#include "gui/crightclickenabler.h"
 #include "gui/tabletapandhold.h"
 #include "gui/dialogpositioner.h"
-#include "channel/channelwebapiutils.h"
 #include "feature/featurewebapiutils.h"
 #include "maincore.h"
 
 #include "navtexdemod.h"
-#include "navtexdemodsink.h"
 
 void NavtexDemodGUI::resizeTable()
 {

plugins/channelrx/demodnavtex/navtexdemodsettings.cpp

@@ -20,7 +20,6 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 #include "navtexdemodsettings.h"

plugins/channelrx/demodnavtex/navtexdemodsink.cpp

@@ -21,10 +21,8 @@
 
 #include <complex.h>
 
-#include "dsp/dspengine.h"
 #include "dsp/scopevis.h"
 #include "util/db.h"
-#include "maincore.h"
 
 #include "navtexdemod.h"
 #include "navtexdemodsink.h"

plugins/channelrx/demodnfm/nfmdemod.cpp

@@ -36,11 +36,9 @@
 #include "SWGChannelReport.h"
 #include "SWGNFMDemodReport.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/devicesamplemimo.h"
 #include "device/deviceapi.h"
-#include "feature/feature.h"
 #include "settings/serializable.h"
 #include "util/db.h"
 #include "maincore.h"

plugins/channelrx/demodnfm/nfmdemodgui.cpp

@@ -25,10 +25,8 @@
 
 #include "ui_nfmdemodgui.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/db.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "gui/crightclickenabler.h"
 #include "gui/audioselectdialog.h"
 #include "gui/dialpopup.h"

plugins/channelrx/demodnfm/nfmdemodsink.cpp

@@ -22,16 +22,9 @@
 #include <QTime>
 #include <QDebug>
 
-#include "util/stepfunctions.h"
-#include "util/db.h"
 #include "util/messagequeue.h"
-#include "audio/audiooutputdevice.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspcommands.h"
-#include "dsp/devicesamplemimo.h"
 #include "dsp/misc.h"
 #include "dsp/datafifo.h"
-#include "device/deviceapi.h"
 #include "maincore.h"
 
 #include "nfmdemodreport.h"

plugins/channelrx/demodpacket/packetdemod.cpp

@@ -32,12 +32,9 @@
 #include "SWGWorkspaceInfo.h"
 #include "SWGPacketDemodSettings.h"
 #include "SWGChannelReport.h"
-#include "SWGMapItem.h"
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "device/deviceapi.h"
-#include "feature/feature.h"
 #include "settings/serializable.h"
 #include "util/ax25.h"
 #include "util/db.h"

plugins/channelrx/demodpacket/packetdemodbaseband.cpp

@@ -19,7 +19,6 @@
 
 #include <QDebug>
 
-#include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/downchannelizer.h"
 

plugins/channelrx/demodpacket/packetdemodgui.cpp

@@ -31,20 +31,14 @@
 #include "dsp/dspcommands.h"
 #include "ui_packetdemodgui.h"
 #include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
 #include "util/csv.h"
 #include "util/db.h"
-#include "util/units.h"
 #include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
 #include "dsp/dspengine.h"
-#include "gui/crightclickenabler.h"
 #include "gui/dialogpositioner.h"
-#include "channel/channelwebapiutils.h"
 #include "maincore.h"
 
 #include "packetdemod.h"
-#include "packetdemodsink.h"
 
 void PacketDemodGUI::resizeTable()
 {

plugins/channelrx/demodpacket/packetdemodsettings.cpp

@@ -20,7 +20,6 @@
 
 #include <QColor>
 
-#include "dsp/dspengine.h"
 #include "util/simpleserializer.h"
 #include "settings/serializable.h"
 #include "packetdemodsettings.h"