From 55d85f1b25f5383a0c55496661273a409c1d9b4d Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@gmail.com>
Date: Tue, 16 Feb 2016 09:35:03 -0500
Subject: [PATCH] Remove more uses of at(); use a std::vector of bare pointers,
 not wx array

---
 src/Dependencies.cpp                  | 2 +-
 src/Project.cpp                       | 4 ++--
 src/Sequence.h                        | 2 +-
 src/UndoManager.cpp                   | 2 +-
 src/ondemand/ODComputeSummaryTask.cpp | 2 +-
 src/ondemand/ODDecodeTask.cpp         | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Dependencies.cpp b/src/Dependencies.cpp
index 517711c8b..64d7ffc5c 100644
--- a/src/Dependencies.cpp
+++ b/src/Dependencies.cpp
@@ -75,7 +75,7 @@ static void GetAllSeqBlocks(AudacityProject *project,
             BlockArray &blocks = sequence->GetBlockArray();
             int i;
             for (i = 0; i < (int)blocks.size(); i++)
-               outBlocks->push_back(&blocks.at(i));
+               outBlocks->push_back(&blocks[i]);
             node = node->GetNext();
          }
       }
diff --git a/src/Project.cpp b/src/Project.cpp
index 881caebcf..7725e5c04 100644
--- a/src/Project.cpp
+++ b/src/Project.cpp
@@ -10,7 +10,7 @@
 *******************************************************************//**
 
 \file Project.cpp
-\brief Implements AudacityProject, DropTarget, and FileObject.
+\brief Implements AudacityProject, DropTarget, and FileObject.F
 Includes Menus.cpp.
 
 *//****************************************************************//**
@@ -3738,7 +3738,7 @@ void AudacityProject::AddImportedTracks(wxString fileName,
          BlockArray &blocks = clip->GetSequence()->GetBlockArray();
          if (clip && blocks.size())
          {
-            SeqBlock& block = blocks.at(0);
+            SeqBlock& block = blocks[0];
             if (block.f->IsAlias())
             {
                mImportedDependencies = true;
diff --git a/src/Sequence.h b/src/Sequence.h
index 6f3247550..26238e12d 100644
--- a/src/Sequence.h
+++ b/src/Sequence.h
@@ -53,7 +53,7 @@ class SeqBlock {
    }
 };
 class BlockArray : public std::vector<SeqBlock> {};
-WX_DEFINE_ARRAY(SeqBlock *, BlockPtrArray);
+using BlockPtrArray = std::vector<SeqBlock*>; // non-owning pointers
 
 class Sequence: public XMLTagHandler {
  public:
diff --git a/src/UndoManager.cpp b/src/UndoManager.cpp
index f279203cc..bebce6bfa 100644
--- a/src/UndoManager.cpp
+++ b/src/UndoManager.cpp
@@ -82,7 +82,7 @@ void UndoManager::CalculateSpaceUsage()
             BlockArray *blocks = it->GetData()->GetSequenceBlockArray();
             for (size_t b = 0, cnt = blocks->size(); b < cnt; b++)
             {
-               BlockFile *file = blocks->at(b).f;
+               BlockFile *file = (*blocks)[b].f;
 
                // Accumulate space used by the file if the file didn't exist
                // in the previous level
diff --git a/src/ondemand/ODComputeSummaryTask.cpp b/src/ondemand/ODComputeSummaryTask.cpp
index 12a8693d9..d9f88d09a 100644
--- a/src/ondemand/ODComputeSummaryTask.cpp
+++ b/src/ondemand/ODComputeSummaryTask.cpp
@@ -205,7 +205,7 @@ void ODComputeSummaryTask::Update()
             for(i=0; i<(int)blocks->size(); i++)
             {
                //if there is data but no summary, this blockfile needs summarizing.
-               SeqBlock &block = blocks->at(i);
+               SeqBlock &block = (*blocks)[i];
                BlockFile *const file = block.f;
                if(file->IsDataAvailable() && !file->IsSummaryAvailable())
                {
diff --git a/src/ondemand/ODDecodeTask.cpp b/src/ondemand/ODDecodeTask.cpp
index 652f3c490..1223be5f7 100644
--- a/src/ondemand/ODDecodeTask.cpp
+++ b/src/ondemand/ODDecodeTask.cpp
@@ -157,7 +157,7 @@ void ODDecodeTask::Update()
             for (i = 0; i<(int)blocks->size(); i++)
             {
                //since we have more than one ODBlockFile, we will need type flags to cast.
-               SeqBlock &block = blocks->at(i);
+               SeqBlock &block = (*blocks)[i];
                BlockFile *const file = block.f;
                ODDecodeBlockFile *oddbFile;
                if (!file->IsDataAvailable() &&