summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFearlessTobi <thm.frey@gmail.com>2020-08-29 21:34:01 +0200
committerFearlessTobi <thm.frey@gmail.com>2020-08-29 22:06:47 +0200
commit0aa6ec42764756c8312da6faf5e67d85c3c28b2f (patch)
tree7d72415c4c2eef76845f86b6d6bb28038494fe79
parentAddress review comments and fix code compilation (diff)
downloadyuzu-0aa6ec42764756c8312da6faf5e67d85c3c28b2f.tar
yuzu-0aa6ec42764756c8312da6faf5e67d85c3c28b2f.tar.gz
yuzu-0aa6ec42764756c8312da6faf5e67d85c3c28b2f.tar.bz2
yuzu-0aa6ec42764756c8312da6faf5e67d85c3c28b2f.tar.lz
yuzu-0aa6ec42764756c8312da6faf5e67d85c3c28b2f.tar.xz
yuzu-0aa6ec42764756c8312da6faf5e67d85c3c28b2f.tar.zst
yuzu-0aa6ec42764756c8312da6faf5e67d85c3c28b2f.zip
-rw-r--r--src/yuzu/configuration/configure_motion_touch.h4
-rw-r--r--src/yuzu/configuration/configure_touch_from_button.ui2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/yuzu/configuration/configure_motion_touch.h b/src/yuzu/configuration/configure_motion_touch.h
index 2a7cdfed7..0fafb3aed 100644
--- a/src/yuzu/configuration/configure_motion_touch.h
+++ b/src/yuzu/configuration/configure_motion_touch.h
@@ -70,6 +70,8 @@ private:
void ConnectEvents();
bool CanCloseDialog();
+ InputCommon::InputSubsystem* input_subsystem;
+
std::unique_ptr<Ui::ConfigureMotionTouch> ui;
// Coordinate system of the CemuhookUDP touch provider
@@ -80,7 +82,5 @@ private:
bool udp_test_in_progress{};
- InputCommon::InputSubsystem* input_subsystem;
-
std::vector<Settings::TouchFromButtonMap> touch_from_button_maps;
};
diff --git a/src/yuzu/configuration/configure_touch_from_button.ui b/src/yuzu/configuration/configure_touch_from_button.ui
index d0598bdbd..f581e27e0 100644
--- a/src/yuzu/configuration/configure_touch_from_button.ui
+++ b/src/yuzu/configuration/configure_touch_from_button.ui
@@ -205,7 +205,7 @@ Drag points to change position, or double-click table cells to edit values.</str
<customwidget>
<class>TouchScreenPreview</class>
<extends>QFrame</extends>
- <header>citra_qt/configuration/configure_touch_widget.h</header>
+ <header>yuzu/configuration/configure_touch_widget.h</header>
<container>1</container>
</customwidget>
</customwidgets>