Remove Track.h from other headers

src/LabelDialog.cpp

@@ -35,7 +35,6 @@
 #include "LabelTrack.h"
 #include "Prefs.h"
 #include "Project.h"
-#include "Track.h"
 #include "ViewInfo.h"
 #include "widgets/NumericTextCtrl.h"
 

src/Printing.cpp

@@ -25,7 +25,6 @@
 #include <wx/printdlg.h>
 
 #include "AColor.h"
-#include "Track.h"
 #include "TrackArtist.h"
 #include "ViewInfo.h"
 #include "WaveTrack.h"

src/Project.cpp

@@ -113,7 +113,6 @@ scroll information.  It also has some status flags.
 #include "Snap.h"
 #include "Tags.h"
 #include "TimeTrack.h"
-#include "Track.h"
 #include "TrackPanel.h"
 #include "WaveTrack.h"
 #include "DirManager.h"

src/Snap.h

@@ -18,9 +18,10 @@
 #include <wx/defs.h>
 #include <wx/dynarray.h>
 
-#include "Track.h"
 #include "widgets/NumericTextCtrl.h"
 
+class Track;
+class TrackList;
 class TrackClipArray;
 class ZoomInfo;
 

src/TrackArtist.cpp

@@ -169,7 +169,6 @@ audio tracks.
 #include "BlockFile.h"
 #include "Envelope.h"
 #include "NumberScale.h"
-#include "Track.h"
 #include "WaveTrack.h"
 #include "LabelTrack.h"
 #include "TimeTrack.h"

src/TrackPanel.cpp

@@ -208,7 +208,6 @@ is time to refresh some aspect of the screen.
 #include "ShuttleGui.h"
 #include "Theme.h"
 #include "TimeTrack.h"
-#include "Track.h"
 #include "TrackArtist.h"
 #include "TrackPanelAx.h"
 #include "ViewInfo.h"

src/UndoManager.cpp

@@ -28,7 +28,6 @@ UndoManager
 #include "Diags.h"
 #include "Internat.h"
 #include "Sequence.h"
-#include "Track.h"
 #include "WaveTrack.h"          // temp
 #include "NoteTrack.h"  // for Sonify* function declarations
 #include "Diags.h"

src/commands/GetProjectInfoCommand.h

@@ -18,7 +18,6 @@
 
 #include "Command.h"
 #include "CommandType.h"
