Turn QAxisInput into QAbstractAxisInput

Change-Id: If31fe8612c177b3383d63cf5f50c34d088f0d72b
Task-number: QTBUG-51474
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

3 files changed, 15 insertions, 15 deletions

diff --git a/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp b/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp
index c18beb81d..a403c38f5 100644
--- a/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp
+++ b/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp
@@ -87,7 +87,7 @@ void Qt3DQuick3DInputPlugin::registerTypes(const char *uri)
     qmlRegisterExtendedType<Qt3DInput::QLogicalDevice, Qt3DInput::Input::Quick::Quick3DLogicalDevice>(uri, 2, 0, "LogicalDevice");
     qmlRegisterUncreatableType<Qt3DInput::QAbstractActionInput>(uri, 2, 0, "AbstractActionInput", QStringLiteral("AbstractActionInput is abstract"));
     qmlRegisterType<Qt3DInput::QActionInput>(uri, 2, 0, "ActionInput");
-    qmlRegisterType<Qt3DInput::QAxisInput>(uri, 2, 0, "AxisInput");
+    qmlRegisterUncreatableType<Qt3DInput::QAbstractAxisInput>(uri, 2, 0, "AbstractAxisInput", QStringLiteral("AbstractAxisInput is abstract"));
     qmlRegisterType<Qt3DInput::QAxisSetting>(uri, 2, 0, "AxisSetting");
     qmlRegisterType<Qt3DInput::QAnalogAxisInput>(uri, 2, 0, "AnalogAxisInput");
     qmlRegisterType<Qt3DInput::QButtonAxisInput>(uri, 2, 0, "ButtonAxisInput");
diff --git a/src/quick3d/quick3dinput/items/quick3daxis.cpp b/src/quick3d/quick3dinput/items/quick3daxis.cpp
index 7ac06200c..06bc4747a 100644
--- a/src/quick3d/quick3dinput/items/quick3daxis.cpp
+++ b/src/quick3d/quick3dinput/items/quick3daxis.cpp
@@ -50,37 +50,37 @@ Quick3DAxis::Quick3DAxis(QObject *parent)
 {
 }
 
-QQmlListProperty<QAxisInput> Quick3DAxis::qmlAxisInputs()
+QQmlListProperty<QAbstractAxisInput> Quick3DAxis::qmlAxisInputs()
 {
-    return QQmlListProperty<QAxisInput>(this, 0,
+    return QQmlListProperty<QAbstractAxisInput>(this, 0,
                                         &Quick3DAxis::appendAxisInput,
                                         &Quick3DAxis::axesInputCount,
                                         &Quick3DAxis::axisInputAt,
                                         &Quick3DAxis::clearAxisInputs);
 }
 
-void Quick3DAxis::appendAxisInput(QQmlListProperty<QAxisInput> *list, QAxisInput *input)
+void Quick3DAxis::appendAxisInput(QQmlListProperty<QAbstractAxisInput> *list, QAbstractAxisInput *input)
 {
     Quick3DAxis *axis = qobject_cast<Quick3DAxis *>(list->object);
     axis->parentAxis()->addInput(input);
 }
 
-QAxisInput *Quick3DAxis::axisInputAt(QQmlListProperty<QAxisInput> *list, int index)
+QAbstractAxisInput *Quick3DAxis::axisInputAt(QQmlListProperty<QAbstractAxisInput> *list, int index)
 {
     Quick3DAxis *axis = qobject_cast<Quick3DAxis *>(list->object);
     return axis->parentAxis()->inputs().at(index);
 }
 
-int Quick3DAxis::axesInputCount(QQmlListProperty<QAxisInput> *list)
+int Quick3DAxis::axesInputCount(QQmlListProperty<QAbstractAxisInput> *list)
 {
     Quick3DAxis *axis = qobject_cast<Quick3DAxis *>(list->object);
     return axis->parentAxis()->inputs().count();
 }
 
-void Quick3DAxis::clearAxisInputs(QQmlListProperty<QAxisInput> *list)
+void Quick3DAxis::clearAxisInputs(QQmlListProperty<QAbstractAxisInput> *list)
 {
     Quick3DAxis *axis = qobject_cast<Quick3DAxis *>(list->object);
-    Q_FOREACH (QAxisInput *input, axis->parentAxis()->inputs())
+    Q_FOREACH (QAbstractAxisInput *input, axis->parentAxis()->inputs())
         axis->parentAxis()->removeInput(input);
 }
 
diff --git a/src/quick3d/quick3dinput/items/quick3daxis_p.h b/src/quick3d/quick3dinput/items/quick3daxis_p.h
index 7eee3421a..400bd5ea0 100644
--- a/src/quick3d/quick3dinput/items/quick3daxis_p.h
+++ b/src/quick3d/quick3dinput/items/quick3daxis_p.h
@@ -53,7 +53,7 @@
 
 #include <Qt3DQuickInput/private/qt3dquickinput_global_p.h>
 #include <Qt3DInput/QAxis>
-#include <Qt3DInput/QAxisInput>
+#include <Qt3DInput/QAbstractAxisInput>
 #include <QQmlListProperty>
 
 QT_BEGIN_NAMESPACE
@@ -65,19 +65,19 @@ namespace Quick {
 class QT3DQUICKINPUTSHARED_PRIVATE_EXPORT Quick3DAxis : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3DInput::QAxisInput> inputs READ qmlAxisInputs CONSTANT)
+    Q_PROPERTY(QQmlListProperty<Qt3DInput::QAbstractAxisInput> inputs READ qmlAxisInputs CONSTANT)
     Q_CLASSINFO("DefaultProperty", "inputs")
 public:
     explicit Quick3DAxis(QObject *parent = nullptr);
 
     inline QAxis *parentAxis() const { return qobject_cast<QAxis *>(parent()); }
-    QQmlListProperty<QAxisInput> qmlAxisInputs();
+    QQmlListProperty<QAbstractAxisInput> qmlAxisInputs();
 
 private:
-    static void appendAxisInput(QQmlListProperty<QAxisInput> *list, QAxisInput *input);
-    static QAxisInput *axisInputAt(QQmlListProperty<QAxisInput> *list, int index);
-    static int axesInputCount(QQmlListProperty<QAxisInput> *list);
-    static void clearAxisInputs(QQmlListProperty<QAxisInput> *list);
+    static void appendAxisInput(QQmlListProperty<QAbstractAxisInput> *list, QAbstractAxisInput *input);
+    static QAbstractAxisInput *axisInputAt(QQmlListProperty<QAbstractAxisInput> *list, int index);
+    static int axesInputCount(QQmlListProperty<QAbstractAxisInput> *list);
+    static void clearAxisInputs(QQmlListProperty<QAbstractAxisInput> *list);
 };
 
 } // namespace Quick