From 5c841f287bdc5d94f488aa98f815f12a7bcdde88 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Thu, 24 Oct 2002 20:15:24 +0000
Subject: [PATCH] s/RemoveAll/clear/g

---
 stepmania/src/BGAnimation.cpp          | 2 +-
 stepmania/src/Background.cpp           | 4 ++--
 stepmania/src/GameState.cpp            | 4 ++--
 stepmania/src/InputQueue.cpp           | 6 +++---
 stepmania/src/NoteDisplay.cpp          | 2 +-
 stepmania/src/NotesLoaderKSF.cpp       | 2 +-
 stepmania/src/NotesLoaderSM.cpp        | 4 ++--
 stepmania/src/PrefsManager.cpp         | 2 +-
 stepmania/src/RageTexture.cpp          | 3 +--
 stepmania/src/RageUtil.cpp             | 2 +-
 stepmania/src/ScreenEz2SelectMusic.cpp | 2 +-
 stepmania/src/ScreenManager.cpp        | 4 ++--
 stepmania/src/ScreenSelectMusic.cpp    | 2 +-
 stepmania/src/ScrollingList.cpp        | 2 +-
 stepmania/src/Song.cpp                 | 2 +-
 stepmania/src/SongManager.cpp          | 4 ++--
 stepmania/src/SongSelector.cpp         | 4 ++--
 17 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/stepmania/src/BGAnimation.cpp b/stepmania/src/BGAnimation.cpp
index 515c54eec1..4730502408 100644
--- a/stepmania/src/BGAnimation.cpp
+++ b/stepmania/src/BGAnimation.cpp
@@ -32,7 +32,7 @@ void BGAnimation::Unload()
 {
     for( int i=0; i<m_Layers.GetSize(); i++ )
 		delete m_Layers[i];
-	m_Layers.RemoveAll();
+	m_Layers.clear();
 }
 
 void BGAnimation::LoadFromStaticGraphic( CString sPath )
diff --git a/stepmania/src/Background.cpp b/stepmania/src/Background.cpp
index 17280607af..35b011403f 100644
--- a/stepmania/src/Background.cpp
+++ b/stepmania/src/Background.cpp
@@ -77,9 +77,9 @@ void Background::Unload()
 {
     for( int i=0; i<m_BGAnimations.GetSize(); i++ )
 		delete m_BGAnimations[i];
-	m_BGAnimations.RemoveAll();
+	m_BGAnimations.clear();
 	
-	m_aBGSegments.RemoveAll();
+	m_aBGSegments.clear();
 	m_iCurBGSegment = 0;
 }
 
diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 74ef978823..1ab7946918 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -75,7 +75,7 @@ void GameState::Reset()
 	m_bFreeze = 0;
 	
 
-	m_apSongsPlayed.RemoveAll();
+	m_apSongsPlayed.clear();
 	
 	m_iSongsIntoCourse = 0;
 	for( p=0; p<NUM_PLAYERS; p++ )
@@ -169,7 +169,7 @@ void GameState::ResetStageStatistics()
 	{
 	case PLAY_MODE_ONI:
 	case PLAY_MODE_ENDLESS:
-		m_apSongsPlayed.RemoveAll();
+		m_apSongsPlayed.clear();
 		break;
 	}
 
diff --git a/stepmania/src/InputQueue.cpp b/stepmania/src/InputQueue.cpp
index 5e41eb5d15..8b1265362a 100644
--- a/stepmania/src/InputQueue.cpp
+++ b/stepmania/src/InputQueue.cpp
@@ -24,7 +24,7 @@ InputQueue*	INPUTQUEUE = NULL;	// global and accessable from anywhere in our pro
 InputQueue::InputQueue()
 {
 	for( int p=0; p<NUM_PLAYERS; p++ )
-		m_aQueue[p].SetSize( MAX_INPUT_QUEUE_LENGTH );
+		m_aQueue[p].insert(m_aQueue[p].begin(), MAX_INPUT_QUEUE_LENGTH, GameButtonAndTime() );
 }
 
 void InputQueue::RememberInput( const GameInput GameI )
@@ -56,7 +56,7 @@ bool InputQueue::MatchesPattern( const GameController c, const MenuButton* butto
 		}
 		if( sequence_index == 0 )		// we matched the whole pattern
 		{
-			m_aQueue[c].RemoveAll();	// empty the queue so we don't match on it again
+			m_aQueue[c].clear();	// empty the queue so we don't match on it again
 			return true;
 		}
 		sequence_index--;
