From 730787aacbc5cbc2adad9fb16b8e2804181c11f3 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 5 Dec 2004 11:59:39 +0000 Subject: [PATCH] name cleanup: State->Screen --- stepmania/src/ScreenNetworkOptions.cpp | 6 +++--- stepmania/src/ScreenNetworkOptions.h | 4 ++-- stepmania/src/ScreenOptions.cpp | 12 ++++++------ stepmania/src/ScreenOptions.h | 6 +++--- stepmania/src/ScreenOptionsMaster.cpp | 4 ++-- stepmania/src/ScreenOptionsMaster.h | 4 ++-- stepmania/src/ScreenPlayerOptions.cpp | 4 ++-- stepmania/src/ScreenPlayerOptions.h | 4 ++-- stepmania/src/ScreenProfileOptions.cpp | 6 +++--- stepmania/src/ScreenProfileOptions.h | 4 ++-- stepmania/src/ScreenSongOptions.cpp | 4 ++-- stepmania/src/ScreenSongOptions.h | 4 ++-- 12 files changed, 31 insertions(+), 31 deletions(-) diff --git a/stepmania/src/ScreenNetworkOptions.cpp b/stepmania/src/ScreenNetworkOptions.cpp index f60d80d2d1..15d01ef54f 100644 --- a/stepmania/src/ScreenNetworkOptions.cpp +++ b/stepmania/src/ScreenNetworkOptions.cpp @@ -58,14 +58,14 @@ ScreenNetworkOptions::ScreenNetworkOptions( CString sClassName ) : ScreenOptions } -void ScreenNetworkOptions::GoToPrevState() +void ScreenNetworkOptions::GoToPrevScreen() { SCREENMAN->SetNewScreen( "ScreenOptionsMenu" ); } -void ScreenNetworkOptions::GoToNextState() +void ScreenNetworkOptions::GoToNextScreen() { - GoToPrevState(); + GoToPrevScreen(); } void ScreenNetworkOptions::HandleScreenMessage( const ScreenMessage SM ) diff --git a/stepmania/src/ScreenNetworkOptions.h b/stepmania/src/ScreenNetworkOptions.h index 4b798552a8..c69c5a7f14 100644 --- a/stepmania/src/ScreenNetworkOptions.h +++ b/stepmania/src/ScreenNetworkOptions.h @@ -16,8 +16,8 @@ private: void ImportOptions(); void ExportOptions(); - void GoToNextState(); - void GoToPrevState(); + void GoToNextScreen(); + void GoToPrevScreen(); void UpdateConnectStatus(); diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index 127cb30cbb..6408925060 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -899,15 +899,15 @@ void ScreenOptions::HandleScreenMessage( const ScreenMessage SM ) switch( SM ) { case SM_MenuTimer: - StartGoToNextState(); + StartGoToNextScreen(); break; case SM_GoToPrevScreen: // this->ExportOptions(); // Don't save options if we're going back! - this->GoToPrevState(); + this->GoToPrevScreen(); break; case SM_GoToNextScreen: this->ExportOptions(); - this->GoToNextState(); + this->GoToNextScreen(); break; case SM_BeginFadingOut: if(IsTransitioning()) @@ -1118,7 +1118,7 @@ void ScreenOptions::MenuBack( PlayerNumber pn ) Back( SM_GoToPrevScreen ); } -void ScreenOptions::StartGoToNextState() +void ScreenOptions::StartGoToNextScreen() { this->PostScreenMessage( SM_BeginFadingOut, 0 ); } @@ -1174,7 +1174,7 @@ void ScreenOptions::MenuStart( PlayerNumber pn, const InputEventType type ) { /* Don't accept START to go to the next screen if we're still transitioning in. */ if( AllAreOnExit() && type == IET_FIRST_PRESS && !IsTransitioning() ) - StartGoToNextState(); + StartGoToNextScreen(); return; } @@ -1232,7 +1232,7 @@ void ScreenOptions::MenuStart( PlayerNumber pn, const InputEventType type ) case NAV_THREE_KEY_MENU: /* Don't accept START to go to the next screen if we're still transitioning in. */ if( type == IET_FIRST_PRESS && !IsTransitioning() ) - StartGoToNextState(); + StartGoToNextScreen(); break; case NAV_FIVE_KEY: /* Jump to the exit row. (If everyone's already on the exit row, then diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h index e07d1a5de7..2c07c9bd62 100644 --- a/stepmania/src/ScreenOptions.h +++ b/stepmania/src/ScreenOptions.h @@ -70,10 +70,10 @@ protected: virtual void MenuBack( PlayerNumber pn ); virtual void MenuStart( PlayerNumber pn, const InputEventType type ); - void StartGoToNextState(); + void StartGoToNextScreen(); - virtual void GoToNextState() = 0; - virtual void GoToPrevState() = 0; + virtual void GoToNextScreen() = 0; + virtual void GoToPrevScreen() = 0; void MenuLeft( PlayerNumber pn, const InputEventType type ) { ChangeValueInRow(pn,-1,type != IET_FIRST_PRESS); } void MenuRight( PlayerNumber pn, const InputEventType type ) { ChangeValueInRow(pn,+1,type != IET_FIRST_PRESS); } diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp index 45bd9b9225..dddd5e2b39 100644 --- a/stepmania/src/ScreenOptionsMaster.cpp +++ b/stepmania/src/ScreenOptionsMaster.cpp @@ -571,7 +571,7 @@ void ScreenOptionsMaster::ExportOptions() CHECKPOINT; } -void ScreenOptionsMaster::GoToNextState() +void ScreenOptionsMaster::GoToNextScreen() { if( GAMESTATE->m_bEditing ) SCREENMAN->PopTopScreen(); @@ -579,7 +579,7 @@ void ScreenOptionsMaster::GoToNextState() SCREENMAN->SetNewScreen( m_sNextScreen ); } -void ScreenOptionsMaster::GoToPrevState() +void ScreenOptionsMaster::GoToPrevScreen() { /* XXX: A better way to handle this would be to check if we're a pushed screen. */ if( GAMESTATE->m_bEditing ) diff --git a/stepmania/src/ScreenOptionsMaster.h b/stepmania/src/ScreenOptionsMaster.h index 86906ac601..6de43be15b 100644 --- a/stepmania/src/ScreenOptionsMaster.h +++ b/stepmania/src/ScreenOptionsMaster.h @@ -54,8 +54,8 @@ protected: virtual void ExportOptions(); virtual void ImportOptionsForPlayer( PlayerNumber pn ); // used by ScreenPlayerOptions - virtual void GoToNextState(); - virtual void GoToPrevState(); + virtual void GoToNextScreen(); + virtual void GoToPrevScreen(); virtual void RefreshIcons(); }; diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp index 4fc6d3fae0..8e5e78d653 100644 --- a/stepmania/src/ScreenPlayerOptions.cpp +++ b/stepmania/src/ScreenPlayerOptions.cpp @@ -57,7 +57,7 @@ ScreenPlayerOptions::ScreenPlayerOptions( CString sClassName ) : } -void ScreenPlayerOptions::GoToPrevState() +void ScreenPlayerOptions::GoToPrevScreen() { if( GAMESTATE->m_bEditing ) SCREENMAN->PopTopScreen(); @@ -65,7 +65,7 @@ void ScreenPlayerOptions::GoToPrevState() SCREENMAN->SetNewScreen( PREV_SCREEN ); } -void ScreenPlayerOptions::GoToNextState() +void ScreenPlayerOptions::GoToNextScreen() { if( GAMESTATE->m_bEditing ) SCREENMAN->PopTopScreen(); diff --git a/stepmania/src/ScreenPlayerOptions.h b/stepmania/src/ScreenPlayerOptions.h index 19e7cbd3f4..b19e147ef1 100644 --- a/stepmania/src/ScreenPlayerOptions.h +++ b/stepmania/src/ScreenPlayerOptions.h @@ -14,8 +14,8 @@ public: virtual void HandleScreenMessage( const ScreenMessage SM ); private: - void GoToNextState(); - void GoToPrevState(); + void GoToNextScreen(); + void GoToPrevScreen(); void UpdateDisqualified(); diff --git a/stepmania/src/ScreenProfileOptions.cpp b/stepmania/src/ScreenProfileOptions.cpp index d4a9da1193..6ee430618a 100644 --- a/stepmania/src/ScreenProfileOptions.cpp +++ b/stepmania/src/ScreenProfileOptions.cpp @@ -113,15 +113,15 @@ void ScreenProfileOptions::ExportOptions() PREFSMAN->m_sDefaultLocalProfileID[PLAYER_2] = ""; } -void ScreenProfileOptions::GoToPrevState() +void ScreenProfileOptions::GoToPrevScreen() { SCREENMAN->SetNewScreen( "ScreenOptionsMenu" ); } -void ScreenProfileOptions::GoToNextState() +void ScreenProfileOptions::GoToNextScreen() { PREFSMAN->SaveGlobalPrefsToDisk(); - GoToPrevState(); + GoToPrevScreen(); } void ScreenProfileOptions::HandleScreenMessage( const ScreenMessage SM ) diff --git a/stepmania/src/ScreenProfileOptions.h b/stepmania/src/ScreenProfileOptions.h index 3c807db303..a8139eeed4 100644 --- a/stepmania/src/ScreenProfileOptions.h +++ b/stepmania/src/ScreenProfileOptions.h @@ -16,8 +16,8 @@ private: void ImportOptions(); void ExportOptions(); - void GoToNextState(); - void GoToPrevState(); + void GoToNextScreen(); + void GoToPrevScreen(); CString GetSelectedProfileID(); CString GetSelectedProfileName(); diff --git a/stepmania/src/ScreenSongOptions.cpp b/stepmania/src/ScreenSongOptions.cpp index 56dec316ff..775fa287ce 100644 --- a/stepmania/src/ScreenSongOptions.cpp +++ b/stepmania/src/ScreenSongOptions.cpp @@ -29,7 +29,7 @@ ScreenSongOptions::ScreenSongOptions( CString sClassName ) : } } -void ScreenSongOptions::GoToPrevState() +void ScreenSongOptions::GoToPrevScreen() { if( GAMESTATE->m_bEditing ) SCREENMAN->PopTopScreen( SM_None ); @@ -37,7 +37,7 @@ void ScreenSongOptions::GoToPrevState() SCREENMAN->SetNewScreen( PREV_SCREEN ); } -void ScreenSongOptions::GoToNextState() +void ScreenSongOptions::GoToNextScreen() { if( GAMESTATE->m_bEditing ) SCREENMAN->PopTopScreen(); diff --git a/stepmania/src/ScreenSongOptions.h b/stepmania/src/ScreenSongOptions.h index ac07f46a00..466a3f3935 100644 --- a/stepmania/src/ScreenSongOptions.h +++ b/stepmania/src/ScreenSongOptions.h @@ -10,8 +10,8 @@ public: static CString GetNextScreen(); private: - void GoToNextState(); - void GoToPrevState(); + void GoToNextScreen(); + void GoToPrevScreen(); }; #endif