return NULL -> return CString() for clarity and efficiency

2005-09-04 16:55:21 +00:00
parent c414d1bcf8
commit 48ebc53549
55 changed files with 107 additions and 107 deletions
@@ -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 NULL;
-	default:	ASSERT(0);	return NULL;
+	case DEVICE_NONE:		return CString();
+	default:	ASSERT(0);	return CString();
 	}
 }

@@ -337,7 +337,7 @@ int GetNumDeviceButtons( InputDevice device )
 CString DeviceInput::toString() const
 {
 	if( device == DEVICE_NONE )
-		return NULL;
+		return CString();

 	CString s = InputDeviceToString(device) + "_" + DeviceButtonToString(device,button);
 	return s;