Reorganize Input aspect sources into backend/frontend

Change-Id: I7cb9137a6f108d557e3028dc0b72a0053d3f01d4
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

61 files changed, 31 insertions, 25 deletions

diff --git a/src/input/assignkeyboardfocusjob.cpp b/src/input/backend/assignkeyboardfocusjob.cpp
index 095732d22..095732d22 100644
--- a/src/input/assignkeyboardfocusjob.cpp
+++ b/src/input/backend/assignkeyboardfocusjob.cpp
diff --git a/src/input/assignkeyboardfocusjob_p.h b/src/input/backend/assignkeyboardfocusjob_p.h
index fcb251c5a..fcb251c5a 100644
--- a/src/input/assignkeyboardfocusjob_p.h
+++ b/src/input/backend/assignkeyboardfocusjob_p.h
diff --git a/src/input/backend/backend.pri b/src/input/backend/backend.pri
new file mode 100644
index 000000000..8ab2bc64a
--- /dev/null
+++ b/src/input/backend/backend.pri
@@ -0,0 +1,29 @@
+HEADERS += \
+    $$PWD/cameracontroller_p.h \
+    $$PWD/keyboardcontroller_p.h \
+    $$PWD/keyboardinput_p.h \
+    $$PWD/inputhandler_p.h \
+    $$PWD/inputmanagers_p.h \
+    $$PWD/handle_types_p.h \
+    $$PWD/keyboardeventfilter_p.h \
+    $$PWD/assignkeyboardfocusjob_p.h \
+    $$PWD/keyeventdispatcherjob_p.h \
+    $$PWD/mousecontroller_p.h \
+    $$PWD/mouseinput_p.h \
+    $$PWD/mouseeventdispatcherjob_p.h \
+    $$PWD/mouseeventfilter_p.h \
+
+SOURCES += \
+    $$PWD/cameracontroller.cpp \
+    $$PWD/keyboardcontroller.cpp \
+    $$PWD/keyboardinput.cpp \
+    $$PWD/inputhandler.cpp \
+    $$PWD/keyboardeventfilter.cpp \
+    $$PWD/assignkeyboardfocusjob.cpp \
+    $$PWD/keyeventdispatcherjob.cpp \
+    $$PWD/mousecontroller.cpp \
+    $$PWD/mouseinput.cpp \
+    $$PWD/mouseeventfilter.cpp \
+    $$PWD/mouseeventdispatcherjob.cpp \
+
+INCLUDEPATH += $$PWD
diff --git a/src/input/cameracontroller.cpp b/src/input/backend/cameracontroller.cpp
index 2af5adf67..2af5adf67 100644
--- a/src/input/cameracontroller.cpp
+++ b/src/input/backend/cameracontroller.cpp
diff --git a/src/input/cameracontroller_p.h b/src/input/backend/cameracontroller_p.h
index 956400b02..956400b02 100644
--- a/src/input/cameracontroller_p.h
+++ b/src/input/backend/cameracontroller_p.h
diff --git a/src/input/handle_types_p.h b/src/input/backend/handle_types_p.h
index dfa26b53b..dfa26b53b 100644
--- a/src/input/handle_types_p.h
+++ b/src/input/backend/handle_types_p.h
diff --git a/src/input/inputhandler.cpp b/src/input/backend/inputhandler.cpp
index 1fd778501..1fd778501 100644
--- a/src/input/inputhandler.cpp
+++ b/src/input/backend/inputhandler.cpp
diff --git a/src/input/inputhandler_p.h b/src/input/backend/inputhandler_p.h
index b6806b5b6..b6806b5b6 100644
--- a/src/input/inputhandler_p.h
+++ b/src/input/backend/inputhandler_p.h
diff --git a/src/input/inputmanagers_p.h b/src/input/backend/inputmanagers_p.h
index 1a0447080..1a0447080 100644
--- a/src/input/inputmanagers_p.h
+++ b/src/input/backend/inputmanagers_p.h
diff --git a/src/input/keyboardcontroller.cpp b/src/input/backend/keyboardcontroller.cpp
index 359f52ee7..359f52ee7 100644
--- a/src/input/keyboardcontroller.cpp
+++ b/src/input/backend/keyboardcontroller.cpp
diff --git a/src/input/keyboardcontroller_p.h b/src/input/backend/keyboardcontroller_p.h
index d127fdd8c..d127fdd8c 100644
--- a/src/input/keyboardcontroller_p.h
+++ b/src/input/backend/keyboardcontroller_p.h
diff --git a/src/input/keyboardeventfilter.cpp b/src/input/backend/keyboardeventfilter.cpp
index 4027c98a8..4027c98a8 100644
--- a/src/input/keyboardeventfilter.cpp
+++ b/src/input/backend/keyboardeventfilter.cpp
diff --git a/src/input/keyboardeventfilter_p.h b/src/input/backend/keyboardeventfilter_p.h
index 11974d73a..11974d73a 100644
--- a/src/input/keyboardeventfilter_p.h
+++ b/src/input/backend/keyboardeventfilter_p.h
diff --git a/src/input/keyboardinput.cpp b/src/input/backend/keyboardinput.cpp
index 730142282..730142282 100644
--- a/src/input/keyboardinput.cpp
+++ b/src/input/backend/keyboardinput.cpp
diff --git a/src/input/keyboardinput_p.h b/src/input/backend/keyboardinput_p.h
index 64eb4f759..64eb4f759 100644
--- a/src/input/keyboardinput_p.h
+++ b/src/input/backend/keyboardinput_p.h
diff --git a/src/input/keyeventdispatcherjob.cpp b/src/input/backend/keyeventdispatcherjob.cpp
index ebfddc163..ebfddc163 100644
--- a/src/input/keyeventdispatcherjob.cpp
+++ b/src/input/backend/keyeventdispatcherjob.cpp
diff --git a/src/input/keyeventdispatcherjob_p.h b/src/input/backend/keyeventdispatcherjob_p.h
index 1ced85881..1ced85881 100644
--- a/src/input/keyeventdispatcherjob_p.h
+++ b/src/input/backend/keyeventdispatcherjob_p.h
diff --git a/src/input/mousecontroller.cpp b/src/input/backend/mousecontroller.cpp
index da61f7241..da61f7241 100644
--- a/src/input/mousecontroller.cpp
+++ b/src/input/backend/mousecontroller.cpp
diff --git a/src/input/mousecontroller_p.h b/src/input/backend/mousecontroller_p.h
index 69adc78ee..69adc78ee 100644
--- a/src/input/mousecontroller_p.h
+++ b/src/input/backend/mousecontroller_p.h
diff --git a/src/input/mouseeventdispatcherjob.cpp b/src/input/backend/mouseeventdispatcherjob.cpp
index 2fe4ffb14..2fe4ffb14 100644
--- a/src/input/mouseeventdispatcherjob.cpp
+++ b/src/input/backend/mouseeventdispatcherjob.cpp
diff --git a/src/input/mouseeventdispatcherjob_p.h b/src/input/backend/mouseeventdispatcherjob_p.h
index eb37dbc4d..eb37dbc4d 100644
--- a/src/input/mouseeventdispatcherjob_p.h
+++ b/src/input/backend/mouseeventdispatcherjob_p.h
diff --git a/src/input/mouseeventfilter.cpp b/src/input/backend/mouseeventfilter.cpp
index fcf8eb922..fcf8eb922 100644
--- a/src/input/mouseeventfilter.cpp
+++ b/src/input/backend/mouseeventfilter.cpp
diff --git a/src/input/mouseeventfilter_p.h b/src/input/backend/mouseeventfilter_p.h
index 6fba946b8..6fba946b8 100644
--- a/src/input/mouseeventfilter_p.h
+++ b/src/input/backend/mouseeventfilter_p.h
diff --git a/src/input/mouseinput.cpp b/src/input/backend/mouseinput.cpp
index 158e32d19..158e32d19 100644
--- a/src/input/mouseinput.cpp
+++ b/src/input/backend/mouseinput.cpp
diff --git a/src/input/mouseinput_p.h b/src/input/backend/mouseinput_p.h
index c1e4c02ac..c1e4c02ac 100644
--- a/src/input/mouseinput_p.h
+++ b/src/input/backend/mouseinput_p.h
diff --git a/src/input/input.pri b/src/input/frontend/frontend.pri
index 447d1b7e7..4758d9c35 100644
--- a/src/input/input.pri
+++ b/src/input/frontend/frontend.pri
@@ -1,29 +1,16 @@
 HEADERS += \
