style cleanup: use FOREACH_ENUM( X, x ) everywhere instead of FOREACH_X( x ) for consistency
The FOREACH_X defines are not very useful, and they were created back before FOREACH_ENUM was convenient.
This commit is contained in:
@@ -32,7 +32,6 @@ enum RadarCategory
|
||||
NUM_RadarCategory, // leave this at the end
|
||||
RadarCategory_Invalid
|
||||
};
|
||||
#define FOREACH_RadarCategory( rc ) FOREACH_ENUM( RadarCategory, rc )
|
||||
const RString& RadarCategoryToString( RadarCategory cat );
|
||||
const RString& RadarCategoryToLocalizedString( RadarCategory cat );
|
||||
LuaDeclareType( RadarCategory );
|
||||
@@ -73,7 +72,6 @@ enum StepsType
|
||||
NUM_StepsType, // leave this at the end
|
||||
StepsType_Invalid,
|
||||
};
|
||||
#define FOREACH_StepsType( st ) FOREACH_ENUM( StepsType, st )
|
||||
LuaDeclareType( StepsType );
|
||||
|
||||
//
|
||||
@@ -90,7 +88,6 @@ enum PlayMode
|
||||
NUM_PlayMode,
|
||||
PlayMode_Invalid
|
||||
};
|
||||
#define FOREACH_PlayMode( pm ) FOREACH_ENUM( PlayMode, pm )
|
||||
const RString& PlayModeToString( PlayMode pm );
|
||||
const RString& PlayModeToLocalizedString( PlayMode pm );
|
||||
PlayMode StringToPlayMode( const RString& s );
|
||||
@@ -123,7 +120,6 @@ enum SortOrder
|
||||
SortOrder_Invalid
|
||||
};
|
||||
const SortOrder MAX_SELECTABLE_SORT = (SortOrder)(SORT_ROULETTE-1);
|
||||
#define FOREACH_SortOrder( so ) FOREACH_ENUM( SortOrder, so )
|
||||
const RString& SortOrderToString( SortOrder so );
|
||||
SortOrder StringToSortOrder( const RString& str );
|
||||
LuaDeclareType( SortOrder );
|
||||
@@ -147,7 +143,6 @@ enum TapNoteScore {
|
||||
NUM_TapNoteScore,
|
||||
TapNoteScore_Invalid,
|
||||
};
|
||||
#define FOREACH_TapNoteScore( tns ) FOREACH_ENUM( TapNoteScore, tns )
|
||||
const RString& TapNoteScoreToString( TapNoteScore tns );
|
||||
const RString& TapNoteScoreToLocalizedString( TapNoteScore tns );
|
||||
TapNoteScore StringToTapNoteScore( const RString& str );
|
||||
@@ -162,7 +157,6 @@ enum HoldNoteScore
|
||||
NUM_HoldNoteScore,
|
||||
HoldNoteScore_Invalid,
|
||||
};
|
||||
#define FOREACH_HoldNoteScore( hns ) FOREACH_ENUM( HoldNoteScore, hns )
|
||||
const RString& HoldNoteScoreToString( HoldNoteScore hns );
|
||||
const RString& HoldNoteScoreToLocalizedString( HoldNoteScore hns );
|
||||
HoldNoteScore StringToHoldNoteScore( const RString& str );
|
||||
@@ -220,7 +214,6 @@ enum ProfileSlot
|
||||
NUM_ProfileSlot,
|
||||
ProfileSlot_Invalid
|
||||
};
|
||||
#define FOREACH_ProfileSlot( slot ) FOREACH_ENUM( ProfileSlot, slot )
|
||||
|
||||
|
||||
enum MemoryCardState
|
||||
@@ -250,7 +243,6 @@ enum RankingCategory
|
||||
NUM_RankingCategory,
|
||||
RankingCategory_Invalid
|
||||
};
|
||||
#define FOREACH_RankingCategory( rc ) FOREACH_ENUM( RankingCategory, rc )
|
||||
const RString& RankingCategoryToString( RankingCategory rc );
|
||||
RankingCategory StringToRankingCategory( const RString& rc );
|
||||
|
||||
@@ -315,7 +307,6 @@ enum CoinMode
|
||||
NUM_CoinMode,
|
||||
CoinMode_Invalid
|
||||
};
|
||||
#define FOREACH_CoinMode( i ) FOREACH_ENUM( CoinMode, i )
|
||||
const RString& CoinModeToString( CoinMode cm );
|
||||
LuaDeclareType( CoinMode );
|
||||
|
||||
@@ -331,7 +322,6 @@ enum Premium
|
||||
NUM_Premium,
|
||||
Premium_Invalid
|
||||
};
|
||||
#define FOREACH_Premium( i ) FOREACH_ENUM( Premium, i )
|
||||
const RString& PremiumToString( Premium p );
|
||||
LuaDeclareType( Premium );
|
||||
|
||||
@@ -355,7 +345,6 @@ enum PerDifficultyAward
|
||||
NUM_PerDifficultyAward,
|
||||
PerDifficultyAward_Invalid,
|
||||
};
|
||||
#define FOREACH_PerDifficultyAward( pma ) FOREACH_ENUM( PerDifficultyAward, pma )
|
||||
const RString& PerDifficultyAwardToString( PerDifficultyAward pma );
|
||||
const RString& PerDifficultyAwardToLocalizedString( PerDifficultyAward pma );
|
||||
PerDifficultyAward StringToPerDifficultyAward( const RString& pma );
|
||||
@@ -377,7 +366,6 @@ enum PeakComboAward
|
||||
NUM_PeakComboAward,
|
||||
PeakComboAward_Invalid,
|
||||
};
|
||||
#define FOREACH_PeakComboAward( pca ) FOREACH_ENUM( PeakComboAward, pca )
|
||||
const RString& PeakComboAwardToString( PeakComboAward pma );
|
||||
const RString& PeakComboAwardToLocalizedString( PeakComboAward pma );
|
||||
PeakComboAward StringToPeakComboAward( const RString& pma );
|
||||
@@ -416,7 +404,6 @@ enum GoalType
|
||||
NUM_GoalType,
|
||||
GoalType_Invalid,
|
||||
};
|
||||
#define FOREACH_GoalType( gt ) FOREACH_ENUM( GoalType, gt )
|
||||
const RString& GoalTypeToString( GoalType gt );
|
||||
GoalType StringToGoalType( const RString& s );
|
||||
LuaDeclareType( GoalType );
|
||||
@@ -454,7 +441,6 @@ enum Stage
|
||||
NUM_Stage,
|
||||
Stage_Invalid,
|
||||
};
|
||||
#define FOREACH_Stage( s ) FOREACH_ENUM( Stage, s )
|
||||
const RString& StageToString( Stage s );
|
||||
LuaDeclareType( Stage );
|
||||
|
||||
|
||||
Reference in New Issue
Block a user