From 803d8b9559080165228f7d42467336dd040ac833 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Wed, 14 Nov 2018 11:07:06 -0500 Subject: [PATCH] Remove wx/filename.h, wx/choice.h, wxFileNameWrapper.h from headers --- src/BatchCommandDialog.h | 1 - src/BatchProcessDialog.h | 1 - src/BlockFile.h | 3 +-- src/Dependencies.h | 3 +-- src/DirManager.h | 3 +-- src/FileException.h | 2 +- src/Tags.h | 1 - src/TimerRecordDialog.cpp | 1 + src/blockfile/LegacyBlockFile.h | 4 ++-- src/blockfile/NotYetAvailableException.h | 1 - src/blockfile/SilentBlockFile.h | 2 -- src/blockfile/SimpleBlockFile.h | 2 -- src/commands/AudacityCommand.h | 1 - src/effects/ChangePitch.cpp | 1 + src/effects/ChangePitch.h | 2 +- src/effects/ChangeSpeed.cpp | 1 + src/effects/ChangeSpeed.h | 3 +-- src/effects/Effect.cpp | 1 + src/effects/EffectManager.h | 1 - src/effects/Equalization.h | 2 +- src/effects/ScienFilter.cpp | 1 + src/effects/ScienFilter.h | 2 +- src/effects/nyquist/Nyquist.cpp | 1 + src/effects/nyquist/Nyquist.h | 2 +- src/effects/vamp/VampEffect.h | 2 +- src/export/Export.h | 2 +- src/export/ExportMultiple.h | 2 +- src/import/ImportPlugin.h | 1 - src/prefs/DevicePrefs.h | 3 +-- src/prefs/MidiIOPrefs.h | 3 +-- src/prefs/QualityPrefs.cpp | 1 + src/prefs/QualityPrefs.h | 3 +-- src/toolbars/MixerToolBar.h | 1 - src/widgets/FileHistory.h | 1 - src/widgets/Grid.h | 2 +- src/wxFileNameWrapper.h | 2 ++ 36 files changed, 27 insertions(+), 38 deletions(-) diff --git a/src/BatchCommandDialog.h b/src/BatchCommandDialog.h index 2e2ce78b7..2dfd0c780 100644 --- a/src/BatchCommandDialog.h +++ b/src/BatchCommandDialog.h @@ -27,7 +27,6 @@ class wxWindow; class wxCheckBox; -class wxChoice; class wxTextCtrl; class wxRadioButton; class wxListCtrl; diff --git a/src/BatchProcessDialog.h b/src/BatchProcessDialog.h index eca8d820c..7258ea7bd 100644 --- a/src/BatchProcessDialog.h +++ b/src/BatchProcessDialog.h @@ -27,7 +27,6 @@ class wxWindow; class wxCheckBox; -class wxChoice; class wxTextCtrl; class wxRadioButton; class wxListCtrl; diff --git a/src/BlockFile.h b/src/BlockFile.h index 590ce8fbb..ee0988be5 100644 --- a/src/BlockFile.h +++ b/src/BlockFile.h @@ -14,14 +14,13 @@ #include "MemoryX.h" #include -#include #include "xml/XMLTagHandler.h" #include "xml/XMLWriter.h" #include "SampleFormat.h" -#include "wxFileNameWrapper.h" +#include "wxFileNameWrapper.h" // member variable below #include "ondemand/ODTaskThread.h" diff --git a/src/Dependencies.h b/src/Dependencies.h index d4897d8d6..440bdf87f 100644 --- a/src/Dependencies.h +++ b/src/Dependencies.h @@ -15,9 +15,8 @@ #define __AUDACITY_DEPENDENCIES__ #include -#include #include "MemoryX.h" -#include "wxFileNameWrapper.h" +#include "wxFileNameWrapper.h" // member variable below class AudacityProject; diff --git a/src/DirManager.h b/src/DirManager.h index 00e505dd9..deaff8e6a 100644 --- a/src/DirManager.h +++ b/src/DirManager.h @@ -13,16 +13,15 @@ #include "MemoryX.h" #include -#include #include #include #include "audacity/Types.h" #include "xml/XMLTagHandler.h" -#include "wxFileNameWrapper.h" #include +class wxFileNameWrapper; class wxHashTable; class BlockArray; class BlockFile; diff --git a/src/FileException.h b/src/FileException.h index 9f624be63..3ad4145d2 100644 --- a/src/FileException.h +++ b/src/FileException.h @@ -10,7 +10,7 @@ #define __AUDACITY_FILE_EXCEPTION__ #include "AudacityException.h" -#include +#include // wxFileName member variable below class FileException /* not final */ : public MessageBoxException { diff --git a/src/Tags.h b/src/Tags.h index 83c725ff1..27f6a93a0 100644 --- a/src/Tags.h +++ b/src/Tags.h @@ -45,7 +45,6 @@ class wxArrayString; class wxButton; -class wxChoice; class wxComboBox; class wxGridCellChoiceEditor; class wxRadioButton; diff --git a/src/TimerRecordDialog.cpp b/src/TimerRecordDialog.cpp index be444856d..9e7aa8be3 100644 --- a/src/TimerRecordDialog.cpp +++ b/src/TimerRecordDialog.cpp @@ -25,6 +25,7 @@ #include // for wxUSE_* macros +#include #include #include #include diff --git a/src/blockfile/LegacyBlockFile.h b/src/blockfile/LegacyBlockFile.h index bf9ec1165..7f13adbbe 100644 --- a/src/blockfile/LegacyBlockFile.h +++ b/src/blockfile/LegacyBlockFile.h @@ -11,10 +11,10 @@ #ifndef __AUDACITY_LEGACY_BLOCKFILE__ #define __AUDACITY_LEGACY_BLOCKFILE__ -#include - #include "../BlockFile.h" +class wxFileName; + void ComputeLegacySummaryInfo(const wxFileName &fileName, size_t summaryLen, sampleFormat format, diff --git a/src/blockfile/NotYetAvailableException.h b/src/blockfile/NotYetAvailableException.h index cc375c15c..c61360601 100644 --- a/src/blockfile/NotYetAvailableException.h +++ b/src/blockfile/NotYetAvailableException.h @@ -10,7 +10,6 @@ #define __AUDACITY_NOT_YET_AVAILABLE_EXCEPTION__ #include "../FileException.h" -#include // This exception can be thrown when attempting read of on-demand block files // that have not yet completed loading. diff --git a/src/blockfile/SilentBlockFile.h b/src/blockfile/SilentBlockFile.h index 946e08c9a..9ef760dd9 100644 --- a/src/blockfile/SilentBlockFile.h +++ b/src/blockfile/SilentBlockFile.h @@ -14,8 +14,6 @@ #ifndef __AUDACITY_SILENT_BLOCKFILE__ #define __AUDACITY_SILENT_BLOCKFILE__ -#include - #include "../BlockFile.h" #include "../DirManager.h" diff --git a/src/blockfile/SimpleBlockFile.h b/src/blockfile/SimpleBlockFile.h index 46e14c939..2c9df311d 100644 --- a/src/blockfile/SimpleBlockFile.h +++ b/src/blockfile/SimpleBlockFile.h @@ -11,8 +11,6 @@ #ifndef __AUDACITY_SIMPLE_BLOCKFILE__ #define __AUDACITY_SIMPLE_BLOCKFILE__ -#include - #include "../BlockFile.h" #include "../DirManager.h" #include "../xml/XMLWriter.h" diff --git a/src/commands/AudacityCommand.h b/src/commands/AudacityCommand.h index d48797883..452d2a4df 100644 --- a/src/commands/AudacityCommand.h +++ b/src/commands/AudacityCommand.h @@ -24,7 +24,6 @@ #include class wxCheckBox; -class wxChoice; class wxListBox; class wxWindow; diff --git a/src/effects/ChangePitch.cpp b/src/effects/ChangePitch.cpp index b1b356e24..95c9e8114 100644 --- a/src/effects/ChangePitch.cpp +++ b/src/effects/ChangePitch.cpp @@ -27,6 +27,7 @@ the pitch without changing the tempo. #include #include +#include #include #include #include diff --git a/src/effects/ChangePitch.h b/src/effects/ChangePitch.h index 8922c3f2d..cc159022f 100644 --- a/src/effects/ChangePitch.h +++ b/src/effects/ChangePitch.h @@ -26,12 +26,12 @@ the pitch without changing the tempo. #include #endif -#include #include #include "SoundTouchEffect.h" class wxSlider; +class wxChoice; class wxTextCtrl; class ShuttleGui; diff --git a/src/effects/ChangeSpeed.cpp b/src/effects/ChangeSpeed.cpp index 4cd56cdd0..cd58a6e45 100644 --- a/src/effects/ChangeSpeed.cpp +++ b/src/effects/ChangeSpeed.cpp @@ -18,6 +18,7 @@ #include +#include #include #include diff --git a/src/effects/ChangeSpeed.h b/src/effects/ChangeSpeed.h index 797a6072c..5ee9ab596 100644 --- a/src/effects/ChangeSpeed.h +++ b/src/effects/ChangeSpeed.h @@ -13,13 +13,12 @@ #ifndef __AUDACITY_EFFECT_CHANGESPEED__ #define __AUDACITY_EFFECT_CHANGESPEED__ -#include - #include "../widgets/NumericTextCtrl.h" #include "Effect.h" class wxSlider; +class wxChoice; class wxTextCtrl; class ShuttleGui; diff --git a/src/effects/Effect.cpp b/src/effects/Effect.cpp index cae185cd9..62e5d6562 100644 --- a/src/effects/Effect.cpp +++ b/src/effects/Effect.cpp @@ -29,6 +29,7 @@ greater use in future. #include #include +#include #include #include #include diff --git a/src/effects/EffectManager.h b/src/effects/EffectManager.h index a26368a89..955c90bed 100644 --- a/src/effects/EffectManager.h +++ b/src/effects/EffectManager.h @@ -15,7 +15,6 @@ #include "../Experimental.h" #include -#include #include #include diff --git a/src/effects/Equalization.h b/src/effects/Equalization.h index b7ed6a329..d464cc422 100644 --- a/src/effects/Equalization.h +++ b/src/effects/Equalization.h @@ -25,7 +25,6 @@ #include #include #include -#include #include #include @@ -54,6 +53,7 @@ const int kEqOptionCurve =1<<1; // The legacy version offers both Graphic and curve on the same UI. const int kEqLegacy = kEqOptionGraphic + kEqOptionCurve; +class wxChoice; class wxSlider; class wxStaticText; class Envelope; diff --git a/src/effects/ScienFilter.cpp b/src/effects/ScienFilter.cpp index b3b672e69..b861c6225 100644 --- a/src/effects/ScienFilter.cpp +++ b/src/effects/ScienFilter.cpp @@ -41,6 +41,7 @@ a graph for EffectScienFilter. #include // for wxUSE_* macros #include +#include #include #include #include diff --git a/src/effects/ScienFilter.h b/src/effects/ScienFilter.h index d8d217fec..957b345ea 100644 --- a/src/effects/ScienFilter.h +++ b/src/effects/ScienFilter.h @@ -16,13 +16,13 @@ Vaughan Johnson (Preview) #include // for wxUSE_* macros #include -#include #include #include "Biquad.h" #include "Effect.h" +class wxChoice; class wxSlider; class wxStaticText; class wxTextCtrl; diff --git a/src/effects/nyquist/Nyquist.cpp b/src/effects/nyquist/Nyquist.cpp index 5f2de03f0..22c10c189 100644 --- a/src/effects/nyquist/Nyquist.cpp +++ b/src/effects/nyquist/Nyquist.cpp @@ -67,6 +67,7 @@ effects from this one class. #include "../../widgets/valnum.h" #include "../../widgets/ErrorDialog.h" #include "../../Prefs.h" +#include "../../wxFileNameWrapper.h" #include "../../prefs/WaveformSettings.h" #include "../../widgets/NumericTextCtrl.h" diff --git a/src/effects/nyquist/Nyquist.h b/src/effects/nyquist/Nyquist.h index ef3ce1b50..f34a78a7c 100644 --- a/src/effects/nyquist/Nyquist.h +++ b/src/effects/nyquist/Nyquist.h @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -25,6 +24,7 @@ #include "nyx.h" class wxArrayString; +class wxFileName; class wxTextCtrl; #define NYQUISTEFFECTS_VERSION wxT("1.0.0.0") diff --git a/src/effects/vamp/VampEffect.h b/src/effects/vamp/VampEffect.h index 0e8d2da8b..018864ddf 100644 --- a/src/effects/vamp/VampEffect.h +++ b/src/effects/vamp/VampEffect.h @@ -16,7 +16,6 @@ #if defined(USE_VAMP) #include -#include #include @@ -25,6 +24,7 @@ class wxStaticText; class wxSlider; +class wxChoice; class wxTextCtrl; class LabelTrack; diff --git a/src/export/Export.h b/src/export/Export.h index 685d82b13..8b88892f4 100644 --- a/src/export/Export.h +++ b/src/export/Export.h @@ -14,13 +14,13 @@ #include "../MemoryX.h" #include #include -#include #include #include "../Tags.h" #include "../SampleFormat.h" #include "../widgets/wxPanelWrapper.h" class wxArrayString; +class wxFileName; class FileDialogWrapper; class wxFileCtrlEvent; class wxMemoryDC; diff --git a/src/export/ExportMultiple.h b/src/export/ExportMultiple.h index 6ad8048e4..32917e8e2 100644 --- a/src/export/ExportMultiple.h +++ b/src/export/ExportMultiple.h @@ -17,7 +17,7 @@ #include "Export.h" #include "../Tags.h" // we need to know about the Tags class for metadata -#include "../wxFileNameWrapper.h" +#include "../wxFileNameWrapper.h" // member variable below class wxButton; class wxCheckBox; diff --git a/src/import/ImportPlugin.h b/src/import/ImportPlugin.h index 39c1fc5ef..f6d5e0982 100644 --- a/src/import/ImportPlugin.h +++ b/src/import/ImportPlugin.h @@ -59,7 +59,6 @@ but little else. #include "audacity/Types.h" #include "../Internat.h" -#include #include "../MemoryX.h" #include "../widgets/ProgressDialog.h" diff --git a/src/prefs/DevicePrefs.h b/src/prefs/DevicePrefs.h index 09c7f2c8a..9f3ee4821 100644 --- a/src/prefs/DevicePrefs.h +++ b/src/prefs/DevicePrefs.h @@ -14,10 +14,9 @@ #include -#include - #include "PrefsPanel.h" +class wxChoice; class ShuttleGui; class wxArrayStringEx; diff --git a/src/prefs/MidiIOPrefs.h b/src/prefs/MidiIOPrefs.h index 0f4f26bea..ef83184b8 100644 --- a/src/prefs/MidiIOPrefs.h +++ b/src/prefs/MidiIOPrefs.h @@ -11,6 +11,7 @@ #include "../Experimental.h" +class wxChoice; class wxTextCtrl; class ShuttleGui; @@ -21,8 +22,6 @@ class ShuttleGui; #include -#include - #include "PrefsPanel.h" class wxArrayStringEx; diff --git a/src/prefs/QualityPrefs.cpp b/src/prefs/QualityPrefs.cpp index 5bd4f2353..0e1685278 100644 --- a/src/prefs/QualityPrefs.cpp +++ b/src/prefs/QualityPrefs.cpp @@ -18,6 +18,7 @@ #include "../Audacity.h" #include "QualityPrefs.h" +#include #include #include "../AudioIO.h" diff --git a/src/prefs/QualityPrefs.h b/src/prefs/QualityPrefs.h index c38c274f0..da267abe3 100644 --- a/src/prefs/QualityPrefs.h +++ b/src/prefs/QualityPrefs.h @@ -15,10 +15,9 @@ #include #include -#include - #include "PrefsPanel.h" +class wxChoice; class wxTextCtrl; class ShuttleGui; enum sampleFormat : unsigned; diff --git a/src/toolbars/MixerToolBar.h b/src/toolbars/MixerToolBar.h index 116e781b0..d06942f25 100644 --- a/src/toolbars/MixerToolBar.h +++ b/src/toolbars/MixerToolBar.h @@ -17,7 +17,6 @@ class wxImage; class wxSize; class wxPoint; -class wxChoice; class wxStaticBitmap; class ASlider; diff --git a/src/widgets/FileHistory.h b/src/widgets/FileHistory.h index 07eb03fd5..469da1eab 100644 --- a/src/widgets/FileHistory.h +++ b/src/widgets/FileHistory.h @@ -14,7 +14,6 @@ #include #include #include -#include #include #include diff --git a/src/widgets/Grid.h b/src/widgets/Grid.h index d2eb041de..7032cfb9d 100644 --- a/src/widgets/Grid.h +++ b/src/widgets/Grid.h @@ -15,7 +15,6 @@ #include #include // for wxUSE_* macros #include -#include #include #include "NumericTextCtrl.h" #include "../Internat.h" @@ -29,6 +28,7 @@ class GridAx; #endif class wxArrayString; +class wxChoice; class NumericTextCtrl; /**********************************************************************//** diff --git a/src/wxFileNameWrapper.h b/src/wxFileNameWrapper.h index 06848731b..922c72eb0 100644 --- a/src/wxFileNameWrapper.h +++ b/src/wxFileNameWrapper.h @@ -13,6 +13,8 @@ Paul Licameli class wxArrayString; +#include // to inherit + // The wxFileName does not have a move constructor. // So add one to it, so that it passes around by value more quickly. class wxFileNameWrapper : public wxFileName