From 71ce49d7ba02d5435454e56c9024e3278dbea20c Mon Sep 17 00:00:00 2001 From: Johannes Lorenz <1042576+JohannesLorenz@users.noreply.github.com> Date: Mon, 21 Jul 2025 23:39:17 +0200 Subject: [PATCH] Remove lots of useless/misplaced includes (#7999) Follow-Up of 7db3fa94a103e2561de397c796b3b28ebd1112b5 . This was done by setting `CMAKE_C_INCLUDE_WHAT_YOU_USE` and `CMAKE_CXX_INCLUDE_WHAT_YOU_USE` to (broken down into multiple lines here, note, all below `FL/x.h` is not required for C): ``` include-what-you-use; -Xiwyu;--mapping_file=/usr/share/include-what-you-use/qt5_11.imp; -Xiwyu;--keep=*/xmmintrin.h; -Xiwyu;--keep=*/lmmsconfig.h; -Xiwyu;--keep=*/weak_libjack.h; -Xiwyu;--keep=*/sys/*; -Xiwyu;--keep=*/debug.h; -Xiwyu;--keep=*/SDL/*; -Xiwyu;--keep=*/alsa/*; -Xiwyu;--keep=*/FL/x.h; -Xiwyu;--keep=*/MidiApple.h; -Xiwyu;--keep=*/MidiWinMM.h; -Xiwyu;--keep=*/AudioSoundIo.h; -Xiwyu;--keep=*/OpulenZ/adplug/*; -Xiwyu;--keep=QPainterPath; -Xiwyu;--keep=QtTest ``` FAQ: * Q: Does this speed-up a completely fresh compile? * A: No, I measured it. * Q: Does it speed up anything else? * A: Yes. If you change one header, it can reduce the number of CPP files that your compiler needs to recompile, or your IDE has to re-scan. * Q: What other reasons are for this PR? * A: It's idiomatic to only include headers if you need them. Also, it will reduce output for those who want to use IWYU for new PRs. Background: This is just a remainder PR of what I planned. My original idea was to setup a CI which warns you of useless includes (but not of all issues that IWYU complains about). However, I could not see that this was favored on Discord. A full IWYU CI also has the problem that it (possibly??) needs to compile with `make -j 1`, which would make CI really slow. However, for that plan, I had to fix the whole code base to be IWYU compliant - which it now is. --- include/AudioEngine.h | 3 +-- include/AudioPortAudio.h | 1 - include/AudioSoundIo.h | 3 +-- include/AutomatableButton.h | 14 ++++++------ include/AutomatableModel.h | 1 - include/AutomationClip.h | 3 --- include/AutomationEditor.h | 9 +++----- include/Clip.h | 1 - include/ClipView.h | 2 -- include/ConfigManager.h | 2 -- include/ControlLayout.h | 2 -- include/ControllerRackView.h | 1 - include/Controls.h | 2 -- include/EffectRackView.h | 1 - include/EffectSelectDialog.h | 10 ++++----- include/EnvelopeAndLfoParameters.h | 1 - include/EnvelopeAndLfoView.h | 4 ++-- include/FileBrowser.h | 11 ++++------ include/GuiApplication.h | 2 +- include/InstrumentFunctions.h | 2 +- include/InstrumentSoundShapingView.h | 3 ++- include/InstrumentTrack.h | 1 - include/InstrumentTrackView.h | 2 +- include/InstrumentTrackWindow.h | 8 ++----- include/Knob.h | 4 ---- include/LedCheckBox.h | 1 - include/LfoController.h | 9 +++----- include/LinkedModelGroupViews.h | 2 +- include/LmmsSemaphore.h | 1 - include/Lv2ControlBase.h | 1 - include/Lv2Features.h | 2 +- include/Lv2Proc.h | 4 ---- include/Lv2ViewBase.h | 2 -- include/Lv2Worker.h | 1 - include/MainWindow.h | 5 ----- include/MidiAlsaRaw.h | 1 - include/MidiAlsaSeq.h | 1 - include/MidiJack.h | 1 - include/MixerChannelView.h | 22 +++++++++---------- include/MixerView.h | 15 ++++++------- include/PatternTrack.h | 1 - include/PianoRoll.h | 4 ---- include/PluginBrowser.h | 1 - include/PluginFactory.h | 3 +-- include/RemotePlugin.h | 13 ++++++----- include/RemotePluginBase.h | 16 +++++--------- include/RemotePluginClient.h | 2 ++ include/Sample.h | 1 - include/SampleBuffer.h | 3 --- include/SampleDecoder.h | 1 - include/SamplePlayHandle.h | 2 -- include/SampleThumbnail.h | 8 +++++-- include/SampleTrackView.h | 6 ++--- include/SampleTrackWindow.h | 2 +- include/Song.h | 5 +---- include/SongEditor.h | 2 +- include/StepRecorder.h | 1 - include/SubWindow.h | 2 -- include/TimeLineWidget.h | 4 ---- include/TrackContentWidget.h | 4 ++-- include/TrackOperationsWidget.h | 3 +-- include/VstSyncController.h | 3 +-- include/embed.h | 3 ++- plugins/Amplifier/AmplifierControlDialog.h | 3 --- plugins/Amplifier/AmplifierControls.cpp | 1 - plugins/Amplifier/AmplifierControls.h | 5 ----- .../AudioFileProcessorView.cpp | 2 +- .../AudioFileProcessorView.h | 4 ++-- .../AudioFileProcessorWaveView.h | 2 -- plugins/BassBooster/BassBoosterControls.cpp | 1 - plugins/Bitcrush/BitcrushControlDialog.cpp | 2 +- plugins/Bitcrush/BitcrushControls.cpp | 1 - plugins/CarlaBase/Carla.h | 4 ++-- .../Compressor/CompressorControlDialog.cpp | 8 +++---- plugins/Compressor/CompressorControlDialog.h | 10 ++++----- plugins/Compressor/CompressorControls.cpp | 1 - .../CrossoverEQ/CrossoverEQControlDialog.cpp | 4 +--- plugins/Delay/DelayControls.cpp | 1 - plugins/Delay/StereoDelay.cpp | 1 - plugins/Delay/StereoDelay.h | 1 - plugins/Dispersion/Dispersion.cpp | 2 ++ plugins/Dispersion/Dispersion.h | 1 - .../Dispersion/DispersionControlDialog.cpp | 1 - plugins/Dispersion/DispersionControls.cpp | 1 - plugins/Dispersion/DispersionControls.h | 6 ----- plugins/DualFilter/DualFilterControls.cpp | 1 - .../DynamicsProcessorControlDialog.cpp | 2 +- plugins/Eq/EqControls.cpp | 1 - plugins/Eq/EqControlsDialog.cpp | 4 ++-- plugins/Eq/EqParameterWidget.cpp | 5 +---- plugins/Flanger/FlangerControls.cpp | 1 - plugins/Flanger/FlangerControlsDialog.cpp | 4 ++-- plugins/FreeBoy/FreeBoy.h | 3 +-- .../GranularPitchShifterControlDialog.cpp | 6 +++-- .../GranularPitchShifterControlDialog.h | 6 ----- .../GranularPitchShifterControls.cpp | 1 - .../GranularPitchShifterControls.h | 6 +---- .../GranularPitchShifterEffect.h | 1 - plugins/HydrogenImport/LocalFileMng.h | 4 ---- plugins/Kicker/Kicker.h | 2 +- plugins/LOMM/LOMMControlDialog.cpp | 8 ++++++- plugins/LOMM/LOMMControlDialog.h | 6 ----- plugins/LOMM/LOMMControls.cpp | 1 - plugins/LOMM/LOMMControls.h | 5 ----- plugins/LadspaBrowser/LadspaDescription.cpp | 3 +-- plugins/LadspaEffect/LadspaControls.h | 5 +++-- plugins/LadspaEffect/LadspaEffect.cpp | 1 - .../LadspaMatrixControlDialog.cpp | 8 ++----- .../LadspaEffect/LadspaSubPluginFeatures.cpp | 4 ++-- plugins/Lb302/Lb302.cpp | 3 ++- plugins/Lb302/Lb302.h | 10 +++++---- plugins/Lv2Effect/Lv2FxControls.cpp | 1 - plugins/MidiExport/MidiExport.cpp | 1 - plugins/MidiExport/MidiExport.h | 1 - plugins/MidiImport/portsmf/allegro.cpp | 10 +++------ plugins/MidiImport/portsmf/allegro.h | 1 - plugins/MidiImport/portsmf/allegrord.cpp | 1 - plugins/MidiImport/portsmf/allegrosmfrd.cpp | 3 --- plugins/MidiImport/portsmf/allegrosmfwr.cpp | 4 ---- plugins/MidiImport/portsmf/allegrowr.cpp | 4 ---- plugins/Monstro/Monstro.cpp | 5 ++--- plugins/Monstro/Monstro.h | 4 ++-- plugins/Nes/Nes.cpp | 5 ++--- plugins/Nes/Nes.h | 7 +++--- plugins/OpulenZ/OpulenZ.cpp | 4 ++-- plugins/OpulenZ/OpulenZ.h | 7 +++--- plugins/Organic/Organic.h | 3 +-- plugins/Patman/Patman.h | 1 - plugins/ReverbSC/ReverbSC.cpp | 1 - plugins/ReverbSC/ReverbSCControls.cpp | 1 - plugins/Sf2Player/Sf2Player.h | 1 - plugins/Sfxr/Sfxr.cpp | 2 +- plugins/Sfxr/Sfxr.h | 4 ++-- plugins/Sid/SidInstrument.cpp | 7 +++--- plugins/Sid/SidInstrument.h | 12 +++++----- plugins/SlicerT/SlicerT.cpp | 1 + plugins/SlicerT/SlicerT.h | 13 ++++++----- plugins/SlicerT/SlicerTView.cpp | 9 +++++--- plugins/SlicerT/SlicerTView.h | 16 +++++++------- plugins/SlicerT/SlicerTWaveform.cpp | 4 +++- plugins/SlicerT/SlicerTWaveform.h | 6 +---- plugins/SpectrumAnalyzer/SaControls.cpp | 2 +- plugins/SpectrumAnalyzer/SaControlsDialog.cpp | 1 + plugins/SpectrumAnalyzer/SaControlsDialog.h | 1 - plugins/SpectrumAnalyzer/SaProcessor.h | 1 - plugins/SpectrumAnalyzer/SaSpectrumView.cpp | 2 +- plugins/SpectrumAnalyzer/SaSpectrumView.h | 2 -- plugins/SpectrumAnalyzer/SaWaterfallView.h | 1 - .../StereoEnhancer/StereoEnhancerControls.cpp | 1 - plugins/StereoMatrix/StereoMatrixControls.cpp | 1 - plugins/TapTempo/TapTempo.cpp | 12 ---------- plugins/TapTempo/TapTempoView.cpp | 1 - plugins/TapTempo/TapTempoView.h | 5 ----- plugins/TripleOscillator/TripleOscillator.cpp | 6 ++--- plugins/TripleOscillator/TripleOscillator.h | 13 +++++------ plugins/Vectorscope/VecControls.cpp | 1 - plugins/Vectorscope/VecControls.h | 2 -- plugins/Vectorscope/VecControlsDialog.cpp | 1 - plugins/Vectorscope/VectorView.cpp | 1 - plugins/Vestige/Vestige.h | 5 ++--- plugins/Vibed/NineButtonSelector.cpp | 11 +++++----- plugins/Vibed/NineButtonSelector.h | 8 +++---- plugins/Vibed/Vibed.h | 5 +---- plugins/VstBase/RemoteVstPlugin.cpp | 1 + plugins/VstEffect/VstEffectControlDialog.h | 1 - plugins/VstEffect/VstSubPluginFeatures.cpp | 1 + plugins/VstEffect/VstSubPluginFeatures.h | 1 - plugins/Watsyn/Watsyn.cpp | 6 ++--- plugins/Watsyn/Watsyn.h | 8 +++---- plugins/Xpressive/ExprSynth.h | 10 +-------- plugins/Xpressive/Xpressive.cpp | 2 +- plugins/Xpressive/Xpressive.h | 14 +++++------- plugins/ZynAddSubFx/ZynAddSubFx.cpp | 1 + src/common/RemotePluginBase.cpp | 1 + src/common/SystemSemaphore.cpp | 2 +- src/core/AutomatableModel.cpp | 4 +++- src/core/AutomationClip.cpp | 1 - src/core/Effect.cpp | 1 - src/core/InstrumentFunctions.cpp | 1 - src/core/MixHelpers.cpp | 1 - src/core/PeakController.cpp | 1 - src/core/Plugin.cpp | 1 - src/core/RemotePlugin.cpp | 1 + src/core/SampleClip.cpp | 3 +-- src/core/SampleDecoder.cpp | 1 - src/core/Song.cpp | 1 - src/core/ThreadPool.cpp | 2 -- src/core/TimePos.cpp | 1 - src/core/Timeline.cpp | 1 - src/core/VstSyncController.cpp | 2 -- src/core/audio/AudioAlsa.cpp | 1 - src/core/audio/AudioDevice.cpp | 1 - src/core/audio/AudioFileFlac.cpp | 2 -- src/core/audio/AudioFileOgg.cpp | 3 ++- src/core/audio/AudioJack.cpp | 1 - src/core/audio/AudioOss.cpp | 1 - src/core/audio/AudioPortAudio.cpp | 1 - src/core/audio/AudioSdl.cpp | 1 - src/core/audio/AudioSndio.cpp | 1 - src/core/lv2/Lv2Proc.cpp | 1 - src/core/lv2/Lv2SubPluginFeatures.cpp | 2 -- src/core/lv2/Lv2Worker.cpp | 2 -- src/core/midi/MidiController.cpp | 1 - src/gui/FileBrowser.cpp | 5 ++--- src/gui/GuiApplication.cpp | 2 +- src/gui/LfoControllerDialog.cpp | 4 ++-- src/gui/LmmsStyle.cpp | 2 +- src/gui/MainWindow.cpp | 3 +-- src/gui/MixerChannelView.cpp | 11 +++++++++- src/gui/MixerView.cpp | 17 +++++++++----- src/gui/SampleLoader.cpp | 1 - src/gui/SampleThumbnail.cpp | 4 +++- src/gui/SampleTrackWindow.cpp | 1 + src/gui/SendButtonIndicator.cpp | 2 +- src/gui/SubWindow.cpp | 2 +- src/gui/clips/AutomationClipView.cpp | 4 +--- src/gui/clips/ClipView.cpp | 6 ----- src/gui/clips/MidiClipView.cpp | 2 -- src/gui/editors/AutomationEditor.cpp | 4 ++-- src/gui/editors/PianoRoll.cpp | 2 +- src/gui/editors/TimeLineWidget.cpp | 3 --- src/gui/instrument/EnvelopeAndLfoView.cpp | 4 ++-- src/gui/instrument/InstrumentMidiIOView.cpp | 1 - .../instrument/InstrumentSoundShapingView.cpp | 4 +++- src/gui/instrument/InstrumentTrackWindow.cpp | 2 ++ src/gui/instrument/InstrumentView.cpp | 1 - src/gui/instrument/PianoView.cpp | 3 +-- src/gui/modals/EffectSelectDialog.cpp | 5 +++++ src/gui/modals/VersionedSaveDialog.cpp | 3 ++- src/gui/tracks/InstrumentTrackView.cpp | 13 ++++++----- src/gui/tracks/SampleTrackView.cpp | 5 ++++- src/gui/tracks/TrackLabelButton.cpp | 1 - src/gui/tracks/TrackOperationsWidget.cpp | 6 ++--- src/gui/tracks/TrackView.cpp | 3 +-- src/gui/widgets/AutomatableButton.cpp | 18 +++++++-------- src/gui/widgets/BarModelEditor.cpp | 1 - src/gui/widgets/Fader.cpp | 3 +-- src/gui/widgets/Graph.cpp | 1 - src/gui/widgets/Knob.cpp | 1 - src/gui/widgets/PeakIndicator.cpp | 1 - src/gui/widgets/SimpleTextFloat.cpp | 1 - src/gui/widgets/TextFloat.cpp | 2 -- tests/src/core/ArrayVectorTest.cpp | 2 +- tests/src/core/AutomatableModelTest.cpp | 2 +- tests/src/core/MathTest.cpp | 3 +-- tests/src/core/ProjectVersionTest.cpp | 2 +- tests/src/core/RelativePathsTest.cpp | 4 +--- tests/src/tracks/AutomationTrackTest.cpp | 4 +--- 248 files changed, 333 insertions(+), 562 deletions(-) diff --git a/include/AudioEngine.h b/include/AudioEngine.h index 49b511a17..79f6eb281 100644 --- a/include/AudioEngine.h +++ b/include/AudioEngine.h @@ -45,9 +45,8 @@ namespace lmms { -class AudioDevice; class MidiClient; -class AudioBusHandle; +class AudioBusHandle; // IWYU pragma: keep class AudioEngineWorkerThread; constexpr fpp_t MINIMUM_BUFFER_SIZE = 32; diff --git a/include/AudioPortAudio.h b/include/AudioPortAudio.h index fbfa9b60d..271ce0941 100644 --- a/include/AudioPortAudio.h +++ b/include/AudioPortAudio.h @@ -69,7 +69,6 @@ public: namespace gui { class ComboBox; -class LcdSpinBox; } diff --git a/include/AudioSoundIo.h b/include/AudioSoundIo.h index 1260951bf..2e785e1c1 100644 --- a/include/AudioSoundIo.h +++ b/include/AudioSoundIo.h @@ -25,10 +25,9 @@ #ifndef LMMS_AUDIO_SOUNDIO_H #define LMMS_AUDIO_SOUNDIO_H -#include #include "lmmsconfig.h" -#include "ComboBoxModel.h" +#include "ComboBoxModel.h" // IWYU pragma: keep #ifdef LMMS_HAVE_SOUNDIO diff --git a/include/AutomatableButton.h b/include/AutomatableButton.h index 3d78b8e9c..06f797d3f 100644 --- a/include/AutomatableButton.h +++ b/include/AutomatableButton.h @@ -1,5 +1,5 @@ /* - * AutomatableButton.h - class automatableButton, the base for all buttons + * AutomatableButton.h - class AutomatableButton, the base for all buttons * * Copyright (c) 2006-2008 Tobias Doerffel * @@ -32,7 +32,7 @@ namespace lmms::gui { -class automatableButtonGroup; +class AutomatableButtonGroup; class LMMS_EXPORT AutomatableButton : public QPushButton, public BoolModelView @@ -69,10 +69,10 @@ protected: private: - automatableButtonGroup * m_group; + AutomatableButtonGroup * m_group; - friend class automatableButtonGroup; + friend class AutomatableButtonGroup; using QPushButton::setChecked; using QPushButton::isChecked; @@ -80,13 +80,13 @@ private: -class LMMS_EXPORT automatableButtonGroup : public QWidget, public IntModelView +class LMMS_EXPORT AutomatableButtonGroup : public QWidget, public IntModelView { Q_OBJECT public: - automatableButtonGroup( QWidget * _parent, const QString & _name + AutomatableButtonGroup( QWidget * _parent, const QString & _name = QString() ); - ~automatableButtonGroup() override; + ~AutomatableButtonGroup() override; void addButton( AutomatableButton * _btn ); void removeButton( AutomatableButton * _btn ); diff --git a/include/AutomatableModel.h b/include/AutomatableModel.h index 15285e17a..0f05ea343 100644 --- a/include/AutomatableModel.h +++ b/include/AutomatableModel.h @@ -28,7 +28,6 @@ #include #include #include -#include #include "JournallingObject.h" #include "Model.h" diff --git a/include/AutomationClip.h b/include/AutomationClip.h index abc713869..1b723f8e1 100644 --- a/include/AutomationClip.h +++ b/include/AutomationClip.h @@ -29,9 +29,6 @@ #include #include -#if (QT_VERSION >= QT_VERSION_CHECK(5,14,0)) - #include -#endif #include "AutomationNode.h" #include "Clip.h" diff --git a/include/AutomationEditor.h b/include/AutomationEditor.h index c7eaca8aa..b6a585548 100644 --- a/include/AutomationEditor.h +++ b/include/AutomationEditor.h @@ -26,7 +26,6 @@ #ifndef LMMS_GUI_AUTOMATION_EDITOR_H #define LMMS_GUI_AUTOMATION_EDITOR_H -#include #include #include @@ -34,26 +33,24 @@ #include "ComboBoxModel.h" #include "Editor.h" #include "JournallingObject.h" -#include "MidiClip.h" #include "SampleClip.h" #include "TimePos.h" #include "LmmsTypes.h" #include "SampleThumbnail.h" -class QPainter; -class QPixmap; +class QPushButton; class QScrollBar; namespace lmms { -class NotePlayHandle; +class MidiClip; namespace gui { -class Knob; class ComboBox; +class Knob; class TimeLineWidget; diff --git a/include/Clip.h b/include/Clip.h index 6198ff135..e3c291382 100644 --- a/include/Clip.h +++ b/include/Clip.h @@ -36,7 +36,6 @@ namespace lmms { class Track; -class TrackContainer; namespace gui { diff --git a/include/ClipView.h b/include/ClipView.h index 6e904b856..5c1518043 100644 --- a/include/ClipView.h +++ b/include/ClipView.h @@ -35,13 +35,11 @@ class QMenu; -class QContextMenuEvent; namespace lmms { class DataFile; -class Clip; namespace gui { diff --git a/include/ConfigManager.h b/include/ConfigManager.h index bf98f5999..392fecbf3 100644 --- a/include/ConfigManager.h +++ b/include/ConfigManager.h @@ -40,8 +40,6 @@ namespace lmms { -class Engine; - const QString PROJECTS_PATH = "projects/"; const QString TEMPLATE_PATH = "templates/"; const QString PRESETS_PATH = "presets/"; diff --git a/include/ControlLayout.h b/include/ControlLayout.h index 568ce1a85..29ec5850c 100644 --- a/include/ControlLayout.h +++ b/include/ControlLayout.h @@ -78,8 +78,6 @@ #include class QLayoutItem; -class QRect; -class QString; class QLineEdit; diff --git a/include/ControllerRackView.h b/include/ControllerRackView.h index 436618303..02f90b623 100644 --- a/include/ControllerRackView.h +++ b/include/ControllerRackView.h @@ -26,7 +26,6 @@ #define LMMS_GUI_CONTROLLER_RACK_VIEW_H #include -#include #include "SerializingObject.h" diff --git a/include/Controls.h b/include/Controls.h index 243f77690..00a860d55 100644 --- a/include/Controls.h +++ b/include/Controls.h @@ -37,8 +37,6 @@ class QLabel; namespace lmms { -class AutomatableModel; - namespace gui { diff --git a/include/EffectRackView.h b/include/EffectRackView.h index f166612e2..8b3455005 100644 --- a/include/EffectRackView.h +++ b/include/EffectRackView.h @@ -32,7 +32,6 @@ #include "ModelView.h" class QScrollArea; -class QVBoxLayout; namespace lmms::gui { diff --git a/include/EffectSelectDialog.h b/include/EffectSelectDialog.h index 53e8dbe7e..81a04dbed 100644 --- a/include/EffectSelectDialog.h +++ b/include/EffectSelectDialog.h @@ -29,15 +29,13 @@ #include "Effect.h" #include -#include -#include -#include -#include #include -#include #include #include -#include + +class QScrollArea; +class QTableView; +class QLineEdit; namespace lmms::gui { diff --git a/include/EnvelopeAndLfoParameters.h b/include/EnvelopeAndLfoParameters.h index 34cbae5ec..8c995ac9d 100644 --- a/include/EnvelopeAndLfoParameters.h +++ b/include/EnvelopeAndLfoParameters.h @@ -26,7 +26,6 @@ #define LMMS_ENVELOPE_AND_LFO_PARAMETERS_H #include -#include #include "JournallingObject.h" #include "AutomatableModel.h" diff --git a/include/EnvelopeAndLfoView.h b/include/EnvelopeAndLfoView.h index 0063dc788..c16424ca7 100644 --- a/include/EnvelopeAndLfoView.h +++ b/include/EnvelopeAndLfoView.h @@ -38,7 +38,7 @@ class EnvelopeAndLfoParameters; namespace gui { -class automatableButtonGroup; +class AutomatableButtonGroup; class Knob; class LedCheckBox; class PixmapButton; @@ -87,7 +87,7 @@ private: TempoSyncKnob * m_lfoSpeedKnob; Knob * m_lfoAmountKnob; PixmapButton * m_userLfoBtn; - automatableButtonGroup * m_lfoWaveBtnGrp; + AutomatableButtonGroup * m_lfoWaveBtnGrp; LedCheckBox * m_x100Cb; LedCheckBox * m_controlEnvAmountCb; diff --git a/include/FileBrowser.h b/include/FileBrowser.h index 71a878fc1..75b0c0c78 100644 --- a/include/FileBrowser.h +++ b/include/FileBrowser.h @@ -25,28 +25,25 @@ #ifndef LMMS_GUI_FILE_BROWSER_H #define LMMS_GUI_FILE_BROWSER_H -#include #include #include -#include #include -#include "FileSearch.h" #include "embed.h" -#if (QT_VERSION >= QT_VERSION_CHECK(5,14,0)) - #include -#endif #include #include "SideBarWidget.h" #include "lmmsconfig.h" +class QCheckBox; class QLineEdit; +class QProgressBar; namespace lmms { +class FileSearch; class InstrumentTrack; class PlayHandle; class TrackContainer; @@ -54,8 +51,8 @@ class TrackContainer; namespace gui { -class FileItem; class FileBrowserTreeWidget; +class FileItem; class FileBrowser : public SideBarWidget { diff --git a/include/GuiApplication.h b/include/GuiApplication.h index 02fb6ed67..df23acbfb 100644 --- a/include/GuiApplication.h +++ b/include/GuiApplication.h @@ -26,12 +26,12 @@ #define LMMS_GUI_GUI_APPLICATION_H #include -#include #include "lmms_export.h" #include "lmmsconfig.h" class QLabel; +class QSocketNotifier; namespace lmms::gui { diff --git a/include/InstrumentFunctions.h b/include/InstrumentFunctions.h index aa2e6de68..930afc9a8 100644 --- a/include/InstrumentFunctions.h +++ b/include/InstrumentFunctions.h @@ -35,7 +35,7 @@ namespace lmms { -class InstrumentTrack; +class InstrumentTrack; // IWYU pragma: keep class NotePlayHandle; namespace gui diff --git a/include/InstrumentSoundShapingView.h b/include/InstrumentSoundShapingView.h index b9e1fe82b..d4b60b324 100644 --- a/include/InstrumentSoundShapingView.h +++ b/include/InstrumentSoundShapingView.h @@ -27,11 +27,12 @@ #include -#include "InstrumentSoundShaping.h" #include "ModelView.h" class QLabel; +namespace lmms { class InstrumentSoundShaping; } + namespace lmms::gui { diff --git a/include/InstrumentTrack.h b/include/InstrumentTrack.h index 17d3233da..b8777f88a 100644 --- a/include/InstrumentTrack.h +++ b/include/InstrumentTrack.h @@ -26,7 +26,6 @@ #ifndef LMMS_INSTRUMENT_TRACK_H #define LMMS_INSTRUMENT_TRACK_H -#include #include "AudioBusHandle.h" #include "InstrumentFunctions.h" diff --git a/include/InstrumentTrackView.h b/include/InstrumentTrackView.h index c7d524b36..0c645926c 100644 --- a/include/InstrumentTrackView.h +++ b/include/InstrumentTrackView.h @@ -25,7 +25,6 @@ #ifndef LMMS_GUI_INSTRUMENT_TRACK_VIEW_H #define LMMS_GUI_INSTRUMENT_TRACK_VIEW_H -#include "MixerChannelLcdSpinBox.h" #include "TrackView.h" #include "InstrumentTrack.h" @@ -38,6 +37,7 @@ namespace lmms::gui class InstrumentTrackWindow; class Knob; class MidiCCRackView; +class MixerChannelLcdSpinBox; class TrackContainerView; class TrackLabelButton; diff --git a/include/InstrumentTrackWindow.h b/include/InstrumentTrackWindow.h index 6f0245875..e6a2f74cc 100644 --- a/include/InstrumentTrackWindow.h +++ b/include/InstrumentTrackWindow.h @@ -27,24 +27,21 @@ #include -#include "AutomatableButton.h" +#include "InstrumentTrack.h" #include "ModelView.h" #include "SerializingObject.h" -#include "PluginView.h" class QLabel; class QLineEdit; -class QWidget; class QMdiSubWindow; namespace lmms { -class InstrumentTrack; - namespace gui { +class AutomatableButton; class EffectRackView; class MixerChannelLcdSpinBox; class InstrumentFunctionArpeggioView; @@ -52,7 +49,6 @@ class InstrumentFunctionNoteStackingView; class InstrumentMidiIOView; class InstrumentTuningView; class InstrumentSoundShapingView; -class InstrumentTrackShapingView; class InstrumentTrackView; class Knob; class LcdSpinBox; diff --git a/include/Knob.h b/include/Knob.h index 8254e3392..1becfb0e8 100644 --- a/include/Knob.h +++ b/include/Knob.h @@ -26,19 +26,15 @@ #define LMMS_GUI_KNOB_H #include -#include #include "FloatModelEditorBase.h" -class QPixmap; namespace lmms::gui { -class SimpleTextFloat; - enum class KnobType { Dark28, Bright26, Small17, Vintage32, Styled diff --git a/include/LedCheckBox.h b/include/LedCheckBox.h index 4f23cd74b..6b8b5965b 100644 --- a/include/LedCheckBox.h +++ b/include/LedCheckBox.h @@ -28,7 +28,6 @@ #include "AutomatableButton.h" -class QPixmap; namespace lmms::gui diff --git a/include/LfoController.h b/include/LfoController.h index e884cd5e4..2a44039ed 100644 --- a/include/LfoController.h +++ b/include/LfoController.h @@ -25,9 +25,7 @@ #ifndef LMMS_LFO_CONTROLLER_H #define LMMS_LFO_CONTROLLER_H -#include -#include "Model.h" #include "AutomatableModel.h" #include "Controller.h" #include "ControllerDialog.h" @@ -40,8 +38,7 @@ namespace lmms namespace gui { -class automatableButtonGroup; -class LedCheckBox; +class AutomatableButtonGroup; class PixmapButton; class Knob; class TempoSyncKnob; @@ -120,8 +117,8 @@ protected: Knob * m_amountKnob; Knob * m_phaseKnob; PixmapButton * m_userLfoBtn; - automatableButtonGroup * m_waveBtnGrp; - automatableButtonGroup * m_multiplierBtnGrp; + AutomatableButtonGroup * m_waveBtnGrp; + AutomatableButtonGroup * m_multiplierBtnGrp; private: diff --git a/include/LinkedModelGroupViews.h b/include/LinkedModelGroupViews.h index cf5aabd0d..feab7c4c5 100644 --- a/include/LinkedModelGroupViews.h +++ b/include/LinkedModelGroupViews.h @@ -40,7 +40,7 @@ class LinkedModelGroups; namespace gui { -class Control; +class Control; // IWYU pragma: keep /** @file LinkedModelGroupViews.h diff --git a/include/LmmsSemaphore.h b/include/LmmsSemaphore.h index 4170eef6c..6eb705535 100644 --- a/include/LmmsSemaphore.h +++ b/include/LmmsSemaphore.h @@ -40,7 +40,6 @@ # include #endif -#include namespace lmms { diff --git a/include/Lv2ControlBase.h b/include/Lv2ControlBase.h index 8ee235ad8..6cea7d6a6 100644 --- a/include/Lv2ControlBase.h +++ b/include/Lv2ControlBase.h @@ -32,7 +32,6 @@ #include #include -#include "DataFile.h" #include "LinkedModelGroups.h" #include "lmms_export.h" #include "Plugin.h" diff --git a/include/Lv2Features.h b/include/Lv2Features.h index 69a456bbd..fa85d5f81 100644 --- a/include/Lv2Features.h +++ b/include/Lv2Features.h @@ -32,8 +32,8 @@ #include #include #include -#include "Lv2Manager.h" +#include namespace lmms { diff --git a/include/Lv2Proc.h b/include/Lv2Proc.h index f315c5d7a..4545706f8 100644 --- a/include/Lv2Proc.h +++ b/include/Lv2Proc.h @@ -57,10 +57,6 @@ namespace Lv2Ports struct Audio; struct PortBase; struct AtomSeq; - - enum class Type; - enum class Flow; - enum class Vis; } diff --git a/include/Lv2ViewBase.h b/include/Lv2ViewBase.h index 43086849c..70ed68a7c 100644 --- a/include/Lv2ViewBase.h +++ b/include/Lv2ViewBase.h @@ -37,7 +37,6 @@ class QPushButton; class QMdiSubWindow; -class QLabel; namespace lmms { @@ -49,7 +48,6 @@ class Lv2ControlBase; namespace gui { -class LedCheckBox; //! View for one processor, Lv2ViewBase contains 2 of those for mono plugins class Lv2ViewProc : public LinkedModelGroupView diff --git a/include/Lv2Worker.h b/include/Lv2Worker.h index b15bd9026..8c2b2a304 100644 --- a/include/Lv2Worker.h +++ b/include/Lv2Worker.h @@ -29,7 +29,6 @@ #ifdef LMMS_HAVE_LV2 -#include #include #include #include diff --git a/include/MainWindow.h b/include/MainWindow.h index d2efd4ac0..5f0f23f71 100644 --- a/include/MainWindow.h +++ b/include/MainWindow.h @@ -36,21 +36,16 @@ class QAction; class QDomElement; class QGridLayout; -class QMdiArea; namespace lmms { -class ConfigManager; - namespace gui { -class FileBrowser; class PluginView; class SubWindow; class ToolButton; -class GuiApplication; class MainWindow : public QMainWindow diff --git a/include/MidiAlsaRaw.h b/include/MidiAlsaRaw.h index 345cdbd54..ba690bad4 100644 --- a/include/MidiAlsaRaw.h +++ b/include/MidiAlsaRaw.h @@ -31,7 +31,6 @@ #include -#include #include #include "MidiClient.h" diff --git a/include/MidiAlsaSeq.h b/include/MidiAlsaSeq.h index 006cdefc8..a8c37f4c3 100644 --- a/include/MidiAlsaSeq.h +++ b/include/MidiAlsaSeq.h @@ -39,7 +39,6 @@ #include "MidiClient.h" -struct pollfd; namespace lmms diff --git a/include/MidiJack.h b/include/MidiJack.h index e61db26dd..8836d286f 100644 --- a/include/MidiJack.h +++ b/include/MidiJack.h @@ -39,7 +39,6 @@ #include "MidiClient.h" -class QLineEdit; namespace lmms { diff --git a/include/MixerChannelView.h b/include/MixerChannelView.h index ed0d4f1ff..1b2fa3953 100644 --- a/include/MixerChannelView.h +++ b/include/MixerChannelView.h @@ -25,26 +25,26 @@ #ifndef LMMS_GUI_MIXER_CHANNEL_VIEW_H #define LMMS_GUI_MIXER_CHANNEL_VIEW_H -#include -#include -#include -#include -#include #include -#include "EffectRackView.h" -#include "Fader.h" -#include "Knob.h" -#include "LcdWidget.h" -#include "PixmapButton.h" -#include "SendButtonIndicator.h" +class QGraphicsView; +class QLabel; +class QLineEdit; +class QStackedWidget; namespace lmms { class MixerChannel; } namespace lmms::gui { +class AutomatableButton; +class EffectRackView; +class Fader; +class Knob; +class LcdWidget; +class MixerView; class PeakIndicator; +class SendButtonIndicator; class MixerChannelView : public QWidget diff --git a/include/MixerView.h b/include/MixerView.h index 89315f93a..f5f98b62a 100644 --- a/include/MixerView.h +++ b/include/MixerView.h @@ -26,17 +26,16 @@ #define LMMS_GUI_MIXER_VIEW_H #include -#include -#include -#include #include "MixerChannelView.h" #include "ModelView.h" -#include "Engine.h" -#include "Fader.h" -#include "PixmapButton.h" -#include "embed.h" -#include "EffectRackView.h" +#include "SerializingObject.h" + +class QDomDocument; // IWYU pragma: keep +class QDomElement; // IWYU pragma: keep +class QHBoxLayout; +class QStackedLayout; +class QScrollArea; namespace lmms { diff --git a/include/PatternTrack.h b/include/PatternTrack.h index 2568fc91e..704cbc997 100644 --- a/include/PatternTrack.h +++ b/include/PatternTrack.h @@ -37,7 +37,6 @@ class TrackContainer; namespace gui { -class TrackLabelButton; class PatternTrackView; } // namespace gui diff --git a/include/PianoRoll.h b/include/PianoRoll.h index 96557f33d..274541671 100644 --- a/include/PianoRoll.h +++ b/include/PianoRoll.h @@ -40,11 +40,8 @@ #include "StepRecorder.h" #include "StepRecorderWidget.h" -class QPainter; -class QPixmap; class QPushButton; class QScrollBar; -class QString; class QMenu; class QToolButton; @@ -52,7 +49,6 @@ namespace lmms { -class NotePlayHandle; class MidiClip; diff --git a/include/PluginBrowser.h b/include/PluginBrowser.h index 2bb1b6d5c..31cfe1dc3 100644 --- a/include/PluginBrowser.h +++ b/include/PluginBrowser.h @@ -30,7 +30,6 @@ #include "SideBarWidget.h" #include "Plugin.h" -class QLineEdit; class QTreeWidget; namespace lmms::gui diff --git a/include/PluginFactory.h b/include/PluginFactory.h index 6ed0bc40b..21afaef3a 100644 --- a/include/PluginFactory.h +++ b/include/PluginFactory.h @@ -30,14 +30,13 @@ #include #include -#include #include #include #include "lmms_export.h" #include "Plugin.h" -class QLibrary; +class QLibrary; // IWYU pragma: keep namespace lmms { diff --git a/include/RemotePlugin.h b/include/RemotePlugin.h index a2e2e08d6..5ed4cc320 100644 --- a/include/RemotePlugin.h +++ b/include/RemotePlugin.h @@ -25,17 +25,20 @@ #ifndef LMMS_REMOTE_PLUGIN_H #define LMMS_REMOTE_PLUGIN_H +#include +#include +#if (QT_VERSION >= QT_VERSION_CHECK(5,14,0)) +#include // IWYU pragma: keep +#endif + #include "RemotePluginBase.h" #include "SharedMemory.h" - -#if (QT_VERSION >= QT_VERSION_CHECK(5,14,0)) - #include -#endif +#include "LmmsTypes.h" namespace lmms { - +class MidiEvent; class RemotePlugin; class SampleFrame; diff --git a/include/RemotePluginBase.h b/include/RemotePluginBase.h index 53ccce1c7..bd353ab6f 100644 --- a/include/RemotePluginBase.h +++ b/include/RemotePluginBase.h @@ -25,17 +25,14 @@ #ifndef LMMS_REMOTE_PLUGIN_BASE_H #define LMMS_REMOTE_PLUGIN_BASE_H -#include "MidiEvent.h" - -#include "lmmsconfig.h" - -#include +#include // IWYU pragma: keep #include #include #include #include #include -#include + +#include "lmmsconfig.h" #if !(defined(LMMS_HAVE_SYS_IPC_H) && defined(LMMS_HAVE_SEMAPHORE_H)) #define SYNC_WITH_SHM_FIFO @@ -50,7 +47,7 @@ #endif // !(LMMS_HAVE_SYS_IPC_H && LMMS_HAVE_SEMAPHORE_H) #ifdef LMMS_HAVE_LOCALE_H -#include +#include // IWYU pragma: keep #endif #ifdef LMMS_HAVE_PTHREAD_H @@ -69,14 +66,11 @@ #else // BUILD_REMOTE_PLUGIN_CLIENT #include "lmms_export.h" -#include -#include -#include #include #ifndef SYNC_WITH_SHM_FIFO #include -#include +#include // IWYU pragma: keep #endif // SYNC_WITH_SHM_FIFO #endif // BUILD_REMOTE_PLUGIN_CLIENT diff --git a/include/RemotePluginClient.h b/include/RemotePluginClient.h index 081c88eb7..b7ce0f8d0 100644 --- a/include/RemotePluginClient.h +++ b/include/RemotePluginClient.h @@ -38,6 +38,8 @@ # include #endif +#include "LmmsTypes.h" +#include "MidiEvent.h" #include "SharedMemory.h" #include "VstSyncData.h" diff --git a/include/Sample.h b/include/Sample.h index 3fd5bc38e..f5178d3a1 100644 --- a/include/Sample.h +++ b/include/Sample.h @@ -25,7 +25,6 @@ #ifndef LMMS_SAMPLE_H #define LMMS_SAMPLE_H -#include #include #include "AudioResampler.h" diff --git a/include/SampleBuffer.h b/include/SampleBuffer.h index d21bacf84..4e799c47c 100644 --- a/include/SampleBuffer.h +++ b/include/SampleBuffer.h @@ -25,11 +25,8 @@ #ifndef LMMS_SAMPLE_BUFFER_H #define LMMS_SAMPLE_BUFFER_H -#include #include #include -#include -#include #include #include "AudioEngine.h" diff --git a/include/SampleDecoder.h b/include/SampleDecoder.h index 9109d4121..5013554dd 100644 --- a/include/SampleDecoder.h +++ b/include/SampleDecoder.h @@ -26,7 +26,6 @@ #define LMMS_SAMPLE_DECODER_H #include -#include #include #include #include diff --git a/include/SamplePlayHandle.h b/include/SamplePlayHandle.h index b3fddd503..48c63defa 100644 --- a/include/SamplePlayHandle.h +++ b/include/SamplePlayHandle.h @@ -27,7 +27,6 @@ #define LMMS_SAMPLE_PLAY_HANDLE_H #include "Sample.h" -#include "SampleBuffer.h" #include "AutomatableModel.h" #include "PlayHandle.h" @@ -38,7 +37,6 @@ namespace lmms class PatternTrack; class SampleClip; class Track; -class AudioBusHandle; class LMMS_EXPORT SamplePlayHandle : public PlayHandle diff --git a/include/SampleThumbnail.h b/include/SampleThumbnail.h index 7d1082437..b0b6d7b45 100644 --- a/include/SampleThumbnail.h +++ b/include/SampleThumbnail.h @@ -27,15 +27,19 @@ #define LMMS_SAMPLE_THUMBNAIL_H #include -#include #include #include -#include "Sample.h" #include "lmms_export.h" +#include "SampleBuffer.h" +#include "SampleFrame.h" + +class QPainter; namespace lmms { +class Sample; + /** Allows for visualizing sample data. diff --git a/include/SampleTrackView.h b/include/SampleTrackView.h index 2f94bfb56..8c4f58ef9 100644 --- a/include/SampleTrackView.h +++ b/include/SampleTrackView.h @@ -26,19 +26,17 @@ #define LMMS_GUI_SAMPLE_TRACK_VIEW_H -#include "MixerChannelLcdSpinBox.h" +#include "SampleTrack.h" #include "TrackView.h" namespace lmms { -class SampleTrack; - - namespace gui { class Knob; +class MixerChannelLcdSpinBox; class SampleTrackWindow; class TrackLabelButton; diff --git a/include/SampleTrackWindow.h b/include/SampleTrackWindow.h index f9aa0f71c..05e38fd2f 100644 --- a/include/SampleTrackWindow.h +++ b/include/SampleTrackWindow.h @@ -30,13 +30,13 @@ #include "ModelView.h" #include "SampleTrack.h" #include "SerializingObject.h" -#include "AutomatableButton.h" class QLineEdit; namespace lmms::gui { +class AutomatableButton; class EffectRackView; class Knob; class MixerChannelLcdSpinBox; diff --git a/include/Song.h b/include/Song.h index 7fedaa44d..ee45c536b 100644 --- a/include/Song.h +++ b/include/Song.h @@ -28,8 +28,8 @@ #include #include -#include #include +#include // IWYU pragma: keep #include "AudioEngine.h" #include "Controller.h" @@ -50,11 +50,8 @@ class Scale; namespace gui { - -class TimeLineWidget; class SongEditor; class ControllerRackView; - } diff --git a/include/SongEditor.h b/include/SongEditor.h index 1f719623a..b1ae4c7dd 100644 --- a/include/SongEditor.h +++ b/include/SongEditor.h @@ -26,7 +26,6 @@ #ifndef LMMS_GUI_SONG_EDITOR_H #define LMMS_GUI_SONG_EDITOR_H -#include "AutomatableModel.h" #include "Editor.h" #include "TrackContainerView.h" @@ -36,6 +35,7 @@ class QScrollBar; namespace lmms { +class IntModel; class Song; class ComboBoxModel; diff --git a/include/StepRecorder.h b/include/StepRecorder.h index e085838e2..1b4a7ad27 100644 --- a/include/StepRecorder.h +++ b/include/StepRecorder.h @@ -21,7 +21,6 @@ #ifndef LMMS_STEP_RECORDER_H #define LMMS_STEP_RECORDER_H -#include #include #include #include diff --git a/include/SubWindow.h b/include/SubWindow.h index cc9ff38a3..cca4063f0 100644 --- a/include/SubWindow.h +++ b/include/SubWindow.h @@ -34,9 +34,7 @@ class QGraphicsDropShadowEffect; class QLabel; -class QMoveEvent; class QPushButton; -class QResizeEvent; class QWidget; namespace lmms::gui diff --git a/include/TimeLineWidget.h b/include/TimeLineWidget.h index 0eb33bad9..b1861f67c 100644 --- a/include/TimeLineWidget.h +++ b/include/TimeLineWidget.h @@ -27,7 +27,6 @@ #include -#include #include #include @@ -35,7 +34,6 @@ #include "embed.h" -class QPixmap; class QToolBar; namespace lmms { @@ -47,9 +45,7 @@ class Timeline; namespace lmms::gui { -class NStateButton; class TextFloat; -class SongEditor; class TimeLineWidget : public QWidget diff --git a/include/TrackContentWidget.h b/include/TrackContentWidget.h index f93b0a58d..76ad57a00 100644 --- a/include/TrackContentWidget.h +++ b/include/TrackContentWidget.h @@ -30,8 +30,8 @@ #include "JournallingObject.h" #include "TimePos.h" +class QMimeData; // IWYU pragma: keep -class QMimeData; namespace lmms { @@ -41,8 +41,8 @@ class Track; namespace gui { +class ClipView; // IWYU pragma: keep class TrackView; -class ClipView; class TrackContentWidget : public QWidget, public JournallingObject { diff --git a/include/TrackOperationsWidget.h b/include/TrackOperationsWidget.h index 3eb9215b9..ed3b72c81 100644 --- a/include/TrackOperationsWidget.h +++ b/include/TrackOperationsWidget.h @@ -26,14 +26,13 @@ #define LMMS_GUI_TRACK_OPERATIONS_WIDGET_H #include -#include "AutomatableButton.h" class QPushButton; namespace lmms::gui { -class PixmapButton; +class AutomatableButton; class TrackGrip; class TrackView; diff --git a/include/VstSyncController.h b/include/VstSyncController.h index d3c6af051..4a0fcd739 100644 --- a/include/VstSyncController.h +++ b/include/VstSyncController.h @@ -29,12 +29,11 @@ #include #include "SharedMemory.h" -#include "VstSyncData.h" +#include "VstSyncData.h" // IWYU pragma: keep namespace lmms { - class VstSyncController : public QObject { Q_OBJECT diff --git a/include/embed.h b/include/embed.h index 489a06270..cbe4509ee 100644 --- a/include/embed.h +++ b/include/embed.h @@ -32,8 +32,9 @@ #include #include "lmms_export.h" +#ifdef PLUGIN_NAME #include "LmmsCommonMacros.h" - +#endif namespace lmms { diff --git a/plugins/Amplifier/AmplifierControlDialog.h b/plugins/Amplifier/AmplifierControlDialog.h index 672830117..008cc94b6 100644 --- a/plugins/Amplifier/AmplifierControlDialog.h +++ b/plugins/Amplifier/AmplifierControlDialog.h @@ -32,13 +32,10 @@ namespace lmms { class AmplifierControls; -class FloatModel; namespace gui { -class Knob; - class AmplifierControlDialog : public EffectControlDialog { Q_OBJECT diff --git a/plugins/Amplifier/AmplifierControls.cpp b/plugins/Amplifier/AmplifierControls.cpp index 72960dd3b..85fa393cb 100644 --- a/plugins/Amplifier/AmplifierControls.cpp +++ b/plugins/Amplifier/AmplifierControls.cpp @@ -23,7 +23,6 @@ * */ -#include #include "AmplifierControls.h" #include "Amplifier.h" diff --git a/plugins/Amplifier/AmplifierControls.h b/plugins/Amplifier/AmplifierControls.h index 6b5063ddd..16cf9bbab 100644 --- a/plugins/Amplifier/AmplifierControls.h +++ b/plugins/Amplifier/AmplifierControls.h @@ -34,11 +34,6 @@ namespace lmms class AmplifierEffect; -namespace gui -{ -class AmplifierControlDialog; -} - class AmplifierControls : public EffectControls { Q_OBJECT diff --git a/plugins/AudioFileProcessor/AudioFileProcessorView.cpp b/plugins/AudioFileProcessor/AudioFileProcessorView.cpp index 02098c540..6a809b31e 100644 --- a/plugins/AudioFileProcessor/AudioFileProcessorView.cpp +++ b/plugins/AudioFileProcessor/AudioFileProcessorView.cpp @@ -99,7 +99,7 @@ AudioFileProcessorView::AudioFileProcessorView(Instrument* instrument, "loop_pingpong_off")); m_loopPingPongButton->setToolTip(tr("Enable ping-pong loop")); - m_loopGroup = new automatableButtonGroup(this); + m_loopGroup = new AutomatableButtonGroup(this); m_loopGroup->addButton(m_loopOffButton); m_loopGroup->addButton(m_loopOnButton); m_loopGroup->addButton(m_loopPingPongButton); diff --git a/plugins/AudioFileProcessor/AudioFileProcessorView.h b/plugins/AudioFileProcessor/AudioFileProcessorView.h index 039eaab2c..75f8b08d3 100644 --- a/plugins/AudioFileProcessor/AudioFileProcessorView.h +++ b/plugins/AudioFileProcessor/AudioFileProcessorView.h @@ -34,7 +34,7 @@ namespace lmms namespace gui { -class automatableButtonGroup; +class AutomatableButtonGroup; class Knob; class PixmapButton; class ComboBox; @@ -73,7 +73,7 @@ private: gui::PixmapButton* m_openAudioFileButton; PixmapButton* m_reverseButton; - automatableButtonGroup* m_loopGroup; + AutomatableButtonGroup* m_loopGroup; PixmapButton* m_stutterButton; ComboBox* m_interpBox; } ; diff --git a/plugins/AudioFileProcessor/AudioFileProcessorWaveView.h b/plugins/AudioFileProcessor/AudioFileProcessorWaveView.h index 69dea0b1b..ac36bf9ec 100644 --- a/plugins/AudioFileProcessor/AudioFileProcessorWaveView.h +++ b/plugins/AudioFileProcessor/AudioFileProcessorWaveView.h @@ -38,8 +38,6 @@ class Sample; namespace gui { -class AudioFileProcessorView; - class AudioFileProcessorWaveView : public QWidget { Q_OBJECT diff --git a/plugins/BassBooster/BassBoosterControls.cpp b/plugins/BassBooster/BassBoosterControls.cpp index cda00043b..b73f664ba 100644 --- a/plugins/BassBooster/BassBoosterControls.cpp +++ b/plugins/BassBooster/BassBoosterControls.cpp @@ -23,7 +23,6 @@ */ -#include #include "BassBoosterControls.h" #include "BassBooster.h" diff --git a/plugins/Bitcrush/BitcrushControlDialog.cpp b/plugins/Bitcrush/BitcrushControlDialog.cpp index 3036c802a..c7614f7cd 100644 --- a/plugins/Bitcrush/BitcrushControlDialog.cpp +++ b/plugins/Bitcrush/BitcrushControlDialog.cpp @@ -114,4 +114,4 @@ BitcrushControlDialog::BitcrushControlDialog( BitcrushControls * controls ) : } -} // namespace lmms::gui \ No newline at end of file +} // namespace lmms::gui diff --git a/plugins/Bitcrush/BitcrushControls.cpp b/plugins/Bitcrush/BitcrushControls.cpp index 348f1288e..41fd37423 100644 --- a/plugins/Bitcrush/BitcrushControls.cpp +++ b/plugins/Bitcrush/BitcrushControls.cpp @@ -24,7 +24,6 @@ */ -#include #include "BitcrushControls.h" #include "Bitcrush.h" diff --git a/plugins/CarlaBase/Carla.h b/plugins/CarlaBase/Carla.h index f833c4668..143b82c81 100644 --- a/plugins/CarlaBase/Carla.h +++ b/plugins/CarlaBase/Carla.h @@ -41,7 +41,7 @@ #include "carlabase_export.h" #include #if CARLA_VERSION_HEX >= 0x010911 - #include + #include // IWYU pragma: keep #else #include #include @@ -65,7 +65,7 @@ class QCompleter; class QGridLayout; class QHBoxLayout; class QLineEdit; -class QStringListModel; +class QStringListModel; // IWYU pragma: keep class QScrollArea; diff --git a/plugins/Compressor/CompressorControlDialog.cpp b/plugins/Compressor/CompressorControlDialog.cpp index b4b1b0146..40b7e679d 100755 --- a/plugins/Compressor/CompressorControlDialog.cpp +++ b/plugins/Compressor/CompressorControlDialog.cpp @@ -195,7 +195,7 @@ CompressorControlDialog::CompressorControlDialog(CompressorControls* controls) : peakButton->setInactiveGraphic(PLUGIN_NAME::getIconPixmap("peak_unsel")); peakButton->setToolTip(tr("Use absolute value of the input")); - rmsPeakGroup = new automatableButtonGroup(this); + rmsPeakGroup = new AutomatableButtonGroup(this); rmsPeakGroup->addButton(rmsButton); rmsPeakGroup->addButton(peakButton); rmsPeakGroup->setModel(&controls->m_peakmodeModel); @@ -210,7 +210,7 @@ CompressorControlDialog::CompressorControlDialog(CompressorControls* controls) : midSideButton->setInactiveGraphic(PLUGIN_NAME::getIconPixmap("midside_unsel")); midSideButton->setToolTip(tr("Compress mid and side audio")); - leftRightMidSideGroup = new automatableButtonGroup(this); + leftRightMidSideGroup = new AutomatableButtonGroup(this); leftRightMidSideGroup->addButton(leftRightButton); leftRightMidSideGroup->addButton(midSideButton); leftRightMidSideGroup->setModel(&controls->m_midsideModel); @@ -225,7 +225,7 @@ CompressorControlDialog::CompressorControlDialog(CompressorControls* controls) : limitButton->setInactiveGraphic(PLUGIN_NAME::getIconPixmap("limiter_unsel")); limitButton->setToolTip(tr("Set Ratio to infinity (is not guaranteed to limit audio volume)")); - compressLimitGroup = new automatableButtonGroup(this); + compressLimitGroup = new AutomatableButtonGroup(this); compressLimitGroup->addButton(compressButton); compressLimitGroup->addButton(limitButton); compressLimitGroup->setModel(&controls->m_limiterModel); @@ -255,7 +255,7 @@ CompressorControlDialog::CompressorControlDialog(CompressorControls* controls) : blendButton->setInactiveGraphic(PLUGIN_NAME::getIconPixmap("blend_unsel")); blendButton->setToolTip(tr("Blend between stereo linking modes")); - stereoLinkGroup = new automatableButtonGroup(this); + stereoLinkGroup = new AutomatableButtonGroup(this); stereoLinkGroup->addButton(unlinkedButton); stereoLinkGroup->addButton(maximumButton); stereoLinkGroup->addButton(averageButton); diff --git a/plugins/Compressor/CompressorControlDialog.h b/plugins/Compressor/CompressorControlDialog.h index 108c421a0..b7e2a87e1 100755 --- a/plugins/Compressor/CompressorControlDialog.h +++ b/plugins/Compressor/CompressorControlDialog.h @@ -59,7 +59,7 @@ constexpr int COMP_BOX_Y = 280; constexpr float COMP_GRID_SPACING = 3.f;// 3 db per grid line constexpr float COMP_GRID_MAX = 96.f;// Can't zoom out past 96 db -class automatableButtonGroup; +class AutomatableButtonGroup; class Knob; class PixmapButton; class EqFader; @@ -196,22 +196,22 @@ private: PixmapButton * rmsButton; PixmapButton * peakButton; - automatableButtonGroup * rmsPeakGroup; + AutomatableButtonGroup * rmsPeakGroup; PixmapButton * leftRightButton; PixmapButton * midSideButton; - automatableButtonGroup * leftRightMidSideGroup; + AutomatableButtonGroup * leftRightMidSideGroup; PixmapButton * compressButton; PixmapButton * limitButton; - automatableButtonGroup * compressLimitGroup; + AutomatableButtonGroup * compressLimitGroup; PixmapButton * unlinkedButton; PixmapButton * maximumButton; PixmapButton * averageButton; PixmapButton * minimumButton; PixmapButton * blendButton; - automatableButtonGroup * stereoLinkGroup; + AutomatableButtonGroup * stereoLinkGroup; PixmapButton * autoMakeupButton; PixmapButton * auditionButton; diff --git a/plugins/Compressor/CompressorControls.cpp b/plugins/Compressor/CompressorControls.cpp index 81247e900..5fbf39ca4 100755 --- a/plugins/Compressor/CompressorControls.cpp +++ b/plugins/Compressor/CompressorControls.cpp @@ -26,7 +26,6 @@ #include "CompressorControls.h" #include "Compressor.h" -#include namespace lmms diff --git a/plugins/CrossoverEQ/CrossoverEQControlDialog.cpp b/plugins/CrossoverEQ/CrossoverEQControlDialog.cpp index a04606601..abdc86b3e 100644 --- a/plugins/CrossoverEQ/CrossoverEQControlDialog.cpp +++ b/plugins/CrossoverEQ/CrossoverEQControlDialog.cpp @@ -25,16 +25,14 @@ */ +#include "AutomatableButton.h" #include "CrossoverEQControlDialog.h" #include "CrossoverEQControls.h" #include "embed.h" #include "FontHelper.h" -#include "LedCheckBox.h" #include "Knob.h" #include "Fader.h" -#include "PixmapButton.h" -#include #include #include diff --git a/plugins/Delay/DelayControls.cpp b/plugins/Delay/DelayControls.cpp index c1ad73153..c38593271 100644 --- a/plugins/Delay/DelayControls.cpp +++ b/plugins/Delay/DelayControls.cpp @@ -22,7 +22,6 @@ * */ -#include #include "DelayControls.h" #include "DelayEffect.h" diff --git a/plugins/Delay/StereoDelay.cpp b/plugins/Delay/StereoDelay.cpp index 7381dc3e3..352805bfe 100644 --- a/plugins/Delay/StereoDelay.cpp +++ b/plugins/Delay/StereoDelay.cpp @@ -24,7 +24,6 @@ #include "StereoDelay.h" -#include "LmmsTypes.h" #include "SampleFrame.h" namespace lmms diff --git a/plugins/Delay/StereoDelay.h b/plugins/Delay/StereoDelay.h index 72b49a9df..319999670 100644 --- a/plugins/Delay/StereoDelay.h +++ b/plugins/Delay/StereoDelay.h @@ -25,7 +25,6 @@ #ifndef STEREODELAY_H #define STEREODELAY_H -#include "LmmsTypes.h" namespace lmms diff --git a/plugins/Dispersion/Dispersion.cpp b/plugins/Dispersion/Dispersion.cpp index 52dd60136..8b167a5a4 100644 --- a/plugins/Dispersion/Dispersion.cpp +++ b/plugins/Dispersion/Dispersion.cpp @@ -24,6 +24,8 @@ #include "Dispersion.h" +#include + #include "embed.h" #include "plugin_export.h" diff --git a/plugins/Dispersion/Dispersion.h b/plugins/Dispersion/Dispersion.h index 27365950d..9a0f29de6 100644 --- a/plugins/Dispersion/Dispersion.h +++ b/plugins/Dispersion/Dispersion.h @@ -29,7 +29,6 @@ #include "DispersionControls.h" #include "Effect.h" -#include "lmms_math.h" namespace lmms { diff --git a/plugins/Dispersion/DispersionControlDialog.cpp b/plugins/Dispersion/DispersionControlDialog.cpp index aacb48290..fbf37923c 100644 --- a/plugins/Dispersion/DispersionControlDialog.cpp +++ b/plugins/Dispersion/DispersionControlDialog.cpp @@ -29,7 +29,6 @@ #include "AutomatableButton.h" #include "DispersionControls.h" -#include "embed.h" #include "Knob.h" #include "LcdSpinBox.h" diff --git a/plugins/Dispersion/DispersionControls.cpp b/plugins/Dispersion/DispersionControls.cpp index f97fc0e37..f75ba7cc4 100644 --- a/plugins/Dispersion/DispersionControls.cpp +++ b/plugins/Dispersion/DispersionControls.cpp @@ -26,7 +26,6 @@ #include "DispersionControls.h" #include "Dispersion.h" -#include namespace lmms { diff --git a/plugins/Dispersion/DispersionControls.h b/plugins/Dispersion/DispersionControls.h index e815e1115..a670a53c7 100644 --- a/plugins/Dispersion/DispersionControls.h +++ b/plugins/Dispersion/DispersionControls.h @@ -33,12 +33,6 @@ namespace lmms class DispersionEffect; -namespace gui -{ -class DispersionControlDialog; -} - - class DispersionControls : public EffectControls { Q_OBJECT diff --git a/plugins/DualFilter/DualFilterControls.cpp b/plugins/DualFilter/DualFilterControls.cpp index 75478c9d7..561aad3c5 100644 --- a/plugins/DualFilter/DualFilterControls.cpp +++ b/plugins/DualFilter/DualFilterControls.cpp @@ -24,7 +24,6 @@ */ -#include #include "BasicFilters.h" #include "DualFilterControls.h" diff --git a/plugins/DynamicsProcessor/DynamicsProcessorControlDialog.cpp b/plugins/DynamicsProcessor/DynamicsProcessorControlDialog.cpp index 62838d5f4..b61029600 100644 --- a/plugins/DynamicsProcessor/DynamicsProcessorControlDialog.cpp +++ b/plugins/DynamicsProcessor/DynamicsProcessorControlDialog.cpp @@ -135,7 +135,7 @@ DynProcControlDialog::DynProcControlDialog( smUnlButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "unl_inactive" ) ); smUnlButton->setToolTip(tr("Process each stereo channel independently")); - auto smGroup = new automatableButtonGroup(this); + auto smGroup = new AutomatableButtonGroup(this); smGroup -> addButton( smMaxButton ); smGroup -> addButton( smAvgButton ); smGroup -> addButton( smUnlButton ); diff --git a/plugins/Eq/EqControls.cpp b/plugins/Eq/EqControls.cpp index ea5b2947f..63a4cd159 100644 --- a/plugins/Eq/EqControls.cpp +++ b/plugins/Eq/EqControls.cpp @@ -24,7 +24,6 @@ #include "EqControls.h" -#include #include "EqControlsDialog.h" #include "EqEffect.h" diff --git a/plugins/Eq/EqControlsDialog.cpp b/plugins/Eq/EqControlsDialog.cpp index 1fb10e2bb..c7d737d87 100644 --- a/plugins/Eq/EqControlsDialog.cpp +++ b/plugins/Eq/EqControlsDialog.cpp @@ -198,13 +198,13 @@ EqControlsDialog::EqControlsDialog( EqControls *controls ) : QObject::connect( m_parameterWidget->getBandModels( 7 )->lp24 , SIGNAL ( dataChanged() ), m_parameterWidget, SLOT( updateHandle())); QObject::connect( m_parameterWidget->getBandModels( 7 )->lp48 , SIGNAL ( dataChanged() ), m_parameterWidget, SLOT( updateHandle())); - auto lpBtnGrp = new automatableButtonGroup(this, tr("LP group")); + auto lpBtnGrp = new AutomatableButtonGroup(this, tr("LP group")); lpBtnGrp->addButton( lp12Button ); lpBtnGrp->addButton( lp24Button ); lpBtnGrp->addButton( lp48Button ); lpBtnGrp->setModel(&m_controls->m_lpTypeModel); - auto hpBtnGrp = new automatableButtonGroup(this, tr("HP group")); + auto hpBtnGrp = new AutomatableButtonGroup(this, tr("HP group")); hpBtnGrp->addButton( hp12Button ); hpBtnGrp->addButton( hp24Button ); hpBtnGrp->addButton( hp48Button ); diff --git a/plugins/Eq/EqParameterWidget.cpp b/plugins/Eq/EqParameterWidget.cpp index a7c75b70d..0d11d6468 100644 --- a/plugins/Eq/EqParameterWidget.cpp +++ b/plugins/Eq/EqParameterWidget.cpp @@ -23,18 +23,15 @@ * */ + #include "EqParameterWidget.h" -#include #include #include -#include -#include #include #include "AutomatableModel.h" #include "EqCurve.h" -#include "EqParameterWidget.h" namespace lmms::gui diff --git a/plugins/Flanger/FlangerControls.cpp b/plugins/Flanger/FlangerControls.cpp index c5606380c..71ab37c6b 100644 --- a/plugins/Flanger/FlangerControls.cpp +++ b/plugins/Flanger/FlangerControls.cpp @@ -22,7 +22,6 @@ * */ -#include #include "FlangerControls.h" #include "FlangerEffect.h" diff --git a/plugins/Flanger/FlangerControlsDialog.cpp b/plugins/Flanger/FlangerControlsDialog.cpp index e39b122ce..7433a6b2c 100644 --- a/plugins/Flanger/FlangerControlsDialog.cpp +++ b/plugins/Flanger/FlangerControlsDialog.cpp @@ -24,13 +24,13 @@ #include "FlangerControlsDialog.h" +#include + #include "embed.h" #include "FlangerControls.h" #include "LedCheckBox.h" #include "TempoSyncKnob.h" -#include - namespace lmms::gui { diff --git a/plugins/FreeBoy/FreeBoy.h b/plugins/FreeBoy/FreeBoy.h index 3a178fdb1..aa5e37b9f 100644 --- a/plugins/FreeBoy/FreeBoy.h +++ b/plugins/FreeBoy/FreeBoy.h @@ -26,7 +26,6 @@ #ifndef LMMS_FREEBOY_H #define LMMS_FREEBOY_H -#include #include "AutomatableModel.h" #include "Instrument.h" @@ -36,7 +35,7 @@ namespace lmms { -class NotePlayHandle; +class NotePlayHandle; // IWYU pragma: keep namespace gui diff --git a/plugins/GranularPitchShifter/GranularPitchShifterControlDialog.cpp b/plugins/GranularPitchShifter/GranularPitchShifterControlDialog.cpp index 1231535c2..91073cbbd 100755 --- a/plugins/GranularPitchShifter/GranularPitchShifterControlDialog.cpp +++ b/plugins/GranularPitchShifter/GranularPitchShifterControlDialog.cpp @@ -22,11 +22,13 @@ * */ +#include "embed.h" +#include "ComboBox.h" #include "GranularPitchShifterControlDialog.h" #include "GranularPitchShifterControls.h" -#include "embed.h" -#include "LcdFloatSpinBox.h" #include "Knob.h" +#include "LcdFloatSpinBox.h" +#include "MainWindow.h" #include "GuiApplication.h" #include "PixmapButton.h" diff --git a/plugins/GranularPitchShifter/GranularPitchShifterControlDialog.h b/plugins/GranularPitchShifter/GranularPitchShifterControlDialog.h index 751106b2c..ec7835602 100755 --- a/plugins/GranularPitchShifter/GranularPitchShifterControlDialog.h +++ b/plugins/GranularPitchShifter/GranularPitchShifterControlDialog.h @@ -28,21 +28,15 @@ #include "EffectControlDialog.h" #include -#include "ComboBox.h" -#include "GuiApplication.h" -#include "MainWindow.h" namespace lmms { class GranularPitchShifterControls; -class FloatModel; namespace gui { -class Knob; - class GranularPitchShifterControlDialog : public EffectControlDialog { Q_OBJECT diff --git a/plugins/GranularPitchShifter/GranularPitchShifterControls.cpp b/plugins/GranularPitchShifter/GranularPitchShifterControls.cpp index 86e9a0cfd..2b213d5b8 100755 --- a/plugins/GranularPitchShifter/GranularPitchShifterControls.cpp +++ b/plugins/GranularPitchShifter/GranularPitchShifterControls.cpp @@ -22,7 +22,6 @@ * */ -#include #include "GranularPitchShifterControls.h" #include "GranularPitchShifterEffect.h" diff --git a/plugins/GranularPitchShifter/GranularPitchShifterControls.h b/plugins/GranularPitchShifter/GranularPitchShifterControls.h index 3ae8f8819..e5f1ff353 100755 --- a/plugins/GranularPitchShifter/GranularPitchShifterControls.h +++ b/plugins/GranularPitchShifter/GranularPitchShifterControls.h @@ -25,6 +25,7 @@ #ifndef LMMS_GRANULAR_PITCH_SHIFTER_CONTROL_DIALOG_H #define LMMS_GRANULAR_PITCH_SHIFTER_CONTROL_DIALOG_H +#include "ComboBoxModel.h" #include "EffectControls.h" #include "GranularPitchShifterControlDialog.h" @@ -33,11 +34,6 @@ namespace lmms class GranularPitchShifterEffect; -namespace gui -{ -class GranularPitchShifterControlDialog; -} - class GranularPitchShifterControls : public EffectControls { Q_OBJECT diff --git a/plugins/GranularPitchShifter/GranularPitchShifterEffect.h b/plugins/GranularPitchShifter/GranularPitchShifterEffect.h index 4b4eb55b2..ca31572ad 100755 --- a/plugins/GranularPitchShifter/GranularPitchShifterEffect.h +++ b/plugins/GranularPitchShifter/GranularPitchShifterEffect.h @@ -30,7 +30,6 @@ #include "Effect.h" #include "GranularPitchShifterControls.h" -#include "BasicFilters.h" #include "interpolation.h" namespace lmms diff --git a/plugins/HydrogenImport/LocalFileMng.h b/plugins/HydrogenImport/LocalFileMng.h index 1260dbfdd..4dfd5373a 100644 --- a/plugins/HydrogenImport/LocalFileMng.h +++ b/plugins/HydrogenImport/LocalFileMng.h @@ -1,10 +1,6 @@ #ifndef LFILEMNG_H #define LFILEMNG_H -#include -#include -#include -#include #include namespace lmms diff --git a/plugins/Kicker/Kicker.h b/plugins/Kicker/Kicker.h index 2eadaa333..cdd221f04 100644 --- a/plugins/Kicker/Kicker.h +++ b/plugins/Kicker/Kicker.h @@ -38,7 +38,7 @@ namespace lmms #define KICKER_PRESET_VERSION 1 -class NotePlayHandle; +class NotePlayHandle; // IWYU pragma: keep namespace gui { diff --git a/plugins/LOMM/LOMMControlDialog.cpp b/plugins/LOMM/LOMMControlDialog.cpp index b3cf34506..fa7f53fb7 100644 --- a/plugins/LOMM/LOMMControlDialog.cpp +++ b/plugins/LOMM/LOMMControlDialog.cpp @@ -23,9 +23,15 @@ */ -#include "LOMM.h" #include "LOMMControlDialog.h" + +#include +#include + +#include "GuiApplication.h" +#include "LOMM.h" #include "LOMMControls.h" +#include "MainWindow.h" namespace lmms::gui diff --git a/plugins/LOMM/LOMMControlDialog.h b/plugins/LOMM/LOMMControlDialog.h index 3de38c984..0bbf09747 100644 --- a/plugins/LOMM/LOMMControlDialog.h +++ b/plugins/LOMM/LOMMControlDialog.h @@ -27,16 +27,10 @@ #include "EffectControlDialog.h" -#include -#include #include "embed.h" -#include "GuiApplication.h" #include "Knob.h" #include "LcdFloatSpinBox.h" -#include "LcdSpinBox.h" -#include "LedCheckBox.h" -#include "MainWindow.h" #include "PixmapButton.h" namespace lmms diff --git a/plugins/LOMM/LOMMControls.cpp b/plugins/LOMM/LOMMControls.cpp index 3ede0ddf2..ed819db11 100644 --- a/plugins/LOMM/LOMMControls.cpp +++ b/plugins/LOMM/LOMMControls.cpp @@ -26,7 +26,6 @@ #include "LOMMControls.h" #include "LOMM.h" -#include #include namespace lmms diff --git a/plugins/LOMM/LOMMControls.h b/plugins/LOMM/LOMMControls.h index 3e5325426..f4fb3ae7c 100644 --- a/plugins/LOMM/LOMMControls.h +++ b/plugins/LOMM/LOMMControls.h @@ -32,11 +32,6 @@ namespace lmms { class LOMMEffect; -namespace gui -{ -class LOMMControlDialog; -} - class LOMMControls : public EffectControls { Q_OBJECT diff --git a/plugins/LadspaBrowser/LadspaDescription.cpp b/plugins/LadspaBrowser/LadspaDescription.cpp index a61e7f233..2f6513cbb 100644 --- a/plugins/LadspaBrowser/LadspaDescription.cpp +++ b/plugins/LadspaBrowser/LadspaDescription.cpp @@ -30,10 +30,9 @@ #include #include -#include "AudioDevice.h" -#include "AudioEngine.h" #include "Engine.h" #include "Ladspa2LMMS.h" +#include "lmms_constants.h" namespace lmms::gui diff --git a/plugins/LadspaEffect/LadspaControls.h b/plugins/LadspaEffect/LadspaControls.h index c91f3badd..acfc78cdf 100644 --- a/plugins/LadspaEffect/LadspaControls.h +++ b/plugins/LadspaEffect/LadspaControls.h @@ -26,7 +26,6 @@ #define LADSPA_CONTROLS_H #include "EffectControls.h" -#include "LadspaControlDialog.h" #include "LadspaMatrixControlDialog.h" namespace lmms @@ -35,7 +34,9 @@ namespace lmms class LadspaControl; using control_list_t = QVector; - +namespace gui { +class LadspaControlDialog; +} class LadspaEffect; diff --git a/plugins/LadspaEffect/LadspaEffect.cpp b/plugins/LadspaEffect/LadspaEffect.cpp index eebe6938c..49fc74401 100644 --- a/plugins/LadspaEffect/LadspaEffect.cpp +++ b/plugins/LadspaEffect/LadspaEffect.cpp @@ -29,7 +29,6 @@ #include "LadspaEffect.h" #include "DataFile.h" -#include "AudioDevice.h" #include "AudioEngine.h" #include "Ladspa2LMMS.h" #include "LadspaBase.h" diff --git a/plugins/LadspaEffect/LadspaMatrixControlDialog.cpp b/plugins/LadspaEffect/LadspaMatrixControlDialog.cpp index 4c9cd50ac..c05481c6d 100644 --- a/plugins/LadspaEffect/LadspaMatrixControlDialog.cpp +++ b/plugins/LadspaEffect/LadspaMatrixControlDialog.cpp @@ -24,21 +24,17 @@ */ -#include -#include #include #include #include #include -#include +#include -#include "LadspaBase.h" #include "LadspaControl.h" -#include "LadspaEffect.h" +#include "LadspaControls.h" #include "LadspaMatrixControlDialog.h" #include "LadspaWidgetFactory.h" -#include "LadspaControlView.h" #include "LedCheckBox.h" diff --git a/plugins/LadspaEffect/LadspaSubPluginFeatures.cpp b/plugins/LadspaEffect/LadspaSubPluginFeatures.cpp index 4349f621f..55bcd9d2c 100644 --- a/plugins/LadspaEffect/LadspaSubPluginFeatures.cpp +++ b/plugins/LadspaEffect/LadspaSubPluginFeatures.cpp @@ -29,11 +29,11 @@ #include #include "LadspaSubPluginFeatures.h" -#include "AudioDevice.h" -#include "AudioEngine.h" + #include "Engine.h" #include "Ladspa2LMMS.h" #include "LadspaBase.h" +#include "lmms_constants.h" namespace lmms { diff --git a/plugins/Lb302/Lb302.cpp b/plugins/Lb302/Lb302.cpp index ab910d134..d103c1bcd 100644 --- a/plugins/Lb302/Lb302.cpp +++ b/plugins/Lb302/Lb302.cpp @@ -34,6 +34,7 @@ #include "Lb302.h" #include "AutomatableButton.h" +#include "DspEffectLibrary.h" #include "Engine.h" #include "InstrumentPlayHandle.h" #include "InstrumentTrack.h" @@ -982,7 +983,7 @@ Lb302SynthView::Lb302SynthView( Instrument * _instrument, QWidget * _parent ) : tr( "Click here for bandlimited moog saw wave." ) ); - m_waveBtnGrp = new automatableButtonGroup( this ); + m_waveBtnGrp = new AutomatableButtonGroup( this ); m_waveBtnGrp->addButton( sawWaveBtn ); m_waveBtnGrp->addButton( triangleWaveBtn ); m_waveBtnGrp->addButton( sqrWaveBtn ); diff --git a/plugins/Lb302/Lb302.h b/plugins/Lb302/Lb302.h index f9129af66..2552a1621 100644 --- a/plugins/Lb302/Lb302.h +++ b/plugins/Lb302/Lb302.h @@ -32,7 +32,6 @@ #ifndef LB302_H #define LB302_H -#include "DspEffectLibrary.h" #include "Instrument.h" #include "InstrumentView.h" #include "NotePlayHandle.h" @@ -44,12 +43,15 @@ namespace lmms static const int NUM_FILTERS = 2; -class NotePlayHandle; +namespace DspEffectLibrary +{ +class Distortion; +} namespace gui { -class automatableButtonGroup; +class AutomatableButtonGroup; class Knob; class Lb302SynthView; class LedCheckBox; @@ -278,7 +280,7 @@ private: Knob * m_distKnob; Knob * m_slideDecKnob; - automatableButtonGroup * m_waveBtnGrp; + AutomatableButtonGroup * m_waveBtnGrp; LedCheckBox * m_slideToggle; /*LedCheckBox * m_accentToggle;*/ // removed pending accent implementation diff --git a/plugins/Lv2Effect/Lv2FxControls.cpp b/plugins/Lv2Effect/Lv2FxControls.cpp index 72c387ba7..a5153d6bb 100644 --- a/plugins/Lv2Effect/Lv2FxControls.cpp +++ b/plugins/Lv2Effect/Lv2FxControls.cpp @@ -24,7 +24,6 @@ #include "Lv2FxControls.h" -#include #include "Engine.h" #include "Lv2Effect.h" diff --git a/plugins/MidiExport/MidiExport.cpp b/plugins/MidiExport/MidiExport.cpp index b3b08a0e1..7e7e5d6a4 100644 --- a/plugins/MidiExport/MidiExport.cpp +++ b/plugins/MidiExport/MidiExport.cpp @@ -27,7 +27,6 @@ #include "MidiExport.h" -#include "Engine.h" #include "TrackContainer.h" #include "DataFile.h" #include "InstrumentTrack.h" diff --git a/plugins/MidiExport/MidiExport.h b/plugins/MidiExport/MidiExport.h index 7c77c7af2..1977dd4a8 100644 --- a/plugins/MidiExport/MidiExport.h +++ b/plugins/MidiExport/MidiExport.h @@ -26,7 +26,6 @@ #ifndef _MIDI_EXPORT_H #define _MIDI_EXPORT_H -#include #include "ExportFilter.h" #include "MidiFile.hpp" diff --git a/plugins/MidiImport/portsmf/allegro.cpp b/plugins/MidiImport/portsmf/allegro.cpp index 5f57839d5..80313db46 100644 --- a/plugins/MidiImport/portsmf/allegro.cpp +++ b/plugins/MidiImport/portsmf/allegro.cpp @@ -9,19 +9,15 @@ 04 apr 03 -- fixed bug in add_track that caused infinite loop */ -#include "assert.h" -#include "stdlib.h" -#include "stdio.h" -#include "string.h" -#include "memory.h" -#include +#include +#include +#include #include using namespace std; #include "allegro.h" #include "algrd_internal.h" #include "algsmfrd_internal.h" // #include "trace.h" -- only needed for debugging -#include "math.h" #define STREQL(x, y) (strcmp(x, y) == 0) #define MAX(x, y) ((x) > (y) ? (x) : (y)) diff --git a/plugins/MidiImport/portsmf/allegro.h b/plugins/MidiImport/portsmf/allegro.h index 6210652e2..67e922790 100644 --- a/plugins/MidiImport/portsmf/allegro.h +++ b/plugins/MidiImport/portsmf/allegro.h @@ -52,7 +52,6 @@ #include #include #include -#include #define ALG_EPS 0.000001 // epsilon #define ALG_DEFAULT_BPM 100.0 // default tempo diff --git a/plugins/MidiImport/portsmf/allegrord.cpp b/plugins/MidiImport/portsmf/allegrord.cpp index b0a1bfd67..2d9553d8a 100644 --- a/plugins/MidiImport/portsmf/allegrord.cpp +++ b/plugins/MidiImport/portsmf/allegrord.cpp @@ -2,7 +2,6 @@ #include "stdlib.h" #include "string.h" #include "ctype.h" -#include "trace.h" #include #include #include diff --git a/plugins/MidiImport/portsmf/allegrosmfrd.cpp b/plugins/MidiImport/portsmf/allegrosmfrd.cpp index 388f4c9c9..5df95e88a 100644 --- a/plugins/MidiImport/portsmf/allegrosmfrd.cpp +++ b/plugins/MidiImport/portsmf/allegrosmfrd.cpp @@ -1,15 +1,12 @@ // midifile reader -#include "stdlib.h" #include "stdio.h" #include "string.h" #include "assert.h" -#include #include #include "allegro.h" #include "algsmfrd_internal.h" #include "mfmidi.h" -#include "trace.h" using namespace std; diff --git a/plugins/MidiImport/portsmf/allegrosmfwr.cpp b/plugins/MidiImport/portsmf/allegrosmfwr.cpp index eadb4c3ae..0e27dd12c 100644 --- a/plugins/MidiImport/portsmf/allegrosmfwr.cpp +++ b/plugins/MidiImport/portsmf/allegrosmfwr.cpp @@ -2,10 +2,6 @@ #include #include -#include -#include -#include -#include #include using namespace std; #include "allegro.h" diff --git a/plugins/MidiImport/portsmf/allegrowr.cpp b/plugins/MidiImport/portsmf/allegrowr.cpp index fb39f31bc..3e7e98ca9 100644 --- a/plugins/MidiImport/portsmf/allegrowr.cpp +++ b/plugins/MidiImport/portsmf/allegrowr.cpp @@ -1,13 +1,9 @@ // allegrowr.cpp -- write sequence to an Allegro file (text) #include "assert.h" -#include "stdlib.h" -#include #include #include -#include #include -#include "memory.h" using namespace std; #include "strparse.h" #include "allegro.h" diff --git a/plugins/Monstro/Monstro.cpp b/plugins/Monstro/Monstro.cpp index 57d423bca..df6f4665f 100644 --- a/plugins/Monstro/Monstro.cpp +++ b/plugins/Monstro/Monstro.cpp @@ -24,7 +24,6 @@ #include "Monstro.h" -#include #include "ComboBox.h" #include "Engine.h" @@ -1503,7 +1502,7 @@ MonstroView::MonstroView( Instrument * _instrument, m_matViewButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "matview_inactive" ) ); m_matViewButton->setToolTip(tr("Matrix view")); - m_selectedViewGroup = new automatableButtonGroup( this ); + m_selectedViewGroup = new AutomatableButtonGroup( this ); m_selectedViewGroup -> addButton( m_opViewButton ); m_selectedViewGroup -> addButton( m_matViewButton ); @@ -1767,7 +1766,7 @@ QWidget * MonstroView::setupOperatorsView( QWidget * _parent ) m_pmButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "pm_inactive" ) ); m_pmButton->setToolTip(tr("Modulate phase of osc 3 by osc 2")); - m_o23ModGroup = new automatableButtonGroup( view ); + m_o23ModGroup = new AutomatableButtonGroup( view ); m_o23ModGroup-> addButton( m_mixButton ); m_o23ModGroup-> addButton( m_amButton ); m_o23ModGroup-> addButton( m_fmButton ); diff --git a/plugins/Monstro/Monstro.h b/plugins/Monstro/Monstro.h index a1ae72a38..9da2a7cd3 100644 --- a/plugins/Monstro/Monstro.h +++ b/plugins/Monstro/Monstro.h @@ -666,9 +666,9 @@ private: TempoSyncKnob * m_env2RelKnob; Knob * m_env2SlopeKnob; - automatableButtonGroup * m_o23ModGroup; + AutomatableButtonGroup * m_o23ModGroup; - automatableButtonGroup * m_selectedViewGroup; + AutomatableButtonGroup * m_selectedViewGroup; QWidget * m_operatorsView; QWidget * m_matrixView; diff --git a/plugins/Nes/Nes.cpp b/plugins/Nes/Nes.cpp index 9fbb46db1..b17e121f0 100644 --- a/plugins/Nes/Nes.cpp +++ b/plugins/Nes/Nes.cpp @@ -22,7 +22,6 @@ * */ -#include #include "Nes.h" @@ -767,7 +766,7 @@ NesInstrumentView::NesInstrumentView( Instrument * instrument, QWidget * parent dcx += 13; makedcled( ch1_dc4, dcx, 42, tr( "75% Duty cycle" ), "nesdc4_on" ) - m_ch1DutyCycleGrp = new automatableButtonGroup( this ); + m_ch1DutyCycleGrp = new AutomatableButtonGroup( this ); m_ch1DutyCycleGrp -> addButton( ch1_dc1 ); m_ch1DutyCycleGrp -> addButton( ch1_dc2 ); m_ch1DutyCycleGrp -> addButton( ch1_dc3 ); @@ -798,7 +797,7 @@ NesInstrumentView::NesInstrumentView( Instrument * instrument, QWidget * parent dcx += 13; makedcled( ch2_dc4, dcx, 99, tr( "75% Duty cycle" ), "nesdc4_on" ) - m_ch2DutyCycleGrp = new automatableButtonGroup( this ); + m_ch2DutyCycleGrp = new AutomatableButtonGroup( this ); m_ch2DutyCycleGrp -> addButton( ch2_dc1 ); m_ch2DutyCycleGrp -> addButton( ch2_dc2 ); m_ch2DutyCycleGrp -> addButton( ch2_dc3 ); diff --git a/plugins/Nes/Nes.h b/plugins/Nes/Nes.h index ca084032a..3345d3508 100644 --- a/plugins/Nes/Nes.h +++ b/plugins/Nes/Nes.h @@ -25,7 +25,6 @@ #ifndef NES_H #define NES_H -#include #include "Instrument.h" #include "InstrumentView.h" @@ -84,7 +83,7 @@ class NesInstrument; namespace gui { -class Knob; +class Knob; // IWYU pragma: keep class NesInstrumentView; } // namespace gui @@ -318,7 +317,7 @@ private: PixmapButton * m_ch1EnvLoopedBtn; Knob * m_ch1EnvLenKnob; - automatableButtonGroup * m_ch1DutyCycleGrp; + AutomatableButtonGroup * m_ch1DutyCycleGrp; PixmapButton * m_ch1SweepEnabledBtn; Knob * m_ch1SweepAmtKnob; @@ -333,7 +332,7 @@ private: PixmapButton * m_ch2EnvLoopedBtn; Knob * m_ch2EnvLenKnob; - automatableButtonGroup * m_ch2DutyCycleGrp; + AutomatableButtonGroup * m_ch2DutyCycleGrp; PixmapButton * m_ch2SweepEnabledBtn; Knob * m_ch2SweepAmtKnob; diff --git a/plugins/OpulenZ/OpulenZ.cpp b/plugins/OpulenZ/OpulenZ.cpp index f5c0e1a8d..eaefa8d84 100644 --- a/plugins/OpulenZ/OpulenZ.cpp +++ b/plugins/OpulenZ/OpulenZ.cpp @@ -711,7 +711,7 @@ OpulenzInstrumentView::OpulenzInstrumentView( Instrument * _instrument, BUTTON_GEN(op1_vib_btn, "Vibrato", 93, 87); KNOB_GEN(feedback_kn, "Feedback", "", 128, 48); - op1_waveform = new automatableButtonGroup( this ); + op1_waveform = new AutomatableButtonGroup( this ); WAVEBUTTON_GEN(op1_w0_btn,"Sine", 154, 86, "wave1_on", "wave1_off", op1_waveform); WAVEBUTTON_GEN(op1_w1_btn,"Half sine", 178, 86, "wave2_on", "wave2_off", op1_waveform); WAVEBUTTON_GEN(op1_w2_btn,"Absolute sine", 199, 86, "wave3_on", "wave3_off", op1_waveform); @@ -731,7 +731,7 @@ OpulenzInstrumentView::OpulenzInstrumentView( Instrument * _instrument, BUTTON_GEN(op2_trem_btn, "Tremolo", 65, 177); BUTTON_GEN(op2_vib_btn, "Vibrato", 93, 177); - op2_waveform = new automatableButtonGroup( this ); + op2_waveform = new AutomatableButtonGroup( this ); WAVEBUTTON_GEN(op2_w0_btn,"Sine", 154, 176, "wave1_on", "wave1_off", op2_waveform); WAVEBUTTON_GEN(op2_w1_btn,"Half sine", 178, 176, "wave2_on", "wave2_off", op2_waveform); WAVEBUTTON_GEN(op2_w2_btn,"Absolute sine", 199, 176, "wave3_on", "wave3_off", op2_waveform); diff --git a/plugins/OpulenZ/OpulenZ.h b/plugins/OpulenZ/OpulenZ.h index bd51c9cf5..42cf1299c 100644 --- a/plugins/OpulenZ/OpulenZ.h +++ b/plugins/OpulenZ/OpulenZ.h @@ -25,7 +25,6 @@ #ifndef OPULENZ_H #define OPULENZ_H -#include #include "AutomatableModel.h" #include "Instrument.h" @@ -42,7 +41,7 @@ namespace gui class Knob; class LcdSpinBox; class PixmapButton; -class automatableButtonGroup; +class AutomatableButtonGroup; } @@ -178,7 +177,7 @@ public: PixmapButton *op1_w1_btn; PixmapButton *op1_w2_btn; PixmapButton *op1_w3_btn; - automatableButtonGroup *op1_waveform; + AutomatableButtonGroup *op1_waveform; Knob *op2_a_kn; @@ -196,7 +195,7 @@ public: PixmapButton *op2_w1_btn; PixmapButton *op2_w2_btn; PixmapButton *op2_w3_btn; - automatableButtonGroup *op2_waveform; + AutomatableButtonGroup *op2_waveform; PixmapButton *fm_btn; diff --git a/plugins/Organic/Organic.h b/plugins/Organic/Organic.h index 5a066af43..60d41601b 100644 --- a/plugins/Organic/Organic.h +++ b/plugins/Organic/Organic.h @@ -31,13 +31,12 @@ #include "InstrumentView.h" #include "AutomatableModel.h" -class QPixmap; namespace lmms { -class NotePlayHandle; +class NotePlayHandle; // IWYU pragma: keep class Oscillator; namespace gui diff --git a/plugins/Patman/Patman.h b/plugins/Patman/Patman.h index a77c2607f..562f2adf3 100644 --- a/plugins/Patman/Patman.h +++ b/plugins/Patman/Patman.h @@ -29,7 +29,6 @@ #include "Instrument.h" #include "InstrumentView.h" #include "Sample.h" -#include "SampleBuffer.h" #include "AutomatableModel.h" namespace lmms diff --git a/plugins/ReverbSC/ReverbSC.cpp b/plugins/ReverbSC/ReverbSC.cpp index 4eae13129..b2acaf4b8 100644 --- a/plugins/ReverbSC/ReverbSC.cpp +++ b/plugins/ReverbSC/ReverbSC.cpp @@ -20,7 +20,6 @@ * */ -#include #include "ReverbSC.h" #include "embed.h" diff --git a/plugins/ReverbSC/ReverbSCControls.cpp b/plugins/ReverbSC/ReverbSCControls.cpp index 4784d416d..7d0bb9521 100644 --- a/plugins/ReverbSC/ReverbSCControls.cpp +++ b/plugins/ReverbSC/ReverbSCControls.cpp @@ -23,7 +23,6 @@ */ -#include #include "ReverbSCControls.h" #include "ReverbSC.h" diff --git a/plugins/Sf2Player/Sf2Player.h b/plugins/Sf2Player/Sf2Player.h index b63dd48e9..16d6aa068 100644 --- a/plugins/Sf2Player/Sf2Player.h +++ b/plugins/Sf2Player/Sf2Player.h @@ -42,7 +42,6 @@ namespace lmms { -class Sf2Font; struct Sf2PluginData; class NotePlayHandle; diff --git a/plugins/Sfxr/Sfxr.cpp b/plugins/Sfxr/Sfxr.cpp index b941d8f0a..5603b7138 100644 --- a/plugins/Sfxr/Sfxr.cpp +++ b/plugins/Sfxr/Sfxr.cpp @@ -662,7 +662,7 @@ SfxrInstrumentView::SfxrInstrumentView( Instrument * _instrument, createButtonLocalGraphic(m_sinWaveBtn, KNOBS_BASE_X+WAVEFORM_BUTTON_WIDTH*2, WAVEFORM_BASE_Y, "Sine Wave", "sfxr_sin_wave"); createButtonLocalGraphic(m_noiseWaveBtn, KNOBS_BASE_X+WAVEFORM_BUTTON_WIDTH*3, WAVEFORM_BASE_Y, "Noise", "sfxr_white_noise_wave"); - m_waveBtnGroup = new automatableButtonGroup( this ); + m_waveBtnGroup = new AutomatableButtonGroup( this ); m_waveBtnGroup->addButton(m_sqrWaveBtn); m_waveBtnGroup->addButton(m_sawWaveBtn); m_waveBtnGroup->addButton(m_sinWaveBtn); diff --git a/plugins/Sfxr/Sfxr.h b/plugins/Sfxr/Sfxr.h index c245ca64c..a3ad518f1 100644 --- a/plugins/Sfxr/Sfxr.h +++ b/plugins/Sfxr/Sfxr.h @@ -69,7 +69,7 @@ class SfxrInstrument; namespace gui { -class automatableButtonGroup; +class AutomatableButtonGroup; class Knob; class PixmapButton; class SfxrInstrumentView; @@ -288,7 +288,7 @@ private: Knob * m_hpFilCutKnob; //HP Filter Cutoff Knob * m_hpFilCutSweepKnob; //HP Filter Cutoff Sweep - automatableButtonGroup * m_waveBtnGroup; + AutomatableButtonGroup * m_waveBtnGroup; PixmapButton * m_sqrWaveBtn; //NOTE: This button has Square Duty //and Square Speed configurable PixmapButton * m_sawWaveBtn; diff --git a/plugins/Sid/SidInstrument.cpp b/plugins/Sid/SidInstrument.cpp index fbb68b4e4..64bf0a091 100644 --- a/plugins/Sid/SidInstrument.cpp +++ b/plugins/Sid/SidInstrument.cpp @@ -24,7 +24,6 @@ */ -#include #include #include @@ -511,7 +510,7 @@ SidInstrumentView::SidInstrumentView( Instrument * _instrument, lp_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "lp" ) ); lp_btn->setToolTip(tr("Low-pass filter ")); - m_passBtnGrp = new automatableButtonGroup( this ); + m_passBtnGrp = new AutomatableButtonGroup( this ); m_passBtnGrp->addButton( hp_btn ); m_passBtnGrp->addButton( bp_btn ); m_passBtnGrp->addButton( lp_btn ); @@ -535,7 +534,7 @@ SidInstrumentView::SidInstrumentView( Instrument * _instrument, mos8580_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "8580" ) ); mos8580_btn->setToolTip(tr("MOS8580 SID ")); - m_sidTypeBtnGrp = new automatableButtonGroup( this ); + m_sidTypeBtnGrp = new AutomatableButtonGroup( this ); m_sidTypeBtnGrp->addButton( mos6581_btn ); m_sidTypeBtnGrp->addButton( mos8580_btn ); @@ -597,7 +596,7 @@ SidInstrumentView::SidInstrumentView( Instrument * _instrument, PLUGIN_NAME::getIconPixmap( "noise" ) ); noise_btn->setToolTip(tr("Noise")); - auto wfbg = new automatableButtonGroup(this); + auto wfbg = new AutomatableButtonGroup(this); wfbg->addButton( pulse_btn ); wfbg->addButton( triangle_btn ); diff --git a/plugins/Sid/SidInstrument.h b/plugins/Sid/SidInstrument.h index 79ad7f32a..84762af04 100644 --- a/plugins/Sid/SidInstrument.h +++ b/plugins/Sid/SidInstrument.h @@ -35,12 +35,12 @@ namespace lmms { -class NotePlayHandle; +class NotePlayHandle; // IWYU pragma: keep namespace gui { class Knob; -class automatableButtonGroup; +class AutomatableButtonGroup; class SidInstrumentView; class PixmapButton; } @@ -154,8 +154,8 @@ public: private: void modelChanged() override; - automatableButtonGroup * m_passBtnGrp; - automatableButtonGroup * m_sidTypeBtnGrp; + AutomatableButtonGroup * m_passBtnGrp; + AutomatableButtonGroup * m_sidTypeBtnGrp; struct voiceKnobs { @@ -165,7 +165,7 @@ private: Knob * r, Knob * pw, Knob * crs, - automatableButtonGroup * wfbg, + AutomatableButtonGroup * wfbg, PixmapButton * syncb, PixmapButton * ringb, PixmapButton * filterb, @@ -190,7 +190,7 @@ private: Knob * m_relKnob; Knob * m_pwKnob; Knob * m_crsKnob; - automatableButtonGroup * m_waveFormBtnGrp; + AutomatableButtonGroup * m_waveFormBtnGrp; PixmapButton * m_syncButton; PixmapButton * m_ringModButton; PixmapButton * m_filterButton; diff --git a/plugins/SlicerT/SlicerT.cpp b/plugins/SlicerT/SlicerT.cpp index ef533cd1a..cbc543fa6 100644 --- a/plugins/SlicerT/SlicerT.cpp +++ b/plugins/SlicerT/SlicerT.cpp @@ -32,6 +32,7 @@ #include "InstrumentTrack.h" #include "PathUtil.h" #include "SampleLoader.h" +#include "SlicerTView.h" #include "Song.h" #include "embed.h" #include "interpolation.h" diff --git a/plugins/SlicerT/SlicerT.h b/plugins/SlicerT/SlicerT.h index 6021f44a3..f8bc64fb2 100644 --- a/plugins/SlicerT/SlicerT.h +++ b/plugins/SlicerT/SlicerT.h @@ -25,21 +25,22 @@ #ifndef LMMS_SLICERT_H #define LMMS_SLICERT_H -#include -#include #include #include "AutomatableModel.h" +#include "ComboBoxModel.h" #include "Instrument.h" -#include "InstrumentView.h" #include "Note.h" #include "Sample.h" -#include "SampleBuffer.h" -#include "SlicerTView.h" -#include "LmmsTypes.h" namespace lmms { +class InstrumentTrack; +namespace gui { +class SlicerTView; +class SlicerTWaveform; +} + class PlaybackState { public: diff --git a/plugins/SlicerT/SlicerTView.cpp b/plugins/SlicerT/SlicerTView.cpp index 1fc3effe7..83e7ac6ef 100644 --- a/plugins/SlicerT/SlicerTView.cpp +++ b/plugins/SlicerT/SlicerTView.cpp @@ -25,16 +25,19 @@ #include "SlicerTView.h" #include -#include -#include +#include +#include #include "Clipboard.h" +#include "ComboBox.h" #include "DataFile.h" -#include "InstrumentTrack.h" #include "InstrumentView.h" +#include "Knob.h" +#include "LcdSpinBox.h" #include "PixmapButton.h" #include "SampleLoader.h" #include "SlicerT.h" +#include "SlicerTWaveform.h" #include "StringPairDrag.h" #include "Track.h" #include "embed.h" diff --git a/plugins/SlicerT/SlicerTView.h b/plugins/SlicerT/SlicerTView.h index c4d0da959..38fca4ee8 100644 --- a/plugins/SlicerT/SlicerTView.h +++ b/plugins/SlicerT/SlicerTView.h @@ -25,16 +25,10 @@ #ifndef LMMS_GUI_SLICERT_VIEW_H #define LMMS_GUI_SLICERT_VIEW_H -#include -#include -#include "ComboBox.h" #include "InstrumentView.h" -#include "Knob.h" -#include "LcdSpinBox.h" -#include "LedCheckBox.h" -#include "PixmapButton.h" -#include "SlicerTWaveform.h" + +class QPushButton; namespace lmms { @@ -42,6 +36,12 @@ class SlicerT; namespace gui { +class ComboBox; +class Knob; +class LcdSpinBox; +class PixmapButton; +class SlicerTWaveform; + class SlicerTView : public InstrumentView { Q_OBJECT diff --git a/plugins/SlicerT/SlicerTWaveform.cpp b/plugins/SlicerT/SlicerTWaveform.cpp index 37f55572f..899aabf5b 100644 --- a/plugins/SlicerT/SlicerTWaveform.cpp +++ b/plugins/SlicerT/SlicerTWaveform.cpp @@ -25,7 +25,9 @@ #include "SlicerTWaveform.h" #include -#include +#include +#include +#include #include "SampleThumbnail.h" #include "SlicerT.h" diff --git a/plugins/SlicerT/SlicerTWaveform.h b/plugins/SlicerT/SlicerTWaveform.h index 029b69320..4e5d5f85c 100644 --- a/plugins/SlicerT/SlicerTWaveform.h +++ b/plugins/SlicerT/SlicerTWaveform.h @@ -25,12 +25,8 @@ #ifndef LMMS_GUI_SLICERT_WAVEFORM_H #define LMMS_GUI_SLICERT_WAVEFORM_H -#include #include -#include -#include -#include -#include +#include #include "SampleThumbnail.h" diff --git a/plugins/SpectrumAnalyzer/SaControls.cpp b/plugins/SpectrumAnalyzer/SaControls.cpp index d14176ed3..7cedd1081 100644 --- a/plugins/SpectrumAnalyzer/SaControls.cpp +++ b/plugins/SpectrumAnalyzer/SaControls.cpp @@ -24,9 +24,9 @@ #include "SaControls.h" -#include #include "Analyzer.h" +#include "fft_helpers.h" #include "SaControlsDialog.h" namespace lmms diff --git a/plugins/SpectrumAnalyzer/SaControlsDialog.cpp b/plugins/SpectrumAnalyzer/SaControlsDialog.cpp index 9645f7b83..bb9055edf 100644 --- a/plugins/SpectrumAnalyzer/SaControlsDialog.cpp +++ b/plugins/SpectrumAnalyzer/SaControlsDialog.cpp @@ -26,6 +26,7 @@ #include #include +#include #include #include #include diff --git a/plugins/SpectrumAnalyzer/SaControlsDialog.h b/plugins/SpectrumAnalyzer/SaControlsDialog.h index 83e12c1bf..f8d67f1e8 100644 --- a/plugins/SpectrumAnalyzer/SaControlsDialog.h +++ b/plugins/SpectrumAnalyzer/SaControlsDialog.h @@ -26,7 +26,6 @@ #define SACONTROLSDIALOG_H #include "EffectControlDialog.h" -#include "fft_helpers.h" namespace lmms { diff --git a/plugins/SpectrumAnalyzer/SaProcessor.h b/plugins/SpectrumAnalyzer/SaProcessor.h index 12163f63b..3bd579aeb 100644 --- a/plugins/SpectrumAnalyzer/SaProcessor.h +++ b/plugins/SpectrumAnalyzer/SaProcessor.h @@ -33,7 +33,6 @@ #include #include -#include "LmmsTypes.h" namespace lmms diff --git a/plugins/SpectrumAnalyzer/SaSpectrumView.cpp b/plugins/SpectrumAnalyzer/SaSpectrumView.cpp index e8d4ff8e0..dd97d3d87 100644 --- a/plugins/SpectrumAnalyzer/SaSpectrumView.cpp +++ b/plugins/SpectrumAnalyzer/SaSpectrumView.cpp @@ -26,11 +26,11 @@ #include "SaSpectrumView.h" -#include #include #include #include #include +#include #include #include "fft_helpers.h" diff --git a/plugins/SpectrumAnalyzer/SaSpectrumView.h b/plugins/SpectrumAnalyzer/SaSpectrumView.h index e9bb47b1d..444404165 100644 --- a/plugins/SpectrumAnalyzer/SaSpectrumView.h +++ b/plugins/SpectrumAnalyzer/SaSpectrumView.h @@ -34,8 +34,6 @@ #include #include -class QMouseEvent; -class QPainter; namespace lmms { diff --git a/plugins/SpectrumAnalyzer/SaWaterfallView.h b/plugins/SpectrumAnalyzer/SaWaterfallView.h index 5de00d7ad..cce533519 100644 --- a/plugins/SpectrumAnalyzer/SaWaterfallView.h +++ b/plugins/SpectrumAnalyzer/SaWaterfallView.h @@ -29,7 +29,6 @@ #include -class QMouseEvent; namespace lmms { diff --git a/plugins/StereoEnhancer/StereoEnhancerControls.cpp b/plugins/StereoEnhancer/StereoEnhancerControls.cpp index 3cad94f91..2efd31314 100644 --- a/plugins/StereoEnhancer/StereoEnhancerControls.cpp +++ b/plugins/StereoEnhancer/StereoEnhancerControls.cpp @@ -23,7 +23,6 @@ */ -#include #include "StereoEnhancerControls.h" #include "StereoEnhancer.h" diff --git a/plugins/StereoMatrix/StereoMatrixControls.cpp b/plugins/StereoMatrix/StereoMatrixControls.cpp index e60b02a8d..144c0397c 100644 --- a/plugins/StereoMatrix/StereoMatrixControls.cpp +++ b/plugins/StereoMatrix/StereoMatrixControls.cpp @@ -23,7 +23,6 @@ */ -#include #include "StereoMatrixControls.h" #include "StereoMatrix.h" diff --git a/plugins/TapTempo/TapTempo.cpp b/plugins/TapTempo/TapTempo.cpp index aad8d99b9..9ea5bcc5c 100644 --- a/plugins/TapTempo/TapTempo.cpp +++ b/plugins/TapTempo/TapTempo.cpp @@ -26,20 +26,8 @@ #include "TapTempo.h" -#include -#include -#include -#include -#include -#include -#include #include -#include "AudioEngine.h" -#include "Engine.h" -#include "LedCheckBox.h" -#include "SamplePlayHandle.h" -#include "Song.h" #include "embed.h" #include "plugin_export.h" diff --git a/plugins/TapTempo/TapTempoView.cpp b/plugins/TapTempo/TapTempoView.cpp index ed451eaa5..182218cdd 100644 --- a/plugins/TapTempo/TapTempoView.cpp +++ b/plugins/TapTempo/TapTempoView.cpp @@ -31,7 +31,6 @@ #include #include #include -#include #include #include "Engine.h" diff --git a/plugins/TapTempo/TapTempoView.h b/plugins/TapTempo/TapTempoView.h index a2a522d3f..0f5cbb228 100644 --- a/plugins/TapTempo/TapTempoView.h +++ b/plugins/TapTempo/TapTempoView.h @@ -29,13 +29,8 @@ #include "ToolPluginView.h" -class QVBoxLayout; -class QHBoxLayout; class QPushButton; class QLabel; -class QCloseEvent; -class QKeyEvent; -class QCheckBox; namespace lmms { class TapTempo; diff --git a/plugins/TripleOscillator/TripleOscillator.cpp b/plugins/TripleOscillator/TripleOscillator.cpp index 55ad80082..a2d4ca199 100644 --- a/plugins/TripleOscillator/TripleOscillator.cpp +++ b/plugins/TripleOscillator/TripleOscillator.cpp @@ -490,7 +490,7 @@ TripleOscillatorView::TripleOscillatorView( Instrument * _instrument, "fm_inactive" ) ); fm_osc1_btn->setToolTip(tr("Modulate frequency of oscillator 1 by oscillator 2")); - m_mod1BtnGrp = new automatableButtonGroup( this ); + m_mod1BtnGrp = new AutomatableButtonGroup( this ); m_mod1BtnGrp->addButton( pm_osc1_btn ); m_mod1BtnGrp->addButton( am_osc1_btn ); m_mod1BtnGrp->addButton( mix_osc1_btn ); @@ -537,7 +537,7 @@ TripleOscillatorView::TripleOscillatorView( Instrument * _instrument, "fm_inactive" ) ); fm_osc2_btn->setToolTip(tr("Modulate frequency of oscillator 2 by oscillator 3")); - m_mod2BtnGrp = new automatableButtonGroup( this ); + m_mod2BtnGrp = new AutomatableButtonGroup( this ); m_mod2BtnGrp->addButton( pm_osc2_btn ); m_mod2BtnGrp->addButton( am_osc2_btn ); @@ -679,7 +679,7 @@ TripleOscillatorView::TripleOscillatorView( Instrument * _instrument, uwt->setCheckable(true); uwt->setToolTip(tr("Use alias-free wavetable oscillators.")); - auto wsbg = new automatableButtonGroup(this); + auto wsbg = new AutomatableButtonGroup(this); wsbg->addButton( sin_wave_btn ); wsbg->addButton( triangle_wave_btn ); diff --git a/plugins/TripleOscillator/TripleOscillator.h b/plugins/TripleOscillator/TripleOscillator.h index fd6fc85ee..e465d2a55 100644 --- a/plugins/TripleOscillator/TripleOscillator.h +++ b/plugins/TripleOscillator/TripleOscillator.h @@ -38,14 +38,13 @@ namespace lmms { -class NotePlayHandle; -class SampleBuffer; +class NotePlayHandle; // IWYU pragma: keep class Oscillator; namespace gui { -class automatableButtonGroup; +class AutomatableButtonGroup; class Knob; class PixmapButton; class TripleOscillatorView; @@ -163,8 +162,8 @@ public: private: void modelChanged() override; - automatableButtonGroup * m_mod1BtnGrp; - automatableButtonGroup * m_mod2BtnGrp; + AutomatableButtonGroup * m_mod1BtnGrp; + AutomatableButtonGroup * m_mod2BtnGrp; struct OscillatorKnobs { @@ -176,7 +175,7 @@ private: Knob * po, Knob * spd, PixmapButton * uwb, - automatableButtonGroup * wsbg, + AutomatableButtonGroup * wsbg, PixmapButton * wt) : m_volKnob( v ), m_panKnob( p ), @@ -199,7 +198,7 @@ private: Knob * m_phaseOffsetKnob; Knob * m_stereoPhaseDetuningKnob; PixmapButton * m_userWaveButton; - automatableButtonGroup * m_waveShapeBtnGrp; + AutomatableButtonGroup * m_waveShapeBtnGrp; PixmapButton * m_multiBandWaveTableButton; } ; diff --git a/plugins/Vectorscope/VecControls.cpp b/plugins/Vectorscope/VecControls.cpp index 19158865d..500b71105 100644 --- a/plugins/Vectorscope/VecControls.cpp +++ b/plugins/Vectorscope/VecControls.cpp @@ -24,7 +24,6 @@ #include "VecControls.h" -#include #include "VecControlsDialog.h" #include "Vectorscope.h" diff --git a/plugins/Vectorscope/VecControls.h b/plugins/Vectorscope/VecControls.h index 2bdb3b157..b90d1129a 100644 --- a/plugins/Vectorscope/VecControls.h +++ b/plugins/Vectorscope/VecControls.h @@ -25,7 +25,6 @@ #ifndef VECCONTROLS_H #define VECCONTROLS_H -#include #include "EffectControls.h" @@ -38,7 +37,6 @@ class Vectorscope; namespace gui { class VecControlsDialog; -class VectorView; } // Holds all the configuration values diff --git a/plugins/Vectorscope/VecControlsDialog.cpp b/plugins/Vectorscope/VecControlsDialog.cpp index 16cf7f8bd..98eaf118c 100644 --- a/plugins/Vectorscope/VecControlsDialog.cpp +++ b/plugins/Vectorscope/VecControlsDialog.cpp @@ -28,7 +28,6 @@ #include #include -#include "Knob.h" #include "LedCheckBox.h" #include "VecControls.h" #include "Vectorscope.h" diff --git a/plugins/Vectorscope/VectorView.cpp b/plugins/Vectorscope/VectorView.cpp index e10d6845e..83a32084b 100644 --- a/plugins/Vectorscope/VectorView.cpp +++ b/plugins/Vectorscope/VectorView.cpp @@ -27,7 +27,6 @@ #include #include -#include #include #include "ColorChooser.h" diff --git a/plugins/Vestige/Vestige.h b/plugins/Vestige/Vestige.h index 6a308ad2c..95d942755 100644 --- a/plugins/Vestige/Vestige.h +++ b/plugins/Vestige/Vestige.h @@ -27,17 +27,16 @@ #define _VESTIGE_H -#include #include #include "Instrument.h" #include "InstrumentView.h" -class QPixmap; +class QGridLayout; +class QMdiSubWindow; class QPushButton; class QScrollArea; -class QGridLayout; namespace lmms { diff --git a/plugins/Vibed/NineButtonSelector.cpp b/plugins/Vibed/NineButtonSelector.cpp index 38c890d80..59f5ca9ed 100644 --- a/plugins/Vibed/NineButtonSelector.cpp +++ b/plugins/Vibed/NineButtonSelector.cpp @@ -26,12 +26,13 @@ #include "NineButtonSelector.h" #include "CaptionMenu.h" +#include "PixmapButton.h" namespace lmms::gui { -NineButtonSelector::NineButtonSelector(std::array onOffIcons, int defaultButton, int x, int y, QWidget* parent) : +NineButtonSelector::NineButtonSelector(const std::array& onOffIcons, int defaultButton, int x, int y, QWidget* parent) : QWidget{parent}, IntModelView{new NineButtonSelectorModel{defaultButton, 0, 8, nullptr, QString{}, true}, this} { @@ -40,17 +41,17 @@ NineButtonSelector::NineButtonSelector(std::array onOffIcons, int d for (int i = 0; i < 9; ++i) { - m_buttons[i] = std::make_unique(this, nullptr); + m_buttons[i] = new PixmapButton(this); const int buttonX = 1 + (i % 3) * 17; const int buttonY = 1 + (i / 3) * 17; m_buttons[i]->move(buttonX, buttonY); m_buttons[i]->setActiveGraphic(onOffIcons[i * 2]); m_buttons[i]->setInactiveGraphic(onOffIcons[(i * 2) + 1]); m_buttons[i]->setChecked(false); - connect(m_buttons[i].get(), &PixmapButton::clicked, this, [=, this](){ buttonClicked(i); }); + connect(m_buttons[i], &PixmapButton::clicked, this, [=, this](){ buttonClicked(i); }); } - m_lastBtn = m_buttons[defaultButton].get(); + m_lastBtn = m_buttons[defaultButton]; m_lastBtn->setChecked(true); } @@ -75,7 +76,7 @@ void NineButtonSelector::updateButton(int newButton) m_lastBtn->setChecked(false); m_lastBtn->update(); - m_lastBtn = m_buttons[newButton].get(); + m_lastBtn = m_buttons[newButton]; m_lastBtn->setChecked(true); m_lastBtn->update(); diff --git a/plugins/Vibed/NineButtonSelector.h b/plugins/Vibed/NineButtonSelector.h index 78ae7c3d1..f3950a047 100644 --- a/plugins/Vibed/NineButtonSelector.h +++ b/plugins/Vibed/NineButtonSelector.h @@ -27,11 +27,9 @@ #define LMMS_GUI_NINE_BUTTON_SELECTOR_H #include -#include #include #include "AutomatableModelView.h" -#include "PixmapButton.h" namespace lmms { @@ -40,12 +38,14 @@ namespace lmms namespace gui { +class PixmapButton; + class NineButtonSelector : public QWidget, public IntModelView { Q_OBJECT public: - NineButtonSelector(std::array onOffIcons, int defaultButton, int x, int y, QWidget* parent); + NineButtonSelector(const std::array& onOffIcons, int defaultButton, int x, int y, QWidget* parent); ~NineButtonSelector() override = default; protected: @@ -62,7 +62,7 @@ private: void modelChanged() override; void updateButton(int); - std::array, 9> m_buttons; + std::array m_buttons; PixmapButton* m_lastBtn; }; diff --git a/plugins/Vibed/Vibed.h b/plugins/Vibed/Vibed.h index f02f810de..e3929925f 100644 --- a/plugins/Vibed/Vibed.h +++ b/plugins/Vibed/Vibed.h @@ -40,13 +40,10 @@ namespace lmms { -class NotePlayHandle; -class graphModel; +class NotePlayHandle; // IWYU pragma: keep namespace gui { -class Graph; -class LedCheckBox; class VibedView; } diff --git a/plugins/VstBase/RemoteVstPlugin.cpp b/plugins/VstBase/RemoteVstPlugin.cpp index 9fa64f2ba..0645cb5de 100644 --- a/plugins/VstBase/RemoteVstPlugin.cpp +++ b/plugins/VstBase/RemoteVstPlugin.cpp @@ -92,6 +92,7 @@ #include #include #include +#include #include diff --git a/plugins/VstEffect/VstEffectControlDialog.h b/plugins/VstEffect/VstEffectControlDialog.h index 1fb538ca5..9d19dad1b 100644 --- a/plugins/VstEffect/VstEffectControlDialog.h +++ b/plugins/VstEffect/VstEffectControlDialog.h @@ -29,7 +29,6 @@ #include -class QPixmap; class QPushButton; class QLabel; diff --git a/plugins/VstEffect/VstSubPluginFeatures.cpp b/plugins/VstEffect/VstSubPluginFeatures.cpp index 7eab7a9bf..b30adf95e 100644 --- a/plugins/VstEffect/VstSubPluginFeatures.cpp +++ b/plugins/VstEffect/VstSubPluginFeatures.cpp @@ -29,6 +29,7 @@ #include "VstSubPluginFeatures.h" #include "ConfigManager.h" +#include "Effect.h" namespace lmms { diff --git a/plugins/VstEffect/VstSubPluginFeatures.h b/plugins/VstEffect/VstSubPluginFeatures.h index a5673dfb7..f6b4d7141 100644 --- a/plugins/VstEffect/VstSubPluginFeatures.h +++ b/plugins/VstEffect/VstSubPluginFeatures.h @@ -28,7 +28,6 @@ #define _VST_SUBPLUGIN_FEATURES_H -#include "Effect.h" #include "Plugin.h" namespace lmms diff --git a/plugins/Watsyn/Watsyn.cpp b/plugins/Watsyn/Watsyn.cpp index 272ba5d46..f58677d27 100644 --- a/plugins/Watsyn/Watsyn.cpp +++ b/plugins/Watsyn/Watsyn.cpp @@ -754,7 +754,7 @@ WatsynView::WatsynView( Instrument * _instrument, b2_selectButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "b2_inactive" ) ); b2_selectButton->setToolTip(tr("Select oscillator B2")); - m_selectedGraphGroup = new automatableButtonGroup( this ); + m_selectedGraphGroup = new AutomatableButtonGroup( this ); m_selectedGraphGroup -> addButton( a1_selectButton ); m_selectedGraphGroup -> addButton( a2_selectButton ); m_selectedGraphGroup -> addButton( b1_selectButton ); @@ -787,7 +787,7 @@ WatsynView::WatsynView( Instrument * _instrument, amod_pmButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "apm_inactive" ) ); amod_pmButton->setToolTip(tr("Modulate phase of A1 by output of A2")); - m_aModGroup = new automatableButtonGroup( this ); + m_aModGroup = new AutomatableButtonGroup( this ); m_aModGroup -> addButton( amod_mixButton ); m_aModGroup -> addButton( amod_amButton ); m_aModGroup -> addButton( amod_rmButton ); @@ -818,7 +818,7 @@ WatsynView::WatsynView( Instrument * _instrument, bmod_pmButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "bpm_inactive" ) ); bmod_pmButton->setToolTip(tr("Modulate phase of B1 by output of B2")); - m_bModGroup = new automatableButtonGroup( this ); + m_bModGroup = new AutomatableButtonGroup( this ); m_bModGroup -> addButton( bmod_mixButton ); m_bModGroup -> addButton( bmod_amButton ); m_bModGroup -> addButton( bmod_rmButton ); diff --git a/plugins/Watsyn/Watsyn.h b/plugins/Watsyn/Watsyn.h index aebc74645..a8e266d21 100644 --- a/plugins/Watsyn/Watsyn.h +++ b/plugins/Watsyn/Watsyn.h @@ -80,7 +80,7 @@ class WatsynInstrument; namespace gui { -class automatableButtonGroup; +class AutomatableButtonGroup; class PixmapButton; class WatsynView; } @@ -364,9 +364,9 @@ private: Knob * m_xtalkKnob; - automatableButtonGroup * m_selectedGraphGroup; - automatableButtonGroup * m_aModGroup; - automatableButtonGroup * m_bModGroup; + AutomatableButtonGroup * m_selectedGraphGroup; + AutomatableButtonGroup * m_aModGroup; + AutomatableButtonGroup * m_bModGroup; Graph * a1_graph; Graph * a2_graph; diff --git a/plugins/Xpressive/ExprSynth.h b/plugins/Xpressive/ExprSynth.h index 3348ed9f4..21ae0d4e5 100644 --- a/plugins/Xpressive/ExprSynth.h +++ b/plugins/Xpressive/ExprSynth.h @@ -28,7 +28,6 @@ #include #include #include -#include "AutomatableModel.h" #include "Graph.h" namespace lmms @@ -36,17 +35,10 @@ namespace lmms class ExprFrontData; +class FloatModel; class NotePlayHandle; class SampleFrame; -namespace gui -{ -class automatableButtonGroup; -class Knob; -class LedCheckBox; -class PixmapButton; -} - class ExprFront { diff --git a/plugins/Xpressive/Xpressive.cpp b/plugins/Xpressive/Xpressive.cpp index 37dcb16fa..9cefe4ac8 100644 --- a/plugins/Xpressive/Xpressive.cpp +++ b/plugins/Xpressive/Xpressive.cpp @@ -370,7 +370,7 @@ XpressiveView::XpressiveView(Instrument * _instrument, QWidget * _parent) : m_helpBtn->setInactiveGraphic(PLUGIN_NAME::getIconPixmap("help_inactive")); m_helpBtn->setToolTip(tr("Open help window")); - m_selectedGraphGroup = new automatableButtonGroup(this); + m_selectedGraphGroup = new AutomatableButtonGroup(this); m_selectedGraphGroup->addButton(m_w1Btn); m_selectedGraphGroup->addButton(m_w2Btn); m_selectedGraphGroup->addButton(m_w3Btn); diff --git a/plugins/Xpressive/Xpressive.h b/plugins/Xpressive/Xpressive.h index 7dd8dcfaa..a50a3b4f2 100644 --- a/plugins/Xpressive/Xpressive.h +++ b/plugins/Xpressive/Xpressive.h @@ -29,6 +29,7 @@ #include +#include "AutomatableModel.h" #include "Graph.h" #include "Instrument.h" #include "InstrumentView.h" @@ -41,8 +42,6 @@ namespace lmms { -class oscillator; - const int W1_EXPR = 0; const int W2_EXPR = 1; const int W3_EXPR = 2; @@ -51,16 +50,15 @@ const int O2_EXPR = 4; const int NUM_EXPRS = 5; -class ExprFront; - namespace gui { -class SubWindow; -class XpressiveView; +class AutomatableButtonGroup; +class Knob; +class LedCheckBox; +class PixmapButton; } - class Xpressive : public Instrument { Q_OBJECT @@ -184,7 +182,7 @@ private: Knob *m_smoothKnob; QPlainTextEdit * m_expressionEditor; - automatableButtonGroup *m_selectedGraphGroup; + AutomatableButtonGroup *m_selectedGraphGroup; PixmapButton *m_w1Btn; PixmapButton *m_w2Btn; PixmapButton *m_w3Btn; diff --git a/plugins/ZynAddSubFx/ZynAddSubFx.cpp b/plugins/ZynAddSubFx/ZynAddSubFx.cpp index 27e286b66..5f338338c 100644 --- a/plugins/ZynAddSubFx/ZynAddSubFx.cpp +++ b/plugins/ZynAddSubFx/ZynAddSubFx.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include "ZynAddSubFx.h" #include "ConfigManager.h" diff --git a/src/common/RemotePluginBase.cpp b/src/common/RemotePluginBase.cpp index 97ae8ac9e..e23e6939b 100644 --- a/src/common/RemotePluginBase.cpp +++ b/src/common/RemotePluginBase.cpp @@ -26,6 +26,7 @@ #ifndef BUILD_REMOTE_PLUGIN_CLIENT #include +#include #endif diff --git a/src/common/SystemSemaphore.cpp b/src/common/SystemSemaphore.cpp index 02c9a2888..e12ec8c1d 100644 --- a/src/common/SystemSemaphore.cpp +++ b/src/common/SystemSemaphore.cpp @@ -23,7 +23,7 @@ #include "SystemSemaphore.h" -#include +#include // IWYU pragma: keep #include #include #include diff --git a/src/core/AutomatableModel.cpp b/src/core/AutomatableModel.cpp index fa523e106..4006c1d85 100644 --- a/src/core/AutomatableModel.cpp +++ b/src/core/AutomatableModel.cpp @@ -24,6 +24,8 @@ #include "AutomatableModel.h" +#include + #include "lmms_math.h" #include "AudioEngine.h" @@ -816,4 +818,4 @@ QString BoolModel::displayValue( const float val ) const } -} // namespace lmms \ No newline at end of file +} // namespace lmms diff --git a/src/core/AutomationClip.cpp b/src/core/AutomationClip.cpp index db2e063c8..40b329c38 100644 --- a/src/core/AutomationClip.cpp +++ b/src/core/AutomationClip.cpp @@ -36,7 +36,6 @@ #include "ProjectJournal.h" #include "Song.h" -#include namespace lmms { diff --git a/src/core/Effect.cpp b/src/core/Effect.cpp index 37133d4d5..d5355a56d 100644 --- a/src/core/Effect.cpp +++ b/src/core/Effect.cpp @@ -32,7 +32,6 @@ #include "ConfigManager.h" #include "SampleFrame.h" -#include "lmms_math.h" namespace lmms { diff --git a/src/core/InstrumentFunctions.cpp b/src/core/InstrumentFunctions.cpp index 3687c0b74..f517a0942 100644 --- a/src/core/InstrumentFunctions.cpp +++ b/src/core/InstrumentFunctions.cpp @@ -22,7 +22,6 @@ * */ -#include #include "InstrumentFunctions.h" #include "AudioEngine.h" diff --git a/src/core/MixHelpers.cpp b/src/core/MixHelpers.cpp index c10e4c50c..22fb43fd9 100644 --- a/src/core/MixHelpers.cpp +++ b/src/core/MixHelpers.cpp @@ -29,7 +29,6 @@ #endif #include -#include #include "ValueBuffer.h" #include "SampleFrame.h" diff --git a/src/core/PeakController.cpp b/src/core/PeakController.cpp index 1c38cf4cb..e1bf0f1f8 100644 --- a/src/core/PeakController.cpp +++ b/src/core/PeakController.cpp @@ -25,7 +25,6 @@ #include "PeakController.h" -#include #include #include diff --git a/src/core/Plugin.cpp b/src/core/Plugin.cpp index f165ddf75..fe34c5c31 100644 --- a/src/core/Plugin.cpp +++ b/src/core/Plugin.cpp @@ -24,7 +24,6 @@ #include "Plugin.h" -#include #include #include #include diff --git a/src/core/RemotePlugin.cpp b/src/core/RemotePlugin.cpp index 25085e3b6..fd6ac6d45 100644 --- a/src/core/RemotePlugin.cpp +++ b/src/core/RemotePlugin.cpp @@ -35,6 +35,7 @@ #include "AudioEngine.h" #include "Engine.h" +#include "MidiEvent.h" #include "Song.h" #include diff --git a/src/core/SampleClip.cpp b/src/core/SampleClip.cpp index 3a131ba6e..0a1c13940 100644 --- a/src/core/SampleClip.cpp +++ b/src/core/SampleClip.cpp @@ -28,11 +28,10 @@ #include #include "PathUtil.h" -#include "SampleBuffer.h" #include "SampleClipView.h" #include "SampleLoader.h" #include "SampleTrack.h" -#include "TimeLineWidget.h" +#include "Song.h" namespace lmms { diff --git a/src/core/SampleDecoder.cpp b/src/core/SampleDecoder.cpp index eb640447c..715363338 100644 --- a/src/core/SampleDecoder.cpp +++ b/src/core/SampleDecoder.cpp @@ -25,7 +25,6 @@ #include "SampleDecoder.h" #include -#include #include #include #include diff --git a/src/core/Song.cpp b/src/core/Song.cpp index 7b8edc03c..e8089eea8 100644 --- a/src/core/Song.cpp +++ b/src/core/Song.cpp @@ -54,7 +54,6 @@ #include "ProjectNotes.h" #include "Scale.h" #include "SongEditor.h" -#include "TimeLineWidget.h" #include "PeakController.h" diff --git a/src/core/ThreadPool.cpp b/src/core/ThreadPool.cpp index 2e5f00df0..8243a297e 100644 --- a/src/core/ThreadPool.cpp +++ b/src/core/ThreadPool.cpp @@ -24,8 +24,6 @@ #include "ThreadPool.h" #include -#include -#include namespace lmms { ThreadPool::ThreadPool(size_t numWorkers) diff --git a/src/core/TimePos.cpp b/src/core/TimePos.cpp index 6cf657c72..2a87387be 100644 --- a/src/core/TimePos.cpp +++ b/src/core/TimePos.cpp @@ -25,7 +25,6 @@ #include "TimePos.h" -#include #include "MeterModel.h" namespace lmms diff --git a/src/core/Timeline.cpp b/src/core/Timeline.cpp index f6f30c21c..32dd70797 100644 --- a/src/core/Timeline.cpp +++ b/src/core/Timeline.cpp @@ -26,7 +26,6 @@ #include #include -#include #include namespace lmms { diff --git a/src/core/VstSyncController.cpp b/src/core/VstSyncController.cpp index c5b33a05f..715c63063 100644 --- a/src/core/VstSyncController.cpp +++ b/src/core/VstSyncController.cpp @@ -30,9 +30,7 @@ #include #include "AudioEngine.h" -#include "ConfigManager.h" #include "Engine.h" -#include "RemotePlugin.h" namespace lmms diff --git a/src/core/audio/AudioAlsa.cpp b/src/core/audio/AudioAlsa.cpp index c41703e22..d83137492 100644 --- a/src/core/audio/AudioAlsa.cpp +++ b/src/core/audio/AudioAlsa.cpp @@ -30,7 +30,6 @@ #include "endian_handling.h" #include "AudioEngine.h" #include "ConfigManager.h" -#include "Engine.h" namespace lmms { diff --git a/src/core/audio/AudioDevice.cpp b/src/core/audio/AudioDevice.cpp index c5d56c997..8d46f794f 100644 --- a/src/core/audio/AudioDevice.cpp +++ b/src/core/audio/AudioDevice.cpp @@ -26,7 +26,6 @@ #include "AudioDevice.h" #include "AudioEngine.h" -#include "ConfigManager.h" namespace lmms { diff --git a/src/core/audio/AudioFileFlac.cpp b/src/core/audio/AudioFileFlac.cpp index dfb97a6be..58fb0a730 100644 --- a/src/core/audio/AudioFileFlac.cpp +++ b/src/core/audio/AudioFileFlac.cpp @@ -22,10 +22,8 @@ * */ -#include #include -#include #include "AudioFileFlac.h" #include "endian_handling.h" diff --git a/src/core/audio/AudioFileOgg.cpp b/src/core/audio/AudioFileOgg.cpp index 165db430a..36def1c7a 100644 --- a/src/core/audio/AudioFileOgg.cpp +++ b/src/core/audio/AudioFileOgg.cpp @@ -32,7 +32,8 @@ #include -#include "AudioEngine.h" +#include "SampleFrame.h" +#include "lmms_constants.h" namespace lmms { diff --git a/src/core/audio/AudioJack.cpp b/src/core/audio/AudioJack.cpp index b5b13d47b..543349c97 100644 --- a/src/core/audio/AudioJack.cpp +++ b/src/core/audio/AudioJack.cpp @@ -36,7 +36,6 @@ #include "AudioEngine.h" #include "ConfigManager.h" -#include "Engine.h" #include "GuiApplication.h" #include "MainWindow.h" #include "MidiJack.h" diff --git a/src/core/audio/AudioOss.cpp b/src/core/audio/AudioOss.cpp index bd4275235..dff41eb2a 100644 --- a/src/core/audio/AudioOss.cpp +++ b/src/core/audio/AudioOss.cpp @@ -33,7 +33,6 @@ #include "endian_handling.h" #include "LcdSpinBox.h" #include "AudioEngine.h" -#include "Engine.h" #ifdef LMMS_HAVE_UNISTD_H #include diff --git a/src/core/audio/AudioPortAudio.cpp b/src/core/audio/AudioPortAudio.cpp index eb5058bc6..1f7009069 100644 --- a/src/core/audio/AudioPortAudio.cpp +++ b/src/core/audio/AudioPortAudio.cpp @@ -51,7 +51,6 @@ void AudioPortAudioSetupUtil::updateChannels() #include -#include "Engine.h" #include "ConfigManager.h" #include "ComboBox.h" #include "AudioEngine.h" diff --git a/src/core/audio/AudioSdl.cpp b/src/core/audio/AudioSdl.cpp index dfbcde737..cdd446f2b 100644 --- a/src/core/audio/AudioSdl.cpp +++ b/src/core/audio/AudioSdl.cpp @@ -28,7 +28,6 @@ #ifdef LMMS_HAVE_SDL #include -#include #include #include diff --git a/src/core/audio/AudioSndio.cpp b/src/core/audio/AudioSndio.cpp index 95fab473a..8bd09906e 100644 --- a/src/core/audio/AudioSndio.cpp +++ b/src/core/audio/AudioSndio.cpp @@ -34,7 +34,6 @@ #include "endian_handling.h" #include "LcdSpinBox.h" #include "AudioEngine.h" -#include "Engine.h" #include "ConfigManager.h" diff --git a/src/core/lv2/Lv2Proc.cpp b/src/core/lv2/Lv2Proc.cpp index e656f0cf1..d799bbdbb 100644 --- a/src/core/lv2/Lv2Proc.cpp +++ b/src/core/lv2/Lv2Proc.cpp @@ -32,7 +32,6 @@ #include #include #include -#include #include #include "AudioEngine.h" diff --git a/src/core/lv2/Lv2SubPluginFeatures.cpp b/src/core/lv2/Lv2SubPluginFeatures.cpp index 66abe2f2e..f853bdc5b 100644 --- a/src/core/lv2/Lv2SubPluginFeatures.cpp +++ b/src/core/lv2/Lv2SubPluginFeatures.cpp @@ -28,10 +28,8 @@ #ifdef LMMS_HAVE_LV2 -#include #include #include -#include #include "Engine.h" #include "Lv2Basics.h" diff --git a/src/core/lv2/Lv2Worker.cpp b/src/core/lv2/Lv2Worker.cpp index c763bacad..ae4682d69 100644 --- a/src/core/lv2/Lv2Worker.cpp +++ b/src/core/lv2/Lv2Worker.cpp @@ -25,11 +25,9 @@ #include "Lv2Worker.h" #include -#include #ifdef LMMS_HAVE_LV2 -#include "Engine.h" namespace lmms diff --git a/src/core/midi/MidiController.cpp b/src/core/midi/MidiController.cpp index 112d9d974..69436abc3 100644 --- a/src/core/midi/MidiController.cpp +++ b/src/core/midi/MidiController.cpp @@ -23,7 +23,6 @@ * */ -#include #include "AudioEngine.h" #include "MidiController.h" diff --git a/src/gui/FileBrowser.cpp b/src/gui/FileBrowser.cpp index 11e48c00f..d0dbbc613 100644 --- a/src/gui/FileBrowser.cpp +++ b/src/gui/FileBrowser.cpp @@ -27,19 +27,18 @@ #include #include -#include +#include #include #include #include #include #include #include -#include +#include #include #include #include #include -#include #include "AudioEngine.h" #include "ConfigManager.h" diff --git a/src/gui/GuiApplication.cpp b/src/gui/GuiApplication.cpp index 292284b3c..f2d570e89 100644 --- a/src/gui/GuiApplication.cpp +++ b/src/gui/GuiApplication.cpp @@ -44,11 +44,11 @@ #include #include #include +#include #include #include #include #include -#include #ifdef LMMS_BUILD_WIN32 #include diff --git a/src/gui/LfoControllerDialog.cpp b/src/gui/LfoControllerDialog.cpp index 4a0ff158f..ae206ff0c 100644 --- a/src/gui/LfoControllerDialog.cpp +++ b/src/gui/LfoControllerDialog.cpp @@ -154,7 +154,7 @@ LfoControllerDialog::LfoControllerDialog( Controller * _model, QWidget * _parent m_userWaveBtn->setToolTip( tr( "User-defined shape.\nDouble click to pick a file." ) ); - m_waveBtnGrp = new automatableButtonGroup( this ); + m_waveBtnGrp = new AutomatableButtonGroup( this ); m_waveBtnGrp->addButton( sin_wave_btn ); m_waveBtnGrp->addButton( triangle_wave_btn ); m_waveBtnGrp->addButton( saw_wave_btn ); @@ -182,7 +182,7 @@ LfoControllerDialog::LfoControllerDialog( Controller * _model, QWidget * _parent d100->setInactiveGraphic(embed::getIconPixmap("lfo_d100_inactive")); d100->setToolTip(tr("Divide modulation frequency by 100")); - m_multiplierBtnGrp = new automatableButtonGroup( this ); + m_multiplierBtnGrp = new AutomatableButtonGroup( this ); m_multiplierBtnGrp->addButton( x1 ); m_multiplierBtnGrp->addButton( x100 ); m_multiplierBtnGrp->addButton( d100 ); diff --git a/src/gui/LmmsStyle.cpp b/src/gui/LmmsStyle.cpp index 26f4c853c..fd34cf562 100644 --- a/src/gui/LmmsStyle.cpp +++ b/src/gui/LmmsStyle.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include // IWYU pragma: keep #include #include diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index e18bb3cbb..adb1bcce7 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -61,14 +61,13 @@ #include "ProjectNotes.h" #include "ProjectRenderer.h" #include "RecentProjectsMenu.h" -#include "RemotePlugin.h" +#include "RemotePluginBase.h" #include "SetupDialog.h" #include "SideBar.h" #include "SongEditor.h" #include "SubWindow.h" #include "TemplatesMenu.h" #include "TextFloat.h" -#include "TimeLineWidget.h" #include "ToolButton.h" #include "ToolPlugin.h" #include "VersionedSaveDialog.h" diff --git a/src/gui/MixerChannelView.cpp b/src/gui/MixerChannelView.cpp index 3391affce..649789c9c 100644 --- a/src/gui/MixerChannelView.cpp +++ b/src/gui/MixerChannelView.cpp @@ -28,19 +28,28 @@ #include #include #include +#include +#include #include #include #include -#include +#include +#include +#include "AutomatableButton.h" #include "CaptionMenu.h" #include "ColorChooser.h" #include "ConfigManager.h" +#include "EffectRackView.h" +#include "Fader.h" #include "FontHelper.h" #include "GuiApplication.h" +#include "Knob.h" +#include "LcdWidget.h" #include "Mixer.h" #include "MixerView.h" #include "PeakIndicator.h" +#include "SendButtonIndicator.h" #include "Song.h" namespace lmms::gui { diff --git a/src/gui/MixerView.cpp b/src/gui/MixerView.cpp index fd6391bf0..26465f225 100644 --- a/src/gui/MixerView.cpp +++ b/src/gui/MixerView.cpp @@ -24,25 +24,32 @@ #include "MixerView.h" +#include #include +#include #include #include #include #include +#include +#include -#include "MixerChannelView.h" -#include "Knob.h" -#include "Mixer.h" +#include "EffectRackView.h" +#include "Engine.h" +#include "Fader.h" #include "GuiApplication.h" -#include "MainWindow.h" -#include "AudioEngine.h" +#include "Knob.h" #include "InstrumentTrack.h" +#include "MainWindow.h" +#include "Mixer.h" +#include "MixerChannelView.h" #include "PatternStore.h" #include "SampleTrack.h" #include "SendButtonIndicator.h" #include "Song.h" #include "SubWindow.h" #include "TrackContainer.h" // For TrackContainer::TrackList typedef +#include "embed.h" namespace lmms::gui { diff --git a/src/gui/SampleLoader.cpp b/src/gui/SampleLoader.cpp index d72b0ba5c..7bd67b6ba 100644 --- a/src/gui/SampleLoader.cpp +++ b/src/gui/SampleLoader.cpp @@ -33,7 +33,6 @@ #include "GuiApplication.h" #include "PathUtil.h" #include "SampleDecoder.h" -#include "Song.h" namespace lmms::gui { QString SampleLoader::openAudioFile(const QString& previousFile) diff --git a/src/gui/SampleThumbnail.cpp b/src/gui/SampleThumbnail.cpp index 8ec18b5cb..76617030a 100644 --- a/src/gui/SampleThumbnail.cpp +++ b/src/gui/SampleThumbnail.cpp @@ -25,8 +25,10 @@ #include "SampleThumbnail.h" -#include #include +#include + +#include "Sample.h" namespace { constexpr auto MaxSampleThumbnailCacheSize = 32; diff --git a/src/gui/SampleTrackWindow.cpp b/src/gui/SampleTrackWindow.cpp index 921ab3fce..ac5305690 100644 --- a/src/gui/SampleTrackWindow.cpp +++ b/src/gui/SampleTrackWindow.cpp @@ -31,6 +31,7 @@ #include #include +#include "AutomatableButton.h" #include "EffectRackView.h" #include "embed.h" #include "GuiApplication.h" diff --git a/src/gui/SendButtonIndicator.cpp b/src/gui/SendButtonIndicator.cpp index 4fb20cc31..48f0d21f4 100644 --- a/src/gui/SendButtonIndicator.cpp +++ b/src/gui/SendButtonIndicator.cpp @@ -1,6 +1,6 @@ #include "SendButtonIndicator.h" -#include "embed.h" +#include "Engine.h" #include "Mixer.h" #include "MixerChannelView.h" #include "MixerView.h" diff --git a/src/gui/SubWindow.cpp b/src/gui/SubWindow.cpp index a76f4055e..995f474f9 100644 --- a/src/gui/SubWindow.cpp +++ b/src/gui/SubWindow.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include "embed.h" diff --git a/src/gui/clips/AutomationClipView.cpp b/src/gui/clips/AutomationClipView.cpp index 89fbd4f8e..1574393a5 100644 --- a/src/gui/clips/AutomationClipView.cpp +++ b/src/gui/clips/AutomationClipView.cpp @@ -23,12 +23,10 @@ */ #include "AutomationClipView.h" -#include - #include #include #include -#include +#include // IWYU pragma: keep #include #include "AutomationEditor.h" diff --git a/src/gui/clips/ClipView.cpp b/src/gui/clips/ClipView.cpp index c7bf046d9..a9141ec50 100644 --- a/src/gui/clips/ClipView.cpp +++ b/src/gui/clips/ClipView.cpp @@ -34,20 +34,14 @@ #include "AutomationClip.h" #include "Clipboard.h" #include "ColorChooser.h" -#include "ComboBoxModel.h" #include "DataFile.h" #include "Engine.h" #include "embed.h" #include "GuiApplication.h" -#include "InstrumentTrack.h" -#include "InstrumentTrackView.h" #include "KeyboardShortcuts.h" -#include "MidiClip.h" #include "MidiClipView.h" -#include "Note.h" #include "PatternClip.h" #include "PatternStore.h" -#include "SampleClip.h" #include "Song.h" #include "SongEditor.h" #include "StringPairDrag.h" diff --git a/src/gui/clips/MidiClipView.cpp b/src/gui/clips/MidiClipView.cpp index eb44cedab..366c49c14 100644 --- a/src/gui/clips/MidiClipView.cpp +++ b/src/gui/clips/MidiClipView.cpp @@ -27,12 +27,10 @@ #include -#include #include #include #include #include -#include #include #include "AutomationEditor.h" diff --git a/src/gui/editors/AutomationEditor.cpp b/src/gui/editors/AutomationEditor.cpp index 6872f26a4..2f2c60e9b 100644 --- a/src/gui/editors/AutomationEditor.cpp +++ b/src/gui/editors/AutomationEditor.cpp @@ -32,7 +32,8 @@ #include #include #include -#include +#include // IWYU pragma: keep +#include #include #include #include @@ -54,7 +55,6 @@ #include "PatternStore.h" #include "PianoRoll.h" #include "ProjectJournal.h" -#include "SampleBuffer.h" #include "StringPairDrag.h" #include "TextFloat.h" #include "TimeLineWidget.h" diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp index 89789937f..ec489c501 100644 --- a/src/gui/editors/PianoRoll.cpp +++ b/src/gui/editors/PianoRoll.cpp @@ -26,7 +26,7 @@ #include "PianoRoll.h" -#include +#include // IWYU pragma: keep #include #include #include diff --git a/src/gui/editors/TimeLineWidget.cpp b/src/gui/editors/TimeLineWidget.cpp index e25ba74a3..d2efae0c0 100644 --- a/src/gui/editors/TimeLineWidget.cpp +++ b/src/gui/editors/TimeLineWidget.cpp @@ -24,9 +24,7 @@ #include "TimeLineWidget.h" -#include -#include #include #include #include @@ -36,7 +34,6 @@ #include "ConfigManager.h" #include "embed.h" -#include "GuiApplication.h" #include "KeyboardShortcuts.h" #include "NStateButton.h" #include "TextFloat.h" diff --git a/src/gui/instrument/EnvelopeAndLfoView.cpp b/src/gui/instrument/EnvelopeAndLfoView.cpp index 02dd014f4..22e8b29af 100644 --- a/src/gui/instrument/EnvelopeAndLfoView.cpp +++ b/src/gui/instrument/EnvelopeAndLfoView.cpp @@ -27,8 +27,8 @@ #include -#include #include +#include #include "EnvelopeGraph.h" #include "LfoGraph.h" @@ -149,7 +149,7 @@ EnvelopeAndLfoView::EnvelopeAndLfoView(QWidget * parent) : typesLayout->addWidget(random_lfo_btn); typesLayout->addWidget(m_userLfoBtn); - m_lfoWaveBtnGrp = new automatableButtonGroup(this); + m_lfoWaveBtnGrp = new AutomatableButtonGroup(this); m_lfoWaveBtnGrp->addButton(sin_lfo_btn); m_lfoWaveBtnGrp->addButton(triangle_lfo_btn); m_lfoWaveBtnGrp->addButton(saw_lfo_btn); diff --git a/src/gui/instrument/InstrumentMidiIOView.cpp b/src/gui/instrument/InstrumentMidiIOView.cpp index c6b58e090..bd4ea49c1 100644 --- a/src/gui/instrument/InstrumentMidiIOView.cpp +++ b/src/gui/instrument/InstrumentMidiIOView.cpp @@ -24,7 +24,6 @@ #include #include -#include #include #include "InstrumentMidiIOView.h" diff --git a/src/gui/instrument/InstrumentSoundShapingView.cpp b/src/gui/instrument/InstrumentSoundShapingView.cpp index 7f786867d..91816c50c 100644 --- a/src/gui/instrument/InstrumentSoundShapingView.cpp +++ b/src/gui/instrument/InstrumentSoundShapingView.cpp @@ -24,14 +24,16 @@ #include "InstrumentSoundShapingView.h" +#include #include -#include +#include #include "EnvelopeAndLfoParameters.h" #include "EnvelopeAndLfoView.h" #include "ComboBox.h" #include "GroupBox.h" #include "FontHelper.h" +#include "InstrumentSoundShaping.h" #include "Knob.h" #include "TabWidget.h" diff --git a/src/gui/instrument/InstrumentTrackWindow.cpp b/src/gui/instrument/InstrumentTrackWindow.cpp index c293d6be7..953afc0b4 100644 --- a/src/gui/instrument/InstrumentTrackWindow.cpp +++ b/src/gui/instrument/InstrumentTrackWindow.cpp @@ -33,6 +33,7 @@ #include #include +#include "AutomatableButton.h" #include "ComboBox.h" #include "ConfigManager.h" #include "DataFile.h" @@ -59,6 +60,7 @@ #include "MainWindow.h" #include "PianoView.h" #include "PluginFactory.h" +#include "PluginView.h" #include "Song.h" #include "StringPairDrag.h" #include "SubWindow.h" diff --git a/src/gui/instrument/InstrumentView.cpp b/src/gui/instrument/InstrumentView.cpp index f7912444d..5db23b85a 100644 --- a/src/gui/instrument/InstrumentView.cpp +++ b/src/gui/instrument/InstrumentView.cpp @@ -26,7 +26,6 @@ #include "InstrumentView.h" #include "embed.h" -#include "InstrumentTrack.h" #include "InstrumentTrackWindow.h" namespace lmms::gui diff --git a/src/gui/instrument/PianoView.cpp b/src/gui/instrument/PianoView.cpp index 8491927db..0f7fbc9dd 100644 --- a/src/gui/instrument/PianoView.cpp +++ b/src/gui/instrument/PianoView.cpp @@ -41,14 +41,13 @@ #include #include #include -#include +#include // IWYU pragma: keep #include #include "AutomatableModelView.h" #include "PianoView.h" #include "Piano.h" #include "CaptionMenu.h" -#include "embed.h" #include "Engine.h" #include "FontHelper.h" #include "InstrumentTrack.h" diff --git a/src/gui/modals/EffectSelectDialog.cpp b/src/gui/modals/EffectSelectDialog.cpp index 65976059f..6e0bcb753 100644 --- a/src/gui/modals/EffectSelectDialog.cpp +++ b/src/gui/modals/EffectSelectDialog.cpp @@ -32,10 +32,15 @@ #include #include #include +#include +#include +#include #include #include +#include #include #include +#include #include diff --git a/src/gui/modals/VersionedSaveDialog.cpp b/src/gui/modals/VersionedSaveDialog.cpp index c8e1c6821..2e883fe08 100644 --- a/src/gui/modals/VersionedSaveDialog.cpp +++ b/src/gui/modals/VersionedSaveDialog.cpp @@ -23,11 +23,12 @@ */ +#include #include #include #include #include -#include +#include #include "DeprecationHelper.h" #include "VersionedSaveDialog.h" diff --git a/src/gui/tracks/InstrumentTrackView.cpp b/src/gui/tracks/InstrumentTrackView.cpp index b6681beeb..c0cba7eef 100644 --- a/src/gui/tracks/InstrumentTrackView.cpp +++ b/src/gui/tracks/InstrumentTrackView.cpp @@ -27,25 +27,28 @@ #include #include #include +#include #include #include #include +#include +#include #include "AudioEngine.h" #include "ConfigManager.h" #include "Engine.h" #include "FadeButton.h" -#include "FontHelper.h" -#include "Knob.h" -#include "MidiCCRackView.h" -#include "Mixer.h" -#include "MixerView.h" #include "GuiApplication.h" #include "Instrument.h" #include "InstrumentTrackWindow.h" +#include "Knob.h" #include "MainWindow.h" #include "MidiClient.h" +#include "MidiCCRackView.h" #include "MidiPortMenu.h" +#include "Mixer.h" +#include "MixerChannelLcdSpinBox.h" +#include "MixerView.h" #include "TrackLabelButton.h" diff --git a/src/gui/tracks/SampleTrackView.cpp b/src/gui/tracks/SampleTrackView.cpp index 34495e735..f70d2c3bf 100644 --- a/src/gui/tracks/SampleTrackView.cpp +++ b/src/gui/tracks/SampleTrackView.cpp @@ -25,14 +25,17 @@ #include "SampleTrackView.h" #include +#include #include +#include +#include #include "ConfigManager.h" #include "embed.h" #include "Engine.h" #include "FadeButton.h" -#include "FontHelper.h" #include "Mixer.h" +#include "MixerChannelLcdSpinBox.h" #include "MixerView.h" #include "GuiApplication.h" #include "Knob.h" diff --git a/src/gui/tracks/TrackLabelButton.cpp b/src/gui/tracks/TrackLabelButton.cpp index 12b4dc4b4..88020b410 100644 --- a/src/gui/tracks/TrackLabelButton.cpp +++ b/src/gui/tracks/TrackLabelButton.cpp @@ -30,7 +30,6 @@ #include "ConfigManager.h" #include "embed.h" -#include "InstrumentTrackView.h" #include "Instrument.h" #include "InstrumentTrack.h" #include "RenameDialog.h" diff --git a/src/gui/tracks/TrackOperationsWidget.cpp b/src/gui/tracks/TrackOperationsWidget.cpp index 238ef8955..17144fdb6 100644 --- a/src/gui/tracks/TrackOperationsWidget.cpp +++ b/src/gui/tracks/TrackOperationsWidget.cpp @@ -24,14 +24,15 @@ #include "TrackOperationsWidget.h" -#include +#include +#include #include #include #include #include #include -#include +#include "AutomatableButton.h" #include "AutomationClip.h" #include "AutomationTrackView.h" #include "ColorChooser.h" @@ -41,7 +42,6 @@ #include "Engine.h" #include "InstrumentTrackView.h" #include "KeyboardShortcuts.h" -#include "PixmapButton.h" #include "Song.h" #include "StringPairDrag.h" #include "Track.h" diff --git a/src/gui/tracks/TrackView.cpp b/src/gui/tracks/TrackView.cpp index ecd397975..6388b7fb2 100644 --- a/src/gui/tracks/TrackView.cpp +++ b/src/gui/tracks/TrackView.cpp @@ -30,15 +30,14 @@ #include #include #include -#include #include "AudioEngine.h" +#include "AutomatableButton.h" #include "ConfigManager.h" #include "DataFile.h" #include "Engine.h" #include "FadeButton.h" -#include "PixmapButton.h" #include "StringPairDrag.h" #include "Track.h" #include "TrackGrip.h" diff --git a/src/gui/widgets/AutomatableButton.cpp b/src/gui/widgets/AutomatableButton.cpp index c205b75cf..3e1c3e229 100644 --- a/src/gui/widgets/AutomatableButton.cpp +++ b/src/gui/widgets/AutomatableButton.cpp @@ -1,6 +1,6 @@ /* - * AutomatableButton.cpp - implementation of class automatableButton and - * automatableButtonGroup + * AutomatableButton.cpp - implementation of class AutomatableButton and + * AutomatableButtonGroup * * Copyright (c) 2006-2011 Tobias Doerffel * @@ -179,7 +179,7 @@ void AutomatableButton::toggle() -automatableButtonGroup::automatableButtonGroup( QWidget * _parent, +AutomatableButtonGroup::AutomatableButtonGroup( QWidget * _parent, const QString & _name ) : QWidget( _parent ), IntModelView( new IntModel( 0, 0, 0, nullptr, _name, true ), this ) @@ -191,7 +191,7 @@ automatableButtonGroup::automatableButtonGroup( QWidget * _parent, -automatableButtonGroup::~automatableButtonGroup() +AutomatableButtonGroup::~AutomatableButtonGroup() { for (const auto& button : m_buttons) { @@ -202,7 +202,7 @@ automatableButtonGroup::~automatableButtonGroup() -void automatableButtonGroup::addButton( AutomatableButton * _btn ) +void AutomatableButtonGroup::addButton( AutomatableButton * _btn ) { _btn->m_group = this; _btn->setCheckable( true ); @@ -219,7 +219,7 @@ void automatableButtonGroup::addButton( AutomatableButton * _btn ) -void automatableButtonGroup::removeButton( AutomatableButton * _btn ) +void AutomatableButtonGroup::removeButton( AutomatableButton * _btn ) { m_buttons.erase( std::find( m_buttons.begin(), m_buttons.end(), _btn ) ); _btn->m_group = nullptr; @@ -228,7 +228,7 @@ void automatableButtonGroup::removeButton( AutomatableButton * _btn ) -void automatableButtonGroup::activateButton( AutomatableButton * _btn ) +void AutomatableButtonGroup::activateButton( AutomatableButton * _btn ) { if( _btn != m_buttons[model()->value()] && m_buttons.indexOf( _btn ) != -1 ) @@ -244,7 +244,7 @@ void automatableButtonGroup::activateButton( AutomatableButton * _btn ) -void automatableButtonGroup::modelChanged() +void AutomatableButtonGroup::modelChanged() { connect( model(), SIGNAL(dataChanged()), this, SLOT(updateButtons())); @@ -255,7 +255,7 @@ void automatableButtonGroup::modelChanged() -void automatableButtonGroup::updateButtons() +void AutomatableButtonGroup::updateButtons() { model()->setRange( 0, m_buttons.size() - 1 ); int i = 0; diff --git a/src/gui/widgets/BarModelEditor.cpp b/src/gui/widgets/BarModelEditor.cpp index ae224530d..eef2adb13 100644 --- a/src/gui/widgets/BarModelEditor.cpp +++ b/src/gui/widgets/BarModelEditor.cpp @@ -1,7 +1,6 @@ #include #include -#include namespace lmms::gui diff --git a/src/gui/widgets/Fader.cpp b/src/gui/widgets/Fader.cpp index 46f336cb7..f7f9ce72b 100644 --- a/src/gui/widgets/Fader.cpp +++ b/src/gui/widgets/Fader.cpp @@ -49,10 +49,9 @@ #include #include #include -#include +#include // IWYU pragma: keep #include "lmms_math.h" -#include "embed.h" #include "CaptionMenu.h" #include "ConfigManager.h" #include "KeyboardShortcuts.h" diff --git a/src/gui/widgets/Graph.cpp b/src/gui/widgets/Graph.cpp index de4d10792..7b20e7499 100644 --- a/src/gui/widgets/Graph.cpp +++ b/src/gui/widgets/Graph.cpp @@ -28,7 +28,6 @@ #include "Graph.h" #include "SampleLoader.h" #include "StringPairDrag.h" -#include "SampleBuffer.h" #include "Oscillator.h" namespace lmms diff --git a/src/gui/widgets/Knob.cpp b/src/gui/widgets/Knob.cpp index 7a10d0aa0..78a3db25f 100644 --- a/src/gui/widgets/Knob.cpp +++ b/src/gui/widgets/Knob.cpp @@ -27,7 +27,6 @@ #include #include -#include "lmms_math.h" #include "DeprecationHelper.h" #include "embed.h" #include "FontHelper.h" diff --git a/src/gui/widgets/PeakIndicator.cpp b/src/gui/widgets/PeakIndicator.cpp index e1278b7ff..802060972 100644 --- a/src/gui/widgets/PeakIndicator.cpp +++ b/src/gui/widgets/PeakIndicator.cpp @@ -26,7 +26,6 @@ #include "lmms_math.h" -#include #include diff --git a/src/gui/widgets/SimpleTextFloat.cpp b/src/gui/widgets/SimpleTextFloat.cpp index 1be683837..89a45c7f7 100644 --- a/src/gui/widgets/SimpleTextFloat.cpp +++ b/src/gui/widgets/SimpleTextFloat.cpp @@ -25,7 +25,6 @@ #include "SimpleTextFloat.h" #include -#include #include #include diff --git a/src/gui/widgets/TextFloat.cpp b/src/gui/widgets/TextFloat.cpp index 4eb14bd50..cdc8f516b 100644 --- a/src/gui/widgets/TextFloat.cpp +++ b/src/gui/widgets/TextFloat.cpp @@ -25,8 +25,6 @@ #include "TextFloat.h" #include -#include -#include #include #include #include diff --git a/tests/src/core/ArrayVectorTest.cpp b/tests/src/core/ArrayVectorTest.cpp index 40ce4d001..7dd47410d 100644 --- a/tests/src/core/ArrayVectorTest.cpp +++ b/tests/src/core/ArrayVectorTest.cpp @@ -25,7 +25,7 @@ #include "ArrayVector.h" #include -#include +#include #include #include diff --git a/tests/src/core/AutomatableModelTest.cpp b/tests/src/core/AutomatableModelTest.cpp index 6e8a28116..9bc5fd6ac 100644 --- a/tests/src/core/AutomatableModelTest.cpp +++ b/tests/src/core/AutomatableModelTest.cpp @@ -23,7 +23,7 @@ */ -#include +#include #include "AutomatableModel.h" #include "ComboBoxModel.h" #include "Engine.h" diff --git a/tests/src/core/MathTest.cpp b/tests/src/core/MathTest.cpp index 00694c44f..544f04f4d 100644 --- a/tests/src/core/MathTest.cpp +++ b/tests/src/core/MathTest.cpp @@ -22,9 +22,8 @@ * */ -#include #include -#include +#include #include "lmms_math.h" diff --git a/tests/src/core/ProjectVersionTest.cpp b/tests/src/core/ProjectVersionTest.cpp index 03b689541..05e97d9c4 100644 --- a/tests/src/core/ProjectVersionTest.cpp +++ b/tests/src/core/ProjectVersionTest.cpp @@ -24,7 +24,7 @@ #include "ProjectVersion.h" -#include +#include class ProjectVersionTest : public QObject { diff --git a/tests/src/core/RelativePathsTest.cpp b/tests/src/core/RelativePathsTest.cpp index 089ab2e8a..ddede8617 100644 --- a/tests/src/core/RelativePathsTest.cpp +++ b/tests/src/core/RelativePathsTest.cpp @@ -22,13 +22,11 @@ * */ -#include #include -#include +#include #include "ConfigManager.h" #include "PathUtil.h" -#include "SampleBuffer.h" class RelativePathsTest : public QObject { diff --git a/tests/src/tracks/AutomationTrackTest.cpp b/tests/src/tracks/AutomationTrackTest.cpp index 18e981115..bf9fb7b75 100644 --- a/tests/src/tracks/AutomationTrackTest.cpp +++ b/tests/src/tracks/AutomationTrackTest.cpp @@ -22,9 +22,8 @@ * */ -#include +#include -#include "QCoreApplication" #include "AutomationClip.h" #include "AutomationTrack.h" @@ -34,7 +33,6 @@ #include "PatternClip.h" #include "PatternTrack.h" #include "PatternStore.h" -#include "TrackContainer.h" #include "Engine.h" #include "Song.h"