diff options
| author | Michael M <mchtly@gmail.com> | 2017-06-07 19:02:16 -0700 |
|---|---|---|
| committer | Michael M <mchtly@gmail.com> | 2017-09-14 12:53:35 -0700 |
| commit | 31f1c062264fcf8628e3a13c44de893d4bac0aa0 (patch) | |
| tree | a15bf2168587e11e257803b69e02f57015f5e4fa /Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp | |
| parent | c332580b83ea8cd5650d53378843ceadcbfeb9cb (diff) | |
ControlReference: don't reparse expression when references are updated
Diffstat (limited to 'Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp')
| -rw-r--r-- | Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp index 7c01a527a2..d30be53ec5 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp @@ -27,7 +27,7 @@ static QString EscapeAmpersand(QString&& string) } MappingButton::MappingButton(MappingWidget* widget, ControlReference* ref) - : ElidedButton(EscapeAmpersand(QString::fromStdString(ref->expression))), m_parent(widget), + : ElidedButton(EscapeAmpersand(QString::fromStdString(ref->GetExpression()))), m_parent(widget), m_reference(ref) { Connect(); @@ -66,7 +66,7 @@ void MappingButton::OnButtonPressed() if (!expr.isEmpty()) { - m_reference->expression = expr.toStdString(); + m_reference->SetExpression(expr.toStdString()); Update(); } else @@ -78,13 +78,13 @@ void MappingButton::OnButtonPressed() void MappingButton::OnButtonTimeout() { - setText(EscapeAmpersand(QString::fromStdString(m_reference->expression))); + setText(EscapeAmpersand(QString::fromStdString(m_reference->GetExpression()))); } void MappingButton::Clear() { m_parent->Update(); - m_reference->expression.clear(); + m_reference->SetExpression(""); Update(); } @@ -92,7 +92,7 @@ void MappingButton::Update() { const auto lock = ControllerEmu::EmulatedController::GetStateLock(); m_reference->UpdateReference(g_controller_interface, m_parent->GetParent()->GetDeviceQualifier()); - setText(EscapeAmpersand(QString::fromStdString(m_reference->expression))); + setText(EscapeAmpersand(QString::fromStdString(m_reference->GetExpression()))); m_parent->SaveSettings(); } |
