From f50cd1f0b7398b7e0437b3446da1a1aed23f07ea Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Wed, 1 May 2013 22:00:32 -0400
Subject: [PATCH] More loops, more deletion spots.

---
 src/WorkoutGraph.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/WorkoutGraph.cpp b/src/WorkoutGraph.cpp
index d512fa99ba..3e0f27ba6b 100644
--- a/src/WorkoutGraph.cpp
+++ b/src/WorkoutGraph.cpp
@@ -23,8 +23,10 @@ WorkoutGraph::WorkoutGraph()
 
 WorkoutGraph::~WorkoutGraph()
 {
-	FOREACH( Sprite*, m_vpBars, a )
-		delete *a;
+	for (Sprite *s : m_vpBars)
+	{
+		delete s;
+	}
 	m_vpBars.clear();
 }
 
@@ -48,10 +50,10 @@ void WorkoutGraph::SetFromCurrentWorkout()
 
 void WorkoutGraph::SetInternal( int iMinSongsPlayed )
 {
-	FOREACH( Sprite*, m_vpBars, p )
+	for (Sprite *s : m_vpBars)
 	{
-		this->RemoveChild( *p );
-		delete *p;
+		this->RemoveChild( s );
+		delete s;
 	}
 	m_vpBars.clear();
 
@@ -105,8 +107,8 @@ void WorkoutGraph::SetFromGameStateAndHighlightSong( int iSongIndex )
 {
 	SetInternal( iSongIndex+1 );
 
-	FOREACH( Sprite*, m_vpBars, spr )
-		(*spr)->StopEffect();
+	for (Sprite *s : m_vpBars)
+		s->StopEffect();
 
 	int iBarIndex = iSongIndex - m_iSongsChoppedOffAtBeginning;