From 4459393d848ae8949c87f2a459eecd1d31294622 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Wed, 13 Jul 2005 19:01:42 +0000 Subject: [PATCH] row -> iRow --- stepmania/src/ScreenCourseManager.cpp | 4 ++-- stepmania/src/ScreenCourseManager.h | 4 ++-- stepmania/src/ScreenEditCourse.cpp | 2 +- stepmania/src/ScreenEditCourse.h | 4 ++-- stepmania/src/ScreenEditCourseEntry.cpp | 2 +- stepmania/src/ScreenEditCourseEntry.h | 4 ++-- stepmania/src/ScreenMiniMenu.h | 4 ++-- stepmania/src/ScreenNetworkOptions.cpp | 4 ++-- stepmania/src/ScreenNetworkOptions.h | 4 ++-- stepmania/src/ScreenOptions.h | 4 ++-- stepmania/src/ScreenOptionsMaster.h | 4 ++-- stepmania/src/ScreenProfileOptions.cpp | 18 +++++++++--------- stepmania/src/ScreenProfileOptions.h | 4 ++-- stepmania/src/ScreenSMOnlineLogin.cpp | 8 ++++---- stepmania/src/ScreenSMOnlineLogin.h | 4 ++-- stepmania/src/ScreenSongOptions.cpp | 4 ++-- stepmania/src/ScreenSongOptions.h | 2 +- 17 files changed, 40 insertions(+), 40 deletions(-) diff --git a/stepmania/src/ScreenCourseManager.cpp b/stepmania/src/ScreenCourseManager.cpp index c85eafa8c2..a6d789ff29 100644 --- a/stepmania/src/ScreenCourseManager.cpp +++ b/stepmania/src/ScreenCourseManager.cpp @@ -220,12 +220,12 @@ void ScreenCourseManager::ProcessMenuStart( PlayerNumber pn, const InputEventTyp } } -void ScreenCourseManager::ImportOptions( int row, const vector &vpns ) +void ScreenCourseManager::ImportOptions( int iRow, const vector &vpns ) { } -void ScreenCourseManager::ExportOptions( int row, const vector &vpns ) +void ScreenCourseManager::ExportOptions( int iRow, const vector &vpns ) { } diff --git a/stepmania/src/ScreenCourseManager.h b/stepmania/src/ScreenCourseManager.h index 7204a21424..139264e107 100644 --- a/stepmania/src/ScreenCourseManager.h +++ b/stepmania/src/ScreenCourseManager.h @@ -13,8 +13,8 @@ public: virtual void HandleScreenMessage( const ScreenMessage SM ); protected: - virtual void ImportOptions( int row, const vector &vpns ); - virtual void ExportOptions( int row, const vector &vpns ); + virtual void ImportOptions( int iRow, const vector &vpns ); + virtual void ExportOptions( int iRow, const vector &vpns ); virtual void AfterChangeValueInRow( PlayerNumber pn ); virtual void ProcessMenuStart( PlayerNumber pn, const InputEventType type ); diff --git a/stepmania/src/ScreenEditCourse.cpp b/stepmania/src/ScreenEditCourse.cpp index 640ea88fe4..f8e386ad3c 100644 --- a/stepmania/src/ScreenEditCourse.cpp +++ b/stepmania/src/ScreenEditCourse.cpp @@ -275,7 +275,7 @@ void ScreenEditCourse::ImportOptions( int iRow, const vector &vpns } } -void ScreenEditCourse::ExportOptions( int row, const vector &vpns ) +void ScreenEditCourse::ExportOptions( int iRow, const vector &vpns ) { } diff --git a/stepmania/src/ScreenEditCourse.h b/stepmania/src/ScreenEditCourse.h index 1ca1d6f5b5..9acfa568c0 100644 --- a/stepmania/src/ScreenEditCourse.h +++ b/stepmania/src/ScreenEditCourse.h @@ -14,8 +14,8 @@ public: virtual void HandleScreenMessage( const ScreenMessage SM ); protected: - virtual void ImportOptions( int row, const vector &vpns ); - virtual void ExportOptions( int row, const vector &vpns ); + virtual void ImportOptions( int iRow, const vector &vpns ); + virtual void ExportOptions( int iRow, const vector &vpns ); virtual void AfterChangeValueInRow( PlayerNumber pn ); virtual void ProcessMenuStart( PlayerNumber pn, const InputEventType type ); diff --git a/stepmania/src/ScreenEditCourseEntry.cpp b/stepmania/src/ScreenEditCourseEntry.cpp index e4e39eace8..6ffe6a702e 100644 --- a/stepmania/src/ScreenEditCourseEntry.cpp +++ b/stepmania/src/ScreenEditCourseEntry.cpp @@ -326,7 +326,7 @@ void ScreenEditCourseEntry::ImportAllOptions() } } -void ScreenEditCourseEntry::ExportOptions( int row, const vector &vpns ) +void ScreenEditCourseEntry::ExportOptions( int iRow, const vector &vpns ) { } diff --git a/stepmania/src/ScreenEditCourseEntry.h b/stepmania/src/ScreenEditCourseEntry.h index 09dad38caf..892c0e48c8 100644 --- a/stepmania/src/ScreenEditCourseEntry.h +++ b/stepmania/src/ScreenEditCourseEntry.h @@ -14,8 +14,8 @@ public: virtual void HandleScreenMessage( const ScreenMessage SM ); protected: - virtual void ImportOptions( int row, const vector &vpns ) {} - virtual void ExportOptions( int row, const vector &vpns ); + virtual void ImportOptions( int iRow, const vector &vpns ) {} + virtual void ExportOptions( int iRow, const vector &vpns ); virtual void AfterChangeValueInRow( PlayerNumber pn ); virtual void ProcessMenuStart( PlayerNumber pn, const InputEventType type ); diff --git a/stepmania/src/ScreenMiniMenu.h b/stepmania/src/ScreenMiniMenu.h index ae466208bc..9b5903bcf4 100644 --- a/stepmania/src/ScreenMiniMenu.h +++ b/stepmania/src/ScreenMiniMenu.h @@ -87,8 +87,8 @@ public: protected: virtual void OnChange( PlayerNumber pn ); - virtual void ImportOptions( int row, const vector &vpns ); - virtual void ExportOptions( int row, const vector &vpns ); + virtual void ImportOptions( int iRow, const vector &vpns ); + virtual void ExportOptions( int iRow, const vector &vpns ); // Screens that get pushed on top of other screens don't // use the ScreenManager's shared background, so they must draw their own. diff --git a/stepmania/src/ScreenNetworkOptions.cpp b/stepmania/src/ScreenNetworkOptions.cpp index c3f952e60d..705685aaad 100644 --- a/stepmania/src/ScreenNetworkOptions.cpp +++ b/stepmania/src/ScreenNetworkOptions.cpp @@ -144,8 +144,8 @@ void ScreenNetworkOptions::MenuStart( PlayerNumber pn, const InputEventType type #endif } -void ScreenNetworkOptions::ImportOptions( int row, const vector &vpns ) { } -void ScreenNetworkOptions::ExportOptions( int row, const vector &vpns ) { } +void ScreenNetworkOptions::ImportOptions( int iRow, const vector &vpns ) { } +void ScreenNetworkOptions::ExportOptions( int iRow, const vector &vpns ) { } void ScreenNetworkOptions::UpdateConnectStatus( ) { diff --git a/stepmania/src/ScreenNetworkOptions.h b/stepmania/src/ScreenNetworkOptions.h index 50f3bcd240..7755ab90b2 100644 --- a/stepmania/src/ScreenNetworkOptions.h +++ b/stepmania/src/ScreenNetworkOptions.h @@ -14,8 +14,8 @@ public: virtual void MenuStart( PlayerNumber pn, const InputEventType type ); private: - void ImportOptions( int row, const vector &vpns ); - void ExportOptions( int row, const vector &vpns ); + void ImportOptions( int iRow, const vector &vpns ); + void ExportOptions( int iRow, const vector &vpns ); void UpdateConnectStatus(); diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h index 41f2b5ad01..15610c5164 100644 --- a/stepmania/src/ScreenOptions.h +++ b/stepmania/src/ScreenOptions.h @@ -35,8 +35,8 @@ public: virtual void HandleScreenMessage( const ScreenMessage SM ); protected: - virtual void ImportOptions( int row, const vector &vpns ) = 0; - virtual void ExportOptions( int row, const vector &vpns ) = 0; + virtual void ImportOptions( int iRow, const vector &vpns ) = 0; + virtual void ExportOptions( int iRow, const vector &vpns ) = 0; void InitOptionsText(); void GetWidthXY( PlayerNumber pn, int iRow, int iChoiceOnRow, int &iWidthOut, int &iXOut, int &iYOut ); diff --git a/stepmania/src/ScreenOptionsMaster.h b/stepmania/src/ScreenOptionsMaster.h index 65e8cca22c..b82d2dd593 100644 --- a/stepmania/src/ScreenOptionsMaster.h +++ b/stepmania/src/ScreenOptionsMaster.h @@ -21,8 +21,8 @@ protected: protected: virtual void HandleScreenMessage( const ScreenMessage SM ); - virtual void ImportOptions( int row, const vector &vpns ); - virtual void ExportOptions( int row, const vector &vpns ); + virtual void ImportOptions( int iRow, const vector &vpns ); + virtual void ExportOptions( int iRow, const vector &vpns ); virtual void BeginFadingOut(); diff --git a/stepmania/src/ScreenProfileOptions.cpp b/stepmania/src/ScreenProfileOptions.cpp index 05389f7d7a..867fc6ae53 100644 --- a/stepmania/src/ScreenProfileOptions.cpp +++ b/stepmania/src/ScreenProfileOptions.cpp @@ -85,14 +85,14 @@ void ScreenProfileOptions::Init() SOUND->PlayMusic( THEME->GetPathS("ScreenMachineOptions","music") ); } -void ScreenProfileOptions::ImportOptions( int row, const vector &vpns ) +void ScreenProfileOptions::ImportOptions( int iRow, const vector &vpns ) { - switch( row ) + switch( iRow ) { case PO_PLAYER1: case PO_PLAYER2: { - PlayerNumber pn = (PlayerNumber)(row - PO_PLAYER1); + PlayerNumber pn = (PlayerNumber)(iRow - PO_PLAYER1); vector vsProfiles; PROFILEMAN->GetLocalProfileIDs( vsProfiles ); @@ -101,25 +101,25 @@ void ScreenProfileOptions::ImportOptions( int row, const vector &v vsProfiles.end(), PREFSMAN->GetDefaultLocalProfileID(pn).Get() ); if( iter != vsProfiles.end() ) - m_pRows[row]->SetOneSharedSelection( iter - vsProfiles.begin() + 1 ); + m_pRows[iRow]->SetOneSharedSelection( iter - vsProfiles.begin() + 1 ); } break; } } -void ScreenProfileOptions::ExportOptions( int row, const vector &vpns ) +void ScreenProfileOptions::ExportOptions( int iRow, const vector &vpns ) { - switch( row ) + switch( iRow ) { case PO_PLAYER1: case PO_PLAYER2: { - PlayerNumber pn = (PlayerNumber)(row - PO_PLAYER1); + PlayerNumber pn = (PlayerNumber)(iRow - PO_PLAYER1); vector vsProfiles; PROFILEMAN->GetLocalProfileIDs( vsProfiles ); - if( m_pRows[row]->GetOneSharedSelection() > 0 ) - PREFSMAN->GetDefaultLocalProfileID(pn).Set( vsProfiles[m_pRows[row]->GetOneSharedSelection()-1] ); + if( m_pRows[iRow]->GetOneSharedSelection() > 0 ) + PREFSMAN->GetDefaultLocalProfileID(pn).Set( vsProfiles[m_pRows[iRow]->GetOneSharedSelection()-1] ); else PREFSMAN->GetDefaultLocalProfileID(pn).Set( "" ); } diff --git a/stepmania/src/ScreenProfileOptions.h b/stepmania/src/ScreenProfileOptions.h index 6409324d13..b04d160b01 100644 --- a/stepmania/src/ScreenProfileOptions.h +++ b/stepmania/src/ScreenProfileOptions.h @@ -14,8 +14,8 @@ public: virtual void MenuStart( PlayerNumber pn, const InputEventType type ); private: - void ImportOptions( int row, const vector &vpns ); - void ExportOptions( int row, const vector &vpns ); + void ImportOptions( int iRow, const vector &vpns ); + void ExportOptions( int iRow, const vector &vpns ); CString GetSelectedProfileID(); CString GetSelectedProfileName(); diff --git a/stepmania/src/ScreenSMOnlineLogin.cpp b/stepmania/src/ScreenSMOnlineLogin.cpp index 6db813baa3..d7cb54c229 100644 --- a/stepmania/src/ScreenSMOnlineLogin.cpp +++ b/stepmania/src/ScreenSMOnlineLogin.cpp @@ -55,9 +55,9 @@ void ScreenSMOnlineLogin::Init() } } -void ScreenSMOnlineLogin::ImportOptions( int row, const vector &vpns ) +void ScreenSMOnlineLogin::ImportOptions( int iRow, const vector &vpns ) { - switch( row ) + switch( iRow ) { case 0: { @@ -75,9 +75,9 @@ void ScreenSMOnlineLogin::ImportOptions( int row, const vector &vp } } -void ScreenSMOnlineLogin::ExportOptions( int row, const vector &vpns ) +void ScreenSMOnlineLogin::ExportOptions( int iRow, const vector &vpns ) { - switch( row ) + switch( iRow ) { case 0: { diff --git a/stepmania/src/ScreenSMOnlineLogin.h b/stepmania/src/ScreenSMOnlineLogin.h index 505cb34f5a..349dedf74f 100644 --- a/stepmania/src/ScreenSMOnlineLogin.h +++ b/stepmania/src/ScreenSMOnlineLogin.h @@ -13,8 +13,8 @@ public: void SendLogin(CString sPassword); private: - void ImportOptions( int row, const vector &vpns ); - void ExportOptions( int row, const vector &vpns ); + void ImportOptions( int iRow, const vector &vpns ); + void ExportOptions( int iRow, const vector &vpns ); CString GetSelectedProfileID(); int m_iPlayer; }; diff --git a/stepmania/src/ScreenSongOptions.cpp b/stepmania/src/ScreenSongOptions.cpp index a8568b5693..aecbbdaeef 100644 --- a/stepmania/src/ScreenSongOptions.cpp +++ b/stepmania/src/ScreenSongOptions.cpp @@ -26,11 +26,11 @@ void ScreenSongOptions::Init() } } -void ScreenSongOptions::ExportOptions( int row, const vector &vpns ) +void ScreenSongOptions::ExportOptions( int iRow, const vector &vpns ) { const SongOptions::FailType ft = GAMESTATE->m_SongOptions.m_FailType; - ScreenOptionsMaster::ExportOptions( row, vpns ); + ScreenOptionsMaster::ExportOptions( iRow, vpns ); if( ft != GAMESTATE->m_SongOptions.m_FailType ) GAMESTATE->m_bChangedFailTypeOnScreenSongOptions = true; diff --git a/stepmania/src/ScreenSongOptions.h b/stepmania/src/ScreenSongOptions.h index 8a1432b223..f76fa02d20 100644 --- a/stepmania/src/ScreenSongOptions.h +++ b/stepmania/src/ScreenSongOptions.h @@ -13,7 +13,7 @@ public: virtual void HandleScreenMessage( const ScreenMessage SM ); private: - virtual void ExportOptions( int row, const vector &vpns ); + virtual void ExportOptions( int iRow, const vector &vpns ); }; #endif