Transition away from Screen(sName).

stepmania/src/ScreenDebugOverlay.cpp

@@ -64,10 +64,7 @@ static bool IsGameplay()
 }
 
 
-REGISTER_SCREEN_CLASS( ScreenDebugOverlay );
+REGISTER_SCREEN_CLASS_NEW( ScreenDebugOverlay );
-ScreenDebugOverlay::ScreenDebugOverlay( const CString &sName ) : Screen(sName)
-{
-}
 
 ScreenDebugOverlay::~ScreenDebugOverlay()
 {

stepmania/src/ScreenDebugOverlay.h

@@ -10,7 +10,6 @@
 class ScreenDebugOverlay : public Screen
 {
 public:
-	ScreenDebugOverlay( const CString &sName );
 	virtual ~ScreenDebugOverlay();
 	virtual void Init();
 	

stepmania/src/ScreenExit.cpp

@@ -11,10 +11,7 @@
  * is annoying, because sounds might be deleted at any time; they aren't ours to have
  * references to.  Also, it's better to quit on command instead of waiting several seconds
  * for a sound to stop. */
-REGISTER_SCREEN_CLASS( ScreenExit );
+REGISTER_SCREEN_CLASS_NEW( ScreenExit );
-ScreenExit::ScreenExit( CString sName ): Screen( sName )
-{
-}
 
 void ScreenExit::Init()
 {

stepmania/src/ScreenExit.h

@@ -7,7 +7,6 @@
 class ScreenExit: public Screen
 {
 public:
-	ScreenExit( CString sName );
 	void Init();
 	void Update( float fDelta );
 

stepmania/src/ScreenNameEntry.cpp

@@ -85,8 +85,8 @@ float GetClosestCharYPos( float fFakeBeat )
 }
 
 
-REGISTER_SCREEN_CLASS( ScreenNameEntry );
+REGISTER_SCREEN_CLASS_NEW( ScreenNameEntry );
-ScreenNameEntry::ScreenNameEntry( CString sClassName ) : Screen( sClassName )
+ScreenNameEntry::ScreenNameEntry()
 {
 		// DEBUGGING STUFF
 //	GAMESTATE->m_CurGame = GAME_DANCE;

stepmania/src/ScreenNameEntry.h

@@ -13,7 +13,7 @@
 class ScreenNameEntry : public Screen
 {
 public:
-	ScreenNameEntry( CString sName );
+	ScreenNameEntry();
 	void Init();
 	virtual ~ScreenNameEntry();
 

stepmania/src/ScreenReloadSongs.cpp

@@ -44,10 +44,7 @@ public:
  * this for the initial load, since we don't want to start up the display
  * until we finish loading songs; that way, people can continue to use their
  * computer while songs load. */
-REGISTER_SCREEN_CLASS( ScreenReloadSongs );
+REGISTER_SCREEN_CLASS_NEW( ScreenReloadSongs );
-ScreenReloadSongs::ScreenReloadSongs( CString sClassName ): Screen(sClassName)
-{
-}
 
 void ScreenReloadSongs::Init()
 {

stepmania/src/ScreenReloadSongs.h

@@ -8,7 +8,6 @@ class LoadingWindow;
 class ScreenReloadSongs: public Screen
 {
 public:
-	ScreenReloadSongs( CString sClassName );
 	virtual void Init();
 	~ScreenReloadSongs();
 	void Update( float fDeltaTime );

stepmania/src/ScreenSandbox.cpp

@@ -13,10 +13,7 @@
 #include "RageLog.h"
 
 
-REGISTER_SCREEN_CLASS( ScreenSandbox );
+REGISTER_SCREEN_CLASS_NEW( ScreenSandbox );
-ScreenSandbox::ScreenSandbox( CString sClassName ) : Screen( sClassName )
-{
-}
 
 void ScreenSandbox::HandleScreenMessage( const ScreenMessage SM )
 {

stepmania/src/ScreenSandbox.h

@@ -6,8 +6,6 @@
 class ScreenSandbox : public Screen
 {
 public:
-	ScreenSandbox( CString sName );
-
 	virtual void Input( const InputEventPlus &input );
 	virtual void HandleScreenMessage( const ScreenMessage SM );
 	virtual void Update(float f);

stepmania/src/ScreenStage.cpp

@@ -14,10 +14,7 @@
 
 AutoScreenMessage( SM_PrepScreen )
 
-REGISTER_SCREEN_CLASS( ScreenStage );
+REGISTER_SCREEN_CLASS_NEW( ScreenStage );
-ScreenStage::ScreenStage( CString sClassName ) : Screen( sClassName )
-{
-}
 
 void ScreenStage::Init()
 {

stepmania/src/ScreenStage.h

@@ -11,7 +11,6 @@
 class ScreenStage : public Screen
 {
 public:
-	ScreenStage( CString sName );
 	virtual void Init();
 
 	virtual void HandleScreenMessage( const ScreenMessage SM );

stepmania/src/ScreenStatsOverlay.cpp

@@ -6,14 +6,7 @@
 #include "RageLog.h"
 #include "ScreenDimensions.h"
 
-REGISTER_SCREEN_CLASS( ScreenStatsOverlay );
+REGISTER_SCREEN_CLASS_NEW( ScreenStatsOverlay );
-ScreenStatsOverlay::ScreenStatsOverlay( const CString &sName ) : Screen(sName)
-{
-}
-
-ScreenStatsOverlay::~ScreenStatsOverlay()
-{
-}
 
 void ScreenStatsOverlay::Init()
 {

stepmania/src/ScreenStatsOverlay.h

@@ -12,8 +12,6 @@ const int NUM_SKIPS_TO_SHOW = 5;
 class ScreenStatsOverlay : public Screen
 {
 public:
-	ScreenStatsOverlay( const CString &sName );
-	virtual ~ScreenStatsOverlay();
 	virtual void Init();
 	
 	void Update( float fDeltaTime );

stepmania/src/ScreenSyncOverlay.cpp

@@ -13,14 +13,7 @@ static bool IsGameplay()
 	return SCREENMAN && SCREENMAN->GetTopScreen() && SCREENMAN->GetTopScreen()->GetScreenType() == gameplay;
 }
 
-REGISTER_SCREEN_CLASS( ScreenSyncOverlay );
+REGISTER_SCREEN_CLASS_NEW( ScreenSyncOverlay );
-ScreenSyncOverlay::ScreenSyncOverlay( const CString &sName ) : Screen(sName)
-{
-}
-
-ScreenSyncOverlay::~ScreenSyncOverlay()
-{
-}
 
 void ScreenSyncOverlay::Init()
 {

stepmania/src/ScreenSyncOverlay.h

@@ -10,8 +10,6 @@
 class ScreenSyncOverlay : public Screen
 {
 public:
-	ScreenSyncOverlay( const CString &sName );
-	virtual ~ScreenSyncOverlay();
 	virtual void Init();
 	
 	bool OverlayInput( const InputEventPlus &input );

stepmania/src/ScreenTest.cpp

@@ -25,8 +25,8 @@ void ScreenTest::SetScreen(int num)
 		current=SCREENMAN->MakeNewScreen("ScreenTestFonts");
 }
 
-REGISTER_SCREEN_CLASS( ScreenTest );
+REGISTER_SCREEN_CLASS_NEW( ScreenTest );
-ScreenTest::ScreenTest( CString sClassName ) : Screen( sClassName )
+ScreenTest::ScreenTest()
 {
 	current = NULL;
 }

stepmania/src/ScreenTest.h

@@ -6,7 +6,7 @@
 class ScreenTest : public Screen
 {
 public:
-	ScreenTest( CString sName );
+	ScreenTest();
 	~ScreenTest();
 	virtual void Init();
 

stepmania/src/ScreenTestFonts.cpp

@@ -30,10 +30,7 @@ void ScreenTestFonts::HandleScreenMessage( const ScreenMessage SM )
 		SetText( g_sCustomText );
 }
 
-REGISTER_SCREEN_CLASS( ScreenTestFonts );
+REGISTER_SCREEN_CLASS_NEW( ScreenTestFonts );
-ScreenTestFonts::ScreenTestFonts( CString sClassName ) : Screen( sClassName )
-{
-}
 
 void ScreenTestFonts::Init()
 {

stepmania/src/ScreenTestFonts.h

@@ -10,7 +10,6 @@
 class ScreenTestFonts: public Screen
 {
 public:
-	ScreenTestFonts( CString sName );
 	virtual void Init();
 
 	void Input( const InputEventPlus &input );

stepmania/src/ScreenTestSound.cpp

@@ -7,10 +7,7 @@
 #include "RageUtil.h"
 #include "InputEventPlus.h"
 
-REGISTER_SCREEN_CLASS( ScreenTestSound );
+REGISTER_SCREEN_CLASS_NEW( ScreenTestSound );
-ScreenTestSound::ScreenTestSound( CString sClassName ) : Screen( sClassName )
-{	
-}
 
 void ScreenTestSound::Init()
 {

stepmania/src/ScreenTestSound.h

@@ -10,7 +10,6 @@ const int nsounds = 5;
 class ScreenTestSound : public Screen
 {
 public:
-	ScreenTestSound( CString sName );
 	virtual void Init();
 	~ScreenTestSound();