From b1ce24c087259c9d7be7d97a80f1fea8b0500c7a Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sun, 11 Nov 2018 16:00:17 -0500 Subject: [PATCH] Remove wx/window.h from headers --- src/AdornedRulerPanel.h | 1 - src/TrackPanelAx.h | 1 - src/effects/AutoDuck.h | 1 - src/effects/Compressor.h | 1 - src/effects/ScienFilter.h | 1 - src/prefs/BatchPrefs.h | 2 -- src/prefs/DevicePrefs.h | 1 - src/prefs/EffectsPrefs.h | 2 -- src/prefs/ExtImportPrefs.h | 1 - src/prefs/GUIPrefs.h | 2 -- src/prefs/ImportExportPrefs.h | 2 -- src/prefs/LibraryPrefs.h | 2 -- src/prefs/MidiIOPrefs.h | 1 - src/prefs/ModulePrefs.h | 2 -- src/prefs/MousePrefs.h | 1 - src/prefs/PlaybackPrefs.h | 2 -- src/prefs/PrefsDialog.h | 1 - src/prefs/PrefsPanel.h | 1 - src/prefs/ProjectsPrefs.h | 2 -- src/prefs/RecordingPrefs.h | 2 -- src/prefs/SpectrumPrefs.h | 1 - src/prefs/ThemePrefs.h | 1 - src/prefs/TracksPrefs.h | 2 -- src/prefs/WarningsPrefs.h | 2 -- src/widgets/AButton.h | 1 - src/widgets/ASlider.h | 1 - src/widgets/ErrorDialog.h | 1 - src/widgets/FileHistory.h | 1 - src/widgets/Grabber.h | 1 - src/widgets/Grid.h | 1 - src/widgets/HelpSystem.h | 1 - src/widgets/MultiDialog.h | 2 +- src/widgets/Warning.h | 2 +- 33 files changed, 2 insertions(+), 44 deletions(-) diff --git a/src/AdornedRulerPanel.h b/src/AdornedRulerPanel.h index 15f7db027..77c7dc02f 100644 --- a/src/AdornedRulerPanel.h +++ b/src/AdornedRulerPanel.h @@ -19,7 +19,6 @@ #include #include #include -#include class ViewInfo; class AudacityProject; diff --git a/src/TrackPanelAx.h b/src/TrackPanelAx.h index f755575a0..d2405a977 100644 --- a/src/TrackPanelAx.h +++ b/src/TrackPanelAx.h @@ -12,7 +12,6 @@ #define __AUDACITY_TRACK_PANEL_ACCESSIBILITY__ #include -#include #include #include // for wxUSE_* macros diff --git a/src/effects/AutoDuck.h b/src/effects/AutoDuck.h index 2cf241380..e85f5d031 100644 --- a/src/effects/AutoDuck.h +++ b/src/effects/AutoDuck.h @@ -14,7 +14,6 @@ #include #include #include -#include #include "Effect.h" #include "../widgets/wxPanelWrapper.h" diff --git a/src/effects/Compressor.h b/src/effects/Compressor.h index 368f43db6..fcfa15488 100644 --- a/src/effects/Compressor.h +++ b/src/effects/Compressor.h @@ -14,7 +14,6 @@ #include #include #include -#include #include "../widgets/wxPanelWrapper.h" #include "TwoPassSimpleMono.h" diff --git a/src/effects/ScienFilter.h b/src/effects/ScienFilter.h index 320e16024..d8d217fec 100644 --- a/src/effects/ScienFilter.h +++ b/src/effects/ScienFilter.h @@ -18,7 +18,6 @@ Vaughan Johnson (Preview) #include #include #include -#include #include "Biquad.h" diff --git a/src/prefs/BatchPrefs.h b/src/prefs/BatchPrefs.h index 5ab8606b3..a9cf01da3 100644 --- a/src/prefs/BatchPrefs.h +++ b/src/prefs/BatchPrefs.h @@ -14,8 +14,6 @@ #include -#include - #include "PrefsPanel.h" class ShuttleGui; diff --git a/src/prefs/DevicePrefs.h b/src/prefs/DevicePrefs.h index fd9fe4d70..09c7f2c8a 100644 --- a/src/prefs/DevicePrefs.h +++ b/src/prefs/DevicePrefs.h @@ -15,7 +15,6 @@ #include #include -#include #include "PrefsPanel.h" diff --git a/src/prefs/EffectsPrefs.h b/src/prefs/EffectsPrefs.h index 0d891d021..b83b2aa1f 100644 --- a/src/prefs/EffectsPrefs.h +++ b/src/prefs/EffectsPrefs.h @@ -15,8 +15,6 @@ #include -#include - #include "PrefsPanel.h" class ShuttleGui; diff --git a/src/prefs/ExtImportPrefs.h b/src/prefs/ExtImportPrefs.h index 497c4501e..d0badb4ef 100644 --- a/src/prefs/ExtImportPrefs.h +++ b/src/prefs/ExtImportPrefs.h @@ -13,7 +13,6 @@ #include #include -#include #include "../widgets/Grid.h" #include "PrefsPanel.h" diff --git a/src/prefs/GUIPrefs.h b/src/prefs/GUIPrefs.h index 43ac7ebb6..15b76281f 100644 --- a/src/prefs/GUIPrefs.h +++ b/src/prefs/GUIPrefs.h @@ -15,8 +15,6 @@ #include -#include - #include "PrefsPanel.h" class ShuttleGui; diff --git a/src/prefs/ImportExportPrefs.h b/src/prefs/ImportExportPrefs.h index f50cdc03c..2c82e32ca 100644 --- a/src/prefs/ImportExportPrefs.h +++ b/src/prefs/ImportExportPrefs.h @@ -15,8 +15,6 @@ #include -#include - #include "PrefsPanel.h" class ShuttleGui; diff --git a/src/prefs/LibraryPrefs.h b/src/prefs/LibraryPrefs.h index d90e460b3..4bccb02ca 100644 --- a/src/prefs/LibraryPrefs.h +++ b/src/prefs/LibraryPrefs.h @@ -15,8 +15,6 @@ #include -#include - #include "PrefsPanel.h" class wxStaticText; diff --git a/src/prefs/MidiIOPrefs.h b/src/prefs/MidiIOPrefs.h index fde911f48..0f4f26bea 100644 --- a/src/prefs/MidiIOPrefs.h +++ b/src/prefs/MidiIOPrefs.h @@ -22,7 +22,6 @@ class ShuttleGui; #include #include -#include #include "PrefsPanel.h" diff --git a/src/prefs/ModulePrefs.h b/src/prefs/ModulePrefs.h index 9b487833f..98a576490 100644 --- a/src/prefs/ModulePrefs.h +++ b/src/prefs/ModulePrefs.h @@ -15,8 +15,6 @@ #include -#include - #include "PrefsPanel.h" diff --git a/src/prefs/MousePrefs.h b/src/prefs/MousePrefs.h index 8be5bbfdf..155d70fcf 100644 --- a/src/prefs/MousePrefs.h +++ b/src/prefs/MousePrefs.h @@ -12,7 +12,6 @@ #include #include -#include #include "PrefsPanel.h" diff --git a/src/prefs/PlaybackPrefs.h b/src/prefs/PlaybackPrefs.h index 818965041..3180c17cc 100644 --- a/src/prefs/PlaybackPrefs.h +++ b/src/prefs/PlaybackPrefs.h @@ -14,8 +14,6 @@ #include -#include - #include "PrefsPanel.h" class ShuttleGui; diff --git a/src/prefs/PrefsDialog.h b/src/prefs/PrefsDialog.h index 4e9e9e19c..2ea220dd9 100644 --- a/src/prefs/PrefsDialog.h +++ b/src/prefs/PrefsDialog.h @@ -16,7 +16,6 @@ #include #include #include -#include #include "../widgets/wxPanelWrapper.h" #include "../Internat.h" diff --git a/src/prefs/PrefsPanel.h b/src/prefs/PrefsPanel.h index 5a1f1baa0..a407c4eed 100644 --- a/src/prefs/PrefsPanel.h +++ b/src/prefs/PrefsPanel.h @@ -33,7 +33,6 @@ PrefsPanel. #ifndef __AUDACITY_PREFS_PANEL__ #define __AUDACITY_PREFS_PANEL__ -#include #include "../widgets/wxPanelWrapper.h" /* A few constants for an attempt at semi-uniformity */ diff --git a/src/prefs/ProjectsPrefs.h b/src/prefs/ProjectsPrefs.h index 34a6a1517..1ff0a3269 100644 --- a/src/prefs/ProjectsPrefs.h +++ b/src/prefs/ProjectsPrefs.h @@ -15,8 +15,6 @@ #include -#include - #include "PrefsPanel.h" class ShuttleGui; diff --git a/src/prefs/RecordingPrefs.h b/src/prefs/RecordingPrefs.h index be179994c..03c5afb38 100644 --- a/src/prefs/RecordingPrefs.h +++ b/src/prefs/RecordingPrefs.h @@ -15,8 +15,6 @@ #include #include -#include - #include "PrefsPanel.h" class ShuttleGui; diff --git a/src/prefs/SpectrumPrefs.h b/src/prefs/SpectrumPrefs.h index 25a711120..a0112cd02 100644 --- a/src/prefs/SpectrumPrefs.h +++ b/src/prefs/SpectrumPrefs.h @@ -24,7 +24,6 @@ #include "../Experimental.h" #include -#include #include "../WaveTrack.h" diff --git a/src/prefs/ThemePrefs.h b/src/prefs/ThemePrefs.h index 1f1271b89..d86b9052d 100644 --- a/src/prefs/ThemePrefs.h +++ b/src/prefs/ThemePrefs.h @@ -15,7 +15,6 @@ #define __AUDACITY_THEME_PREFS__ #include -#include #include "PrefsPanel.h" diff --git a/src/prefs/TracksPrefs.h b/src/prefs/TracksPrefs.h index 3e4c1ee41..98ebf6852 100644 --- a/src/prefs/TracksPrefs.h +++ b/src/prefs/TracksPrefs.h @@ -15,8 +15,6 @@ //#include -//#include - #include #include "PrefsPanel.h" #include "../WaveTrack.h" diff --git a/src/prefs/WarningsPrefs.h b/src/prefs/WarningsPrefs.h index 18952cf01..fb70be115 100644 --- a/src/prefs/WarningsPrefs.h +++ b/src/prefs/WarningsPrefs.h @@ -15,8 +15,6 @@ #include -#include - #include "PrefsPanel.h" class ShuttleGui; diff --git a/src/widgets/AButton.h b/src/widgets/AButton.h index 48680ab06..ea8f06ec7 100644 --- a/src/widgets/AButton.h +++ b/src/widgets/AButton.h @@ -23,7 +23,6 @@ #endif #include -#include #include "ImageRoll.h" diff --git a/src/widgets/ASlider.h b/src/widgets/ASlider.h index 8ff085c77..8ba089ceb 100644 --- a/src/widgets/ASlider.h +++ b/src/widgets/ASlider.h @@ -16,7 +16,6 @@ #include "../MemoryX.h" #include // for wxUSE_* macros #include -#include #include #include #include "widgets/wxPanelWrapper.h" diff --git a/src/widgets/ErrorDialog.h b/src/widgets/ErrorDialog.h index 76f650bda..81e37b07d 100644 --- a/src/widgets/ErrorDialog.h +++ b/src/widgets/ErrorDialog.h @@ -16,7 +16,6 @@ #include #include -#include #include "LinkingHtmlWindow.h" #include "wxPanelWrapper.h" diff --git a/src/widgets/FileHistory.h b/src/widgets/FileHistory.h index 278e4fa45..07eb03fd5 100644 --- a/src/widgets/FileHistory.h +++ b/src/widgets/FileHistory.h @@ -16,7 +16,6 @@ #include #include #include -#include #include #include "audacity/Types.h" diff --git a/src/widgets/Grabber.h b/src/widgets/Grabber.h index 631603334..51792f4b6 100644 --- a/src/widgets/Grabber.h +++ b/src/widgets/Grabber.h @@ -34,7 +34,6 @@ flicker-free use. #include #include #include -#include #include //////////////////////////////////////////////////////////// diff --git a/src/widgets/Grid.h b/src/widgets/Grid.h index cdaecc0b2..d2eb041de 100644 --- a/src/widgets/Grid.h +++ b/src/widgets/Grid.h @@ -17,7 +17,6 @@ #include #include #include -#include #include "NumericTextCtrl.h" #include "../Internat.h" diff --git a/src/widgets/HelpSystem.h b/src/widgets/HelpSystem.h index c27843f07..0c5504823 100644 --- a/src/widgets/HelpSystem.h +++ b/src/widgets/HelpSystem.h @@ -15,7 +15,6 @@ #include "../Audacity.h" #include -#include #include "wxPanelWrapper.h" class AudacityProject; diff --git a/src/widgets/MultiDialog.h b/src/widgets/MultiDialog.h index 45ab213c2..ea417b7fc 100644 --- a/src/widgets/MultiDialog.h +++ b/src/widgets/MultiDialog.h @@ -15,8 +15,8 @@ #define __AUDACITY_MULTIDIALOG__ #include -#include +#include class wxString; const wxString &DefaultMultiDialogMessage(); diff --git a/src/widgets/Warning.h b/src/widgets/Warning.h index 233ed8919..60e4de6cd 100644 --- a/src/widgets/Warning.h +++ b/src/widgets/Warning.h @@ -14,7 +14,7 @@ #include "../Audacity.h" #include -#include +class wxString; // "Don't show this warning again" const wxString &DefaultWarningFooter();