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
@@ -16,8 +16,8 @@ XToString( InputDeviceState );
|
||||
XToLocalizedString( InputDeviceState );
|
||||
LuaXType(InputDevice);
|
||||
|
||||
static map<DeviceButton,RString> g_mapNamesToString;
|
||||
static map<RString,DeviceButton> g_mapStringToNames;
|
||||
static std::map<DeviceButton, RString> g_mapNamesToString;
|
||||
static std::map<RString, DeviceButton> g_mapStringToNames;
|
||||
static void InitNames()
|
||||
{
|
||||
if( !g_mapNamesToString.empty() )
|
||||
@@ -148,7 +148,7 @@ RString DeviceButtonToString( DeviceButton key )
|
||||
|
||||
// Check the name map first to allow making names for keys that are inside
|
||||
// the ascii range. -Kyz
|
||||
map<DeviceButton,RString>::const_iterator it = g_mapNamesToString.find( key );
|
||||
std::map<DeviceButton, RString>::const_iterator it = g_mapNamesToString.find( key );
|
||||
if( it != g_mapNamesToString.end() )
|
||||
return it->second;
|
||||
|
||||
@@ -188,7 +188,7 @@ DeviceButton StringToDeviceButton( const RString& s )
|
||||
if( sscanf(s, "Mouse %i", &i) == 1 )
|
||||
return enum_add2( MOUSE_LEFT, i );
|
||||
|
||||
map<RString,DeviceButton>::const_iterator it = g_mapStringToNames.find( s );
|
||||
std::map<RString, DeviceButton>::const_iterator it = g_mapStringToNames.find( s );
|
||||
if( it != g_mapStringToNames.end() )
|
||||
return it->second;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user