-    $$PWD/cameracontroller_p.h \
     $$PWD/qinputaspect.h \
     $$PWD/qkeyboardcontroller.h \
     $$PWD/qkeyboardcontroller_p.h \
     $$PWD/qkeyboardinput.h \
     $$PWD/qkeyboardinput_p.h \
-    $$PWD/keyboardcontroller_p.h \
-    $$PWD/keyboardinput_p.h \
-    $$PWD/inputhandler_p.h \
-    $$PWD/inputmanagers_p.h \
-    $$PWD/handle_types_p.h \
     $$PWD/qinputaspect_p.h \
-    $$PWD/keyboardeventfilter_p.h \
-    $$PWD/assignkeyboardfocusjob_p.h \
-    $$PWD/keyeventdispatcherjob_p.h \
     $$PWD/q3dkeyevent.h \
     $$PWD/qmousecontroller.h \
     $$PWD/qmouseinput.h \
     $$PWD/qmouseinput_p.h \
     $$PWD/qmousecontroller_p.h \
     $$PWD/q3dmouseevent.h \
-    $$PWD/mousecontroller_p.h \
-    $$PWD/mouseinput_p.h \
-    $$PWD/mouseeventdispatcherjob_p.h \
-    $$PWD/mouseeventfilter_p.h \
     $$PWD/qabstractinputdevice.h \
     $$PWD/qinputdevicefactory_p.h \
     $$PWD/qinputdeviceplugin.h \
