Move all headers in gui/include that aren't used outside of gui

LMMS · Jul 5, 2024 · d5a98ad · d5a98ad
1 parent 1ce4be0
commit d5a98ad
Show file tree

Hide file tree

Showing 85 changed files with 64 additions and 63 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -33,6 +33,7 @@ INCLUDE_DIRECTORIES(
 	"${CMAKE_SOURCE_DIR}/include"
 	"${CMAKE_SOURCE_DIR}/src/core/include"
 	"${CMAKE_SOURCE_DIR}/src/gui/include"
+	"${CMAKE_SOURCE_DIR}/src"
 )
 
 IF(WIN32 AND MSVC)

diff --git a/src/gui/include/ActionGroup.h → src/gui/ActionGroup.h b/src/gui/include/ActionGroup.h → src/gui/ActionGroup.h
diff --git a/src/gui/include/AudioAlsaSetupWidget.h → src/gui/AudioAlsaSetupWidget.h b/src/gui/include/AudioAlsaSetupWidget.h → src/gui/AudioAlsaSetupWidget.h
diff --git a/src/gui/AutomatableModelView.cpp b/src/gui/AutomatableModelView.cpp
@@ -27,7 +27,7 @@
 
 #include "AutomatableModelView.h"
 #include "AutomationClip.h"
-#include "ControllerConnectionDialog.h"
+#include "modals/ControllerConnectionDialog.h"
 #include "ControllerConnection.h"
 #include "embed.h"
 #include "GuiApplication.h"

diff --git a/src/gui/include/ColorHelper.h → src/gui/ColorHelper.h b/src/gui/include/ColorHelper.h → src/gui/ColorHelper.h
diff --git a/src/gui/include/ControlLayout.h → src/gui/ControlLayout.h b/src/gui/include/ControlLayout.h → src/gui/ControlLayout.h
diff --git a/src/gui/include/ControllerView.h → src/gui/ControllerView.h b/src/gui/include/ControllerView.h → src/gui/ControllerView.h
diff --git a/src/gui/include/Controls.h → src/gui/Controls.h b/src/gui/include/Controls.h → src/gui/Controls.h
diff --git a/src/gui/include/DeprecationHelper.h → src/gui/DeprecationHelper.h b/src/gui/include/DeprecationHelper.h → src/gui/DeprecationHelper.h
diff --git a/src/gui/EffectRackView.cpp b/src/gui/EffectRackView.cpp
@@ -30,9 +30,9 @@
 #include <QVBoxLayout>
 
 #include "EffectRackView.h"
-#include "EffectSelectDialog.h"
+#include "modals/EffectSelectDialog.h"
 #include "EffectView.h"
-#include "GroupBox.h"
+#include "widgets/GroupBox.h"
 
 
 namespace lmms::gui

diff --git a/src/gui/FileBrowser.cpp b/src/gui/FileBrowser.cpp
@@ -51,7 +51,7 @@
 #include "ImportFilter.h"
 #include "Instrument.h"
 #include "InstrumentTrack.h"
-#include "InstrumentTrackWindow.h"
+#include "instrument/InstrumentTrackWindow.h"
 #include "MainWindow.h"
 #include "PatternStore.h"
 #include "PluginFactory.h"

diff --git a/src/gui/include/FileBrowser.h → src/gui/FileBrowser.h b/src/gui/include/FileBrowser.h → src/gui/FileBrowser.h
diff --git a/src/gui/include/LmmsPalette.h → src/gui/LmmsPalette.h b/src/gui/include/LmmsPalette.h → src/gui/LmmsPalette.h
diff --git a/src/gui/include/LmmsStyle.h → src/gui/LmmsStyle.h b/src/gui/include/LmmsStyle.h → src/gui/LmmsStyle.h
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
@@ -35,7 +35,7 @@
 #include <QShortcut>
 #include <QSplitter>
 
-#include "AboutDialog.h"
+#include "modals/AboutDialog.h"
 #include "AutomationEditor.h"
 #include "ControllerRackView.h"
 #include "embed.h"
