From 495e98a83fadee8054ed52141a89a74cf8e24e79 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Tue, 27 Jun 2017 20:28:01 -0700 Subject: [PATCH] Qt: Move input to its own directory --- src/platform/qt/CMakeLists.txt | 13 +++++++------ src/platform/qt/{ => input}/InputController.cpp | 0 src/platform/qt/{ => input}/InputController.h | 0 src/platform/qt/{ => input}/InputIndex.cpp | 0 src/platform/qt/{ => input}/InputIndex.h | 0 src/platform/qt/{ => input}/InputItem.cpp | 0 src/platform/qt/{ => input}/InputItem.h | 0 src/platform/qt/{ => input}/InputModel.cpp | 0 src/platform/qt/{ => input}/InputModel.h | 0 src/platform/qt/{ => input}/InputProfile.cpp | 0 src/platform/qt/{ => input}/InputProfile.h | 0 11 files changed, 7 insertions(+), 6 deletions(-) rename src/platform/qt/{ => input}/InputController.cpp (100%) rename src/platform/qt/{ => input}/InputController.h (100%) rename src/platform/qt/{ => input}/InputIndex.cpp (100%) rename src/platform/qt/{ => input}/InputIndex.h (100%) rename src/platform/qt/{ => input}/InputItem.cpp (100%) rename src/platform/qt/{ => input}/InputItem.h (100%) rename src/platform/qt/{ => input}/InputModel.cpp (100%) rename src/platform/qt/{ => input}/InputModel.h (100%) rename src/platform/qt/{ => input}/InputProfile.cpp (100%) rename src/platform/qt/{ => input}/InputProfile.h (100%) diff --git a/src/platform/qt/CMakeLists.txt b/src/platform/qt/CMakeLists.txt index 31b252ca4..73d368eb1 100644 --- a/src/platform/qt/CMakeLists.txt +++ b/src/platform/qt/CMakeLists.txt @@ -26,6 +26,7 @@ endif() set(CMAKE_AUTOMOC ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/input) find_package(Qt5Multimedia) find_package(Qt5OpenGL) @@ -76,11 +77,6 @@ set(SOURCE_FILES GamepadButtonEvent.cpp GamepadHatEvent.cpp IOViewer.cpp - InputController.cpp - InputItem.cpp - InputIndex.cpp - InputModel.cpp - InputProfile.cpp KeyEditor.cpp LoadSaveState.cpp LogController.cpp @@ -105,7 +101,12 @@ set(SOURCE_FILES utils.cpp Window.cpp VFileDevice.cpp - VideoView.cpp) + VideoView.cpp + input/InputController.cpp + input/InputIndex.cpp + input/InputItem.cpp + input/InputModel.cpp + input/InputProfile.cpp) set(UI_FILES AboutScreen.ui diff --git a/src/platform/qt/InputController.cpp b/src/platform/qt/input/InputController.cpp similarity index 100% rename from src/platform/qt/InputController.cpp rename to src/platform/qt/input/InputController.cpp diff --git a/src/platform/qt/InputController.h b/src/platform/qt/input/InputController.h similarity index 100% rename from src/platform/qt/InputController.h rename to src/platform/qt/input/InputController.h diff --git a/src/platform/qt/InputIndex.cpp b/src/platform/qt/input/InputIndex.cpp similarity index 100% rename from src/platform/qt/InputIndex.cpp rename to src/platform/qt/input/InputIndex.cpp diff --git a/src/platform/qt/InputIndex.h b/src/platform/qt/input/InputIndex.h similarity index 100% rename from src/platform/qt/InputIndex.h rename to src/platform/qt/input/InputIndex.h diff --git a/src/platform/qt/InputItem.cpp b/src/platform/qt/input/InputItem.cpp similarity index 100% rename from src/platform/qt/InputItem.cpp rename to src/platform/qt/input/InputItem.cpp diff --git a/src/platform/qt/InputItem.h b/src/platform/qt/input/InputItem.h similarity index 100% rename from src/platform/qt/InputItem.h rename to src/platform/qt/input/InputItem.h diff --git a/src/platform/qt/InputModel.cpp b/src/platform/qt/input/InputModel.cpp similarity index 100% rename from src/platform/qt/InputModel.cpp rename to src/platform/qt/input/InputModel.cpp diff --git a/src/platform/qt/InputModel.h b/src/platform/qt/input/InputModel.h similarity index 100% rename from src/platform/qt/InputModel.h rename to src/platform/qt/input/InputModel.h diff --git a/src/platform/qt/InputProfile.cpp b/src/platform/qt/input/InputProfile.cpp similarity index 100% rename from src/platform/qt/InputProfile.cpp rename to src/platform/qt/input/InputProfile.cpp diff --git a/src/platform/qt/InputProfile.h b/src/platform/qt/input/InputProfile.h similarity index 100% rename from src/platform/qt/InputProfile.h rename to src/platform/qt/input/InputProfile.h