@@ -82,7 +82,7 @@ bool InputQueue::MatchesPattern( const GameController c, const GameButton* butto
 		}
 		if( sequence_index == 0 )		// we matched the whole pattern
 		{
-			m_aQueue[c].RemoveAll();	// empty the queue so we don't match on it again
+			m_aQueue[c].clear();	// empty the queue so we don't match on it again
 			return true;
 		}
 		sequence_index--;
diff --git a/stepmania/src/NoteDisplay.cpp b/stepmania/src/NoteDisplay.cpp
index ec828f377b..1a34ecdc14 100644
--- a/stepmania/src/NoteDisplay.cpp
+++ b/stepmania/src/NoteDisplay.cpp
@@ -56,7 +56,7 @@ void NoteDisplay::Load( int iColNum, PlayerNumber pn )
 	m_sprHoldParts.TurnShadowOff();
 
 
-	m_colorTapTweens.RemoveAll();
+	m_colorTapTweens.clear();
 	const CString sColorsFilePath = GAMEMAN->GetPathTo( iColNum, "Tap.colors" );
 	FILE* fp = fopen( sColorsFilePath, "r" );
 	if( fp == NULL )
diff --git a/stepmania/src/NotesLoaderKSF.cpp b/stepmania/src/NotesLoaderKSF.cpp
index 787a75f081..ecf083d2f5 100644
--- a/stepmania/src/NotesLoaderKSF.cpp
+++ b/stepmania/src/NotesLoaderKSF.cpp
@@ -209,7 +209,7 @@ bool KSFLoader::LoadFromDir( CString sDir, Song &out )
 					CStringArray asBits;
 					split( sDir, "\\", asBits, true);
 					CString sSongFolderName = asBits[ asBits.GetSize()-1 ];
-					asBits.RemoveAll();
+					asBits.clear();
 
 					split( sSongFolderName, " - ", asBits, false );
 					if( asBits.GetSize() == 2 )
