Remove global "using namespace std;" declarations, use "std::" prefixes on all std elements
Fix whitespace changes
This commit is contained in:
committed by
Martin Natano
parent
f0680a29fc
commit
0cba3579de
@@ -29,7 +29,7 @@ AnnouncerManager::~AnnouncerManager()
|
||||
LUA->UnsetGlobal( "ANNOUNCER" );
|
||||
}
|
||||
|
||||
void AnnouncerManager::GetAnnouncerNames( vector<RString>& AddTo )
|
||||
void AnnouncerManager::GetAnnouncerNames( std::vector<RString>& AddTo )
|
||||
{
|
||||
GetDirListing( ANNOUNCERS_DIR+"*", AddTo, true );
|
||||
|
||||
@@ -47,7 +47,7 @@ bool AnnouncerManager::DoesAnnouncerExist( RString sAnnouncerName )
|
||||
if( sAnnouncerName == "" )
|
||||
return true;
|
||||
|
||||
vector<RString> asAnnouncerNames;
|
||||
std::vector<RString> asAnnouncerNames;
|
||||
GetAnnouncerNames( asAnnouncerNames );
|
||||
for( unsigned i=0; i<asAnnouncerNames.size(); i++ )
|
||||
if( 0==strcasecmp(sAnnouncerName, asAnnouncerNames[i]) )
|
||||
@@ -154,7 +154,7 @@ bool AnnouncerManager::HasSoundsFor( RString sFolderName )
|
||||
|
||||
void AnnouncerManager::NextAnnouncer()
|
||||
{
|
||||
vector<RString> as;
|
||||
std::vector<RString> as;
|
||||
GetAnnouncerNames( as );
|
||||
if( as.size()==0 )
|
||||
return;
|
||||
@@ -186,7 +186,7 @@ public:
|
||||
static int DoesAnnouncerExist( T* p, lua_State *L ) { lua_pushboolean(L, p->DoesAnnouncerExist( SArg(1) )); return 1; }
|
||||
static int GetAnnouncerNames( T* p, lua_State *L )
|
||||
{
|
||||
vector<RString> vAnnouncers;
|
||||
std::vector<RString> vAnnouncers;
|
||||
p->GetAnnouncerNames( vAnnouncers );
|
||||
LuaHelpers::CreateTableFromArray(vAnnouncers, L);
|
||||
return 1;
|
||||
|
||||
Reference in New Issue
Block a user