piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8233 from JosJuice/stringutil-string-view

Browse Source 
StringUtil: Use std::string_view more
This commit is contained in:
Connor McLaughlin
2019-08-09 23:39:01 +10:00
committed by GitHub
parent 0ab7e2eed7 117a60ceb2
commit 48ca2c6f2e
13 changed files with 104 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm
View File

@ -141,7 +141,7 @@ static std::string GetDeviceRefName(IOHIDDeviceRef inIOHIDDeviceRef)
{
const NSString* name = reinterpret_cast<const NSString*>(
IOHIDDeviceGetProperty(inIOHIDDeviceRef, CFSTR(kIOHIDProductKey)));
return (name != nullptr) ? StripSpaces([name UTF8String]) : "Unknown device";
return (name != nullptr) ? std::string(StripSpaces([name UTF8String])) : "Unknown device";
}
static void DeviceRemovalCallback(void* inContext, IOReturn inResult, void* inSender,

2
Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm
View File

@ -164,7 +164,7 @@ std::string Joystick::Button::GetName() const
{
std::ostringstream s;
s << IOHIDElementGetUsage(m_element);
return std::string("Button ") + StripSpaces(s.str());
return std::string("Button ").append(StripSpaces(s.str()));
}
Joystick::Axis::Axis(IOHIDElementRef element, IOHIDDeviceRef device, direction dir)

2
Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp
View File

@ -313,7 +313,7 @@ std::string evdevDevice::Button::GetName() const
{
const char* name = libevdev_event_code_get_name(EV_KEY, m_code);
if (name)
return StripSpaces(name);
return std::string(StripSpaces(name));
}
// But controllers use codes above 0x100, and the standard label often doesn't match.
// We are better off with Button 0 and so on.