summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2016-01-18 13:23:14 +0100
committerPaul Lemire <paul.lemire@kdab.com>2016-01-19 15:21:09 +0000
commitdba58cff4a6da0a079909205e6da22825d6fa26e (patch)
treefd4107386fd08cf296851c98b1b53449e5d5f32a /src
parentd38cd8cd2d913f30b0e23c8d6b9a274f4f47036d (diff)
QInputSettings added
Will be used to specify the event source for mouse/keyboard to be used by the QInputAspect as a replacement for setData Change-Id: Icd3ab33f5e2d7a198c4747683da5bc902de62221 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/input/frontend/frontend.pri7
-rw-r--r--src/input/frontend/qinputsettings.cpp78
-rw-r--r--src/input/frontend/qinputsettings.h72
-rw-r--r--src/input/frontend/qinputsettings_p.h69
4 files changed, 224 insertions, 2 deletions
diff --git a/src/input/frontend/frontend.pri b/src/input/frontend/frontend.pri
index 4c9a016d7..f4ad5e6de 100644
--- a/src/input/frontend/frontend.pri
+++ b/src/input/frontend/frontend.pri
@@ -30,7 +30,9 @@ HEADERS += \
$$PWD/qabstractaggregateactioninput.h \
$$PWD/qinputchord.h \
$$PWD/qinputsequence.h \
- $$PWD/qabstractaggregateactioninput_p.h
+ $$PWD/qabstractaggregateactioninput_p.h \
+ $$PWD/qinputsettings.h \
+ $$PWD/qinputsettings_p.h
SOURCES += \
$$PWD/qinputaspect.cpp \
@@ -55,6 +57,7 @@ SOURCES += \
$$PWD/qabstractactioninput.cpp \
$$PWD/qabstractaggregateactioninput.cpp \
$$PWD/qinputchord.cpp \
- $$PWD/qinputsequence.cpp
+ $$PWD/qinputsequence.cpp \
+ $$PWD/qinputsettings.cpp
INCLUDEPATH += $$PWD
diff --git a/src/input/frontend/qinputsettings.cpp b/src/input/frontend/qinputsettings.cpp
new file mode 100644
index 000000000..99c52f481
--- /dev/null
+++ b/src/input/frontend/qinputsettings.cpp
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** 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 "qinputsettings.h"
+#include "qinputsettings_p.h"
+
+QT_BEGIN_NAMESPACE
+
+namespace Qt3DInput {
+
+QInputSettingsPrivate::QInputSettingsPrivate()
+ : Qt3DCore::QComponentPrivate()
+ , m_eventSource(Q_NULLPTR)
+{
+}
+
+QInputSettings::QInputSettings(Qt3DCore::QNode *parent)
+ : Qt3DCore::QComponent(*new QInputSettingsPrivate(), parent)
+{
+}
+
+QInputSettings::~QInputSettings()
+{
+ QComponent::cleanup();
+}
+
+QObject *QInputSettings::eventSource() const
+{
+ Q_D(const QInputSettings);
+ return d->m_eventSource;
+}
+
+void QInputSettings::setEventSource(QObject *eventSource)
+{
+ Q_D(QInputSettings);
+ if (d->m_eventSource != eventSource) {
+ d->m_eventSource = eventSource;
+ emit eventSourceChanged(eventSource);
+ }
+}
+
+} // Qt3DInput
+
+
+QT_END_NAMESPACE
diff --git a/src/input/frontend/qinputsettings.h b/src/input/frontend/qinputsettings.h
new file mode 100644
index 000000000..b732d8031
--- /dev/null
+++ b/src/input/frontend/qinputsettings.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** 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_QINPUTSETTINGS_H
+#define QT3DINPUT_QINPUTSETTINGS_H
+
+#include <Qt3DCore/qcomponent.h>
+
+QT_BEGIN_NAMESPACE
+
+namespace Qt3DInput {
+
+class QInputSettingsPrivate;
+
+class QInputSettings : public Qt3DCore::QComponent
+{
+ Q_OBJECT
+ Q_PROPERTY(QObject *eventSource READ eventSource WRITE setEventSource NOTIFY eventSourceChanged)
+public:
+ explicit QInputSettings(Qt3DCore::QNode *parent = Q_NULLPTR);
+ ~QInputSettings();
+
+ QObject *eventSource() const;
+
+public Q_SLOTS:
+ void setEventSource(QObject *eventSource);
+
+Q_SIGNALS:
+ void eventSourceChanged(QObject *);
+
+private:
+ Q_DECLARE_PRIVATE(QInputSettings)
+};
+
+} // Qt3DInput
+
+QT_END_NAMESPACE
+
+#endif // QINPUTSETTINGS_H
diff --git a/src/input/frontend/qinputsettings_p.h b/src/input/frontend/qinputsettings_p.h
new file mode 100644
index 000000000..17989276b
--- /dev/null
+++ b/src/input/frontend/qinputsettings_p.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** 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_QINPUTSETTINGS_P_H
+#define QT3DINPUT_QINPUTSETTINGS_P_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 <Qt3DCore/private/qcomponent_p.h>
+
+QT_BEGIN_NAMESPACE
+
+namespace Qt3DInput {
+
+class QInputSettingsPrivate : public Qt3DCore::QComponentPrivate
+{
+public:
+ QInputSettingsPrivate();
+
+ QObject *m_eventSource;
+};
+
+} // Qt3DInput
+
+QT_END_NAMESPACE
+
+#endif // QT3DINPUT_QINPUTSETTINGS_P_H