From c86c218522573decc077704e1ec8ec90ac0d10fe Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 14 Nov 2006 04:26:38 +0000 Subject: [PATCH] MessageToString -> MessageIDToString --- stepmania/src/MessageManager.cpp | 8 ++++---- stepmania/src/MessageManager.h | 5 ++--- stepmania/src/OptionRowHandler.cpp | 10 +++++----- stepmania/src/ScreenUnlockBrowse.cpp | 2 +- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/stepmania/src/MessageManager.cpp b/stepmania/src/MessageManager.cpp index 8dedcc1f61..34cdce3c75 100644 --- a/stepmania/src/MessageManager.cpp +++ b/stepmania/src/MessageManager.cpp @@ -199,7 +199,7 @@ void MessageManager::Subscribe( IMessageSubscriber* pSubscriber, const RString& void MessageManager::Subscribe( IMessageSubscriber* pSubscriber, MessageID m ) { - Subscribe( pSubscriber, MessageToString(m) ); + Subscribe( pSubscriber, MessageIDToString(m) ); } void MessageManager::Unsubscribe( IMessageSubscriber* pSubscriber, const RString& sMessage ) @@ -214,7 +214,7 @@ void MessageManager::Unsubscribe( IMessageSubscriber* pSubscriber, const RString void MessageManager::Unsubscribe( IMessageSubscriber* pSubscriber, MessageID m ) { - Unsubscribe( pSubscriber, MessageToString(m) ); + Unsubscribe( pSubscriber, MessageIDToString(m) ); } void MessageManager::Broadcast( const Message &msg ) const @@ -240,7 +240,7 @@ void MessageManager::Broadcast( const RString& sMessage ) const void MessageManager::Broadcast( MessageID m ) const { - Broadcast( MessageToString(m) ); + Broadcast( MessageIDToString(m) ); } void IMessageSubscriber::ClearMessages( const RString sMessage ) @@ -267,7 +267,7 @@ void MessageSubscriber::SubscribeToMessage( const RString &sMessageName ) void MessageSubscriber::SubscribeToMessage( MessageID message ) { MESSAGEMAN->Subscribe( this, message ); - m_vsSubscribedTo.push_back( MessageToString(message) ); + m_vsSubscribedTo.push_back( MessageIDToString(message) ); } void MessageSubscriber::UnsubscribeAll() diff --git a/stepmania/src/MessageManager.h b/stepmania/src/MessageManager.h index fadc0793d8..7d7de8e6a8 100644 --- a/stepmania/src/MessageManager.h +++ b/stepmania/src/MessageManager.h @@ -134,7 +134,6 @@ enum MessageID MessageID_Invalid }; const RString& MessageIDToString( MessageID m ); -#define MessageToString MessageIDToString struct Message { @@ -225,7 +224,7 @@ private: public: explicit BroadcastOnChange( MessageID m ) { mSendWhenChanged = m; } const T Get() const { return val; } - void Set( T t ) { val = t; MESSAGEMAN->Broadcast( MessageToString(mSendWhenChanged) ); } + void Set( T t ) { val = t; MESSAGEMAN->Broadcast( MessageIDToString(mSendWhenChanged) ); } operator T () const { return val; } bool operator == ( const T &other ) const { return val == other; } bool operator != ( const T &other ) const { return val != other; } @@ -258,7 +257,7 @@ private: public: explicit BroadcastOnChangePtr( MessageID m ) { mSendWhenChanged = m; val = NULL; } T* Get() const { return val; } - void Set( T* t ) { val = t; if(MESSAGEMAN) MESSAGEMAN->Broadcast( MessageToString(mSendWhenChanged) ); } + void Set( T* t ) { val = t; if(MESSAGEMAN) MESSAGEMAN->Broadcast( MessageIDToString(mSendWhenChanged) ); } /* This is only intended to be used for setting temporary values; always * restore the original value when finished, so listeners don't get confused * due to missing a message. */ diff --git a/stepmania/src/OptionRowHandler.cpp b/stepmania/src/OptionRowHandler.cpp index 802d00655d..c8ec3bd68e 100644 --- a/stepmania/src/OptionRowHandler.cpp +++ b/stepmania/src/OptionRowHandler.cpp @@ -453,13 +453,13 @@ public: m_ppStepsToFill = &GAMESTATE->m_pCurSteps[0]; m_pDifficultyToFill = &GAMESTATE->m_PreferredDifficulty[0]; m_pst = &GAMESTATE->m_stEdit; - m_vsReloadRowMessages.push_back( MessageToString(Message_EditStepsTypeChanged) ); + m_vsReloadRowMessages.push_back( MessageIDToString(Message_EditStepsTypeChanged) ); } else if( sParam == "EditSourceSteps" ) { m_ppStepsToFill = &GAMESTATE->m_pEditSourceSteps; m_pst = &GAMESTATE->m_stEditSource; - m_vsReloadRowMessages.push_back( MessageToString(Message_EditSourceStepsTypeChanged) ); + m_vsReloadRowMessages.push_back( MessageIDToString(Message_EditSourceStepsTypeChanged) ); if( GAMESTATE->m_pCurSteps[0].Get() != NULL ) m_Def.m_vEnabledForPlayers.clear(); // hide row } @@ -473,7 +473,7 @@ public: m_Def.m_layoutType = LAYOUT_SHOW_ONE_IN_ROW; m_Def.m_bExportOnChange = true; m_Def.m_bAllowThemeItems = false; // we theme the text ourself - m_vsReloadRowMessages.push_back( MessageToString(Message_CurrentSongChanged) ); + m_vsReloadRowMessages.push_back( MessageIDToString(Message_CurrentSongChanged) ); m_vDifficulties.clear(); m_vSteps.clear(); @@ -1134,8 +1134,8 @@ public: else if( sParam == "EditSourceStepsType" ) { m_pstToFill = &GAMESTATE->m_stEditSource; - m_vsReloadRowMessages.push_back( MessageToString(Message_CurrentStepsP1Changed) ); - m_vsReloadRowMessages.push_back( MessageToString(Message_EditStepsTypeChanged) ); + m_vsReloadRowMessages.push_back( MessageIDToString(Message_CurrentStepsP1Changed) ); + m_vsReloadRowMessages.push_back( MessageIDToString(Message_EditStepsTypeChanged) ); if( GAMESTATE->m_pCurSteps[0].Get() != NULL ) m_Def.m_vEnabledForPlayers.clear(); // hide row } diff --git a/stepmania/src/ScreenUnlockBrowse.cpp b/stepmania/src/ScreenUnlockBrowse.cpp index 736945062e..8c8c17ac1d 100644 --- a/stepmania/src/ScreenUnlockBrowse.cpp +++ b/stepmania/src/ScreenUnlockBrowse.cpp @@ -43,7 +43,7 @@ void ScreenUnlockBrowse::BeginScreen() { ScreenSelectMaster::BeginScreen(); - HandleMessage( Message(MessageToString(Message_MenuSelectionChanged)) ); + HandleMessage( Message(MessageIDToString(Message_MenuSelectionChanged)) ); } void ScreenUnlockBrowse::MenuStart( const InputEventPlus &input )