name cleanup: State->Screen

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 )

stepmania/src/ScreenNetworkOptions.h

@@ -16,8 +16,8 @@ private:
 	void ImportOptions();
 	void ExportOptions();
 
-	void GoToNextState();
+	void GoToNextScreen();
-	void GoToPrevState();
+	void GoToPrevScreen();
 
 	void UpdateConnectStatus();
 

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

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 GoToNextScreen() = 0;
-	virtual void GoToPrevState() = 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); }

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 )

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 GoToNextScreen();
-	virtual void GoToPrevState();
+	virtual void GoToPrevScreen();
 
 	virtual void RefreshIcons();
 };

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();

stepmania/src/ScreenPlayerOptions.h

@@ -14,8 +14,8 @@ public:
 	virtual void HandleScreenMessage( const ScreenMessage SM );
 
 private:
-	void GoToNextState();
+	void GoToNextScreen();
-	void GoToPrevState();
+	void GoToPrevScreen();
 
 	void UpdateDisqualified();
 

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 )

stepmania/src/ScreenProfileOptions.h

@@ -16,8 +16,8 @@ private:
 	void ImportOptions();
 	void ExportOptions();
 
-	void GoToNextState();
+	void GoToNextScreen();
-	void GoToPrevState();
+	void GoToPrevScreen();
 
 	CString GetSelectedProfileID();
 	CString GetSelectedProfileName();

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();

stepmania/src/ScreenSongOptions.h

@@ -10,8 +10,8 @@ public:
 	static CString GetNextScreen();
 
 private:
-	void GoToNextState();
+	void GoToNextScreen();
-	void GoToPrevState();
+	void GoToPrevScreen();
 };
 
 #endif