actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Consistent semicolon use.

Browse Source 
This is C++, not Python!
This commit is contained in:
Jason Felds
2011-02-18 20:40:51 -05:00
parent e3e6eae012
commit 00257e7995
26 changed files with 70 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/MusicWheel.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ static Preference<bool> g_bMoveRandomToEnd( "MoveRandomToEnd", false );
static RString SECTION_COLORS_NAME( size_t i ) { return ssprintf("SectionColor%d",int(i+1)); } static RString SECTION_COLORS_NAME( size_t i ) { return ssprintf("SectionColor%d",int(i+1)); }
static RString CHOICE_NAME( RString s ) { return ssprintf("Choice%s",s.c_str()); } static RString CHOICE_NAME( RString s ) { return ssprintf("Choice%s",s.c_str()); }
AutoScreenMessage( SM_SongChanged ) // TODO: Replace this with a Message and MESSAGEMAN AutoScreenMessage( SM_SongChanged ); // TODO: Replace this with a Message and MESSAGEMAN
AutoScreenMessage( SM_SortOrderChanging ); AutoScreenMessage( SM_SortOrderChanging );
AutoScreenMessage( SM_SortOrderChanged ); AutoScreenMessage( SM_SortOrderChanged );
src/NetworkSyncManager.cpp
+1 -1
View File
@@ -43,7 +43,7 @@ void NetworkSyncManager::GetListOfLANServers( vector<NetServerInfo>& AllServers
#include "PlayerState.h" #include "PlayerState.h"
#include "CryptManager.h" #include "CryptManager.h"
AutoScreenMessage( SM_AddToChat ) AutoScreenMessage( SM_AddToChat );
AutoScreenMessage( SM_ChangeSong ); AutoScreenMessage( SM_ChangeSong );
AutoScreenMessage( SM_GotEval ); AutoScreenMessage( SM_GotEval );
AutoScreenMessage( SM_UsersUpdate ); AutoScreenMessage( SM_UsersUpdate );
src/RoomInfoDisplay.cpp
+2 -2
View File
@@ -5,8 +5,8 @@
#include "NetworkSyncManager.h" #include "NetworkSyncManager.h"
#include "LocalizedString.h" #include "LocalizedString.h"
AutoScreenMessage( SM_RoomInfoRetract ) AutoScreenMessage( SM_RoomInfoRetract );
AutoScreenMessage( SM_RoomInfoDeploy ) AutoScreenMessage( SM_RoomInfoDeploy );
static LocalizedString LAST_ROUND_INFO ( "RoomInfoDisplay", "Last Round Info:" ); static LocalizedString LAST_ROUND_INFO ( "RoomInfoDisplay", "Last Round Info:" );
static LocalizedString ROOM_NAME ( "RoomInfoDisplay", "Room Name:" ); static LocalizedString ROOM_NAME ( "RoomInfoDisplay", "Room Name:" );
src/RoomWheel.cpp
+3 -3
View File
@@ -8,9 +8,9 @@
#include "ScreenManager.h" #include "ScreenManager.h"
#include "ActorUtil.h" #include "ActorUtil.h"
AutoScreenMessage( SM_BackFromRoomName ) AutoScreenMessage( SM_BackFromRoomName );
AutoScreenMessage( SM_RoomInfoRetract ) AutoScreenMessage( SM_RoomInfoRetract );
AutoScreenMessage( SM_RoomInfoDeploy ) AutoScreenMessage( SM_RoomInfoDeploy );
RoomWheel::~RoomWheel() RoomWheel::~RoomWheel()
{ {
src/ScreenAttract.h
+1 -1
View File
@@ -5,7 +5,7 @@
#include "ScreenWithMenuElements.h" #include "ScreenWithMenuElements.h"
AutoScreenMessage( SM_GoToStartScreen ) AutoScreenMessage( SM_GoToStartScreen );
class ScreenAttract : public ScreenWithMenuElements class ScreenAttract : public ScreenWithMenuElements
{ {
src/ScreenEditMenu.cpp
+2 -2
View File
@@ -24,8 +24,8 @@ static const RString TEMP_FILE_NAME = "--temp--";
#define EXPLANATION_TEXT( row ) THEME->GetString(m_sName,"Explanation"+EditMenuRowToString(row)) #define EXPLANATION_TEXT( row ) THEME->GetString(m_sName,"Explanation"+EditMenuRowToString(row))
#define EDIT_MENU_TYPE THEME->GetMetric(m_sName,"EditMenuType") #define EDIT_MENU_TYPE THEME->GetMetric(m_sName,"EditMenuType")
AutoScreenMessage( SM_RefreshSelector ) AutoScreenMessage( SM_RefreshSelector );
AutoScreenMessage( SM_BackFromEditDescription ) AutoScreenMessage( SM_BackFromEditDescription );
REGISTER_SCREEN_CLASS( ScreenEditMenu ); REGISTER_SCREEN_CLASS( ScreenEditMenu );
src/ScreenEvaluation.cpp
+1 -1
View File
@@ -74,7 +74,7 @@ XToString( DetailLine );
static const int NUM_SHOWN_RADAR_CATEGORIES = 5; static const int NUM_SHOWN_RADAR_CATEGORIES = 5;
AutoScreenMessage( SM_PlayCheer ) AutoScreenMessage( SM_PlayCheer );
REGISTER_SCREEN_CLASS( ScreenEvaluation ); REGISTER_SCREEN_CLASS( ScreenEvaluation );
void ScreenEvaluation::Init() void ScreenEvaluation::Init()
src/ScreenGameplay.cpp
+7 -7
View File
@@ -71,19 +71,19 @@ static ThemeMetric<float> INITIAL_BACKGROUND_BRIGHTNESS ("ScreenGameplay","Initi
static ThemeMetric<float> SECONDS_BETWEEN_COMMENTS ("ScreenGameplay","SecondsBetweenComments"); static ThemeMetric<float> SECONDS_BETWEEN_COMMENTS ("ScreenGameplay","SecondsBetweenComments");
static ThemeMetric<RString> SCORE_KEEPER_CLASS ("ScreenGameplay","ScoreKeeperClass"); static ThemeMetric<RString> SCORE_KEEPER_CLASS ("ScreenGameplay","ScoreKeeperClass");
AutoScreenMessage( SM_PlayGo ) AutoScreenMessage( SM_PlayGo );
// received while STATE_DANCING // received while STATE_DANCING
AutoScreenMessage( SM_LoadNextSong ) AutoScreenMessage( SM_LoadNextSong );
AutoScreenMessage( SM_StartLoadingNextSong ) AutoScreenMessage( SM_StartLoadingNextSong );
// received while STATE_OUTRO // received while STATE_OUTRO
AutoScreenMessage( SM_DoPrevScreen ) AutoScreenMessage( SM_DoPrevScreen );
AutoScreenMessage( SM_DoNextScreen ) AutoScreenMessage( SM_DoNextScreen );
// received while STATE_INTRO // received while STATE_INTRO
AutoScreenMessage( SM_StartHereWeGo ) AutoScreenMessage( SM_StartHereWeGo );
AutoScreenMessage( SM_StopHereWeGo ) AutoScreenMessage( SM_StopHereWeGo );
AutoScreenMessage( SM_BattleTrickLevel1 ); AutoScreenMessage( SM_BattleTrickLevel1 );
AutoScreenMessage( SM_BattleTrickLevel2 ); AutoScreenMessage( SM_BattleTrickLevel2 );
src/ScreenMessage.h
+1 -1
View File
@@ -26,7 +26,7 @@ namespace ScreenMessageHelpers
// Automatically generate a unique ScreenMessage value // Automatically generate a unique ScreenMessage value
#define AutoScreenMessage( x ) \ #define AutoScreenMessage( x ) \
const ScreenMessage x = ScreenMessageHelpers::ToScreenMessage( #x ); const ScreenMessage x = ScreenMessageHelpers::ToScreenMessage( #x )
#endif #endif
src/ScreenMiniMenu.cpp
+2 -2
View File
@@ -10,8 +10,8 @@
#include "OptionRowHandler.h" #include "OptionRowHandler.h"
#include "PrefsManager.h" #include "PrefsManager.h"
AutoScreenMessage( SM_GoToOK ) AutoScreenMessage( SM_GoToOK );
AutoScreenMessage( SM_GoToCancel ) AutoScreenMessage( SM_GoToCancel );
bool ScreenMiniMenu::s_bCancelled = false; bool ScreenMiniMenu::s_bCancelled = false;
int ScreenMiniMenu::s_iLastRowCode = -1; int ScreenMiniMenu::s_iLastRowCode = -1;
src/ScreenNetEvaluation.cpp
+1 -1
View File
@@ -19,7 +19,7 @@ static const int NUM_SCORE_DIGITS = 9;
#define MAX_COMBO_NUM_DIGITS THEME->GetMetricI("ScreenEvaluation","MaxComboNumDigits") #define MAX_COMBO_NUM_DIGITS THEME->GetMetricI("ScreenEvaluation","MaxComboNumDigits")
static AutoScreenMessage( SM_GotEval ) static AutoScreenMessage( SM_GotEval );
REGISTER_SCREEN_CLASS( ScreenNetEvaluation ); REGISTER_SCREEN_CLASS( ScreenNetEvaluation );
src/ScreenNetRoom.cpp
+7 -7
View File
@@ -11,13 +11,13 @@
#include "InputEventPlus.h" #include "InputEventPlus.h"
#include "LocalizedString.h" #include "LocalizedString.h"
AutoScreenMessage( SM_SMOnlinePack ) AutoScreenMessage( SM_SMOnlinePack );
AutoScreenMessage( SM_BackFromRoomName ) AutoScreenMessage( SM_BackFromRoomName );
AutoScreenMessage( SM_BackFromRoomDesc ) AutoScreenMessage( SM_BackFromRoomDesc );
AutoScreenMessage( SM_BackFromRoomPass ) AutoScreenMessage( SM_BackFromRoomPass );
AutoScreenMessage( SM_BackFromReqPass ) AutoScreenMessage( SM_BackFromReqPass );
AutoScreenMessage( SM_RoomInfoRetract ) AutoScreenMessage( SM_RoomInfoRetract );
AutoScreenMessage( SM_RoomInfoDeploy ) AutoScreenMessage( SM_RoomInfoDeploy );
static LocalizedString ENTER_ROOM_DESCRIPTION ("ScreenNetRoom","Enter a description for the room:"); static LocalizedString ENTER_ROOM_DESCRIPTION ("ScreenNetRoom","Enter a description for the room:");
static LocalizedString ENTER_ROOM_PASSWORD ("ScreenNetRoom","Enter a password for the room (blank, no password):"); static LocalizedString ENTER_ROOM_PASSWORD ("ScreenNetRoom","Enter a password for the room (blank, no password):");
src/ScreenNetSelectBase.cpp
+3 -3
View File
@@ -26,9 +26,9 @@
#define USER_SPACING_X THEME->GetMetricF(m_sName,"UserSpacingX") #define USER_SPACING_X THEME->GetMetricF(m_sName,"UserSpacingX")
#define USER_ADD_Y THEME->GetMetricF(m_sName,"UserLine2Y") #define USER_ADD_Y THEME->GetMetricF(m_sName,"UserLine2Y")
AutoScreenMessage( SM_AddToChat ) AutoScreenMessage( SM_AddToChat );
AutoScreenMessage( SM_UsersUpdate ) AutoScreenMessage( SM_UsersUpdate );
AutoScreenMessage( SM_SMOnlinePack ) AutoScreenMessage( SM_SMOnlinePack );
REGISTER_SCREEN_CLASS( ScreenNetSelectBase ); REGISTER_SCREEN_CLASS( ScreenNetSelectBase );
src/ScreenNetSelectMusic.cpp
+8 -8
View File
@@ -26,14 +26,14 @@
#include "SongManager.h" #include "SongManager.h"
#include "CodeDetector.h" #include "CodeDetector.h"
AutoScreenMessage( SM_NoSongs ) AutoScreenMessage( SM_NoSongs );
AutoScreenMessage( SM_ChangeSong ) AutoScreenMessage( SM_ChangeSong );
AutoScreenMessage( SM_SMOnlinePack ) AutoScreenMessage( SM_SMOnlinePack );
AutoScreenMessage( SM_SetWheelSong ) AutoScreenMessage( SM_SetWheelSong );
AutoScreenMessage( SM_RefreshWheelLocation ) AutoScreenMessage( SM_RefreshWheelLocation );
AutoScreenMessage( SM_SongChanged ) AutoScreenMessage( SM_SongChanged );
AutoScreenMessage( SM_UsersUpdate ) AutoScreenMessage( SM_UsersUpdate );
AutoScreenMessage( SM_BackFromPlayerOptions ) AutoScreenMessage( SM_BackFromPlayerOptions );
REGISTER_SCREEN_CLASS( ScreenNetSelectMusic ); REGISTER_SCREEN_CLASS( ScreenNetSelectMusic );
src/ScreenNetworkOptions.cpp
+1 -1
View File
@@ -36,7 +36,7 @@ enum DisplayScoreboard
NO_SCOREBOARD_ON NO_SCOREBOARD_ON
}; };
AutoScreenMessage( SM_DoneConnecting ) AutoScreenMessage( SM_DoneConnecting );
Preference<RString> g_sLastServer( "LastConnectedServer", "" ); Preference<RString> g_sLastServer( "LastConnectedServer", "" );
src/ScreenOptions.h
+1 -1
View File
@@ -14,7 +14,7 @@
class OptionRowHandler; class OptionRowHandler;
AutoScreenMessage( SM_ExportOptions ) AutoScreenMessage( SM_ExportOptions );
/** @brief The list of input modes for the given row. */ /** @brief The list of input modes for the given row. */
enum InputMode enum InputMode
src/ScreenOptionsCourseOverview.cpp
+3 -3
View File
@@ -57,9 +57,9 @@ static LocalizedString ERROR_DELETING_FILE ("ScreenOptionsCourseOverview",
static LocalizedString COURSE_WILL_BE_LOST ("ScreenOptionsCourseOverview", "This course will be lost permanently."); static LocalizedString COURSE_WILL_BE_LOST ("ScreenOptionsCourseOverview", "This course will be lost permanently.");
static LocalizedString CONTINUE_WITH_DELETE ("ScreenOptionsCourseOverview", "Continue with delete?"); static LocalizedString CONTINUE_WITH_DELETE ("ScreenOptionsCourseOverview", "Continue with delete?");
AutoScreenMessage( SM_BackFromEnterName ) AutoScreenMessage( SM_BackFromEnterName );
AutoScreenMessage( SM_BackFromRename ) AutoScreenMessage( SM_BackFromRename );
AutoScreenMessage( SM_BackFromDelete ) AutoScreenMessage( SM_BackFromDelete );
void ScreenOptionsCourseOverview::Init() void ScreenOptionsCourseOverview::Init()
{ {
src/ScreenOptionsManageEditSteps.cpp
+3 -3
View File
@@ -20,9 +20,9 @@
#include "SpecialFiles.h" #include "SpecialFiles.h"
#include "NotesWriterSM.h" #include "NotesWriterSM.h"
AutoScreenMessage( SM_BackFromRename ) AutoScreenMessage( SM_BackFromRename );
AutoScreenMessage( SM_BackFromDelete ) AutoScreenMessage( SM_BackFromDelete );
AutoScreenMessage( SM_BackFromContextMenu ) AutoScreenMessage( SM_BackFromContextMenu );
enum StepsEditAction enum StepsEditAction
{ {
src/ScreenOptionsManageProfiles.cpp
+5 -5
View File
@@ -16,11 +16,11 @@ static LocalizedString NEW_PROFILE_DEFAULT_NAME( "ScreenOptionsManageProfiles",
#define SHOW_CREATE_NEW (!PROFILEMAN->FixedProfiles()) #define SHOW_CREATE_NEW (!PROFILEMAN->FixedProfiles())
AutoScreenMessage( SM_BackFromEnterNameForNew ) AutoScreenMessage( SM_BackFromEnterNameForNew );
AutoScreenMessage( SM_BackFromRename ) AutoScreenMessage( SM_BackFromRename );
AutoScreenMessage( SM_BackFromDeleteConfirm ) AutoScreenMessage( SM_BackFromDeleteConfirm );
AutoScreenMessage( SM_BackFromClearConfirm ) AutoScreenMessage( SM_BackFromClearConfirm );
AutoScreenMessage( SM_BackFromContextMenu ) AutoScreenMessage( SM_BackFromContextMenu );
enum ProfileAction enum ProfileAction
{ {
src/ScreenPackages.cpp
+1 -1
View File
@@ -14,7 +14,7 @@
#include <cstdlib> #include <cstdlib>
#include "LocalizedString.h" #include "LocalizedString.h"
AutoScreenMessage( SM_BackFromURL ) AutoScreenMessage( SM_BackFromURL );
REGISTER_SCREEN_CLASS( ScreenPackages ); REGISTER_SCREEN_CLASS( ScreenPackages );
src/ScreenRanking.cpp
+2 -2
View File
@@ -15,8 +15,8 @@ static const char *RankingTypeNames[] = {
XToString( RankingType ); XToString( RankingType );
LuaXType( RankingType ); LuaXType( RankingType );
AutoScreenMessage( SM_ShowNextPage ) AutoScreenMessage( SM_ShowNextPage );
AutoScreenMessage( SM_HidePage ) AutoScreenMessage( SM_HidePage );
REGISTER_SCREEN_CLASS( ScreenRanking ); REGISTER_SCREEN_CLASS( ScreenRanking );
src/ScreenSMOnlineLogin.cpp
+3 -3
View File
@@ -17,9 +17,9 @@
REGISTER_SCREEN_CLASS(ScreenSMOnlineLogin); REGISTER_SCREEN_CLASS(ScreenSMOnlineLogin);
AutoScreenMessage( SM_SMOnlinePack ) AutoScreenMessage( SM_SMOnlinePack );
AutoScreenMessage( SM_PasswordDone ) AutoScreenMessage( SM_PasswordDone );
AutoScreenMessage( SM_NoProfilesDefined ) AutoScreenMessage( SM_NoProfilesDefined );
static LocalizedString DEFINE_A_PROFILE( "ScreenSMOnlineLogin", "You must define a Profile." ); static LocalizedString DEFINE_A_PROFILE( "ScreenSMOnlineLogin", "You must define a Profile." );
void ScreenSMOnlineLogin::Init() void ScreenSMOnlineLogin::Init()
src/ScreenSelectMaster.cpp
+1 -1
View File
@@ -22,7 +22,7 @@ static const char *MenuDirNames[] = {
}; };
XToString( MenuDir ); XToString( MenuDir );
AutoScreenMessage( SM_PlayPostSwitchPage ) AutoScreenMessage( SM_PlayPostSwitchPage );
static RString CURSOR_OFFSET_X_FROM_ICON_NAME( size_t p ) { return ssprintf("CursorP%dOffsetXFromIcon",int(p+1)); } static RString CURSOR_OFFSET_X_FROM_ICON_NAME( size_t p ) { return ssprintf("CursorP%dOffsetXFromIcon",int(p+1)); }
static RString CURSOR_OFFSET_Y_FROM_ICON_NAME( size_t p ) { return ssprintf("CursorP%dOffsetYFromIcon",int(p+1)); } static RString CURSOR_OFFSET_Y_FROM_ICON_NAME( size_t p ) { return ssprintf("CursorP%dOffsetYFromIcon",int(p+1)); }
src/ScreenSelectMusic.cpp
+6 -5
View File
@@ -38,15 +38,16 @@ static const char *SelectionStateNames[] = {
}; };
XToString( SelectionState ); XToString( SelectionState );
/** @brief The maximum number of digits for the ScoreDisplay. */
const int NUM_SCORE_DIGITS = 9; const int NUM_SCORE_DIGITS = 9;
#define SHOW_OPTIONS_MESSAGE_SECONDS THEME->GetMetricF( m_sName, "ShowOptionsMessageSeconds" ) #define SHOW_OPTIONS_MESSAGE_SECONDS THEME->GetMetricF( m_sName, "ShowOptionsMessageSeconds" )
AutoScreenMessage( SM_AllowOptionsMenuRepeat ) AutoScreenMessage( SM_AllowOptionsMenuRepeat );
AutoScreenMessage( SM_SongChanged ) AutoScreenMessage( SM_SongChanged );
AutoScreenMessage( SM_SortOrderChanging ) AutoScreenMessage( SM_SortOrderChanging );
AutoScreenMessage( SM_SortOrderChanged ) AutoScreenMessage( SM_SortOrderChanged );
AutoScreenMessage( SM_BackFromPlayerOptions ) AutoScreenMessage( SM_BackFromPlayerOptions );
static RString g_sCDTitlePath; static RString g_sCDTitlePath;
static bool g_bWantFallbackCdTitle; static bool g_bWantFallbackCdTitle;
src/ScreenTestFonts.cpp
+3 -1
View File
@@ -11,7 +11,9 @@
static const float LineWidth = 400; static const float LineWidth = 400;
static const float LineHeight = 50; static const float LineHeight = 50;
/** @brief A quick way of getting a font metric. */
#define FONT( i ) THEME->GetMetric (m_sName,ssprintf("Font%i",i)) #define FONT( i ) THEME->GetMetric (m_sName,ssprintf("Font%i",i))
/** @brief A quick way of getting a particular string. */
#define TEXT( i ) THEME->GetString (m_sName,ssprintf("Text%i",i)) #define TEXT( i ) THEME->GetString (m_sName,ssprintf("Text%i",i))
static RString g_sCustomText; static RString g_sCustomText;
@@ -21,7 +23,7 @@ static void ChangeText( const RString &sText )
g_sCustomText = sText; g_sCustomText = sText;
} }
AutoScreenMessage( SM_ChangeText ) AutoScreenMessage( SM_ChangeText );
void ScreenTestFonts::HandleScreenMessage( const ScreenMessage SM ) void ScreenTestFonts::HandleScreenMessage( const ScreenMessage SM )
{ {
src/WheelBase.cpp
+1 -1
View File
@@ -17,7 +17,7 @@
#include "ScreenDimensions.h" #include "ScreenDimensions.h"
const int MAX_WHEEL_SOUND_SPEED = 15; const int MAX_WHEEL_SOUND_SPEED = 15;
AutoScreenMessage( SM_SongChanged ) // TODO: Replace this with a Message and MESSAGEMAN AutoScreenMessage( SM_SongChanged ); // TODO: Replace this with a Message and MESSAGEMAN
WheelBase::~WheelBase() WheelBase::~WheelBase()
{ {