diff options
Diffstat (limited to 'src/input/frontend')
56 files changed, 174 insertions, 108 deletions
diff --git a/src/input/frontend/qabstractactioninput.cpp b/src/input/frontend/qabstractactioninput.cpp index f5e9ff33e..5d7af72f8 100644 --- a/src/input/frontend/qabstractactioninput.cpp +++ b/src/input/frontend/qabstractactioninput.cpp @@ -37,6 +37,7 @@ ****************************************************************************/ #include "qabstractactioninput_p.h" + #include <Qt3DCore/private/qnode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qabstractactioninput_p.h b/src/input/frontend/qabstractactioninput_p.h index 6741bc4dc..b7494ee38 100644 --- a/src/input/frontend/qabstractactioninput_p.h +++ b/src/input/frontend/qabstractactioninput_p.h @@ -50,7 +50,8 @@ // We mean it. // -#include <Qt3DInput/qabstractactioninput.h> +#include "qabstractactioninput.h" + #include <Qt3DCore/private/qnode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qabstractaxisinput.cpp b/src/input/frontend/qabstractaxisinput.cpp index bcce50a33..e3974421a 100644 --- a/src/input/frontend/qabstractaxisinput.cpp +++ b/src/input/frontend/qabstractaxisinput.cpp @@ -37,8 +37,9 @@ ** ****************************************************************************/ -#include "qabstractaxisinput.h" #include "qabstractaxisinput_p.h" + +#include <Qt3DInput/qabstractaxisinput.h> #include <Qt3DCore/qnodecreatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qabstractaxisinput.h b/src/input/frontend/qabstractaxisinput.h index b26d3249a..c0a93da31 100644 --- a/src/input/frontend/qabstractaxisinput.h +++ b/src/input/frontend/qabstractaxisinput.h @@ -40,9 +40,9 @@ #ifndef QT3DINPUT_QABSTRACTAXISINPUT_H #define QT3DINPUT_QABSTRACTAXISINPUT_H +#include <Qt3DInput/qabstractphysicaldevice.h> #include <Qt3DInput/qt3dinput_global.h> #include <Qt3DCore/qnode.h> -#include <Qt3DInput/qabstractphysicaldevice.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qabstractaxisinput_p.h b/src/input/frontend/qabstractaxisinput_p.h index f64a140f4..91e02719e 100644 --- a/src/input/frontend/qabstractaxisinput_p.h +++ b/src/input/frontend/qabstractaxisinput_p.h @@ -51,10 +51,11 @@ // We mean it. // -#include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/qnodeid.h> #include <QtCore/qvariant.h> +#include <Qt3DCore/private/qnode_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/frontend/qabstractphysicaldevice.cpp b/src/input/frontend/qabstractphysicaldevice.cpp index 4984b4300..8a0e81e0c 100644 --- a/src/input/frontend/qabstractphysicaldevice.cpp +++ b/src/input/frontend/qabstractphysicaldevice.cpp @@ -39,11 +39,13 @@ #include "qabstractphysicaldevice.h" #include "qabstractphysicaldevice_p.h" -#include <Qt3DInput/qphysicaldevicecreatedchange.h> + #include <Qt3DInput/qaxissetting.h> +#include <Qt3DInput/qphysicaldevicecreatedchange.h> #include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qpropertynodeaddedchange.h> #include <Qt3DCore/qpropertynoderemovedchange.h> + #include <Qt3DCore/private/qnode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qabstractphysicaldevice_p.h b/src/input/frontend/qabstractphysicaldevice_p.h index 55e98723c..e2b67a815 100644 --- a/src/input/frontend/qabstractphysicaldevice_p.h +++ b/src/input/frontend/qabstractphysicaldevice_p.h @@ -52,11 +52,12 @@ // #include <Qt3DInput/qt3dinput_global.h> -#include <Qt3DCore/private/qnode_p.h> #include <QtCore/qhash.h> #include <QtCore/qmutex.h> #include <QtCore/qvector.h> + #include <Qt3DInput/private/qt3dinput_global_p.h> +#include <Qt3DCore/private/qnode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qabstractphysicaldeviceproxy.cpp b/src/input/frontend/qabstractphysicaldeviceproxy.cpp index 03e59761b..34b7db2a4 100644 --- a/src/input/frontend/qabstractphysicaldeviceproxy.cpp +++ b/src/input/frontend/qabstractphysicaldeviceproxy.cpp @@ -39,9 +39,11 @@ #include "qabstractphysicaldeviceproxy_p.h" #include "qabstractphysicaldeviceproxy_p_p.h" + #include <Qt3DInput/qphysicaldevicecreatedchange.h> #include <Qt3DCore/qpropertyupdatedchange.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/frontend/qabstractphysicaldeviceproxy_p.h b/src/input/frontend/qabstractphysicaldeviceproxy_p.h index 1175f53bb..6d44ad2cd 100644 --- a/src/input/frontend/qabstractphysicaldeviceproxy_p.h +++ b/src/input/frontend/qabstractphysicaldeviceproxy_p.h @@ -52,6 +52,7 @@ // #include <Qt3DInput/qabstractphysicaldevice.h> + #include <Qt3DInput/private/qt3dinput_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qaction.cpp b/src/input/frontend/qaction.cpp index 3a6e6dc4f..1006c0cec 100644 --- a/src/input/frontend/qaction.cpp +++ b/src/input/frontend/qaction.cpp @@ -39,12 +39,14 @@ #include "qaction.h" #include "qaction_p.h" -#include <Qt3DCore/private/qnode_p.h> + +#include <Qt3DInput/qabstractactioninput.h> #include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qpropertynodeaddedchange.h> #include <Qt3DCore/qpropertynoderemovedchange.h> #include <Qt3DCore/qnodecreatedchange.h> -#include <Qt3DInput/qabstractactioninput.h> + +#include <Qt3DCore/private/qnode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qactioninput.cpp b/src/input/frontend/qactioninput.cpp index 5bee62cb9..b8db101d8 100644 --- a/src/input/frontend/qactioninput.cpp +++ b/src/input/frontend/qactioninput.cpp @@ -38,8 +38,9 @@ #include "qactioninput.h" #include "qactioninput_p.h" + #include <Qt3DInput/qabstractphysicaldevice.h> -#include <Qt3DInput/QAbstractActionInput> +#include <Qt3DInput/qabstractactioninput.h> #include <Qt3DCore/qnodecreatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qactioninput.h b/src/input/frontend/qactioninput.h index 9b06047b2..580afaf2e 100644 --- a/src/input/frontend/qactioninput.h +++ b/src/input/frontend/qactioninput.h @@ -40,9 +40,9 @@ #ifndef QT3DINPUT_QACTIONINPUT_H #define QT3DINPUT_QACTIONINPUT_H +#include <Qt3DInput/qabstractactioninput.h> #include <Qt3DInput/qt3dinput_global.h> #include <Qt3DCore/qnode.h> -#include <Qt3DInput/qabstractactioninput.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qactioninput_p.h b/src/input/frontend/qactioninput_p.h index d1e9f88dc..74a69d68c 100644 --- a/src/input/frontend/qactioninput_p.h +++ b/src/input/frontend/qactioninput_p.h @@ -51,9 +51,10 @@ // We mean it. // -#include <Qt3DInput/private/qabstractactioninput_p.h> #include <QtCore/qvariant.h> +#include <Qt3DInput/private/qabstractactioninput_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/frontend/qanalogaxisinput.cpp b/src/input/frontend/qanalogaxisinput.cpp index 6d50af45c..7b85983e3 100644 --- a/src/input/frontend/qanalogaxisinput.cpp +++ b/src/input/frontend/qanalogaxisinput.cpp @@ -39,6 +39,7 @@ #include "qanalogaxisinput.h" #include "qanalogaxisinput_p.h" + #include <Qt3DInput/qabstractphysicaldevice.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qaxis.cpp b/src/input/frontend/qaxis.cpp index 6b19e43fe..01e28e9cf 100644 --- a/src/input/frontend/qaxis.cpp +++ b/src/input/frontend/qaxis.cpp @@ -38,6 +38,7 @@ #include "qaxis.h" #include "qaxis_p.h" + #include <Qt3DInput/qabstractaxisinput.h> #include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qpropertynodeaddedchange.h> diff --git a/src/input/frontend/qaxisaccumulator.cpp b/src/input/frontend/qaxisaccumulator.cpp index 758faaa37..5f10d81a7 100644 --- a/src/input/frontend/qaxisaccumulator.cpp +++ b/src/input/frontend/qaxisaccumulator.cpp @@ -39,6 +39,7 @@ #include "qaxisaccumulator.h" #include "qaxisaccumulator_p.h" + #include <Qt3DInput/qaxis.h> #include <Qt3DCore/qnodecreatedchange.h> #include <Qt3DCore/qpropertyupdatedchange.h> @@ -88,7 +89,7 @@ namespace Qt3DInput { */ /*! - \qmlproperty int Qt3D.Inpit::Axis::value + \qmlproperty int Qt3D.Input::Axis::value \readonly Holds the value accumulated from the sourceAxis. @@ -183,11 +184,13 @@ QAxisAccumulator::SourceAxisType QAxisAccumulator::sourceAxisType() const /*! \qmlproperty real Qt3D.Input::AxisAccumulator::value - The accumulated (integrated) value. + The amount to scale the axis value by when accumulating. This can be + thought of as the maximum velocity or acceleration the axis can + control. */ /*! - \return the accumulated (integrated) value. + Returns the accumulated (integrated) value. */ float QAxisAccumulator::value() const { @@ -208,14 +211,6 @@ float QAxisAccumulator::velocity() const } /*! - \qmlproperty real Qt3D.Input::AxisAccumulator::value - - The amount to scale the axis value by when accumulating. This can be - thought of as the maximum velocity or acceleration the axis can - control. - */ - -/*! The amount to scale the axis value by when accumulating. This can be thought of as the maximum velocity or acceleration the axis can control. @@ -254,7 +249,7 @@ void QAxisAccumulator::setSourceAxis(QAxis *sourceAxis) } /*! - Sets how the accumulator treats the values originating from the source axis. + Sets how the accumulator treats the values originating from the \a sourceAxisType. */ void QAxisAccumulator::setSourceAxisType(QAxisAccumulator::SourceAxisType sourceAxisType) { diff --git a/src/input/frontend/qaxisaccumulator_p.h b/src/input/frontend/qaxisaccumulator_p.h index 532f01b6b..a936f54aa 100644 --- a/src/input/frontend/qaxisaccumulator_p.h +++ b/src/input/frontend/qaxisaccumulator_p.h @@ -51,9 +51,10 @@ // We mean it. // -#include <Qt3DCore/private/qcomponent_p.h> #include <Qt3DInput/qaxisaccumulator.h> +#include <Qt3DCore/private/qcomponent_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/frontend/qaxissetting.cpp b/src/input/frontend/qaxissetting.cpp index 987cd246a..8f1a8d797 100644 --- a/src/input/frontend/qaxissetting.cpp +++ b/src/input/frontend/qaxissetting.cpp @@ -39,6 +39,7 @@ #include "qaxissetting.h" #include "qaxissetting_p.h" + #include <Qt3DCore/qnodecreatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qaxissetting.h b/src/input/frontend/qaxissetting.h index 483c6c2a0..b3d244e15 100644 --- a/src/input/frontend/qaxissetting.h +++ b/src/input/frontend/qaxissetting.h @@ -40,9 +40,8 @@ #ifndef QT3DINPUT_QAXISSETTING_H #define QT3DINPUT_QAXISSETTING_H -#include <Qt3DCore/qnode.h> #include <Qt3DInput/qt3dinput_global.h> - +#include <Qt3DCore/qnode.h> #include <QtCore/qvector.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qbuttonaxisinput.cpp b/src/input/frontend/qbuttonaxisinput.cpp index e6bfe4f8c..fb74b8efd 100644 --- a/src/input/frontend/qbuttonaxisinput.cpp +++ b/src/input/frontend/qbuttonaxisinput.cpp @@ -39,6 +39,7 @@ #include "qbuttonaxisinput.h" #include "qbuttonaxisinput_p.h" + #include <Qt3DInput/qabstractphysicaldevice.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qgamepadinput.cpp b/src/input/frontend/qgamepadinput.cpp index faf62ae88..a0efecfc0 100644 --- a/src/input/frontend/qgamepadinput.cpp +++ b/src/input/frontend/qgamepadinput.cpp @@ -35,10 +35,11 @@ ****************************************************************************/ #include "qgamepadinput_p.h" -#include "qabstractphysicaldevice_p.h" -#include <QGamepadManager> -#include <QMetaEnum> +#include <QtCore/QMetaEnum> +#include <QtGamepad/QGamepadManager> + +#include <Qt3DInput/private/qabstractphysicaldevice_p.h> QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/frontend/qgamepadinput_p.h b/src/input/frontend/qgamepadinput_p.h index c1990030e..c064f1c94 100644 --- a/src/input/frontend/qgamepadinput_p.h +++ b/src/input/frontend/qgamepadinput_p.h @@ -49,6 +49,7 @@ // #include <Qt3DInput/qabstractphysicaldevice.h> + #include <Qt3DInput/private/qt3dinput_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qgenericinputdevice.cpp b/src/input/frontend/qgenericinputdevice.cpp index 8c4b44992..84a1699fc 100644 --- a/src/input/frontend/qgenericinputdevice.cpp +++ b/src/input/frontend/qgenericinputdevice.cpp @@ -39,7 +39,7 @@ #include "qgenericinputdevice_p.h" -#include "qabstractphysicaldevice_p.h" +#include <Qt3DInput/private/qabstractphysicaldevice_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qgenericinputdevice_p.h b/src/input/frontend/qgenericinputdevice_p.h index f4af03975..b46eada67 100644 --- a/src/input/frontend/qgenericinputdevice_p.h +++ b/src/input/frontend/qgenericinputdevice_p.h @@ -52,6 +52,7 @@ // #include <Qt3DInput/qabstractphysicaldevice.h> + #include <Qt3DInput/private/qt3dinput_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qinputaspect.cpp b/src/input/frontend/qinputaspect.cpp index 5c5fd3b06..a3bf58f08 100644 --- a/src/input/frontend/qinputaspect.cpp +++ b/src/input/frontend/qinputaspect.cpp @@ -39,56 +39,60 @@ #include "qinputaspect.h" #include "qinputaspect_p.h" -#include "inputhandler_p.h" -#include "buttonaxisinput_p.h" -#include "keyboarddevice_p.h" -#include "keyboardhandler_p.h" -#include "mousedevice_p.h" -#include "mousehandler_p.h" -#include <Qt3DInput/qkeyboarddevice.h> -#include <Qt3DInput/qkeyboardhandler.h> -#include <Qt3DInput/qmousedevice.h> -#include <Qt3DInput/qmousehandler.h> -#include <Qt3DInput/private/qinputdeviceintegration_p.h> -#include <Qt3DInput/qinputsettings.h> -#include <Qt3DInput/private/qgenericinputdevice_p.h> -#include <Qt3DInput/private/qinputdeviceintegrationfactory_p.h> -#include <Qt3DCore/private/qservicelocator_p.h> -#include <Qt3DCore/private/qeventfilterservice_p.h> -#include <QDir> -#include <QLibrary> -#include <QLibraryInfo> -#include <QPluginLoader> -#include <Qt3DInput/qaxis.h> -#include <Qt3DInput/qaxisaccumulator.h> +#include <Qt3DInput/qabstractphysicaldevice.h> #include <Qt3DInput/qaction.h> -#include <Qt3DInput/qaxissetting.h> #include <Qt3DInput/qactioninput.h> #include <Qt3DInput/qanalogaxisinput.h> +#include <Qt3DInput/qaxis.h> +#include <Qt3DInput/qaxisaccumulator.h> +#include <Qt3DInput/qaxissetting.h> #include <Qt3DInput/qbuttonaxisinput.h> #include <Qt3DInput/qinputchord.h> #include <Qt3DInput/qinputsequence.h> +#include <Qt3DInput/qinputsettings.h> +#include <Qt3DInput/qkeyboarddevice.h> +#include <Qt3DInput/qkeyboardhandler.h> #include <Qt3DInput/qlogicaldevice.h> -#include <Qt3DInput/qabstractphysicaldevice.h> -#include <Qt3DInput/private/qabstractphysicaldeviceproxy_p.h> +#include <Qt3DInput/qmousedevice.h> +#include <Qt3DInput/qmousehandler.h> +#include <QtCore/QDir> + +#if QT_CONFIG(library) +#include <QtCore/QLibrary> +#endif +#include <QtCore/QLibraryInfo> +#include <QtCore/QPluginLoader> + +#include <Qt3DInput/private/action_p.h> +#include <Qt3DInput/private/actioninput_p.h> #include <Qt3DInput/private/axis_p.h> #include <Qt3DInput/private/axisaccumulator_p.h> -#include <Qt3DInput/private/action_p.h> +#include <Qt3DInput/private/axisaccumulatorjob_p.h> #include <Qt3DInput/private/axissetting_p.h> -#include <Qt3DInput/private/actioninput_p.h> -#include <Qt3DInput/private/inputchord_p.h> -#include <Qt3DInput/private/inputsequence_p.h> -#include <Qt3DInput/private/logicaldevice_p.h> +#include <Qt3DInput/private/buttonaxisinput_p.h> +#include <Qt3DInput/private/eventsourcesetterhelper_p.h> +#include <Qt3DInput/private/genericdevicebackendnode_p.h> #include <Qt3DInput/private/inputbackendnodefunctor_p.h> +#include <Qt3DInput/private/inputchord_p.h> +#include <Qt3DInput/private/inputhandler_p.h> #include <Qt3DInput/private/inputmanagers_p.h> -#include <Qt3DInput/private/updateaxisactionjob_p.h> -#include <Qt3DInput/private/keyboardmousegenericdeviceintegration_p.h> -#include <Qt3DInput/private/genericdevicebackendnode_p.h> +#include <Qt3DInput/private/inputsequence_p.h> #include <Qt3DInput/private/inputsettings_p.h> -#include <Qt3DInput/private/eventsourcesetterhelper_p.h> +#include <Qt3DInput/private/keyboarddevice_p.h> +#include <Qt3DInput/private/keyboardhandler_p.h> +#include <Qt3DInput/private/keyboardmousegenericdeviceintegration_p.h> #include <Qt3DInput/private/loadproxydevicejob_p.h> -#include <Qt3DInput/private/axisaccumulatorjob_p.h> +#include <Qt3DInput/private/logicaldevice_p.h> +#include <Qt3DInput/private/mousedevice_p.h> +#include <Qt3DInput/private/mousehandler_p.h> +#include <Qt3DInput/private/qabstractphysicaldeviceproxy_p.h> +#include <Qt3DInput/private/qgenericinputdevice_p.h> +#include <Qt3DInput/private/qinputdeviceintegration_p.h> +#include <Qt3DInput/private/qinputdeviceintegrationfactory_p.h> +#include <Qt3DInput/private/updateaxisactionjob_p.h> +#include <Qt3DCore/private/qeventfilterservice_p.h> +#include <Qt3DCore/private/qservicelocator_p.h> #ifdef HAVE_QGAMEPAD # include <Qt3DInput/private/qgamepadinput_p.h> diff --git a/src/input/frontend/qinputaspect_p.h b/src/input/frontend/qinputaspect_p.h index 35a4ffa02..bcdd8d4ed 100644 --- a/src/input/frontend/qinputaspect_p.h +++ b/src/input/frontend/qinputaspect_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <private/qabstractaspect_p.h> +#include <Qt3DCore/private/qabstractaspect_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qinputchord.cpp b/src/input/frontend/qinputchord.cpp index 372c61990..7c986f297 100644 --- a/src/input/frontend/qinputchord.cpp +++ b/src/input/frontend/qinputchord.cpp @@ -38,8 +38,9 @@ #include "qinputchord.h" #include "qinputchord_p.h" -#include <Qt3DCore/qnodecreatedchange.h> + #include <Qt3DInput/qabstractphysicaldevice.h> +#include <Qt3DCore/qnodecreatedchange.h> #include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qpropertynodeaddedchange.h> #include <Qt3DCore/qpropertynoderemovedchange.h> diff --git a/src/input/frontend/qinputchord.h b/src/input/frontend/qinputchord.h index f3e603eb5..1fc69bd1b 100644 --- a/src/input/frontend/qinputchord.h +++ b/src/input/frontend/qinputchord.h @@ -40,9 +40,9 @@ #ifndef QT3DINPUT_QINPUTCHORD_H #define QT3DINPUT_QINPUTCHORD_H +#include <Qt3DInput/qabstractactioninput.h> #include <Qt3DInput/qt3dinput_global.h> #include <Qt3DCore/qnode.h> -#include <Qt3DInput/qabstractactioninput.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qinputchord_p.h b/src/input/frontend/qinputchord_p.h index bd49f93d6..37cbbd9f2 100644 --- a/src/input/frontend/qinputchord_p.h +++ b/src/input/frontend/qinputchord_p.h @@ -51,9 +51,10 @@ // We mean it. // -#include <Qt3DInput/private/qabstractactioninput_p.h> #include <Qt3DCore/qnodeid.h> +#include <Qt3DInput/private/qabstractactioninput_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/frontend/qinputdeviceintegration_p.h b/src/input/frontend/qinputdeviceintegration_p.h index 248243fa2..a066d7629 100644 --- a/src/input/frontend/qinputdeviceintegration_p.h +++ b/src/input/frontend/qinputdeviceintegration_p.h @@ -51,12 +51,12 @@ // We mean it. // -#include <QObject> #include <Qt3DInput/qt3dinput_global.h> -#include <Qt3DInput/private/qabstractphysicaldevicebackendnode_p.h> - #include <Qt3DCore/qaspectjob.h> #include <Qt3DCore/qnodeid.h> +#include <QtCore/QObject> + +#include <Qt3DInput/private/qabstractphysicaldevicebackendnode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qinputdeviceintegration_p_p.h b/src/input/frontend/qinputdeviceintegration_p_p.h index c8557eac5..31eea4cdf 100644 --- a/src/input/frontend/qinputdeviceintegration_p_p.h +++ b/src/input/frontend/qinputdeviceintegration_p_p.h @@ -51,8 +51,8 @@ // We mean it. // -#include <private/qobject_p.h> -#include <private/qt3dinput_global_p.h> +#include <Qt3DInput/private/qt3dinput_global_p.h> +#include <QtCore/private/qobject_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qinputdeviceintegrationfactory.cpp b/src/input/frontend/qinputdeviceintegrationfactory.cpp index 22e93294e..957b33542 100644 --- a/src/input/frontend/qinputdeviceintegrationfactory.cpp +++ b/src/input/frontend/qinputdeviceintegrationfactory.cpp @@ -38,11 +38,13 @@ ****************************************************************************/ #include "qinputdeviceintegrationfactory_p.h" + +#include <QtCore/QCoreApplication> +#include <QtCore/QDir> + #include <Qt3DInput/private/qinputdeviceintegration_p.h> #include <Qt3DInput/private/qinputdeviceplugin_p.h> #include <QtCore/private/qfactoryloader_p.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> QT_BEGIN_NAMESPACE @@ -72,6 +74,7 @@ QStringList QInputDeviceIntegrationFactory::keys(const QString &pluginPath) list.append(loader()->keyMap().values()); return list; #else + Q_UNUSED(pluginPath); return QStringList(); #endif } @@ -86,6 +89,10 @@ QInputDeviceIntegration *QInputDeviceIntegrationFactory::create(const QString &n } if (QInputDeviceIntegration *ret = qLoadPlugin<QInputDeviceIntegration, QInputDevicePlugin>(loader(), name, args)) return ret; +#else + Q_UNUSED(name); + Q_UNUSED(args); + Q_UNUSED(pluginPath); #endif return nullptr; } diff --git a/src/input/frontend/qinputdeviceplugin_p.h b/src/input/frontend/qinputdeviceplugin_p.h index ca77441af..a2f93eb3f 100644 --- a/src/input/frontend/qinputdeviceplugin_p.h +++ b/src/input/frontend/qinputdeviceplugin_p.h @@ -52,8 +52,8 @@ // #include <QtCore/QObject> -#include <QtCore/QtPlugin> #include <QtCore/QFactoryInterface> +#include <QtCore/QtPlugin> #include <Qt3DInput/private/qt3dinput_global_p.h> diff --git a/src/input/frontend/qinputsequence.cpp b/src/input/frontend/qinputsequence.cpp index 99eff289b..766674840 100644 --- a/src/input/frontend/qinputsequence.cpp +++ b/src/input/frontend/qinputsequence.cpp @@ -38,13 +38,15 @@ #include "qinputsequence.h" #include "qinputsequence_p.h" -#include <Qt3DCore/private/qnode_p.h> -#include <Qt3DCore/qnodecreatedchange.h> -#include <Qt3DInput/qabstractphysicaldevice.h> + #include <Qt3DInput/qabstractactioninput.h> -#include <Qt3DCore/qpropertyupdatedchange.h> +#include <Qt3DInput/qabstractphysicaldevice.h> +#include <Qt3DCore/qnodecreatedchange.h> #include <Qt3DCore/qpropertynodeaddedchange.h> #include <Qt3DCore/qpropertynoderemovedchange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> + +#include <Qt3DCore/private/qnode_p.h> QT_BEGIN_NAMESPACE @@ -74,7 +76,7 @@ QInputSequencePrivate::QInputSequencePrivate() Represents a set of QAbstractActionInput's that must be triggerd one after the other. - The following example shows a chord that will be triggered by pressing the A and S keys together with a tolerence of 10 miliseconds between presses. + The following example shows a chord that will be triggered by pressing the A and S keys together with a tolerance of 10 miliseconds between presses. \qml InputChord { tolerance: 10 diff --git a/src/input/frontend/qinputsequence.h b/src/input/frontend/qinputsequence.h index 2baeb40b8..6e08bc649 100644 --- a/src/input/frontend/qinputsequence.h +++ b/src/input/frontend/qinputsequence.h @@ -40,9 +40,9 @@ #ifndef QT3DINPUT_QINPUTSEQUENCE_H #define QT3DINPUT_QINPUTSEQUENCE_H +#include <Qt3DInput/qabstractactioninput.h> #include <Qt3DInput/qt3dinput_global.h> #include <Qt3DCore/qnode.h> -#include <Qt3DInput/qabstractactioninput.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qinputsequence_p.h b/src/input/frontend/qinputsequence_p.h index 3290e4dcc..b2807b2d5 100644 --- a/src/input/frontend/qinputsequence_p.h +++ b/src/input/frontend/qinputsequence_p.h @@ -51,9 +51,10 @@ // We mean it. // -#include <Qt3DInput/private/qabstractactioninput_p.h> #include <Qt3DCore/qnodeid.h> +#include <Qt3DInput/private/qabstractactioninput_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/frontend/qinputsettings.cpp b/src/input/frontend/qinputsettings.cpp index 47c835cea..ccc53e47b 100644 --- a/src/input/frontend/qinputsettings.cpp +++ b/src/input/frontend/qinputsettings.cpp @@ -39,6 +39,7 @@ #include "qinputsettings.h" #include "qinputsettings_p.h" + #include <Qt3DCore/qnodecreatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qinputsettings.h b/src/input/frontend/qinputsettings.h index 9e0ea7b6b..4f4d746f6 100644 --- a/src/input/frontend/qinputsettings.h +++ b/src/input/frontend/qinputsettings.h @@ -40,8 +40,8 @@ #ifndef QT3DINPUT_QINPUTSETTINGS_H #define QT3DINPUT_QINPUTSETTINGS_H -#include <Qt3DCore/qcomponent.h> #include <Qt3DInput/qt3dinput_global.h> +#include <Qt3DCore/qcomponent.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qinputsettings_p.h b/src/input/frontend/qinputsettings_p.h index 13757ac0b..584e597ba 100644 --- a/src/input/frontend/qinputsettings_p.h +++ b/src/input/frontend/qinputsettings_p.h @@ -51,9 +51,10 @@ // We mean it. // -#include <Qt3DCore/private/qcomponent_p.h> #include <QtCore/qpointer.h> +#include <Qt3DCore/private/qcomponent_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/frontend/qkeyboarddevice.cpp b/src/input/frontend/qkeyboarddevice.cpp index b2c0975ee..257a5be8c 100644 --- a/src/input/frontend/qkeyboarddevice.cpp +++ b/src/input/frontend/qkeyboarddevice.cpp @@ -39,10 +39,12 @@ #include "qkeyboarddevice.h" #include "qkeyboarddevice_p.h" -#include "qkeyboardhandler.h" -#include <Qt3DCore/private/qscene_p.h> + +#include <Qt3DInput/qkeyboardhandler.h> #include <Qt3DCore/qpropertyupdatedchange.h> +#include <Qt3DCore/private/qscene_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/frontend/qkeyboarddevice.h b/src/input/frontend/qkeyboarddevice.h index a86687769..a0baf255e 100644 --- a/src/input/frontend/qkeyboarddevice.h +++ b/src/input/frontend/qkeyboarddevice.h @@ -40,9 +40,9 @@ #ifndef QT3DINPUT_INPUT_QKEYBOARDDEVICE_H #define QT3DINPUT_INPUT_QKEYBOARDDEVICE_H +#include <Qt3DInput/QKeyboardHandler> #include <Qt3DInput/qt3dinput_global.h> #include <Qt3DInput/qabstractphysicaldevice.h> -#include <Qt3DInput/QKeyboardHandler> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qkeyboarddevice_p.h b/src/input/frontend/qkeyboarddevice_p.h index e05f7549b..8399b061b 100644 --- a/src/input/frontend/qkeyboarddevice_p.h +++ b/src/input/frontend/qkeyboarddevice_p.h @@ -51,11 +51,12 @@ // We mean it. // -#include <private/qabstractphysicaldevice_p.h> #include <Qt3DCore/qnodeid.h> #include <QtCore/qhash.h> #include <QtCore/qstring.h> +#include <Qt3DInput/private/qabstractphysicaldevice_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/frontend/qkeyboardhandler.cpp b/src/input/frontend/qkeyboardhandler.cpp index e45609f74..5854a047d 100644 --- a/src/input/frontend/qkeyboardhandler.cpp +++ b/src/input/frontend/qkeyboardhandler.cpp @@ -39,7 +39,8 @@ #include "qkeyboardhandler.h" #include "qkeyboardhandler_p.h" -#include "qkeyboarddevice.h" + +#include <Qt3DInput/qkeyboarddevice.h> #include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qkeyboardhandler_p.h b/src/input/frontend/qkeyboardhandler_p.h index 339d36d26..9de55f9d0 100644 --- a/src/input/frontend/qkeyboardhandler_p.h +++ b/src/input/frontend/qkeyboardhandler_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <private/qcomponent_p.h> +#include <Qt3DCore/private/qcomponent_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qkeyevent.h b/src/input/frontend/qkeyevent.h index 0978a45e7..e028438ce 100644 --- a/src/input/frontend/qkeyevent.h +++ b/src/input/frontend/qkeyevent.h @@ -40,9 +40,9 @@ #ifndef QT3DINPUT_QKEYEVENT_H #define QT3DINPUT_QKEYEVENT_H -#include <QObject> -#include <QtGui/QKeyEvent> #include <Qt3DInput/qt3dinput_global.h> +#include <QtCore/QObject> +#include <QtGui/QKeyEvent> QT_BEGIN_NAMESPACE @@ -78,7 +78,9 @@ public: inline bool isAccepted() const { return m_event.isAccepted(); } inline void setAccepted(bool accepted) { m_event.setAccepted(accepted); } inline QEvent::Type type() const { return m_event.type(); } +#if QT_CONFIG(shortcut) Q_INVOKABLE bool matches(QKeySequence::StandardKey key_) const { return m_event.matches(key_); } +#endif private: QT_PREPEND_NAMESPACE(QKeyEvent) m_event; diff --git a/src/input/frontend/qlogicaldevice.cpp b/src/input/frontend/qlogicaldevice.cpp index 4794431b8..1e7033962 100644 --- a/src/input/frontend/qlogicaldevice.cpp +++ b/src/input/frontend/qlogicaldevice.cpp @@ -39,12 +39,13 @@ #include "qlogicaldevice.h" #include "qlogicaldevice_p.h" -#include <Qt3DInput/qaction.h> -#include <Qt3DInput/qaxis.h> + #include <Qt3DCore/qnodecreatedchange.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qpropertynodeaddedchange.h> #include <Qt3DCore/qpropertynoderemovedchange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> +#include <Qt3DInput/qaction.h> +#include <Qt3DInput/qaxis.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qlogicaldevice_p.h b/src/input/frontend/qlogicaldevice_p.h index c8940e6b9..e04d238c5 100644 --- a/src/input/frontend/qlogicaldevice_p.h +++ b/src/input/frontend/qlogicaldevice_p.h @@ -51,9 +51,10 @@ // We mean it. // -#include <Qt3DCore/private/qcomponent_p.h> #include <Qt3DCore/qnodeid.h> +#include <Qt3DCore/private/qcomponent_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/frontend/qmousedevice.cpp b/src/input/frontend/qmousedevice.cpp index 744d289f3..b5123533f 100644 --- a/src/input/frontend/qmousedevice.cpp +++ b/src/input/frontend/qmousedevice.cpp @@ -39,8 +39,9 @@ #include "qmousedevice.h" #include "qmousedevice_p.h" -#include <Qt3DInput/qphysicaldevicecreatedchange.h> + #include <Qt3DInput/qmouseevent.h> +#include <Qt3DInput/qphysicaldevicecreatedchange.h> #include <Qt3DCore/qentity.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qmousedevice.h b/src/input/frontend/qmousedevice.h index 620c41edc..93ee99256 100644 --- a/src/input/frontend/qmousedevice.h +++ b/src/input/frontend/qmousedevice.h @@ -40,8 +40,8 @@ #ifndef QT3DINPUT_QMOUSEDEVICE_H #define QT3DINPUT_QMOUSEDEVICE_H -#include <Qt3DInput/qt3dinput_global.h> #include <Qt3DInput/qabstractphysicaldevice.h> +#include <Qt3DInput/qt3dinput_global.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qmousedevice_p.h b/src/input/frontend/qmousedevice_p.h index 92718dffa..49c1c6191 100644 --- a/src/input/frontend/qmousedevice_p.h +++ b/src/input/frontend/qmousedevice_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <private/qabstractphysicaldevice_p.h> +#include <Qt3DInput/private/qabstractphysicaldevice_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qmouseevent.cpp b/src/input/frontend/qmouseevent.cpp index b1574f623..62f7a097e 100644 --- a/src/input/frontend/qmouseevent.cpp +++ b/src/input/frontend/qmouseevent.cpp @@ -455,6 +455,7 @@ QMouseEvent::Modifiers QMouseEvent::modifiers() const * Returns the QEvent::Type of the event. */ +#if QT_CONFIG(wheelevent) /*! * Constructs a new QWheelEvent instance from the QWheelEvent \a e. */ @@ -497,6 +498,7 @@ QWheelEvent::Modifiers QWheelEvent::modifiers() const return QWheelEvent::NoModifier; } } +#endif // QT_CONFIG(wheelevent) } // namespace Qt3DInput diff --git a/src/input/frontend/qmouseevent.h b/src/input/frontend/qmouseevent.h index c1051dc1f..63786ac28 100644 --- a/src/input/frontend/qmouseevent.h +++ b/src/input/frontend/qmouseevent.h @@ -41,9 +41,9 @@ #define QT3DINPUT_QMOUSEEVENT_H #include <Qt3DInput/qt3dinput_global.h> -#include <QObject> +#include <QtCore/QtGlobal> +#include <QtCore/QObject> #include <QtGui/QMouseEvent> -#include <QtGlobal> QT_BEGIN_NAMESPACE @@ -85,7 +85,13 @@ public: inline int x() const { return m_event.x(); } inline int y() const { return m_event.y(); } - inline bool wasHeld() const { return static_cast<Qt::GestureType>(m_event.type()) == Qt::TapAndHoldGesture; } + inline bool wasHeld() const { +#if QT_CONFIG(gestures) + return static_cast<Qt::GestureType>(m_event.type()) == Qt::TapAndHoldGesture; +#else + return false; +#endif + } Buttons button() const; int buttons() const; Modifiers modifiers() const; @@ -100,6 +106,7 @@ private: typedef QSharedPointer<QMouseEvent> QMouseEventPtr; +#if QT_CONFIG(wheelevent) class QT3DINPUTSHARED_EXPORT QWheelEvent : public QObject { Q_OBJECT @@ -148,12 +155,16 @@ private: }; typedef QSharedPointer<QWheelEvent> QWheelEventPtr; +#endif } // namespace Qt3DInput QT_END_NAMESPACE Q_DECLARE_METATYPE(Qt3DInput::QMouseEvent*) // LCOV_EXCL_LINE + +#if QT_CONFIG(wheelevent) Q_DECLARE_METATYPE(Qt3DInput::QWheelEvent*) // LCOV_EXCL_LINE +#endif #endif // QT3DINPUT_QMOUSEEVENT_H diff --git a/src/input/frontend/qmousehandler.cpp b/src/input/frontend/qmousehandler.cpp index 75e68b819..419052d8a 100644 --- a/src/input/frontend/qmousehandler.cpp +++ b/src/input/frontend/qmousehandler.cpp @@ -39,10 +39,11 @@ #include "qmousehandler.h" #include "qmousehandler_p.h" -#include "qmousedevice.h" -#include "qmouseevent.h" + +#include <Qt3DInput/qmousedevice.h> +#include <Qt3DInput/qmouseevent.h> #include <Qt3DCore/qpropertyupdatedchange.h> -#include <QTimer> +#include <QtCore/QTimer> QT_BEGIN_NAMESPACE @@ -82,9 +83,11 @@ void QMouseHandlerPrivate::mouseEvent(const QMouseEventPtr &event) m_pressAndHoldTimer->stop(); emit q->released(event.data()); break; +#if QT_CONFIG(gestures) case Qt::TapGesture: emit q->clicked(event.data()); break; +#endif case QEvent::MouseButtonDblClick: emit q->doubleClicked(event.data()); break; @@ -310,9 +313,11 @@ void QMouseHandler::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) if (e->propertyName() == QByteArrayLiteral("mouse")) { QMouseEventPtr ev = e->value().value<QMouseEventPtr>(); d->mouseEvent(ev); +#if QT_CONFIG(wheelevent) } else if (e->propertyName() == QByteArrayLiteral("wheel")) { QWheelEventPtr ev = e->value().value<QWheelEventPtr>(); emit wheel(ev.data()); +#endif } } } diff --git a/src/input/frontend/qmousehandler.h b/src/input/frontend/qmousehandler.h index 750ed394d..ef4267c5c 100644 --- a/src/input/frontend/qmousehandler.h +++ b/src/input/frontend/qmousehandler.h @@ -82,7 +82,9 @@ Q_SIGNALS: void pressAndHold(Qt3DInput::QMouseEvent *mouse); void positionChanged(Qt3DInput::QMouseEvent *mouse); +#if QT_CONFIG(wheelevent) void wheel(Qt3DInput::QWheelEvent *wheel); +#endif protected: void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE; diff --git a/src/input/frontend/qmousehandler_p.h b/src/input/frontend/qmousehandler_p.h index 2d82ca1ad..bb82334a0 100644 --- a/src/input/frontend/qmousehandler_p.h +++ b/src/input/frontend/qmousehandler_p.h @@ -51,9 +51,10 @@ // We mean it. // -#include <private/qcomponent_p.h> #include <Qt3DInput/qmouseevent.h> +#include <Qt3DCore/private/qcomponent_p.h> + QT_BEGIN_NAMESPACE class QTimer; diff --git a/src/input/frontend/qphysicaldevicecreatedchange.cpp b/src/input/frontend/qphysicaldevicecreatedchange.cpp index 17edde76a..2f2452187 100644 --- a/src/input/frontend/qphysicaldevicecreatedchange.cpp +++ b/src/input/frontend/qphysicaldevicecreatedchange.cpp @@ -36,10 +36,12 @@ #include "qphysicaldevicecreatedchange.h" #include "qphysicaldevicecreatedchange_p.h" + #include <Qt3DInput/qabstractphysicaldevice.h> #include <Qt3DInput/qaxissetting.h> #include <Qt3DCore/qnodeid.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { |