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-10 18:28:56 +03: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/ScreenOptionsMemoryCard.cpp
+11 -11
View File
@@ -25,9 +25,9 @@ void ScreenOptionsMemoryCard::Init()
bool ScreenOptionsMemoryCard::UpdateCurrentUsbStorageDevices()
{
vector<UsbStorageDevice> aOldDevices = m_CurrentUsbStorageDevices;
std::vector<UsbStorageDevice> aOldDevices = m_CurrentUsbStorageDevices;
const vector<UsbStorageDevice> &aNewDevices = MEMCARDMAN->GetStorageDevices();
const std::vector<UsbStorageDevice> &aNewDevices = MEMCARDMAN->GetStorageDevices();
m_CurrentUsbStorageDevices.clear();
for( size_t i = 0; i < aNewDevices.size(); ++i )
@@ -46,11 +46,11 @@ static LocalizedString SIZE_UNKNOWN ("ScreenOptionsMemoryCard", "size ???" );
static LocalizedString VOLUME_SIZE ("ScreenOptionsMemoryCard", "%dMB" );
void ScreenOptionsMemoryCard::CreateMenu()
{
vector<OptionRowHandler*> vHands;
std::vector<OptionRowHandler*> vHands;
for (UsbStorageDevice const &iter : m_CurrentUsbStorageDevices)
{
vector<RString> vs;
std::vector<RString> vs;
if( iter.sVolumeLabel.empty() )
vs.push_back( NO_LABEL );
else
@@ -123,7 +123,7 @@ void ScreenOptionsMemoryCard::HandleMessage( const Message &msg )
if( !m_Out.IsTransitioning() )
{
/* Remember the old mountpoint. */
const vector<UsbStorageDevice> &v = m_CurrentUsbStorageDevices;
const std::vector<UsbStorageDevice> &v = m_CurrentUsbStorageDevices;
int iRow = m_iCurrentRow[GAMESTATE->GetMasterPlayerNumber()];
RString sOldMountPoint;
if( iRow < int(v.size()) )
@@ -147,12 +147,12 @@ void ScreenOptionsMemoryCard::HandleMessage( const Message &msg )
ScreenOptions::HandleMessage( msg );
}
void ScreenOptionsMemoryCard::ImportOptions( int iRow, const vector<PlayerNumber> &vpns )
void ScreenOptionsMemoryCard::ImportOptions( int iRow, const std::vector<PlayerNumber> &vpns )
{
}
void ScreenOptionsMemoryCard::ExportOptions( int iRow, const vector<PlayerNumber> &vpns )
void ScreenOptionsMemoryCard::ExportOptions( int iRow, const std::vector<PlayerNumber> &vpns )
{
OptionRow &row = *m_pRows[iRow];
if( row.GetRowType() == OptionRow::RowType_Exit )
@@ -161,7 +161,7 @@ void ScreenOptionsMemoryCard::ExportOptions( int iRow, const vector<PlayerNumber
PlayerNumber pn = GAMESTATE->GetMasterPlayerNumber();
if( m_iCurrentRow[pn] == iRow )
{
const vector<UsbStorageDevice> &v = m_CurrentUsbStorageDevices;
const std::vector<UsbStorageDevice> &v = m_CurrentUsbStorageDevices;
if( iRow < int(v.size()) )
{
const UsbStorageDevice &dev = v[iRow];
@@ -175,7 +175,7 @@ void ScreenOptionsMemoryCard::SelectRowWithMemoryCard( const RString &sOsMountPo
if( sOsMountPoint.empty() )
return;
const vector<UsbStorageDevice> &v = m_CurrentUsbStorageDevices;
const std::vector<UsbStorageDevice> &v = m_CurrentUsbStorageDevices;
for( unsigned i=0; i<v.size(); i++ )
{
if( v[i].sOsMountDir == sOsMountPoint )
@@ -194,11 +194,11 @@ void ScreenOptionsMemoryCard::ProcessMenuStart( const InputEventPlus & )
int iCurRow = m_iCurrentRow[GAMESTATE->GetMasterPlayerNumber()];
const vector<UsbStorageDevice> &v = m_CurrentUsbStorageDevices;
const std::vector<UsbStorageDevice> &v = m_CurrentUsbStorageDevices;
if( iCurRow < int(v.size()) ) // a card
{
// Why is this statement in twice? Doubt it would change right after the if. -Wolfman2000
const vector<UsbStorageDevice> &vUSB = m_CurrentUsbStorageDevices;
const std::vector<UsbStorageDevice> &vUSB = m_CurrentUsbStorageDevices;
const UsbStorageDevice &dev = vUSB[iCurRow];
MEMCARDMAN->m_sEditorMemoryCardOsMountPoint.Set( dev.sOsMountDir );