Merge branch 'yuzu-emu:master' into convert_legacy

1 files changed, 0 insertions, 23 deletions

diff --git a/src/input_common/touch_from_button.h b/src/input_common/touch_from_button.h
deleted file mode 100644
index 8b4d1aa96..000000000
--- a/src/input_common/touch_from_button.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2020 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include <memory>
-#include "core/frontend/input.h"
-
-namespace InputCommon {
-
-/**
- * A touch device factory that takes a list of button devices and combines them into a touch device.
- */
-class TouchFromButtonFactory final : public Input::Factory<Input::TouchDevice> {
-public:
-    /**
-     * Creates a touch device from a list of button devices
-     */
-    std::unique_ptr<Input::TouchDevice> Create(const Common::ParamPackage& params) override;
-};
-
-} // namespace InputCommon