@@ -34,24 +21,13 @@ HEADERS += \
     $$PWD/qlogicaldevice.h
 
 SOURCES += \
-    $$PWD/cameracontroller.cpp \
     $$PWD/qinputaspect.cpp \
     $$PWD/qkeyboardcontroller.cpp \
     $$PWD/qkeyboardinput.cpp \
-    $$PWD/keyboardcontroller.cpp \
-    $$PWD/keyboardinput.cpp \
-    $$PWD/inputhandler.cpp \
-    $$PWD/keyboardeventfilter.cpp \
-    $$PWD/assignkeyboardfocusjob.cpp \
-    $$PWD/keyeventdispatcherjob.cpp \
     $$PWD/q3dkeyevent.cpp \
     $$PWD/qmouseinput.cpp \
     $$PWD/qmousecontroller.cpp \
     $$PWD/q3dmouseevent.cpp \
-    $$PWD/mousecontroller.cpp \
-    $$PWD/mouseinput.cpp \
-    $$PWD/mouseeventfilter.cpp \
-    $$PWD/mouseeventdispatcherjob.cpp \
     $$PWD/qinputdevicefactory.cpp \
     $$PWD/qinputdeviceplugin.cpp \
     $$PWD/qactioninput.cpp \
diff --git a/src/input/q3dkeyevent.cpp b/src/input/frontend/q3dkeyevent.cpp
index 7c817967b..7c817967b 100644
--- a/src/input/q3dkeyevent.cpp
+++ b/src/input/frontend/q3dkeyevent.cpp
diff --git a/src/input/q3dkeyevent.h b/src/input/frontend/q3dkeyevent.h
index e48071858..e48071858 100644
--- a/src/input/q3dkeyevent.h
+++ b/src/input/frontend/q3dkeyevent.h
diff --git a/src/input/q3dmouseevent.cpp b/src/input/frontend/q3dmouseevent.cpp
index 8446a0a5a..8446a0a5a 100644
--- a/src/input/q3dmouseevent.cpp
+++ b/src/input/frontend/q3dmouseevent.cpp
diff --git a/src/input/q3dmouseevent.h b/src/input/frontend/q3dmouseevent.h
index ef1a74bb0..ef1a74bb0 100644
--- a/src/input/q3dmouseevent.h
+++ b/src/input/frontend/q3dmouseevent.h
diff --git a/src/input/qabstractinputdevice.h b/src/input/frontend/qabstractinputdevice.h
index ea0231e93..ea0231e93 100644
--- a/src/input/qabstractinputdevice.h
+++ b/src/input/frontend/qabstractinputdevice.h
diff --git a/src/input/qaction.cpp b/src/input/frontend/qaction.cpp
index f5e68932d..f5e68932d 100644
--- a/src/input/qaction.cpp
+++ b/src/input/frontend/qaction.cpp
diff --git a/src/input/qaction.h b/src/input/frontend/qaction.h
index 3eb18653c..3eb18653c 100644
--- a/src/input/qaction.h
+++ b/src/input/frontend/qaction.h
diff --git a/src/input/qactioninput.cpp b/src/input/frontend/qactioninput.cpp
index 5577e3e9c..5577e3e9c 100644
--- a/src/input/qactioninput.cpp
+++ b/src/input/frontend/qactioninput.cpp
diff --git a/src/input/qactioninput.h b/src/input/frontend/qactioninput.h
index faa44d448..faa44d448 100644
--- a/src/input/qactioninput.h
+++ b/src/input/frontend/qactioninput.h
diff --git a/src/input/qaxis.cpp b/src/input/frontend/qaxis.cpp
index df765d1ee..df765d1ee 100644
--- a/src/input/qaxis.cpp
+++ b/src/input/frontend/qaxis.cpp
diff --git a/src/input/qaxis.h b/src/input/frontend/qaxis.h
index ca6594e6e..ca6594e6e 100644
--- a/src/input/qaxis.h
+++ b/src/input/frontend/qaxis.h
diff --git a/src/input/qaxisinput.cpp b/src/input/frontend/qaxisinput.cpp
index 5b3989fbf..5b3989fbf 100644
--- a/src/input/qaxisinput.cpp
+++ b/src/input/frontend/qaxisinput.cpp
diff --git a/src/input/qaxisinput.h b/src/input/frontend/qaxisinput.h
index 40284edb7..40284edb7 100644
--- a/src/input/qaxisinput.h
+++ b/src/input/frontend/qaxisinput.h
diff --git a/src/input/qinputaspect.cpp b/src/input/frontend/qinputaspect.cpp
index ee6f851a6..ee6f851a6 100644
--- a/src/input/qinputaspect.cpp
+++ b/src/input/frontend/qinputaspect.cpp
diff --git a/src/input/qinputaspect.h b/src/input/frontend/qinputaspect.h
index 41d5ae82d..41d5ae82d 100644
--- a/src/input/qinputaspect.h
+++ b/src/input/frontend/qinputaspect.h
diff --git a/src/input/qinputaspect_p.h b/src/input/frontend/qinputaspect_p.h
index 3f2f96155..3f2f96155 100644
--- a/src/input/qinputaspect_p.h
+++ b/src/input/frontend/qinputaspect_p.h
diff --git a/src/input/qinputdevicefactory.cpp b/src/input/frontend/qinputdevicefactory.cpp
index e5896b4ff..e5896b4ff 100644
--- a/src/input/qinputdevicefactory.cpp
+++ b/src/input/frontend/qinputdevicefactory.cpp
diff --git a/src/input/qinputdevicefactory_p.h b/src/input/frontend/qinputdevicefactory_p.h
index 62eef0d18..62eef0d18 100644
--- a/src/input/qinputdevicefactory_p.h
+++ b/src/input/frontend/qinputdevicefactory_p.h
diff --git a/src/input/qinputdeviceplugin.cpp b/src/input/frontend/qinputdeviceplugin.cpp
index 7afdb848e..7afdb848e 100644
--- a/src/input/qinputdeviceplugin.cpp
+++ b/src/input/frontend/qinputdeviceplugin.cpp
diff --git a/src/input/qinputdeviceplugin.h b/src/input/frontend/qinputdeviceplugin.h
index ea73eb312..ea73eb312 100644
--- a/src/input/qinputdeviceplugin.h
+++ b/src/input/frontend/qinputdeviceplugin.h
diff --git a/src/input/qkeyboardcontroller.cpp b/src/input/frontend/qkeyboardcontroller.cpp
index 17345c6c2..17345c6c2 100644
--- a/src/input/qkeyboardcontroller.cpp
+++ b/src/input/frontend/qkeyboardcontroller.cpp
diff --git a/src/input/qkeyboardcontroller.h b/src/input/frontend/qkeyboardcontroller.h
index 1f57b856c..1f57b856c 100644
--- a/src/input/qkeyboardcontroller.h
+++ b/src/input/frontend/qkeyboardcontroller.h
diff --git a/src/input/qkeyboardcontroller_p.h b/src/input/frontend/qkeyboardcontroller_p.h
index 8d1ce7bb1..8d1ce7bb1 100644
--- a/src/input/qkeyboardcontroller_p.h
+++ b/src/input/frontend/qkeyboardcontroller_p.h
diff --git a/src/input/qkeyboardinput.cpp b/src/input/frontend/qkeyboardinput.cpp
index a36f306ea..a36f306ea 100644
--- a/src/input/qkeyboardinput.cpp
+++ b/src/input/frontend/qkeyboardinput.cpp
diff --git a/src/input/qkeyboardinput.h b/src/input/frontend/qkeyboardinput.h
index 592361a4a..592361a4a 100644
--- a/src/input/qkeyboardinput.h
+++ b/src/input/frontend/qkeyboardinput.h
diff --git a/src/input/qkeyboardinput_p.h b/src/input/frontend/qkeyboardinput_p.h
index 7ee0560b6..7ee0560b6 100644
--- a/src/input/qkeyboardinput_p.h
+++ b/src/input/frontend/qkeyboardinput_p.h
diff --git a/src/input/qlogicaldevice.cpp b/src/input/frontend/qlogicaldevice.cpp
index 939583b44..939583b44 100644
--- a/src/input/qlogicaldevice.cpp
+++ b/src/input/frontend/qlogicaldevice.cpp
diff --git a/src/input/qlogicaldevice.h b/src/input/frontend/qlogicaldevice.h
index 6950e3cce..6950e3cce 100644
--- a/src/input/qlogicaldevice.h
+++ b/src/input/frontend/qlogicaldevice.h
diff --git a/src/input/qmousecontroller.cpp b/src/input/frontend/qmousecontroller.cpp
index 461296056..461296056 100644
--- a/src/input/qmousecontroller.cpp
+++ b/src/input/frontend/qmousecontroller.cpp
diff --git a/src/input/qmousecontroller.h b/src/input/frontend/qmousecontroller.h
index a0de94db1..a0de94db1 100644
--- a/src/input/qmousecontroller.h
+++ b/src/input/frontend/qmousecontroller.h
diff --git a/src/input/qmousecontroller_p.h b/src/input/frontend/qmousecontroller_p.h
index c04971af3..c04971af3 100644
--- a/src/input/qmousecontroller_p.h
+++ b/src/input/frontend/qmousecontroller_p.h
diff --git a/src/input/qmouseinput.cpp b/src/input/frontend/qmouseinput.cpp
index 3fbafda47..3fbafda47 100644
--- a/src/input/qmouseinput.cpp
+++ b/src/input/frontend/qmouseinput.cpp
diff --git a/src/input/qmouseinput.h b/src/input/frontend/qmouseinput.h
index 5eca4dd4f..5eca4dd4f 100644
--- a/src/input/qmouseinput.h
+++ b/src/input/frontend/qmouseinput.h
diff --git a/src/input/qmouseinput_p.h b/src/input/frontend/qmouseinput_p.h
index d8f7c3fff..d8f7c3fff 100644
--- a/src/input/qmouseinput_p.h
+++ b/src/input/frontend/qmouseinput_p.h
diff --git a/src/input/input.pro b/src/input/input.pro
index 84bbbc3a2..10520afd6 100644
--- a/src/input/input.pro
+++ b/src/input/input.pro
@@ -8,7 +8,8 @@ MODULE = 3dinput
 
 load(qt_module)
 
-include(input.pri)
+include(frontend/frontend.pri)
+include(backend/backend.pri)
 
 HEADERS += \
     qt3dinput_global.h