@@ -47,7 +47,7 @@
 #include "GuiApplication.h"
 #include "ImportFilter.h"
 #include "InstrumentTrackView.h"
-#include "InstrumentTrackWindow.h"
+#include "instrument/InstrumentTrackWindow.h"
 #include "MicrotunerConfig.h"
 #include "PatternEditor.h"
 #include "PianoRoll.h"
@@ -58,18 +58,18 @@
 #include "ProjectJournal.h"
 #include "ProjectNotes.h"
 #include "ProjectRenderer.h"
-#include "RecentProjectsMenu.h"
+#include "menus/RecentProjectsMenu.h"
 #include "RemotePlugin.h"
-#include "SetupDialog.h"
+#include "modals/SetupDialog.h"
 #include "SideBar.h"
 #include "SongEditor.h"
 #include "SubWindow.h"
-#include "TemplatesMenu.h"
+#include "menus/TemplatesMenu.h"
 #include "TextFloat.h"
 #include "TimeLineWidget.h"
-#include "ToolButton.h"
+#include "widgets/ToolButton.h"
 #include "ToolPlugin.h"
-#include "VersionedSaveDialog.h"
+#include "modals/VersionedSaveDialog.h"
 
 #include "lmmsversion.h"
 

diff --git a/src/gui/include/MicrotunerConfig.h → src/gui/MicrotunerConfig.h b/src/gui/include/MicrotunerConfig.h → src/gui/MicrotunerConfig.h
diff --git a/src/gui/MidiCCRackView.cpp b/src/gui/MidiCCRackView.cpp
@@ -31,7 +31,7 @@
 #include <QWidget>
 
 #include "embed.h"
-#include "GroupBox.h"
+#include "widgets/GroupBox.h"
 #include "GuiApplication.h"
 #include "InstrumentTrack.h"
 #include "Knob.h"

diff --git a/src/gui/include/MidiCCRackView.h → src/gui/MidiCCRackView.h b/src/gui/include/MidiCCRackView.h → src/gui/MidiCCRackView.h
diff --git a/src/gui/include/MidiSetupWidget.h → src/gui/MidiSetupWidget.h b/src/gui/include/MidiSetupWidget.h → src/gui/MidiSetupWidget.h
diff --git a/src/gui/MixerChannelView.cpp b/src/gui/MixerChannelView.cpp
@@ -28,7 +28,7 @@
 #include "Mixer.h"
 #include "MixerChannelView.h"
 #include "MixerView.h"
-#include "PeakIndicator.h"
+#include "widgets/PeakIndicator.h"
 #include "Song.h"
 #include "ConfigManager.h"
 

diff --git a/src/gui/include/PluginBrowser.h → src/gui/PluginBrowser.h b/src/gui/include/PluginBrowser.h → src/gui/PluginBrowser.h
diff --git a/src/gui/include/RowTableView.h → src/gui/RowTableView.h b/src/gui/include/RowTableView.h → src/gui/RowTableView.h
diff --git a/src/gui/SampleTrackWindow.cpp b/src/gui/SampleTrackWindow.cpp
@@ -40,7 +40,7 @@
 #include "SampleTrackView.h"
 #include "Song.h"
 #include "SubWindow.h"
