Remove includes not used directly #2062
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
f4exb
reviewed
Apr 8, 2024
| @@ -25,10 +25,9 @@ | |||
| #include "dsp/channelsamplesink.h" | |||
| #include "dsp/nco.h" | |||
| #include "dsp/interpolator.h" | |||
| #include "util/movingaverage.h" | |||
| #include "util/message.h" | |||
There was a problem hiding this comment.
There is no reference of the Message class in either the .h or the corresponding .cpp so I do not see the point of this
Edit: it should be added where it is used i.e. adsbdemodworker.h
There was a problem hiding this comment.
I ha ta add #include "util/message.h" also in adsbdemodsinkworker.h
f4exb
reviewed
Apr 8, 2024
| @@ -17,9 +17,9 @@ | |||
|
|
|||
| #include <algorithm> | |||
|
|
|||
| #include "bladerf2/devicebladerf2shared.h" | |||
There was a problem hiding this comment.
You should replace it with "bladerf2/devicebladerf2.h" here and not add "bladerf2mimo.h" later
f4exb
reviewed
Apr 8, 2024
| #include "aptdemodsettingsdialog.h" | ||
| #include "aptdemodselectdialog.h" | ||
|
|
||
| #include "SWGMapItem.h" |
f4exb
reviewed
Apr 9, 2024
| #include "util/messagequeue.h" | ||
|
|
||
| #include "atvmodreport.h" |
f4exb
reviewed
Apr 10, 2024
| #include "device/deviceapi.h" | ||
| #include "util/sha512.h" |
f4exb
reviewed
Apr 10, 2024
| #include "SWGXtrxMIMOReport.h" | ||
|
|
||
| #include "device/deviceapi.h" | ||
| #include "dsp/dspcommands.h" | ||
| #include "dsp/dspengine.h" | ||
| #include "dsp/dspdevicemimoengine.h" | ||
| #include "dsp/devicesamplesource.h" |
f4exb
reviewed
Apr 10, 2024
| @@ -21,7 +21,6 @@ | |||
| /////////////////////////////////////////////////////////////////////////////////// | |||
|
|
|||
| #include "SWGDeviceSettings.h" | |||
| #include "soapysdrinput.h" | |||
f4exb
reviewed
Apr 10, 2024
| @@ -25,7 +25,6 @@ | |||
| #include <Tle.h> | |||
|
|
|||
| #include "satelliteselectiondialog.h" | |||
| #include "util/units.h" | |||
f4exb
reviewed
Apr 10, 2024
| #include "dsp/dspdevicesourceengine.h" | ||
| #include "dsp/dspdevicesinkengine.h" | ||
| #include "device/deviceset.h" |
f4exb
reviewed
Apr 10, 2024
| #include "device/deviceset.h" | ||
| #include "settings/mainsettings.h" | ||
| #include "settings/preset.h" | ||
| #include "maincore.h" |
f4exb
reviewed
Apr 10, 2024
| @@ -21,11 +21,6 @@ | |||
| #include <QPushButton> | |||
| #include <QCheckBox> | |||
|
|
|||
| #include "device/deviceset.h" | |||
f4exb
reviewed
Apr 10, 2024
| #include "device/deviceapi.h" | ||
| #include "device/deviceuiset.h" | ||
| #include "gui/colormapper.h" | ||
| #include "gui/glspectrum.h" | ||
| #include "gui/basicdevicesettingsdialog.h" | ||
| #include "gui/dialpopup.h" | ||
| #include "gui/dialogpositioner.h" | ||
| #include "dsp/dspengine.h" | ||
| #include "dsp/dspdevicemimoengine.h" | ||
| #include "dsp/dspcommands.h" |
f4exb
reviewed
Apr 10, 2024
| #include "channel/channelwebapiutils.h" | ||
| #include "feature/featureset.h" | ||
| #include "feature/featureuiset.h" | ||
| #include "feature/featureutils.h" | ||
| #include "feature/featurewebapiutils.h" | ||
| #include "gui/basicfeaturesettingsdialog.h" | ||
| #include "gui/dialogpositioner.h" | ||
| #include "mainwindow.h" |
f4exb
reviewed
Apr 10, 2024
| @@ -27,19 +27,14 @@ | |||
| #include <QtCharts/QDateTimeAxis> | |||
| #include <QtCharts/QValueAxis> | |||
|
|
|||
| #include "device/deviceapi.h" | |||
f4exb
reviewed
Apr 10, 2024
| @@ -27,19 +27,14 @@ | |||
| #include <QtCharts/QDateTimeAxis> | |||
| #include <QtCharts/QValueAxis> | |||
|
|
|||
| #include "device/deviceapi.h" | |||
| #include "device/deviceset.h" | |||
|
To summarize missing includes still: diff --git a/plugins/channeltx/modatv/atvmodsource.cpp b/plugins/channeltx/modatv/atvmodsource.cpp
index 92cbb14db..e4bd6fdc8 100644
--- a/plugins/channeltx/modatv/atvmodsource.cpp
+++ b/plugins/channeltx/modatv/atvmodsource.cpp
@@ -28,6 +28,7 @@
#include "util/messagequeue.h"
+#include "atvmodreport.h"
#include "atvmodsource.h"
const float ATVModSource::m_blackLevel = 0.3f;
diff --git a/plugins/feature/limerfe/limerfegui.cpp b/plugins/feature/limerfe/limerfegui.cpp
index 4205510b3..2dcab36cc 100644
--- a/plugins/feature/limerfe/limerfegui.cpp
+++ b/plugins/feature/limerfe/limerfegui.cpp
@@ -22,6 +22,7 @@
#include "util/db.h"
#include "dsp/dspdevicesourceengine.h"
#include "dsp/dspdevicesinkengine.h"
+#include "device/deviceset.h"
#include "maincore.h"
#include "limerfeusbcalib.h"
diff --git a/plugins/feature/satellitetracker/satelliteradiocontroldialog.cpp b/plugins/feature/satellitetracker/satelliteradiocontroldialog.cpp
index f2300c5b5..6845ebb77 100644
--- a/plugins/feature/satellitetracker/satelliteradiocontroldialog.cpp
+++ b/plugins/feature/satellitetracker/satelliteradiocontroldialog.cpp
@@ -21,6 +21,9 @@
#include <QPushButton>
#include <QCheckBox>
+#include "device/deviceset.h"
+#include "maincore.h"
+
#include "satelliteradiocontroldialog.h"
SatelliteRadioControlDialog::SatelliteRadioControlDialog(SatelliteTrackerSettings *settings,
diff --git a/plugins/feature/satellitetracker/satelliteselectiondialog.cpp b/plugins/feature/satellitetracker/satelliteselectiondialog.cpp
index be12b45e5..7b6de3e91 100644
--- a/plugins/feature/satellitetracker/satelliteselectiondialog.cpp
+++ b/plugins/feature/satellitetracker/satelliteselectiondialog.cpp
@@ -24,6 +24,7 @@
#include <OrbitalElements.h>
#include <Tle.h>
+#include "util/units.h"
#include "satelliteselectiondialog.h"
using namespace libsgp4;
diff --git a/plugins/feature/satellitetracker/satellitetrackergui.cpp b/plugins/feature/satellitetracker/satellitetrackergui.cpp
index 52fc01dcb..807f1d5ed 100644
--- a/plugins/feature/satellitetracker/satellitetrackergui.cpp
+++ b/plugins/feature/satellitetracker/satellitetrackergui.cpp
@@ -35,6 +35,9 @@
#include "gui/basicfeaturesettingsdialog.h"
#include "gui/dialogpositioner.h"
#include "util/units.h"
+#include "device/deviceapi.h"
+#include "device/deviceset.h"
+#include "maincore.h"
#include "ui_satellitetrackergui.h"
#include "satellitetracker.h"
diff --git a/plugins/feature/satellitetracker/satellitetrackersettingsdialog.cpp b/plugins/feature/satellitetracker/satellitetrackersettingsdialog.cpp
index cc53c6158..229458a7a 100644
--- a/plugins/feature/satellitetracker/satellitetrackersettingsdialog.cpp
+++ b/plugins/feature/satellitetracker/satellitetrackersettingsdialog.cpp
@@ -15,6 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
+#include "util/units.h"
#include "satellitetrackersettingsdialog.h"
#include <QDebug>
diff --git a/plugins/samplemimo/xtrxmimo/xtrxmimo.cpp b/plugins/samplemimo/xtrxmimo/xtrxmimo.cpp
index 028df6c75..3a4e90166 100644
--- a/plugins/samplemimo/xtrxmimo/xtrxmimo.cpp
+++ b/plugins/samplemimo/xtrxmimo/xtrxmimo.cpp
@@ -29,6 +29,7 @@
#include "device/deviceapi.h"
#include "dsp/dspcommands.h"
#include "dsp/devicesamplesink.h"
+#include "dsp/devicesamplesource.h"
#include "xtrx/devicextrxparam.h"
#include "xtrx/devicextrxshared.h"
#include "xtrx/devicextrx.h"
diff --git a/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp b/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp
index c54563d74..168ad995d 100644
--- a/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp
+++ b/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp
@@ -31,6 +31,7 @@
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "dsp/devicesamplestatic.h"
+#include "dsp/dspcommands.h"
#include "xtrx/devicextrxshared.h"
#include "xtrxmimo.h"
diff --git a/plugins/samplesource/sigmffileinput/sigmffileinput.cpp b/plugins/samplesource/sigmffileinput/sigmffileinput.cpp
index 70d65a78e..b9d3516fc 100644
--- a/plugins/samplesource/sigmffileinput/sigmffileinput.cpp
+++ b/plugins/samplesource/sigmffileinput/sigmffileinput.cpp
@@ -38,6 +38,7 @@
#include "dsp/dspcommands.h"
#include "dsp/dspdevicesourceengine.h"
#include "device/deviceapi.h"
+#include "util/sha512.h"
#include "sigmffileinput.h"
#include "sigmffileinputworker.h"
diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputwebapiadapter.cpp b/plugins/samplesource/soapysdrinput/soapysdrinputwebapiadapter.cpp
index 6fb48044f..e8285d9fc 100644
--- a/plugins/samplesource/soapysdrinput/soapysdrinputwebapiadapter.cpp
+++ b/plugins/samplesource/soapysdrinput/soapysdrinputwebapiadapter.cpp
@@ -21,6 +21,7 @@
///////////////////////////////////////////////////////////////////////////////////
#include "SWGDeviceSettings.h"
+#include "soapysdrinput.h"
#include "soapysdrinputwebapiadapter.h"
SoapySDRInputWebAPIAdapter::SoapySDRInputWebAPIAdapter() |
adsbdemodsink.h was getting the definition of class Message from dsp/dspcommands.h which was included by adsbdemodsink.cpp before including adsbdemodsink.h itself.
|
Thank you Edouard for your help and your patience. At first I didn't re-run cmake after installing some dependencies I was missing, otherwise I could have catched some obvious compiler errors. I wonder why the IDE was showing wrongs hints about unused includes, it may be due to stale files in my build directory. |
Fixes: /Users/runner/work/sdrangel/sdrangel/plugins/channelrx/demoddsc/dscdemodgui.cpp:469:9: error: unknown type name 'QRegExp'
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR:
I didn't check *.h files except
adsbdemodsink.h. At a later time we might try to use IWYU (https://github.com/include-what-you-use/include-what-you-use) but in my experience it needs a lot of effort.I trust that the CI will catch any error I may have introduced in the configurations that I can't currently compile.
The list of added/replaced includes:
The list of deleted includes is too long, here are some the largest deletions: