Added QML bindings for new aggregate actions

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

3 files changed, 178 insertions, 2 deletions

diff --git a/src/quick3d/quick3dinput/items/items.pri b/src/quick3d/quick3dinput/items/items.pri
index 0a11a2bbf..e59dcf069 100644
--- a/src/quick3d/quick3dinput/items/items.pri
+++ b/src/quick3d/quick3dinput/items/items.pri
@@ -2,12 +2,14 @@ SOURCES += \
     $$PWD/quick3daxis.cpp \
     $$PWD/quick3daction.cpp \
     $$PWD/quick3dlogicaldevice.cpp \
-    $$PWD/quick3dphysicaldevice.cpp
+    $$PWD/quick3dphysicaldevice.cpp \
+    $$PWD/quick3daggregateaction.cpp
 
 HEADERS += \
     $$PWD/quick3daxis_p.h \
     $$PWD/quick3daction_p.h \
     $$PWD/quick3dlogicaldevice_p.h \
-    $$PWD/quick3dphysicaldevice_p.h
+    $$PWD/quick3dphysicaldevice_p.h \
+    $$PWD/quick3daggregateaction_p.h
 
 INCLUDEPATH += $$PWD
diff --git a/src/quick3d/quick3dinput/items/quick3daggregateaction.cpp b/src/quick3d/quick3dinput/items/quick3daggregateaction.cpp
new file mode 100644
index 000000000..d80427dca
--- /dev/null
+++ b/src/quick3d/quick3dinput/items/quick3daggregateaction.cpp
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "quick3daggregateaction_p.h"
+
+QT_BEGIN_NAMESPACE
+
+namespace Qt3DInput {
+namespace Input {
+namespace Quick {
+
+Quick3DAggregateAction::Quick3DAggregateAction(QObject *parent)
+    : QObject(parent)
+{
+}
+
+QQmlListProperty<QAbstractActionInput> Quick3DAggregateAction::qmlActionInputs()
+{
+    return QQmlListProperty<QAbstractActionInput>(this, 0,
+                                        &Quick3DAggregateAction::appendActionInput,
+                                        &Quick3DAggregateAction::actionInputCount,
+                                        &Quick3DAggregateAction::actionInputAt,
+                                        &Quick3DAggregateAction::clearActionInputs);
+}
+
+void Quick3DAggregateAction::appendActionInput(QQmlListProperty<QAbstractActionInput> *list, QAbstractActionInput *input)
+{
+    Quick3DAggregateAction *action = qobject_cast<Quick3DAggregateAction *>(list->object);
+    action->parentAction()->addInput(input);
+}
+
+QAbstractActionInput *Quick3DAggregateAction::actionInputAt(QQmlListProperty<QAbstractActionInput> *list, int index)
+{
+    Quick3DAggregateAction *action = qobject_cast<Quick3DAggregateAction *>(list->object);
+    return action->parentAction()->inputs().at(index);
+}
+
+int Quick3DAggregateAction::actionInputCount(QQmlListProperty<QAbstractActionInput> *list)
+{
+    Quick3DAggregateAction *action = qobject_cast<Quick3DAggregateAction *>(list->object);
+    return action->parentAction()->inputs().count();
+}
+
+void Quick3DAggregateAction::clearActionInputs(QQmlListProperty<QAbstractActionInput> *list)
+{
+    Quick3DAggregateAction *action = qobject_cast<Quick3DAggregateAction *>(list->object);
+    Q_FOREACH (QAbstractActionInput *input, action->parentAction()->inputs())
+        action->parentAction()->removeInput(input);
+}
+
+
+} // namespace Quick
+} // namespace Input
+} // namespace Qt3DInput
+
+QT_END_NAMESPACE
diff --git a/src/quick3d/quick3dinput/items/quick3daggregateaction_p.h b/src/quick3d/quick3dinput/items/quick3daggregateaction_p.h
new file mode 100644
index 000000000..3d0139e1b
--- /dev/null
+++ b/src/quick3d/quick3dinput/items/quick3daggregateaction_p.h
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QT3DINPUT_INPUT_QUICK_QUICK3DAGGREGATEACTION_H
+#define QT3DINPUT_INPUT_QUICK_QUICK3DAGGREGATEACTION_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <Qt3DQuickInput/private/qt3dquickinput_global_p.h>
+#include <Qt3DInput/QAbstractAggregateActionInput>
+#include <QQmlListProperty>
+
+QT_BEGIN_NAMESPACE
+
+namespace Qt3DInput {
+namespace Input {
+namespace Quick {
+
+class QT3DQUICKINPUTSHARED_PRIVATE_EXPORT Quick3DAggregateAction : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QQmlListProperty<Qt3DInput::QAbstractActionInput> inputs READ qmlActionInputs CONSTANT)
+public:
+    explicit Quick3DAggregateAction(QObject *parent = Q_NULLPTR);
+
+    inline QAbstractAggregateActionInput *parentAction() const { return qobject_cast<QAbstractAggregateActionInput *>(parent()); }
+    QQmlListProperty<QAbstractActionInput> qmlActionInputs();
+
+private:
+    static void appendActionInput(QQmlListProperty<QAbstractActionInput> *list, QAbstractActionInput *input);
+    static QAbstractActionInput *actionInputAt(QQmlListProperty<QAbstractActionInput> *list, int index);
+    static int actionInputCount(QQmlListProperty<QAbstractActionInput> *list);
+    static void clearActionInputs(QQmlListProperty<QAbstractActionInput> *list);
+};
+
+} // namespace Quick
+} // namespace Input
+} // namespace Qt3DInput
+
+QT_END_NAMESPACE
+
+
+#endif // QT3DINPUT_INPUT_QUICK_QUICK3DAGGREGATEACTION_H