-#include "TrackLabelButton.h"
+#include "tracks/TrackLabelButton.h"
 
 namespace lmms::gui
 {

diff --git a/src/gui/include/SampleTrackWindow.h → src/gui/SampleTrackWindow.h b/src/gui/include/SampleTrackWindow.h → src/gui/SampleTrackWindow.h
diff --git a/src/gui/include/SideBar.h → src/gui/SideBar.h b/src/gui/include/SideBar.h → src/gui/SideBar.h
diff --git a/src/gui/include/SideBarWidget.h → src/gui/SideBarWidget.h b/src/gui/include/SideBarWidget.h → src/gui/SideBarWidget.h
diff --git a/src/gui/clips/AutomationClipView.cpp b/src/gui/clips/AutomationClipView.cpp
@@ -33,7 +33,7 @@
 #include "embed.h"
 #include "GuiApplication.h"
 #include "ProjectJournal.h"
-#include "RenameDialog.h"
+#include "gui/modals/RenameDialog.h"
 #include "StringPairDrag.h"
 #include "TextFloat.h"
 #include "Track.h"

diff --git a/src/gui/clips/MidiClipView.cpp b/src/gui/clips/MidiClipView.cpp
@@ -36,11 +36,11 @@
 
 #include "AutomationEditor.h"
 #include "ConfigManager.h"
-#include "DeprecationHelper.h"
+#include "gui/DeprecationHelper.h"
 #include "GuiApplication.h"
 #include "MidiClip.h"
 #include "PianoRoll.h"
-#include "RenameDialog.h"
+#include "gui/modals/RenameDialog.h"
 #include "TrackView.h"
 
 namespace lmms::gui

diff --git a/src/gui/clips/PatternClipView.cpp b/src/gui/clips/PatternClipView.cpp
@@ -33,7 +33,7 @@
 #include "MainWindow.h"
 #include "PatternClip.h"
 #include "PatternStore.h"
-#include "RenameDialog.h"
+#include "gui/modals/RenameDialog.h"
 
 namespace lmms::gui
 {

diff --git a/src/gui/editors/AutomationEditor.cpp b/src/gui/editors/AutomationEditor.cpp
@@ -45,10 +45,10 @@
 #define __USE_XOPEN
 #endif
 
-#include "ActionGroup.h"
+#include "gui/ActionGroup.h"
 #include "AutomationNode.h"
 #include "ComboBox.h"
-#include "DeprecationHelper.h"
+#include "gui/DeprecationHelper.h"
 #include "DetuningHelper.h"
 #include "Engine.h"
 #include "GuiApplication.h"

diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp
@@ -49,13 +49,13 @@
 #include <utility>
 
 #include "AutomationEditor.h"
-#include "ActionGroup.h"
+#include "gui/ActionGroup.h"
 #include "Clipboard.h"
 #include "ComboBox.h"
 #include "ConfigManager.h"
 #include "DataFile.h"
 #include "debug.h"
-#include "DeprecationHelper.h"
+#include "gui/DeprecationHelper.h"
 #include "DetuningHelper.h"
 #include "embed.h"
 #include "GuiApplication.h"
@@ -65,7 +65,7 @@
 #include "PatternStore.h"
 #include "PianoView.h"
 #include "PositionLine.h"
-#include "SimpleTextFloat.h"
+#include "gui/widgets/SimpleTextFloat.h"
 #include "SongEditor.h"
 #include "StepRecorderWidget.h"
 #include "TextFloat.h"

diff --git a/src/gui/include/PositionLine.h → src/gui/editors/PositionLine.h b/src/gui/include/PositionLine.h → src/gui/editors/PositionLine.h
diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp
@@ -34,26 +34,26 @@
 #include <QSlider>
 #include <QTimeLine>
 
-#include "ActionGroup.h"
+#include "gui/ActionGroup.h"
 #include "AudioDevice.h"
 #include "AudioEngine.h"
-#include "AutomatableSlider.h"
+#include "gui/widgets/AutomatableSlider.h"
 #include "ClipView.h"
 #include "ComboBox.h"
 #include "ConfigManager.h"
-#include "CPULoadWidget.h"
-#include "DeprecationHelper.h"
+#include "gui/widgets/CPULoadWidget.h"
+#include "gui/DeprecationHelper.h"
 #include "embed.h"
 #include "GuiApplication.h"
 #include "LcdSpinBox.h"
 #include "MainWindow.h"
-#include "MeterDialog.h"
-#include "Oscilloscope.h"
+#include "gui/widgets/MeterDialog.h"
+#include "gui/widgets/Oscilloscope.h"
 #include "PianoRoll.h"
 #include "PositionLine.h"
 #include "SubWindow.h"
 #include "TextFloat.h"
-#include "TimeDisplayWidget.h"
+#include "gui/widgets/TimeDisplayWidget.h"
 #include "TimeLineWidget.h"
 #include "TrackView.h"
 

diff --git a/src/gui/editors/TimeLineWidget.cpp b/src/gui/editors/TimeLineWidget.cpp
@@ -37,7 +37,7 @@
 #include "ConfigManager.h"
 #include "embed.h"
 #include "GuiApplication.h"
-#include "NStateButton.h"
+#include "gui/widgets/NStateButton.h"
 #include "TextFloat.h"
 
 namespace lmms::gui

diff --git a/src/gui/editors/TrackContainerView.cpp b/src/gui/editors/TrackContainerView.cpp
@@ -33,7 +33,7 @@
 #include "AudioEngine.h"
 #include "DataFile.h"
 #include "MainWindow.h"
-#include "FileBrowser.h"
+#include "gui/FileBrowser.h"
 #include "ImportFilter.h"
 #include "Instrument.h"
 #include "InstrumentTrack.h"

diff --git a/src/gui/include/EnvelopeAndLfoView.h → src/gui/instrument/EnvelopeAndLfoView.h b/src/gui/include/EnvelopeAndLfoView.h → src/gui/instrument/EnvelopeAndLfoView.h
diff --git a/src/gui/instrument/EnvelopeGraph.cpp b/src/gui/instrument/EnvelopeGraph.cpp
@@ -31,7 +31,7 @@
 
 #include "EnvelopeAndLfoParameters.h"
 #include "lmms_math.h"
-#include "ColorHelper.h"
+#include "gui/ColorHelper.h"
 
 #include <cmath>
 

diff --git a/src/gui/include/EnvelopeGraph.h → src/gui/instrument/EnvelopeGraph.h b/src/gui/include/EnvelopeGraph.h → src/gui/instrument/EnvelopeGraph.h
diff --git a/src/gui/instrument/InstrumentFunctionViews.cpp b/src/gui/instrument/InstrumentFunctionViews.cpp
@@ -29,7 +29,7 @@
 #include "InstrumentFunctions.h"
 #include "InstrumentFunctionViews.h"
 #include "ComboBox.h"
-#include "GroupBox.h"
+#include "gui/widgets/GroupBox.h"
 #include "gui_templates.h"
 #include "Knob.h"
 #include "TempoSyncKnob.h"

diff --git a/src/gui/include/InstrumentFunctionViews.h → src/gui/instrument/InstrumentFunctionViews.h b/src/gui/include/InstrumentFunctionViews.h → src/gui/instrument/InstrumentFunctionViews.h
diff --git a/src/gui/instrument/InstrumentMidiIOView.cpp b/src/gui/instrument/InstrumentMidiIOView.cpp
@@ -28,11 +28,11 @@
 #include <QVBoxLayout>
 
 #include "InstrumentMidiIOView.h"
-#include "MidiPortMenu.h"
+#include "gui/menus/MidiPortMenu.h"
 #include "AudioEngine.h"
 #include "Engine.h"
 #include "embed.h"
-#include "GroupBox.h"
+#include "gui/widgets/GroupBox.h"
 #include "gui_templates.h"
 #include "LcdSpinBox.h"
 #include "MidiClient.h"

diff --git a/src/gui/include/InstrumentMidiIOView.h → src/gui/instrument/InstrumentMidiIOView.h b/src/gui/include/InstrumentMidiIOView.h → src/gui/instrument/InstrumentMidiIOView.h
diff --git a/src/gui/instrument/InstrumentSoundShapingView.cpp b/src/gui/instrument/InstrumentSoundShapingView.cpp
@@ -30,10 +30,10 @@
 #include "EnvelopeAndLfoParameters.h"
 #include "EnvelopeAndLfoView.h"
 #include "ComboBox.h"
-#include "GroupBox.h"
+#include "gui/widgets/GroupBox.h"
 #include "gui_templates.h"
 #include "Knob.h"
-#include "TabWidget.h"
+#include "gui/widgets/TabWidget.h"
 
 
 namespace lmms::gui

diff --git a/src/gui/include/InstrumentSoundShapingView.h → ...i/instrument/InstrumentSoundShapingView.h b/src/gui/include/InstrumentSoundShapingView.h → ...i/instrument/InstrumentSoundShapingView.h
diff --git a/src/gui/instrument/InstrumentTrackWindow.cpp b/src/gui/instrument/InstrumentTrackWindow.cpp
@@ -39,9 +39,9 @@
 #include "EffectRackView.h"
 #include "embed.h"
 #include "Engine.h"
-#include "FileBrowser.h"
+#include "gui/FileBrowser.h"
 #include "FileDialog.h"
-#include "GroupBox.h"
+#include "gui/widgets/GroupBox.h"
 #include "MixerChannelLcdSpinBox.h"
 #include "GuiApplication.h"
 #include "Instrument.h"
@@ -55,17 +55,17 @@
 #include "Knob.h"
 #include "LcdSpinBox.h"
 #include "LedCheckBox.h"
-#include "LeftRightNav.h"
+#include "gui/widgets/LeftRightNav.h"
 #include "MainWindow.h"
 #include "PianoView.h"
 #include "PluginFactory.h"
 #include "PluginView.h"
 #include "Song.h"
 #include "StringPairDrag.h"
 #include "SubWindow.h"
-#include "TabWidget.h"
+#include "gui/widgets/TabWidget.h"
 #include "TrackContainerView.h"
-#include "TrackLabelButton.h"
+#include "gui/tracks/TrackLabelButton.h"
 
 
 namespace lmms::gui

diff --git a/src/gui/include/InstrumentTrackWindow.h → src/gui/instrument/InstrumentTrackWindow.h b/src/gui/include/InstrumentTrackWindow.h → src/gui/instrument/InstrumentTrackWindow.h
diff --git a/src/gui/instrument/InstrumentTuningView.cpp b/src/gui/instrument/InstrumentTuningView.cpp
@@ -31,7 +31,7 @@
 #include <QVBoxLayout>
 
 #include "ComboBox.h"
-#include "GroupBox.h"
+#include "gui/widgets/GroupBox.h"
 #include "GuiApplication.h"
 #include "gui_templates.h"
 #include "InstrumentTrack.h"

diff --git a/src/gui/include/InstrumentTuningView.h → src/gui/instrument/InstrumentTuningView.h b/src/gui/include/InstrumentTuningView.h → src/gui/instrument/InstrumentTuningView.h
diff --git a/src/gui/instrument/LfoGraph.cpp b/src/gui/instrument/LfoGraph.cpp
@@ -30,7 +30,7 @@
 
 #include "EnvelopeAndLfoParameters.h"
 #include "Oscillator.h"
-#include "ColorHelper.h"
+#include "gui/ColorHelper.h"
 
 #include "gui_templates.h"
 

diff --git a/src/gui/include/LfoGraph.h → src/gui/instrument/LfoGraph.h b/src/gui/include/LfoGraph.h → src/gui/instrument/LfoGraph.h
diff --git a/src/gui/include/MidiPortMenu.h → src/gui/menus/MidiPortMenu.h b/src/gui/include/MidiPortMenu.h → src/gui/menus/MidiPortMenu.h
diff --git a/src/gui/include/RecentProjectsMenu.h → src/gui/menus/RecentProjectsMenu.h b/src/gui/include/RecentProjectsMenu.h → src/gui/menus/RecentProjectsMenu.h
diff --git a/src/gui/include/TemplatesMenu.h → src/gui/menus/TemplatesMenu.h b/src/gui/include/TemplatesMenu.h → src/gui/menus/TemplatesMenu.h
diff --git a/src/gui/include/AboutDialog.h → src/gui/modals/AboutDialog.h b/src/gui/include/AboutDialog.h → src/gui/modals/AboutDialog.h
diff --git a/src/gui/modals/ControllerConnectionDialog.cpp b/src/gui/modals/ControllerConnectionDialog.cpp
@@ -33,14 +33,14 @@
 #include "ControllerConnection.h"
 #include "MidiController.h"
 #include "MidiClient.h"
-#include "MidiPortMenu.h"
+#include "gui/menus/MidiPortMenu.h"
 #include "LcdSpinBox.h"
 #include "LedCheckBox.h"
 #include "ComboBox.h"
-#include "GroupBox.h"
+#include "gui/widgets/GroupBox.h"
 #include "Song.h"
-#include "TabWidget.h"
-#include "ToolButton.h"
+#include "gui/widgets/TabWidget.h"
+#include "gui/widgets/ToolButton.h"
 
 #include "embed.h"
 

diff --git a/src/gui/include/ControllerConnectionDialog.h → src/gui/modals/ControllerConnectionDialog.h b/src/gui/include/ControllerConnectionDialog.h → src/gui/modals/ControllerConnectionDialog.h
diff --git a/src/gui/include/EffectSelectDialog.h → src/gui/modals/EffectSelectDialog.h b/src/gui/include/EffectSelectDialog.h → src/gui/modals/EffectSelectDialog.h
diff --git a/src/gui/include/RenameDialog.h → src/gui/modals/RenameDialog.h b/src/gui/include/RenameDialog.h → src/gui/modals/RenameDialog.h
diff --git a/src/gui/modals/SetupDialog.cpp b/src/gui/modals/SetupDialog.cpp
@@ -38,7 +38,7 @@
 #include "Engine.h"
 #include "FileDialog.h"
 #include "MainWindow.h"
-#include "MidiSetupWidget.h"
+#include "gui/MidiSetupWidget.h"
 #include "ProjectJournal.h"
 #include "SetupDialog.h"
 #include "TabBar.h"
@@ -47,7 +47,7 @@
 
 // Platform-specific audio-interface classes.
 #include "AudioAlsa.h"
-#include "AudioAlsaSetupWidget.h"
+#include "gui/AudioAlsaSetupWidget.h"
 #include "AudioDummy.h"
 #include "AudioJack.h"
 #include "AudioOss.h"

diff --git a/src/gui/include/SetupDialog.h → src/gui/modals/SetupDialog.h b/src/gui/include/SetupDialog.h → src/gui/modals/SetupDialog.h
@@ -32,7 +32,7 @@
 #include "AudioDeviceSetupWidget.h"
 #include "lmmsconfig.h"
 #include "MidiClient.h"
-#include "MidiSetupWidget.h"
+#include "gui/MidiSetupWidget.h"
 
 
 class QCheckBox;

diff --git a/src/gui/modals/VersionedSaveDialog.cpp b/src/gui/modals/VersionedSaveDialog.cpp
@@ -29,7 +29,7 @@
 #include <QPushButton>
 #include <QGroupBox>
 
-#include "DeprecationHelper.h"
+#include "gui/DeprecationHelper.h"
 #include "VersionedSaveDialog.h"
 #include "LedCheckBox.h"
 

diff --git a/src/gui/include/VersionedSaveDialog.h → src/gui/modals/VersionedSaveDialog.h b/src/gui/include/VersionedSaveDialog.h → src/gui/modals/VersionedSaveDialog.h
diff --git a/src/gui/include/FadeButton.h → src/gui/tracks/FadeButton.h b/src/gui/include/FadeButton.h → src/gui/tracks/FadeButton.h
diff --git a/src/gui/tracks/InstrumentTrackView.cpp b/src/gui/tracks/InstrumentTrackView.cpp
@@ -36,15 +36,15 @@
 #include "Engine.h"
 #include "FadeButton.h"
 #include "Knob.h"
-#include "MidiCCRackView.h"
+#include "gui/MidiCCRackView.h"
 #include "Mixer.h"
 #include "MixerView.h"
 #include "GuiApplication.h"
 #include "Instrument.h"
-#include "InstrumentTrackWindow.h"
+#include "gui/instrument/InstrumentTrackWindow.h"
 #include "MainWindow.h"
 #include "MidiClient.h"
-#include "MidiPortMenu.h"
+#include "gui/menus/MidiPortMenu.h"
 #include "TrackLabelButton.h"