diff --git a/stepmania/src/NotesLoaderSM.cpp b/stepmania/src/NotesLoaderSM.cpp
index aff428944b..04ad61b8e9 100644
--- a/stepmania/src/NotesLoaderSM.cpp
+++ b/stepmania/src/NotesLoaderSM.cpp
@@ -51,8 +51,8 @@ bool SMLoader::LoadFromSMFile( CString sPath, Song &out )
 {
 	LOG->Trace( "Song::LoadFromSMDir(%s)", sPath );
 
-	out.m_BPMSegments.RemoveAll();
-	out.m_StopSegments.RemoveAll();
+	out.m_BPMSegments.clear();
+	out.m_StopSegments.clear();
 
 	int i;
 
diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index 67fca79435..21868a00ec 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -109,7 +109,7 @@ PrefsManager::~PrefsManager()
 	ini.GetValueI( "Options", "UnloadTextureDelaySeconds",	m_iUnloadTextureDelaySeconds );
 	ini.GetValueB( "Options", "CoinOpMode",					m_bCoinOpMode );
 
-	m_asAdditionalSongFolders.RemoveAll();
+	m_asAdditionalSongFolders.clear();
 	CString sAdditionalSongFolders;
 	ini.GetValue( "Options", "AdditionalSongFolders", sAdditionalSongFolders );
 	split( sAdditionalSongFolders, ",", m_asAdditionalSongFolders, true );
diff --git a/stepmania/src/RageTexture.cpp b/stepmania/src/RageTexture.cpp
index 15070881d8..79d5dd4c77 100644
--- a/stepmania/src/RageTexture.cpp
+++ b/stepmania/src/RageTexture.cpp
@@ -61,8 +61,7 @@ void RageTexture::CreateFrameRects()
 	///////////////////////////////////
 	// Fill in the m_FrameRects with the bounds of each frame in the animation.
 	///////////////////////////////////
-	m_TextureCoordRects.SetSize( 1, 10 );	// most textures will have only one frame
-	m_TextureCoordRects.RemoveAll();
+	m_TextureCoordRects.clear();
 
 	for( int j=0; j<m_iFramesHigh; j++ )		// traverse along Y
 	{
diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp
index 718c2887f5..99d0986292 100644
--- a/stepmania/src/RageUtil.cpp
+++ b/stepmania/src/RageUtil.cpp
@@ -341,7 +341,7 @@ void DirCache::FlushCache()
 {
 	for(int i = 0; i < directory_cache.GetSize(); ++i)
 		delete directory_cache[i];
-	directory_cache.RemoveAll();
+	directory_cache.clear();
 }
 
 void FlushDirCache() { DirectoryCache.FlushCache(); }
diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp
index 1f9ee916ac..535516a7c2 100644
--- a/stepmania/src/ScreenEz2SelectMusic.cpp
+++ b/stepmania/src/ScreenEz2SelectMusic.cpp
@@ -630,7 +630,7 @@ void ScreenEz2SelectMusic::AfterMusicChange()
 
 	GAMESTATE->m_pCurSong = pSong;
 
-	m_arrayNotes.RemoveAll();
+	m_arrayNotes.clear();
 
 	switch( m_MusicWheel.GetSelectedType() )
 	{
diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp
index c68f854977..58b7ceb557 100644
--- a/stepmania/src/ScreenManager.cpp
+++ b/stepmania/src/ScreenManager.cpp
@@ -73,7 +73,7 @@ void ScreenManager::EmptyDeleteQueue()
 	for( int i=0; i<m_ScreensToDelete.GetSize(); i++ )
 		SAFE_DELETE( m_ScreensToDelete[i] );
 
-	m_ScreensToDelete.RemoveAll();
+	m_ScreensToDelete.clear();
 }
 
 void ScreenManager::Update( float fDeltaTime )
@@ -244,7 +244,7 @@ void ScreenManager::SetNewScreen( Screen *pNewScreen )
 	// move current screen(s) to ScreenToDelete
 	m_ScreensToDelete.insert(m_ScreensToDelete.end(), m_ScreenStack.begin(), m_ScreenStack.end());
 
-	m_ScreenStack.RemoveAll();
+	m_ScreenStack.clear();
 	m_ScreenStack.Add( pNewScreen );
 }
 
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index bf77b7704f..819c73d745 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -703,7 +703,7 @@ void ScreenSelectMusic::AfterMusicChange()
 
 	int pn;
 	for( pn = 0; pn < NUM_PLAYERS; ++pn)
-		m_arrayNotes[pn].RemoveAll();
+		m_arrayNotes[pn].clear();
 
 	switch( m_MusicWheel.GetSelectedType() )
 	{
diff --git a/stepmania/src/ScrollingList.cpp b/stepmania/src/ScrollingList.cpp
index adfede7be9..41910e5b8b 100644
--- a/stepmania/src/ScrollingList.cpp
+++ b/stepmania/src/ScrollingList.cpp
@@ -47,7 +47,7 @@ void ScrollingList::Unload()
 {
 	for( int i=0; i<m_apSprites.GetSize(); i++ )
 		delete m_apSprites[i];
-	m_apSprites.RemoveAll();
+	m_apSprites.clear();
 }
 
 /************************************
diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index e405b9b82e..c30def9045 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -88,7 +88,7 @@ Song::~Song()
 	for( int i=0; i<m_apNotes.GetSize(); i++ )
 		SAFE_DELETE( m_apNotes[i] );
 
-	m_apNotes.RemoveAll();
+	m_apNotes.clear();
 }
 
 
diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp
index eaad855878..3f88441dfb 100644
--- a/stepmania/src/SongManager.cpp
+++ b/stepmania/src/SongManager.cpp
@@ -234,9 +234,9 @@ void SongManager::FreeSongArray()
 {
 	for( int i=0; i<m_pSongs.GetSize(); i++ )
 		SAFE_DELETE( m_pSongs[i] );
-	m_pSongs.RemoveAll();
+	m_pSongs.clear();
 
-	m_GroupBannerPaths.RemoveAll();
+	m_GroupBannerPaths.clear();
 }
 
 
diff --git a/stepmania/src/SongSelector.cpp b/stepmania/src/SongSelector.cpp
index 23165dbc80..56dbf51204 100644
--- a/stepmania/src/SongSelector.cpp
+++ b/stepmania/src/SongSelector.cpp
@@ -242,7 +242,7 @@ void SongSelector::OnGroupChange()
 	m_textGroup.SetText( SONGMAN->ShortenGroupName(GetSelectedGroup()) );
 
 	// reload songs
-	m_pSongs.RemoveAll();
+	m_pSongs.clear();
 	SONGMAN->GetSongsInGroup( GetSelectedGroup(), m_pSongs );
 
 	OnSongChange();
@@ -264,7 +264,7 @@ void SongSelector::OnNotesTypeChange()
 
 	m_textStyle.SetText( GAMEMAN->GetStyleDefForStyle(GetSelectedStyle())->m_szName );
 
-	m_pNotess.RemoveAll();
+	m_pNotess.clear();
 	GetSelectedSong()->GetNotesThatMatch( GAMEMAN->GetStyleDefForStyle(GetSelectedStyle())->m_NotesType, m_pNotess );
 	SortNotesArrayByDifficulty( m_pNotess );
 	m_pNotess.Add( NULL );		// marker for "(NEW)"