From 499c89790b0e07dbb014b8b7415bf0e28cecfaaf Mon Sep 17 00:00:00 2001 From: Kyle K <190571+Docteh@users.noreply.github.com> Date: Sun, 29 May 2022 15:01:07 -0700 Subject: [PATCH] motion touch ui: move remaining connection out of .ui file Two reasons for this: 1. Out of 7 connections, 6 are in ConfigureMotionTouch::ConnectEvents, this is the outlier. 2. Qt6 doesn't moc the connection properly --- .../configuration/configure_motion_touch.cpp | 2 ++ .../configuration/configure_motion_touch.ui | 19 +------------------ 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/yuzu/configuration/configure_motion_touch.cpp b/src/yuzu/configuration/configure_motion_touch.cpp index 27559c37bb..c313b09194 100644 --- a/src/yuzu/configuration/configure_motion_touch.cpp +++ b/src/yuzu/configuration/configure_motion_touch.cpp @@ -151,6 +151,8 @@ void ConfigureMotionTouch::ConnectEvents() { &ConfigureMotionTouch::OnConfigureTouchCalibration); connect(ui->touch_from_button_config_btn, &QPushButton::clicked, this, &ConfigureMotionTouch::OnConfigureTouchFromButton); + connect(ui->buttonBox, &QDialogButtonBox::accepted, this, + &ConfigureMotionTouch::ApplyConfiguration); connect(ui->buttonBox, &QDialogButtonBox::rejected, this, [this] { if (CanCloseDialog()) { reject(); diff --git a/src/yuzu/configuration/configure_motion_touch.ui b/src/yuzu/configuration/configure_motion_touch.ui index c75a84ae41..0237fae54a 100644 --- a/src/yuzu/configuration/configure_motion_touch.ui +++ b/src/yuzu/configuration/configure_motion_touch.ui @@ -293,22 +293,5 @@ - - - buttonBox - accepted() - ConfigureMotionTouch - ApplyConfiguration() - - - 20 - 20 - - - 20 - 20 - - - - +