octo/yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

yuzu/configuration/configure_mouse_advanced: Specify string conversions explicitly

Browse Source 
Allows the advanced mouse configuration code to build with implicit
string conversions disabled.
This commit is contained in:
Lioncash
2019-05-19 12:24:13 -04:00
parent aa83639b78
commit c9c4208c4a
1 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/yuzu/configuration/configure_mouse_advanced.cpp
View File

@@ -25,7 +25,7 @@ static QString GetKeyName(int key_code) {
case Qt::Key_Alt: case Qt::Key_Alt:
return QObject::tr("Alt"); return QObject::tr("Alt");
case Qt::Key_Meta: case Qt::Key_Meta:
return ""; return {};
default: default:
return QKeySequence(key_code).toString(); return QKeySequence(key_code).toString();
} }
@@ -34,25 +34,37 @@ static QString GetKeyName(int key_code) {
static QString ButtonToText(const Common::ParamPackage& param) { static QString ButtonToText(const Common::ParamPackage& param) {
if (!param.Has("engine")) { if (!param.Has("engine")) {
return QObject::tr("[not set]"); return QObject::tr("[not set]");
} else if (param.Get("engine", "") == "keyboard") { }
if (param.Get("engine", "") == "keyboard") {
return GetKeyName(param.Get("code", 0)); return GetKeyName(param.Get("code", 0));
} else if (param.Get("engine", "") == "sdl") { }
if (param.Get("engine", "") == "sdl") {
if (param.Has("hat")) { if (param.Has("hat")) {
return QString(QObject::tr("Hat %1 %2")) const QString hat_str = QString::fromStdString(param.Get("hat", ""));
.arg(param.Get("hat", "").c_str(), param.Get("direction", "").c_str()); const QString direction_str = QString::fromStdString(param.Get("direction", ""));
return QObject::tr("Hat %1 %2").arg(hat_str, direction_str);
} }
if (param.Has("axis")) { if (param.Has("axis")) {
return QString(QObject::tr("Axis %1%2")) const QString axis_str = QString::fromStdString(param.Get("axis", ""));
.arg(param.Get("axis", "").c_str(), param.Get("direction", "").c_str()); const QString direction_str = QString::fromStdString(param.Get("direction", ""));
return QObject::tr("Axis %1%2").arg(axis_str, direction_str);
} }
if (param.Has("button")) { if (param.Has("button")) {
return QString(QObject::tr("Button %1")).arg(param.Get("button", "").c_str()); const QString button_str = QString::fromStdString(param.Get("button", ""));
return QObject::tr("Button %1").arg(button_str);
} }
return QString(); return {};
} else { }
return QObject::tr("[unknown]"); return QObject::tr("[unknown]");
} }
}
ConfigureMouseAdvanced::ConfigureMouseAdvanced(QWidget* parent) ConfigureMouseAdvanced::ConfigureMouseAdvanced(QWidget* parent)
: QDialog(parent), ui(std::make_unique<Ui::ConfigureMouseAdvanced>()), : QDialog(parent), ui(std::make_unique<Ui::ConfigureMouseAdvanced>()),