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

Remove global "using namespace std;" declarations, use "std::" prefixes on all std elements

Browse Source 
Fix whitespace changes
This commit is contained in:
Michael Sundqvist
2022-07-31 22:14:38 +02:00
committed by Martin Natano
parent f0680a29fc
commit 0cba3579de
534 changed files with 3456 additions and 3488 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NoteData.h
+26 -26
View File
@@ -27,11 +27,11 @@
class NoteData
{
public:
typedef map<int,TapNote> TrackMap;
typedef map<int,TapNote>::iterator iterator;
typedef map<int,TapNote>::const_iterator const_iterator;
typedef map<int,TapNote>::reverse_iterator reverse_iterator;
typedef map<int,TapNote>::const_reverse_iterator const_reverse_iterator;
typedef std::map<int,TapNote> TrackMap;
typedef std::map<int,TapNote>::iterator iterator;
typedef std::map<int,TapNote>::const_iterator const_iterator;
typedef std::map<int,TapNote>::reverse_iterator reverse_iterator;
typedef std::map<int,TapNote>::const_reverse_iterator const_reverse_iterator;
NoteData(): m_TapNotes() {}
@@ -60,19 +60,19 @@ public:
class _all_tracks_iterator
{
ND *m_pNoteData;
vector<iter> m_vBeginIters;
std::vector<iter> m_vBeginIters;
/* There isn't a "past the beginning" iterator so this is hard to make a true bidirectional iterator.
* Use the "past the end" iterator in place of the "past the beginning" iterator when in reverse. */
vector<iter> m_vCurrentIters;
std::vector<iter> m_vCurrentIters;
vector<iter> m_vEndIters;
std::vector<iter> m_vEndIters;
int m_iTrack;
bool m_bReverse;
// These exist so that the iterator can be revalidated if the NoteData is
// transformed during this iterator's lifetime.
vector<int> m_PrevCurrentRows;
std::vector<int> m_PrevCurrentRows;
bool m_Inclusive;
int m_StartRow;
int m_EndRow;
@@ -95,7 +95,7 @@ public:
inline const TN &operator*() const { DEBUG_ASSERT( !IsAtEnd() ); return m_vCurrentIters[m_iTrack]->second; }
inline const TN *operator->() const { DEBUG_ASSERT( !IsAtEnd() ); return &m_vCurrentIters[m_iTrack]->second; }
// Use when transforming the NoteData.
void Revalidate(ND* notedata, vector<int> const& added_or_removed_tracks, bool added);
void Revalidate(ND* notedata, std::vector<int> const& added_or_removed_tracks, bool added);
};
typedef _all_tracks_iterator<NoteData, NoteData::iterator, TapNote> all_tracks_iterator;
typedef _all_tracks_iterator<const NoteData, NoteData::const_iterator, const TapNote> all_tracks_const_iterator;
@@ -106,7 +106,7 @@ public:
private:
// There's no point in inserting empty notes into the map.
// Any blank space in the map is defined to be empty.
vector<TrackMap> m_TapNotes;
std::vector<TrackMap> m_TapNotes;
/**
* @brief Determine whether this note is for Player 1 or Player 2.
@@ -143,14 +143,14 @@ private:
* @return true if it's a fake, false otherwise. */
bool IsFake(const TapNote &tn, const int row) const;
pair<int, int> GetNumRowsWithSimultaneousTapsTwoPlayer(int minTaps = 2,
std::pair<int, int> GetNumRowsWithSimultaneousTapsTwoPlayer(int minTaps = 2,
int startRow = 0,
int endRow = MAX_NOTE_ROW) const;
// These exist so that they can be revalidated when something that transforms
// the NoteData occurs. -Kyz
mutable set<all_tracks_iterator*> m_atis;
mutable set<all_tracks_const_iterator*> m_const_atis;
mutable std::set<all_tracks_iterator*> m_atis;
mutable std::set<all_tracks_const_iterator*> m_const_atis;
void AddATIToList(all_tracks_iterator* iter) const;
void AddATIToList(all_tracks_const_iterator* iter) const;
@@ -231,7 +231,7 @@ public:
}
// Call this after using any transform that changes the NoteData.
void RevalidateATIs(vector<int> const& added_or_removed_tracks, bool added);
void RevalidateATIs(std::vector<int> const& added_or_removed_tracks, bool added);
void TransferATIs(NoteData& to);
/* Return an iterator range include iStartRow to iEndRow. Extend the range to include
@@ -278,7 +278,7 @@ public:
bool IsRowEmpty( int row ) const;
bool IsRangeEmpty( int track, int rowBegin, int rowEnd ) const;
int GetNumTapNonEmptyTracks( int row ) const;
void GetTapNonEmptyTracks( int row, set<int>& addTo ) const;
void GetTapNonEmptyTracks( int row, std::set<int>& addTo ) const;
bool GetTapFirstNonEmptyTrack( int row, int &iNonEmptyTrackOut ) const; // return false if no non-empty tracks at row
bool GetTapFirstEmptyTrack( int row, int &iEmptyTrackOut ) const; // return false if no non-empty tracks at row
bool GetTapLastEmptyTrack( int row, int &iEmptyTrackOut ) const; // return false if no empty tracks at row
@@ -290,7 +290,7 @@ public:
inline bool IsThereATapAtRow( int row ) const { return GetFirstTrackWithTap( row ) != -1; }
inline bool IsThereATapOrHoldHeadAtRow( int row ) const { return GetFirstTrackWithTapOrHoldHead( row ) != -1; }
void GetTracksHeldAtRow( int row, set<int>& addTo );
void GetTracksHeldAtRow( int row, std::set<int>& addTo );
int GetNumTracksHeldAtRow( int row );
bool IsHoldNoteAtRow( int iTrack, int iRow, int *pHeadRow = nullptr ) const;
@@ -342,31 +342,31 @@ public:
int GetNumFakes( int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW ) const;
// the couple/routine style variants of the above.
pair<int, int> GetNumTapNotesTwoPlayer(int startRow = 0,
std::pair<int, int> GetNumTapNotesTwoPlayer(int startRow = 0,
int endRow = MAX_NOTE_ROW) const;
pair<int, int> GetNumJumpsTwoPlayer(int startRow = 0,
std::pair<int, int> GetNumJumpsTwoPlayer(int startRow = 0,
int endRow = MAX_NOTE_ROW) const;
pair<int, int> GetNumHandsTwoPlayer(int startRow = 0,
std::pair<int, int> GetNumHandsTwoPlayer(int startRow = 0,
int endRow = MAX_NOTE_ROW) const;
pair<int, int> GetNumQuadsTwoPlayer(int startRow = 0,
std::pair<int, int> GetNumQuadsTwoPlayer(int startRow = 0,
int endRow = MAX_NOTE_ROW) const;
pair<int, int> GetNumHoldNotesTwoPlayer(int startRow = 0,
std::pair<int, int> GetNumHoldNotesTwoPlayer(int startRow = 0,
int endRow = MAX_NOTE_ROW) const;
pair<int, int> GetNumMinesTwoPlayer(int startRow = 0,
std::pair<int, int> GetNumMinesTwoPlayer(int startRow = 0,
int endRow = MAX_NOTE_ROW) const;
pair<int, int> GetNumRollsTwoPlayer(int startRow = 0,
std::pair<int, int> GetNumRollsTwoPlayer(int startRow = 0,
int endRow = MAX_NOTE_ROW) const;
pair<int, int> GetNumLiftsTwoPlayer(int startRow = 0,
std::pair<int, int> GetNumLiftsTwoPlayer(int startRow = 0,
int endRow = MAX_NOTE_ROW) const;
pair<int, int> GetNumFakesTwoPlayer(int startRow = 0,
std::pair<int, int> GetNumFakesTwoPlayer(int startRow = 0,
int endRow = MAX_NOTE_ROW) const;
// Transformations