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

InputCommon: Make use of fmt where applicable

Browse Source 
Continues the migration over to fmt
This commit is contained in:
Lioncash
2019-11-22 14:10:28 -05:00
parent bc449fb98f
commit e8edc49bbe
5 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/InputCommon/ControllerInterface/Device.cpp
View File

@ -11,7 +11,8 @@
#include <string>
#include <tuple>
#include "Common/StringUtil.h"
#include <fmt/format.h>
#include "Common/Thread.h"
namespace ciface::Core
@ -47,7 +48,7 @@ void Device::AddOutput(Device::Output* const o)
std::string Device::GetQualifiedName() const
{
return StringFromFormat("%s/%i/%s", this->GetSource().c_str(), GetId(), this->GetName().c_str());
return fmt::format("{}/{}/{}", GetSource(), GetId(), GetName());
}
Device::Input* Device::FindInput(std::string_view name) const

8
Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
View File

@ -10,6 +10,8 @@
#include <cstdlib>
#include <cstring>
#include <fmt/format.h>
#include "InputCommon/ControllerInterface/Xlib/XInput2.h"
#include "Common/StringUtil.h"
@ -338,7 +340,7 @@ ControlState KeyboardMouse::Key::GetState() const
KeyboardMouse::Button::Button(unsigned int index, unsigned int* buttons)
: m_buttons(buttons), m_index(index)
{
name = StringFromFormat("Click %d", m_index + 1);
name = fmt::format("Click {}", m_index + 1);
}
ControlState KeyboardMouse::Button::GetState() const
@ -349,7 +351,7 @@ ControlState KeyboardMouse::Button::GetState() const
KeyboardMouse::Cursor::Cursor(u8 index, bool positive, const float* cursor)
: m_cursor(cursor), m_index(index), m_positive(positive)
{
name = std::string("Cursor ") + (char)('X' + m_index) + (m_positive ? '+' : '-');
name = fmt::format("Cursor {}{}", static_cast<char>('X' + m_index), (m_positive ? '+' : '-'));
}
ControlState KeyboardMouse::Cursor::GetState() const
@ -360,7 +362,7 @@ ControlState KeyboardMouse::Cursor::GetState() const
KeyboardMouse::Axis::Axis(u8 index, bool positive, const float* axis)
: m_axis(axis), m_index(index), m_positive(positive)
{
name = std::string("Axis ") + (char)('X' + m_index) + (m_positive ? '+' : '-');
name = fmt::format("Axis {}{}", static_cast<char>('X' + m_index), (m_positive ? '+' : '-'));
}
ControlState KeyboardMouse::Axis::GetState() const