summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-11-27 11:00:56 +0100
committerLioncash <mathew1800@gmail.com>2018-11-27 11:00:56 +0100
commitec7ea4ae960e6944d794585d3ad78ca5d7998d1f (patch)
tree9f6e9c430554289fa2cf105abe3b6c24f951e668
parentMerge pull request #1806 from ReinUsesLisp/morton-fixup (diff)
downloadyuzu-ec7ea4ae960e6944d794585d3ad78ca5d7998d1f.tar
yuzu-ec7ea4ae960e6944d794585d3ad78ca5d7998d1f.tar.gz
yuzu-ec7ea4ae960e6944d794585d3ad78ca5d7998d1f.tar.bz2
yuzu-ec7ea4ae960e6944d794585d3ad78ca5d7998d1f.tar.lz
yuzu-ec7ea4ae960e6944d794585d3ad78ca5d7998d1f.tar.xz
yuzu-ec7ea4ae960e6944d794585d3ad78ca5d7998d1f.tar.zst
yuzu-ec7ea4ae960e6944d794585d3ad78ca5d7998d1f.zip
-rw-r--r--src/yuzu/configuration/configure_input.cpp10
-rw-r--r--src/yuzu/configuration/configure_input.h8
-rw-r--r--src/yuzu/configuration/configure_mouse_advanced.h2
3 files changed, 3 insertions, 17 deletions
diff --git a/src/yuzu/configuration/configure_input.cpp b/src/yuzu/configuration/configure_input.cpp
index 7ee572761..e58c62c9a 100644
--- a/src/yuzu/configuration/configure_input.cpp
+++ b/src/yuzu/configuration/configure_input.cpp
@@ -4,11 +4,9 @@
#include <algorithm>
#include <memory>
-#include <utility>
-#include <QMenu>
-#include <QMessageBox>
+
#include <QTimer>
-#include "common/param_package.h"
+
#include "configuration/configure_touchscreen_advanced.h"
#include "core/core.h"
#include "core/hle/service/am/am.h"
@@ -16,12 +14,8 @@
#include "core/hle/service/am/applet_oe.h"
#include "core/hle/service/hid/controllers/npad.h"
#include "core/hle/service/sm/sm.h"
-#include "input_common/main.h"
#include "ui_configure_input.h"
#include "ui_configure_input_player.h"
-#include "ui_configure_mouse_advanced.h"
-#include "ui_configure_touchscreen_advanced.h"
-#include "yuzu/configuration/config.h"
#include "yuzu/configuration/configure_input.h"
#include "yuzu/configuration/configure_input_player.h"
#include "yuzu/configuration/configure_mouse_advanced.h"
diff --git a/src/yuzu/configuration/configure_input.h b/src/yuzu/configuration/configure_input.h
index 29a8a03f8..0de442bf0 100644
--- a/src/yuzu/configuration/configure_input.h
+++ b/src/yuzu/configuration/configure_input.h
@@ -5,20 +5,12 @@
#pragma once
#include <array>
-#include <functional>
#include <memory>
-#include <optional>
-#include <string>
-#include <unordered_map>
#include <QKeyEvent>
#include <QWidget>
-#include "common/param_package.h"
-#include "core/settings.h"
-#include "input_common/main.h"
#include "ui_configure_input.h"
-#include "yuzu/configuration/config.h"
class QPushButton;
class QString;
diff --git a/src/yuzu/configuration/configure_mouse_advanced.h b/src/yuzu/configuration/configure_mouse_advanced.h
index 218df2bda..057b3aa72 100644
--- a/src/yuzu/configuration/configure_mouse_advanced.h
+++ b/src/yuzu/configuration/configure_mouse_advanced.h
@@ -7,7 +7,7 @@
#include <memory>
#include <optional>
#include <QDialog>
-#include <QWidget>
+
#include "core/settings.h"
class QCheckBox;