return "" -> return NULL

This commit is contained in:
Chris Danford
2005-09-02 00:14:07 +00:00
parent 7c4f2595ab
commit e439ae2a96
41 changed files with 97 additions and 87 deletions
+3 -3
View File
@@ -270,8 +270,8 @@ CString DeviceButtonToString( InputDevice device, DeviceButton i )
case DEVICE_PUMP2: return PumpPadButtonToString( (PumpPadButton)i );
case DEVICE_MIDI: return MidiButtonToString( i );
case DEVICE_PARA1: return ParaPadButtonToString( (ParaPadButton)i );
case DEVICE_NONE: return "";
default: ASSERT(0); return "";
case DEVICE_NONE: return NULL;
default: ASSERT(0); return NULL;
}
}
@@ -337,7 +337,7 @@ int GetNumDeviceButtons( InputDevice device )
CString DeviceInput::toString() const
{
if( device == DEVICE_NONE )
return "";
return NULL;
CString s = InputDeviceToString(device) + "_" + DeviceButtonToString(device,button);
return s;