-#include "../Track.h"
 
 class GetProjectInfoCommandType : public CommandType
 {

src/effects/ChangeSpeed.h

@@ -19,7 +19,6 @@
 #include <wx/string.h>
 #include <wx/textctrl.h>
 
-#include "../Track.h"
 #include "../WaveTrack.h"
 #include "../widgets/NumericTextCtrl.h"
 

src/export/ExportFFmpegDialogs.cpp

@@ -61,8 +61,6 @@
 #include "../Prefs.h"
 #include "../Project.h"
 #include "../Tags.h"
-#include "../Track.h"
-#include "../WaveTrack.h"
 
 #include "Export.h"
 

src/export/ExportMultiple.cpp

@@ -104,6 +104,7 @@ END_EVENT_TABLE()
 
 ExportMultiple::ExportMultiple(AudacityProject *project)
 : wxDialog(project, wxID_ANY, wxString(_("Export Multiple")))
+, mIterator(new TrackListIterator)
 {
    SetName(GetTitle());
 
@@ -137,6 +138,7 @@ ExportMultiple::ExportMultiple(AudacityProject *project)
 
 ExportMultiple::~ExportMultiple()
 {
+   delete mIterator;
 }
 
 void ExportMultiple::CountTracksAndLabels()
@@ -146,7 +148,7 @@ void ExportMultiple::CountTracksAndLabels()
    mNumWaveTracks = 0;
 
    Track* pTrack;
-   for (pTrack = mIterator.First(mTracks); pTrack != NULL; pTrack = mIterator.Next())
+   for (pTrack = mIterator->First(mTracks); pTrack != NULL; pTrack = mIterator->Next())
    {
       switch (pTrack->GetKind())
       {
@@ -731,7 +733,7 @@ int ExportMultiple::ExportMultipleByTrack(bool byName,
    wxString title;   // un-messed-with title of file for tagging with
 
    /* Remember which tracks were selected, and set them to unselected */
-   for (tr = mIterator.First(mTracks); tr != NULL; tr = mIterator.Next()) {
+   for (tr = mIterator->First(mTracks); tr != NULL; tr = mIterator->Next()) {
       if (tr->GetKind() != Track::Wave) {
          continue;
       }
@@ -747,7 +749,7 @@ int ExportMultiple::ExportMultipleByTrack(bool byName,
    }
 
    /* Examine all tracks in turn, collecting export information */
-   for (tr = mIterator.First(mTracks); tr != NULL; tr = mIterator.Next()) {
+   for (tr = mIterator->First(mTracks); tr != NULL; tr = mIterator->Next()) {
 
       // Want only non-muted wave tracks.
       if ((tr->GetKind() != Track::Wave)  || tr->GetMute())
@@ -760,7 +762,7 @@ int ExportMultiple::ExportMultipleByTrack(bool byName,
       // Check for a linked track
       tr2 = NULL;
       if (tr->GetLinked()) {
-         tr2 = mIterator.Next();
+         tr2 = mIterator->Next();
          if (tr2) {
 
             // Make sure it gets included
@@ -830,7 +832,7 @@ int ExportMultiple::ExportMultipleByTrack(bool byName,
    // loop
    int count = 0; // count the number of sucessful runs
    ExportKit activeSetting;  // pointer to the settings in use for this export
-   for (tr = mIterator.First(mTracks); tr != NULL; tr = mIterator.Next()) {
+   for (tr = mIterator->First(mTracks); tr != NULL; tr = mIterator->Next()) {
 
       // Want only non-muted wave tracks.
       if ((tr->GetKind() != Track::Wave) || (tr->GetMute() == true)) {
@@ -843,7 +845,7 @@ int ExportMultiple::ExportMultipleByTrack(bool byName,
       // Check for a linked track
       tr2 = NULL;
       if (tr->GetLinked()) {
-         tr2 = mIterator.Next();
+         tr2 = mIterator->Next();
          if (tr2) {
             // Select it also
             tr2->SetSelected(true);

src/export/ExportMultiple.h

@@ -17,7 +17,6 @@
 #include <wx/listctrl.h>
 
 #include "Export.h"
-#include "../Track.h"
 #include "../Tags.h"       // we need to know about the Tags class for metadata
 
 class wxButton;
@@ -27,7 +26,9 @@ class wxRadioButton;
 class wxTextCtrl;
 
 class AudacityProject;
+class LabelTrack;
 class ShuttleGui;
+class TrackListIterator;
 
 class ExportMultiple : public wxDialog
 {
@@ -107,7 +108,7 @@ private:
    AudacityProject *mProject;
    TrackList *mTracks;           /**< The list of tracks in the project that is
                                    being exported */
-   TrackListIterator mIterator;  /**< Iterator used to work through all the
+   TrackListIterator *mIterator;  /**< Iterator used to work through all the
                                    tracks in the project */
    LabelTrack *mLabels;
    int mNumLabels;

src/import/Import.cpp

@@ -58,7 +58,6 @@ and ImportLOF.cpp.
 #include "ImportFLAC.h"
 #include "ImportFFmpeg.h"
 #include "ImportGStreamer.h"
-#include "../Track.h"
 #include "../Prefs.h"
 
 WX_DEFINE_LIST(ImportPluginList);

src/widgets/NumericTextCtrl.h

@@ -23,6 +23,8 @@
 #include <wx/string.h>
 #include <wx/textctrl.h>
 
+#include "../Audacity.h"
+
 #if wxUSE_ACCESSIBILITY
 #include <wx/access.h>
 #endif