From ec2f26e48c44e4170b053f40e11f5a61a4e02d46 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Wed, 14 Nov 2018 13:50:12 -0500 Subject: [PATCH] Remove wx/pen.h, wx/thread.h from headers --- src/AColor.h | 2 +- src/AudioIO.h | 1 - src/Envelope.h | 1 - src/FreqWindow.h | 1 - src/LabelTrack.h | 1 - src/Theme.h | 1 + src/TimeTrack.h | 1 - src/TrackArtist.h | 2 +- src/WaveTrack.h | 1 - src/blockfile/ODDecodeBlockFile.h | 1 - src/blockfile/ODPCMAliasBlockFile.h | 1 - src/commands/ResponseQueue.h | 2 +- src/ondemand/ODManager.h | 1 - src/ondemand/ODTaskThread.h | 2 +- src/toolbars/TranscriptionToolBar.cpp | 1 - src/toolbars/TranscriptionToolBar.h | 3 --- src/widgets/Ruler.h | 2 +- 17 files changed, 6 insertions(+), 18 deletions(-) diff --git a/src/AColor.h b/src/AColor.h index b7eb91a61..3269bc16f 100644 --- a/src/AColor.h +++ b/src/AColor.h @@ -16,7 +16,7 @@ #include "MemoryX.h" #include -#include +#include // member variable class wxDC; class wxRect; diff --git a/src/AudioIO.h b/src/AudioIO.h index 011e51689..e4cdc713c 100644 --- a/src/AudioIO.h +++ b/src/AudioIO.h @@ -49,7 +49,6 @@ using NoteTrackConstArray = std::vector < std::shared_ptr< const NoteTrack > >; #endif #include // to declare custom event types -#include #include "SampleFormat.h" diff --git a/src/Envelope.h b/src/Envelope.h index 15e7f0aa7..ae6f81119 100644 --- a/src/Envelope.h +++ b/src/Envelope.h @@ -16,7 +16,6 @@ #include #include -#include #include "xml/XMLTagHandler.h" #include "Internat.h" diff --git a/src/FreqWindow.h b/src/FreqWindow.h index 3ecf5ebbf..d054b2eff 100644 --- a/src/FreqWindow.h +++ b/src/FreqWindow.h @@ -17,7 +17,6 @@ #include #include #include -#include #include // member variable #include // to inherit #include diff --git a/src/LabelTrack.h b/src/LabelTrack.h index edda960da..19614e80c 100644 --- a/src/LabelTrack.h +++ b/src/LabelTrack.h @@ -17,7 +17,6 @@ #include "Track.h" #include -#include #include diff --git a/src/Theme.h b/src/Theme.h index a4ca5ba39..7ee7dacc6 100644 --- a/src/Theme.h +++ b/src/Theme.h @@ -25,6 +25,7 @@ class wxArrayString; class wxColour; class wxFont; +class wxPen; // JKC: will probably change name from 'teBmps' to 'tIndexBmp'; typedef int teBmps; /// The index of a bitmap resource in Theme Resources. diff --git a/src/TimeTrack.h b/src/TimeTrack.h index d81ccdfbd..f9d73f0f0 100644 --- a/src/TimeTrack.h +++ b/src/TimeTrack.h @@ -13,7 +13,6 @@ #include "Track.h" #include -#include #include diff --git a/src/TrackArtist.h b/src/TrackArtist.h index 3ddce71db..e8d7cc6fb 100644 --- a/src/TrackArtist.h +++ b/src/TrackArtist.h @@ -23,7 +23,7 @@ #include "MemoryX.h" #include -#include +#include // member variables #include "audacity/Types.h" class wxRect; diff --git a/src/WaveTrack.h b/src/WaveTrack.h index d17642e82..465abc3c9 100644 --- a/src/WaveTrack.h +++ b/src/WaveTrack.h @@ -18,7 +18,6 @@ #include #include #include -#include #include "WaveTrackLocation.h" diff --git a/src/blockfile/ODDecodeBlockFile.h b/src/blockfile/ODDecodeBlockFile.h index 042b4a6de..98e2bb5e1 100644 --- a/src/blockfile/ODDecodeBlockFile.h +++ b/src/blockfile/ODDecodeBlockFile.h @@ -33,7 +33,6 @@ Also, see ODPCMAliasBlockFile for a similar file. #include "../DirManager.h" #include "../ondemand/ODDecodeTask.h" #include -#include /// An AliasBlockFile that references uncompressed data in an existing file class ODDecodeBlockFile final : public SimpleBlockFile diff --git a/src/blockfile/ODPCMAliasBlockFile.h b/src/blockfile/ODPCMAliasBlockFile.h index 9f295fb77..77c58db39 100644 --- a/src/blockfile/ODPCMAliasBlockFile.h +++ b/src/blockfile/ODPCMAliasBlockFile.h @@ -40,7 +40,6 @@ Some of these methods have been overridden only because they used the unsafe wxL #include "../BlockFile.h" #include "../ondemand/ODTaskThread.h" #include "../DirManager.h" -#include /// An AliasBlockFile that references uncompressed data in an existing file class ODPCMAliasBlockFile final : public PCMAliasBlockFile diff --git a/src/commands/ResponseQueue.h b/src/commands/ResponseQueue.h index be838d6db..6b5f6ad1a 100644 --- a/src/commands/ResponseQueue.h +++ b/src/commands/ResponseQueue.h @@ -36,7 +36,7 @@ force the script thread to wait until a response is available. #include #include -#include +#include // member variable #include // member variable class wxMutex; diff --git a/src/ondemand/ODManager.h b/src/ondemand/ODManager.h index af8cf4ab7..1a6e65e3f 100644 --- a/src/ondemand/ODManager.h +++ b/src/ondemand/ODManager.h @@ -22,7 +22,6 @@ number of threads. #include #include "ODTaskThread.h" #include // for DECLARE_EXPORTED_EVENT_TYPE -#include #ifdef __WXMAC__ // On Mac OS X, it's better not to use the wxThread class. diff --git a/src/ondemand/ODTaskThread.h b/src/ondemand/ODTaskThread.h index efe4f4314..cefb756d0 100644 --- a/src/ondemand/ODTaskThread.h +++ b/src/ondemand/ODTaskThread.h @@ -24,7 +24,7 @@ #include "../Audacity.h" // contains the set-up of AUDACITY_DLL_API -#include +#include // to inherit #include "../MemoryX.h" diff --git a/src/toolbars/TranscriptionToolBar.cpp b/src/toolbars/TranscriptionToolBar.cpp index b277b397c..184816551 100644 --- a/src/toolbars/TranscriptionToolBar.cpp +++ b/src/toolbars/TranscriptionToolBar.cpp @@ -108,7 +108,6 @@ void TranscriptionToolBar::Create(wxWindow * parent) ToolBar::Create(parent); mBackgroundBrush.SetColour(wxColour(204, 204, 204)); - mBackgroundPen.SetColour(wxColour(204, 204, 204)); mBackgroundHeight = 0; mBackgroundWidth = 0; diff --git a/src/toolbars/TranscriptionToolBar.h b/src/toolbars/TranscriptionToolBar.h index d799a2d29..cfb396a13 100644 --- a/src/toolbars/TranscriptionToolBar.h +++ b/src/toolbars/TranscriptionToolBar.h @@ -19,7 +19,6 @@ #include "../MemoryX.h" #include -#include #include "audacity/Types.h" #include "../Theme.h" @@ -30,7 +29,6 @@ class wxChoice; class wxCommandEvent; class wxImage; class wxKeyEvent; -class wxPen; class AButton; class ASlider; @@ -153,7 +151,6 @@ class TranscriptionToolBar final : public ToolBar { #endif wxBrush mBackgroundBrush; - wxPen mBackgroundPen; int mBackgroundWidth; int mBackgroundHeight; diff --git a/src/widgets/Ruler.h b/src/widgets/Ruler.h index 66ca6988d..8992b854c 100644 --- a/src/widgets/Ruler.h +++ b/src/widgets/Ruler.h @@ -15,7 +15,7 @@ #include // member variable #include -#include +#include // member variable #include class wxArrayString;