From ddaadfb7e7af851aef2b5c32c95fa58a1693197b Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sat, 30 Mar 2019 15:53:54 -0400 Subject: [PATCH] Remove NumericTextCtrl.h from other headers or comment why you can't --- src/Snap.h | 2 +- src/TimeDialog.cpp | 1 + src/TimeDialog.h | 3 ++- src/effects/ChangeSpeed.cpp | 1 + src/effects/ChangeSpeed.h | 3 +-- src/effects/DtmfGen.cpp | 1 + src/effects/DtmfGen.h | 3 +-- src/effects/Noise.cpp | 1 + src/effects/Noise.h | 3 +-- src/effects/Silence.cpp | 1 + src/effects/Silence.h | 4 ++-- src/effects/ToneGen.cpp | 1 + src/effects/ToneGen.h | 3 +-- src/effects/VST/VSTEffect.cpp | 1 + src/effects/VST/VSTEffect.h | 3 ++- src/effects/ladspa/LadspaEffect.cpp | 1 + src/effects/ladspa/LadspaEffect.h | 5 +++-- src/effects/lv2/LV2Effect.cpp | 1 + src/effects/lv2/LV2Effect.h | 5 ++++- src/toolbars/SpectralSelectionBar.cpp | 2 ++ src/toolbars/SpectralSelectionBar.h | 1 - src/widgets/Grid.h | 2 +- 22 files changed, 30 insertions(+), 18 deletions(-) diff --git a/src/Snap.h b/src/Snap.h index 074625c92..1208205b5 100644 --- a/src/Snap.h +++ b/src/Snap.h @@ -17,7 +17,7 @@ #include #include -#include "widgets/NumericTextCtrl.h" +#include "widgets/NumericTextCtrl.h" // member variable class AudacityProject; class Track; diff --git a/src/TimeDialog.cpp b/src/TimeDialog.cpp index 10d393cf7..faf086a2a 100644 --- a/src/TimeDialog.cpp +++ b/src/TimeDialog.cpp @@ -22,6 +22,7 @@ #include #include "ShuttleGui.h" +#include "widgets/NumericTextCtrl.h" BEGIN_EVENT_TABLE(TimeDialog, wxDialogWrapper) EVT_COMMAND(wxID_ANY, EVT_TIMETEXTCTRL_UPDATED, TimeDialog::OnUpdate) diff --git a/src/TimeDialog.h b/src/TimeDialog.h index 9c9a9c24a..064fa37cd 100644 --- a/src/TimeDialog.h +++ b/src/TimeDialog.h @@ -13,7 +13,8 @@ #include -#include "widgets/NumericTextCtrl.h" // for NumericFormatSymbol +#include "audacity/ComponentInterface.h" // member variable + #include "widgets/wxPanelWrapper.h" // to inherit class NumericTextCtrl; diff --git a/src/effects/ChangeSpeed.cpp b/src/effects/ChangeSpeed.cpp index cd58a6e45..dc6f77320 100644 --- a/src/effects/ChangeSpeed.cpp +++ b/src/effects/ChangeSpeed.cpp @@ -28,6 +28,7 @@ #include "../Resample.h" #include "../Shuttle.h" #include "../ShuttleGui.h" +#include "../widgets/NumericTextCtrl.h" #include "../widgets/valnum.h" #include "TimeWarper.h" diff --git a/src/effects/ChangeSpeed.h b/src/effects/ChangeSpeed.h index 5ee9ab596..1fa8470bf 100644 --- a/src/effects/ChangeSpeed.h +++ b/src/effects/ChangeSpeed.h @@ -13,13 +13,12 @@ #ifndef __AUDACITY_EFFECT_CHANGESPEED__ #define __AUDACITY_EFFECT_CHANGESPEED__ -#include "../widgets/NumericTextCtrl.h" - #include "Effect.h" class wxSlider; class wxChoice; class wxTextCtrl; +class NumericTextCtrl; class ShuttleGui; #define CHANGESPEED_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Change Speed") } diff --git a/src/effects/DtmfGen.cpp b/src/effects/DtmfGen.cpp index 160ef53bb..100fb168c 100644 --- a/src/effects/DtmfGen.cpp +++ b/src/effects/DtmfGen.cpp @@ -27,6 +27,7 @@ #include "../Prefs.h" #include "../Shuttle.h" #include "../ShuttleGui.h" +#include "../widgets/NumericTextCtrl.h" #include "../widgets/valnum.h" diff --git a/src/effects/DtmfGen.h b/src/effects/DtmfGen.h index f9417463c..ea265c01b 100644 --- a/src/effects/DtmfGen.h +++ b/src/effects/DtmfGen.h @@ -14,13 +14,12 @@ #ifndef __AUDACITY_EFFECT_DTMF__ #define __AUDACITY_EFFECT_DTMF__ -#include "../widgets/NumericTextCtrl.h" - #include "Effect.h" class wxSlider; class wxStaticText; class wxTextCtrl; +class NumericTextCtrl; class ShuttleGui; #define DTMFTONES_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("DTMF Tones") } diff --git a/src/effects/Noise.cpp b/src/effects/Noise.cpp index 61c031f2d..d7844bfd5 100644 --- a/src/effects/Noise.cpp +++ b/src/effects/Noise.cpp @@ -27,6 +27,7 @@ #include "../Shuttle.h" #include "../ShuttleGui.h" #include "../widgets/valnum.h" +#include "../widgets/NumericTextCtrl.h" enum kTypes { diff --git a/src/effects/Noise.h b/src/effects/Noise.h index 951e1b133..9efd528e3 100644 --- a/src/effects/Noise.h +++ b/src/effects/Noise.h @@ -13,10 +13,9 @@ #ifndef __AUDACITY_EFFECT_NOISE__ #define __AUDACITY_EFFECT_NOISE__ -#include "../widgets/NumericTextCtrl.h" - #include "Effect.h" +class NumericTextCtrl; class ShuttleGui; #define NOISE_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Noise") } diff --git a/src/effects/Silence.cpp b/src/effects/Silence.cpp index a91701590..3617bea72 100644 --- a/src/effects/Silence.cpp +++ b/src/effects/Silence.cpp @@ -20,6 +20,7 @@ #include "../ShuttleGui.h" #include "../WaveTrack.h" +#include "../widgets/NumericTextCtrl.h" EffectSilence::EffectSilence() { diff --git a/src/effects/Silence.h b/src/effects/Silence.h index 40587ebac..b8f60eb98 100644 --- a/src/effects/Silence.h +++ b/src/effects/Silence.h @@ -13,10 +13,10 @@ #ifndef __AUDACITY_EFFECT_SILENCE__ #define __AUDACITY_EFFECT_SILENCE__ -#include "../widgets/NumericTextCtrl.h" - #include "Generator.h" +class NumericTextCtrl; + #define SILENCE_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Silence") } class EffectSilence final : public Generator diff --git a/src/effects/ToneGen.cpp b/src/effects/ToneGen.cpp index e247a3e0a..5b648076a 100644 --- a/src/effects/ToneGen.cpp +++ b/src/effects/ToneGen.cpp @@ -32,6 +32,7 @@ frequency changes smoothly during the tone. #include "../Shuttle.h" #include "../ShuttleGui.h" #include "../widgets/valnum.h" +#include "../widgets/NumericTextCtrl.h" enum kInterpolations { diff --git a/src/effects/ToneGen.h b/src/effects/ToneGen.h index d57852eca..ca988c801 100644 --- a/src/effects/ToneGen.h +++ b/src/effects/ToneGen.h @@ -13,10 +13,9 @@ #ifndef __AUDACITY_EFFECT_TONEGEN__ #define __AUDACITY_EFFECT_TONEGEN__ -#include "../widgets/NumericTextCtrl.h" - #include "Effect.h" +class NumericTextCtrl; class ShuttleGui; #define CHIRP_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Chirp") } diff --git a/src/effects/VST/VSTEffect.cpp b/src/effects/VST/VSTEffect.cpp index a30151f29..391eb0836 100644 --- a/src/effects/VST/VSTEffect.cpp +++ b/src/effects/VST/VSTEffect.cpp @@ -86,6 +86,7 @@ #include "../../effects/Effect.h" #include "../../widgets/valnum.h" #include "../../widgets/ErrorDialog.h" +#include "../../widgets/NumericTextCtrl.h" #include "../../xml/XMLFileReader.h" #if wxUSE_ACCESSIBILITY diff --git a/src/effects/VST/VSTEffect.h b/src/effects/VST/VSTEffect.h index 64ac039a1..cb693e845 100644 --- a/src/effects/VST/VSTEffect.h +++ b/src/effects/VST/VSTEffect.h @@ -17,13 +17,14 @@ #include "audacity/PluginInterface.h" #include "../../SampleFormat.h" -#include "../../widgets/NumericTextCtrl.h" #include "../../xml/XMLTagHandler.h" class wxSizerItem; class wxSlider; class wxStaticText; +class NumericTextCtrl; + class VSTControl; #include "VSTControl.h" diff --git a/src/effects/ladspa/LadspaEffect.cpp b/src/effects/ladspa/LadspaEffect.cpp index fa4847b8e..30b8131d2 100644 --- a/src/effects/ladspa/LadspaEffect.cpp +++ b/src/effects/ladspa/LadspaEffect.cpp @@ -48,6 +48,7 @@ effects from this one class. #include "../../FileNames.h" #include "../../ShuttleGui.h" +#include "../../widgets/NumericTextCtrl.h" #include "../../widgets/valnum.h" #include "../../widgets/wxPanelWrapper.h" diff --git a/src/effects/ladspa/LadspaEffect.h b/src/effects/ladspa/LadspaEffect.h index b2af1d0cc..ce8de7251 100644 --- a/src/effects/ladspa/LadspaEffect.h +++ b/src/effects/ladspa/LadspaEffect.h @@ -13,14 +13,15 @@ class wxStaticText; class wxTextCtrl; class wxCheckBox; +class NumericTextCtrl; + #include // member variable +#include // to inherit #include "audacity/EffectInterface.h" #include "audacity/ModuleInterface.h" #include "audacity/PluginInterface.h" -#include "../../widgets/NumericTextCtrl.h" - #include "ladspa.h" #include "../../SampleFormat.h" diff --git a/src/effects/lv2/LV2Effect.cpp b/src/effects/lv2/LV2Effect.cpp index e3817c628..3a68237d8 100644 --- a/src/effects/lv2/LV2Effect.cpp +++ b/src/effects/lv2/LV2Effect.cpp @@ -37,6 +37,7 @@ #include "../../ShuttleGui.h" #include "../../widgets/valnum.h" #include "../../widgets/ErrorDialog.h" +#include "../../widgets/NumericTextCtrl.h" #include "lilv/lilv.h" #include "suil/suil.h" diff --git a/src/effects/lv2/LV2Effect.h b/src/effects/lv2/LV2Effect.h index 6d0993122..b208accf4 100644 --- a/src/effects/lv2/LV2Effect.h +++ b/src/effects/lv2/LV2Effect.h @@ -17,6 +17,8 @@ class wxArrayString; #include +#include // to inherit + #include "lv2/lv2plug.in/ns/ext/atom/forge.h" #include "lv2/lv2plug.in/ns/ext/data-access/data-access.h" #include "lv2/lv2plug.in/ns/ext/options/options.h" @@ -28,7 +30,6 @@ class wxArrayString; #include #include "../../SampleFormat.h" -#include "../../widgets/NumericTextCtrl.h" #include "LoadLV2.h" @@ -37,6 +38,8 @@ class wxArrayString; class wxSlider; class wxTextCtrl; +class NumericTextCtrl; + #define LV2EFFECTS_VERSION wxT("1.0.0.0") /* i18n-hint: abbreviates "Linux Audio Developer's Simple Plugin API (LADSPA) version 2" */ diff --git a/src/toolbars/SpectralSelectionBar.cpp b/src/toolbars/SpectralSelectionBar.cpp index 1bb6ec5a5..7059c6a4a 100644 --- a/src/toolbars/SpectralSelectionBar.cpp +++ b/src/toolbars/SpectralSelectionBar.cpp @@ -61,6 +61,8 @@ with changes in the SpectralSelectionBar. #include "../widgets/WindowAccessible.h" #endif +#include "../widgets/NumericTextCtrl.h" + #ifdef EXPERIMENTAL_SPECTRAL_EDITING IMPLEMENT_CLASS(SpectralSelectionBar, ToolBar); diff --git a/src/toolbars/SpectralSelectionBar.h b/src/toolbars/SpectralSelectionBar.h index 27a423139..4bcba66ae 100644 --- a/src/toolbars/SpectralSelectionBar.h +++ b/src/toolbars/SpectralSelectionBar.h @@ -14,7 +14,6 @@ Paul Licameli #include #include "ToolBar.h" -#include "../widgets/NumericTextCtrl.h" class wxChoice; class wxComboBox; diff --git a/src/widgets/Grid.h b/src/widgets/Grid.h index 5ffc2dffa..f81fc66ab 100644 --- a/src/widgets/Grid.h +++ b/src/widgets/Grid.h @@ -15,7 +15,7 @@ #include // for wxUSE_* macros #include #include // to inherit wxGridCellEditor -#include "NumericTextCtrl.h" +#include "NumericTextCtrl.h" // for NumericConverter::Type #if wxUSE_ACCESSIBILITY class GridAx;