From 162bf4066a1b2c22a784c8fe73ee7510acec6635 Mon Sep 17 00:00:00 2001 From: Paul Walker Date: Fri, 23 Aug 2024 08:50:36 -0400 Subject: [PATCH] Code Cleanup: Run fixcode after big UI restructure I forgot to run fix-code when i did the ui restructure so the header include names hadn't been rebuilt. No biggie but it means runnign fix code again gave loads of diffs, so package those up into a single pr and get on with life --- src-ui/app/HasEditor.h | 4 ++-- src-ui/app/SCXTEditor.h | 4 ++-- src-ui/app/browser-ui/BrowserPane.h | 4 ++-- src-ui/app/edit-screen/EditScreen.h | 4 ++-- src-ui/app/edit-screen/components/AdsrPane.h | 4 ++-- src-ui/app/edit-screen/components/GroupZoneTreeControl.h | 4 ++-- src-ui/app/edit-screen/components/LFOPane.h | 4 ++-- src-ui/app/edit-screen/components/MappingPane.h | 4 ++-- src-ui/app/edit-screen/components/ModPane.h | 4 ++-- src-ui/app/edit-screen/components/OutputPane.h | 4 ++-- src-ui/app/edit-screen/components/PartGroupSidebar.h | 4 ++-- src-ui/app/edit-screen/components/ProcessorPane.h | 4 ++-- src-ui/app/editor-impl/SCXTJuceLookAndFeel.h | 4 ++-- src-ui/app/mixer-screen/MixerScreen.h | 4 ++-- src-ui/app/mixer-screen/components/BusPane.h | 4 ++-- src-ui/app/mixer-screen/components/ChannelStrip.h | 4 ++-- src-ui/app/mixer-screen/components/PartEffectsPane.h | 4 ++-- src-ui/app/other-screens/AboutScreen.h | 4 ++-- src-ui/app/other-screens/LogScreen.h | 4 ++-- src-ui/app/other-screens/WelcomeScreen.h | 4 ++-- src-ui/app/play-screen/PlayScreen.h | 4 ++-- src-ui/app/shared/HeaderRegion.h | 4 ++-- src-ui/app/shared/PartSidebarCard.h | 4 ++-- src-ui/app/shared/SingleMacroEditor.h | 4 ++-- src-ui/connectors/JSONAssetSupport.h | 4 ++-- 25 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src-ui/app/HasEditor.h b/src-ui/app/HasEditor.h index 99189283..8e93a83c 100644 --- a/src-ui/app/HasEditor.h +++ b/src-ui/app/HasEditor.h @@ -25,8 +25,8 @@ * https://github.com/surge-synthesizer/shortcircuit-xt */ -#ifndef SCXT_SRC_UI_COMPONENTS_HASEDITOR_H -#define SCXT_SRC_UI_COMPONENTS_HASEDITOR_H +#ifndef SCXT_SRC_UI_APP_HASEDITOR_H +#define SCXT_SRC_UI_APP_HASEDITOR_H #include #include diff --git a/src-ui/app/SCXTEditor.h b/src-ui/app/SCXTEditor.h index c9826e9a..ba2d7c16 100644 --- a/src-ui/app/SCXTEditor.h +++ b/src-ui/app/SCXTEditor.h @@ -25,8 +25,8 @@ * https://github.com/surge-synthesizer/shortcircuit-xt */ -#ifndef SCXT_SRC_UI_COMPONENTS_SCXTEDITOR_H -#define SCXT_SRC_UI_COMPONENTS_SCXTEDITOR_H +#ifndef SCXT_SRC_UI_APP_SCXTEDITOR_H +#define SCXT_SRC_UI_APP_SCXTEDITOR_H #include #include diff --git a/src-ui/app/browser-ui/BrowserPane.h b/src-ui/app/browser-ui/BrowserPane.h index d0bf0e86..6a1998ec 100644 --- a/src-ui/app/browser-ui/BrowserPane.h +++ b/src-ui/app/browser-ui/BrowserPane.h @@ -25,8 +25,8 @@ * https://github.com/surge-synthesizer/shortcircuit-xt */ -#ifndef SCXT_SRC_UI_COMPONENTS_BROWSER_BROWSERPANE_H -#define SCXT_SRC_UI_COMPONENTS_BROWSER_BROWSERPANE_H +#ifndef SCXT_SRC_UI_APP_BROWSER_UI_BROWSERPANE_H +#define SCXT_SRC_UI_APP_BROWSER_UI_BROWSERPANE_H #include #include "filesystem/import.h" diff --git a/src-ui/app/edit-screen/EditScreen.h b/src-ui/app/edit-screen/EditScreen.h index 83573744..94bd82dd 100644 --- a/src-ui/app/edit-screen/EditScreen.h +++ b/src-ui/app/edit-screen/EditScreen.h @@ -25,8 +25,8 @@ * https://github.com/surge-synthesizer/shortcircuit-xt */ -#ifndef SCXT_SRC_UI_COMPONENTS_MULTISCREEN_H -#define SCXT_SRC_UI_COMPONENTS_MULTISCREEN_H +#ifndef SCXT_SRC_UI_APP_EDIT_SCREEN_EDITSCREEN_H +#define SCXT_SRC_UI_APP_EDIT_SCREEN_EDITSCREEN_H #include #include diff --git a/src-ui/app/edit-screen/components/AdsrPane.h b/src-ui/app/edit-screen/components/AdsrPane.h index f8efaace..0d2ab89a 100644 --- a/src-ui/app/edit-screen/components/AdsrPane.h +++ b/src-ui/app/edit-screen/components/AdsrPane.h @@ -25,8 +25,8 @@ * https://github.com/surge-synthesizer/shortcircuit-xt */ -#ifndef SCXT_SRC_UI_COMPONENTS_MULTI_ADSRPANE_H -#define SCXT_SRC_UI_COMPONENTS_MULTI_ADSRPANE_H +#ifndef SCXT_SRC_UI_APP_EDIT_SCREEN_COMPONENTS_ADSRPANE_H +#define SCXT_SRC_UI_APP_EDIT_SCREEN_COMPONENTS_ADSRPANE_H #include #include diff --git a/src-ui/app/edit-screen/components/GroupZoneTreeControl.h b/src-ui/app/edit-screen/components/GroupZoneTreeControl.h index 2e80b8c0..b4bb4de9 100644 --- a/src-ui/app/edit-screen/components/GroupZoneTreeControl.h +++ b/src-ui/app/edit-screen/components/GroupZoneTreeControl.h @@ -25,8 +25,8 @@ * https://github.com/surge-synthesizer/shortcircuit-xt */ -#ifndef SCXT_SRC_UI_COMPONENTS_MULTI_DETAIL_GROUPZONETREECONTROL_H -#define SCXT_SRC_UI_COMPONENTS_MULTI_DETAIL_GROUPZONETREECONTROL_H +#ifndef SCXT_SRC_UI_APP_EDIT_SCREEN_COMPONENTS_GROUPZONETREECONTROL_H +#define SCXT_SRC_UI_APP_EDIT_SCREEN_COMPONENTS_GROUPZONETREECONTROL_H #include #include diff --git a/src-ui/app/edit-screen/components/LFOPane.h b/src-ui/app/edit-screen/components/LFOPane.h index ce55718b..48b7d2cf 100644 --- a/src-ui/app/edit-screen/components/LFOPane.h +++ b/src-ui/app/edit-screen/components/LFOPane.h @@ -25,8 +25,8 @@ * https://github.com/surge-synthesizer/shortcircuit-xt */ -#ifndef SCXT_SRC_UI_COMPONENTS_MULTI_LFOPANE_H -#define SCXT_SRC_UI_COMPONENTS_MULTI_LFOPANE_H +#ifndef SCXT_SRC_UI_APP_EDIT_SCREEN_COMPONENTS_LFOPANE_H +#define SCXT_SRC_UI_APP_EDIT_SCREEN_COMPONENTS_LFOPANE_H #include "sst/jucegui/components/GlyphButton.h" #include "sst/jucegui/components/NamedPanel.h" diff --git a/src-ui/app/edit-screen/components/MappingPane.h b/src-ui/app/edit-screen/components/MappingPane.h index 5a0f219d..fa0266c5 100644 --- a/src-ui/app/edit-screen/components/MappingPane.h +++ b/src-ui/app/edit-screen/components/MappingPane.h @@ -25,8 +25,8 @@ * https://github.com/surge-synthesizer/shortcircuit-xt */ -#ifndef SCXT_SRC_UI_COMPONENTS_MULTI_MAPPINGPANE_H -#define SCXT_SRC_UI_COMPONENTS_MULTI_MAPPINGPANE_H +#ifndef SCXT_SRC_UI_APP_EDIT_SCREEN_COMPONENTS_MAPPINGPANE_H +#define SCXT_SRC_UI_APP_EDIT_SCREEN_COMPONENTS_MAPPINGPANE_H #include "sst/jucegui/components/NamedPanel.h" #include "app/HasEditor.h" diff --git a/src-ui/app/edit-screen/components/ModPane.h b/src-ui/app/edit-screen/components/ModPane.h index aab87b05..d804d761 100644 --- a/src-ui/app/edit-screen/components/ModPane.h +++ b/src-ui/app/edit-screen/components/ModPane.h @@ -25,8 +25,8 @@ * https://github.com/surge-synthesizer/shortcircuit-xt */ -#ifndef SCXT_SRC_UI_COMPONENTS_MULTI_MODPANE_H -#define SCXT_SRC_UI_COMPONENTS_MULTI_MODPANE_H +#ifndef SCXT_SRC_UI_APP_EDIT_SCREEN_COMPONENTS_MODPANE_H +#define SCXT_SRC_UI_APP_EDIT_SCREEN_COMPONENTS_MODPANE_H #include "sst/jucegui/components/NamedPanel.h" #include "app/HasEditor.h" diff --git a/src-ui/app/edit-screen/components/OutputPane.h b/src-ui/app/edit-screen/components/OutputPane.h index 3571665c..83ef041d 100644 --- a/src-ui/app/edit-screen/components/OutputPane.h +++ b/src-ui/app/edit-screen/components/OutputPane.h @@ -25,8 +25,8 @@ * https://github.com/surge-synthesizer/shortcircuit-xt */ -#ifndef SCXT_SRC_UI_COMPONENTS_MULTI_OUTPUTPANE_H -#define SCXT_SRC_UI_COMPONENTS_MULTI_OUTPUTPANE_H +#ifndef SCXT_SRC_UI_APP_EDIT_SCREEN_COMPONENTS_OUTPUTPANE_H +#define SCXT_SRC_UI_APP_EDIT_SCREEN_COMPONENTS_OUTPUTPANE_H #include "sst/jucegui/components/NamedPanel.h" #include "app/HasEditor.h" diff --git a/src-ui/app/edit-screen/components/PartGroupSidebar.h b/src-ui/app/edit-screen/components/PartGroupSidebar.h index 10cb6d54..e9b92a69 100644 --- a/src-ui/app/edit-screen/components/PartGroupSidebar.h +++ b/src-ui/app/edit-screen/components/PartGroupSidebar.h @@ -25,8 +25,8 @@ * https://github.com/surge-synthesizer/shortcircuit-xt */ -#ifndef SCXT_SRC_UI_COMPONENTS_MULTI_PARTGROUPSIDEBAR_H -#define SCXT_SRC_UI_COMPONENTS_MULTI_PARTGROUPSIDEBAR_H +#ifndef SCXT_SRC_UI_APP_EDIT_SCREEN_COMPONENTS_PARTGROUPSIDEBAR_H +#define SCXT_SRC_UI_APP_EDIT_SCREEN_COMPONENTS_PARTGROUPSIDEBAR_H #include #include "sst/jucegui/components/NamedPanel.h" diff --git a/src-ui/app/edit-screen/components/ProcessorPane.h b/src-ui/app/edit-screen/components/ProcessorPane.h index a7b62dcf..4cd46313 100644 --- a/src-ui/app/edit-screen/components/ProcessorPane.h +++ b/src-ui/app/edit-screen/components/ProcessorPane.h @@ -25,8 +25,8 @@ * https://github.com/surge-synthesizer/shortcircuit-xt */ -#ifndef SCXT_SRC_UI_COMPONENTS_MULTI_PROCESSORPANE_H -#define SCXT_SRC_UI_COMPONENTS_MULTI_PROCESSORPANE_H +#ifndef SCXT_SRC_UI_APP_EDIT_SCREEN_COMPONENTS_PROCESSORPANE_H +#define SCXT_SRC_UI_APP_EDIT_SCREEN_COMPONENTS_PROCESSORPANE_H #include #include diff --git a/src-ui/app/editor-impl/SCXTJuceLookAndFeel.h b/src-ui/app/editor-impl/SCXTJuceLookAndFeel.h index d0db5c04..5431b0c5 100644 --- a/src-ui/app/editor-impl/SCXTJuceLookAndFeel.h +++ b/src-ui/app/editor-impl/SCXTJuceLookAndFeel.h @@ -25,8 +25,8 @@ * https://github.com/surge-synthesizer/shortcircuit-xt */ -#ifndef SCXT_SRC_UI_COMPONENTS_SCXTJUCELOOKANDFEEL_H -#define SCXT_SRC_UI_COMPONENTS_SCXTJUCELOOKANDFEEL_H +#ifndef SCXT_SRC_UI_APP_EDITOR_IMPL_SCXTJUCELOOKANDFEEL_H +#define SCXT_SRC_UI_APP_EDITOR_IMPL_SCXTJUCELOOKANDFEEL_H #include #include "connectors/SCXTResources.h" diff --git a/src-ui/app/mixer-screen/MixerScreen.h b/src-ui/app/mixer-screen/MixerScreen.h index ad89487d..e08989ca 100644 --- a/src-ui/app/mixer-screen/MixerScreen.h +++ b/src-ui/app/mixer-screen/MixerScreen.h @@ -25,8 +25,8 @@ * https://github.com/surge-synthesizer/shortcircuit-xt */ -#ifndef SCXT_SRC_UI_COMPONENTS_MIXERSCREEN_H -#define SCXT_SRC_UI_COMPONENTS_MIXERSCREEN_H +#ifndef SCXT_SRC_UI_APP_MIXER_SCREEN_MIXERSCREEN_H +#define SCXT_SRC_UI_APP_MIXER_SCREEN_MIXERSCREEN_H #include "configuration.h" #include "app/HasEditor.h" diff --git a/src-ui/app/mixer-screen/components/BusPane.h b/src-ui/app/mixer-screen/components/BusPane.h index c83f4261..72b0e225 100644 --- a/src-ui/app/mixer-screen/components/BusPane.h +++ b/src-ui/app/mixer-screen/components/BusPane.h @@ -25,8 +25,8 @@ * https://github.com/surge-synthesizer/shortcircuit-xt */ -#ifndef SCXT_SRC_UI_COMPONENTS_MIXER_BUSPANE_H -#define SCXT_SRC_UI_COMPONENTS_MIXER_BUSPANE_H +#ifndef SCXT_SRC_UI_APP_MIXER_SCREEN_COMPONENTS_BUSPANE_H +#define SCXT_SRC_UI_APP_MIXER_SCREEN_COMPONENTS_BUSPANE_H #include diff --git a/src-ui/app/mixer-screen/components/ChannelStrip.h b/src-ui/app/mixer-screen/components/ChannelStrip.h index 86e064d0..0b31e15f 100644 --- a/src-ui/app/mixer-screen/components/ChannelStrip.h +++ b/src-ui/app/mixer-screen/components/ChannelStrip.h @@ -25,8 +25,8 @@ * https://github.com/surge-synthesizer/shortcircuit-xt */ -#ifndef SCXT_SRC_UI_COMPONENTS_MIXER_CHANNELSTRIP_H -#define SCXT_SRC_UI_COMPONENTS_MIXER_CHANNELSTRIP_H +#ifndef SCXT_SRC_UI_APP_MIXER_SCREEN_COMPONENTS_CHANNELSTRIP_H +#define SCXT_SRC_UI_APP_MIXER_SCREEN_COMPONENTS_CHANNELSTRIP_H #include "engine/bus.h" #include "app/HasEditor.h" diff --git a/src-ui/app/mixer-screen/components/PartEffectsPane.h b/src-ui/app/mixer-screen/components/PartEffectsPane.h index 9bc8dc48..abfc607d 100644 --- a/src-ui/app/mixer-screen/components/PartEffectsPane.h +++ b/src-ui/app/mixer-screen/components/PartEffectsPane.h @@ -25,8 +25,8 @@ * https://github.com/surge-synthesizer/shortcircuit-xt */ -#ifndef SCXT_SRC_UI_COMPONENTS_MIXER_PARTEFFECTSPANE_H -#define SCXT_SRC_UI_COMPONENTS_MIXER_PARTEFFECTSPANE_H +#ifndef SCXT_SRC_UI_APP_MIXER_SCREEN_COMPONENTS_PARTEFFECTSPANE_H +#define SCXT_SRC_UI_APP_MIXER_SCREEN_COMPONENTS_PARTEFFECTSPANE_H #include #include diff --git a/src-ui/app/other-screens/AboutScreen.h b/src-ui/app/other-screens/AboutScreen.h index 07ad96d1..5be3c0e9 100644 --- a/src-ui/app/other-screens/AboutScreen.h +++ b/src-ui/app/other-screens/AboutScreen.h @@ -25,8 +25,8 @@ * https://github.com/surge-synthesizer/shortcircuit-xt */ -#ifndef SCXT_SRC_UI_COMPONENTS_ABOUTSCREEN_H -#define SCXT_SRC_UI_COMPONENTS_ABOUTSCREEN_H +#ifndef SCXT_SRC_UI_APP_OTHER_SCREENS_ABOUTSCREEN_H +#define SCXT_SRC_UI_APP_OTHER_SCREENS_ABOUTSCREEN_H #include "app/HasEditor.h" #include diff --git a/src-ui/app/other-screens/LogScreen.h b/src-ui/app/other-screens/LogScreen.h index 8b90b6d0..e543a677 100644 --- a/src-ui/app/other-screens/LogScreen.h +++ b/src-ui/app/other-screens/LogScreen.h @@ -25,8 +25,8 @@ * https://github.com/surge-synthesizer/shortcircuit-xt */ -#ifndef SCXT_SRC_UI_COMPONENTS_LOGSCREEN_H -#define SCXT_SRC_UI_COMPONENTS_LOGSCREEN_H +#ifndef SCXT_SRC_UI_APP_OTHER_SCREENS_LOGSCREEN_H +#define SCXT_SRC_UI_APP_OTHER_SCREENS_LOGSCREEN_H #include "app/HasEditor.h" #include diff --git a/src-ui/app/other-screens/WelcomeScreen.h b/src-ui/app/other-screens/WelcomeScreen.h index aee44ca0..3b25afba 100644 --- a/src-ui/app/other-screens/WelcomeScreen.h +++ b/src-ui/app/other-screens/WelcomeScreen.h @@ -25,8 +25,8 @@ * https://github.com/surge-synthesizer/shortcircuit-xt */ -#ifndef SCXT_SRC_UI_COMPONENTS_WELCOMESCREEN_H -#define SCXT_SRC_UI_COMPONENTS_WELCOMESCREEN_H +#ifndef SCXT_SRC_UI_APP_OTHER_SCREENS_WELCOMESCREEN_H +#define SCXT_SRC_UI_APP_OTHER_SCREENS_WELCOMESCREEN_H #include #include "sst/jucegui/components/TextPushButton.h" diff --git a/src-ui/app/play-screen/PlayScreen.h b/src-ui/app/play-screen/PlayScreen.h index 0829b0e2..70511a43 100644 --- a/src-ui/app/play-screen/PlayScreen.h +++ b/src-ui/app/play-screen/PlayScreen.h @@ -25,8 +25,8 @@ * https://github.com/surge-synthesizer/shortcircuit-xt */ -#ifndef SCXT_SRC_UI_COMPONENTS_PLAYSCREEN_H -#define SCXT_SRC_UI_COMPONENTS_PLAYSCREEN_H +#ifndef SCXT_SRC_UI_APP_PLAY_SCREEN_PLAYSCREEN_H +#define SCXT_SRC_UI_APP_PLAY_SCREEN_PLAYSCREEN_H #include #include diff --git a/src-ui/app/shared/HeaderRegion.h b/src-ui/app/shared/HeaderRegion.h index 10699240..b7476573 100644 --- a/src-ui/app/shared/HeaderRegion.h +++ b/src-ui/app/shared/HeaderRegion.h @@ -25,8 +25,8 @@ * https://github.com/surge-synthesizer/shortcircuit-xt */ -#ifndef SCXT_SRC_UI_COMPONENTS_HEADERREGION_H -#define SCXT_SRC_UI_COMPONENTS_HEADERREGION_H +#ifndef SCXT_SRC_UI_APP_SHARED_HEADERREGION_H +#define SCXT_SRC_UI_APP_SHARED_HEADERREGION_H #include #include diff --git a/src-ui/app/shared/PartSidebarCard.h b/src-ui/app/shared/PartSidebarCard.h index f94e66a0..d57863f4 100644 --- a/src-ui/app/shared/PartSidebarCard.h +++ b/src-ui/app/shared/PartSidebarCard.h @@ -25,8 +25,8 @@ * https://github.com/surge-synthesizer/shortcircuit-xt */ -#ifndef SCXT_SRC_UI_COMPONENTS_MULTI_PARTSIDEBARCARD_H -#define SCXT_SRC_UI_COMPONENTS_MULTI_PARTSIDEBARCARD_H +#ifndef SCXT_SRC_UI_APP_SHARED_PARTSIDEBARCARD_H +#define SCXT_SRC_UI_APP_SHARED_PARTSIDEBARCARD_H #include #include "sst/jucegui/components/MenuButton.h" diff --git a/src-ui/app/shared/SingleMacroEditor.h b/src-ui/app/shared/SingleMacroEditor.h index 0871173d..f7b6b358 100644 --- a/src-ui/app/shared/SingleMacroEditor.h +++ b/src-ui/app/shared/SingleMacroEditor.h @@ -25,8 +25,8 @@ * https://github.com/surge-synthesizer/shortcircuit-xt */ -#ifndef SCXT_SRC_UI_COMPONENTS_MULTI_SINGLEMACROEDITOR_H -#define SCXT_SRC_UI_COMPONENTS_MULTI_SINGLEMACROEDITOR_H +#ifndef SCXT_SRC_UI_APP_SHARED_SINGLEMACROEDITOR_H +#define SCXT_SRC_UI_APP_SHARED_SINGLEMACROEDITOR_H #include #include "sst/jucegui/components/Knob.h" diff --git a/src-ui/connectors/JSONAssetSupport.h b/src-ui/connectors/JSONAssetSupport.h index 073a9fab..bcc4e9e9 100644 --- a/src-ui/connectors/JSONAssetSupport.h +++ b/src-ui/connectors/JSONAssetSupport.h @@ -25,8 +25,8 @@ * https://github.com/surge-synthesizer/shortcircuit-xt */ -#ifndef SCXT_SRC_UI_CONNECTORS_JSONLAYOUTCONSUMER_H -#define SCXT_SRC_UI_CONNECTORS_JSONLAYOUTCONSUMER_H +#ifndef SCXT_SRC_UI_CONNECTORS_JSONASSETSUPPORT_H +#define SCXT_SRC_UI_CONNECTORS_JSONASSETSUPPORT_H #include #include