summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKevin Ottens <kevin.ottens@kdab.com>2015-12-16 10:39:46 +0100
committerKevin Ottens <kevin.ottens@kdab.com>2015-12-17 00:06:36 +0000
commit919d42a776ceeb741e97a87fead5197c45af422a (patch)
tree1559a7646aea4c09e1cf18a0532a596f5d55e86f /src
parent53c7a19c739478fc8da8ecf17c5a50292dde0b1b (diff)
Add missing pimpl to QInputeDeviceIntegration
Change-Id: I87cc1525adf0dc0665affe3797f3be79ae1294b5 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/input/frontend/frontend.pri1
-rw-r--r--src/input/frontend/qinputdeviceintegration.cpp12
-rw-r--r--src/input/frontend/qinputdeviceintegration.h8
-rw-r--r--src/input/frontend/qinputdeviceintegration_p.h72
4 files changed, 91 insertions, 2 deletions
diff --git a/src/input/frontend/frontend.pri b/src/input/frontend/frontend.pri
index bc28d3d6e..9d90c567f 100644
--- a/src/input/frontend/frontend.pri
+++ b/src/input/frontend/frontend.pri
@@ -18,6 +18,7 @@ HEADERS += \
$$PWD/qaxis.h \
$$PWD/qlogicaldevice.h \
$$PWD/qinputdeviceintegration.h \
+ $$PWD/qinputdeviceintegration_p.h \
$$PWD/qabstractphysicaldevice.h \
$$PWD/qinputdeviceintegrationfactory_p.h \
$$PWD/qaxissetting.h \
diff --git a/src/input/frontend/qinputdeviceintegration.cpp b/src/input/frontend/qinputdeviceintegration.cpp
index 6277a4b56..67f541ac8 100644
--- a/src/input/frontend/qinputdeviceintegration.cpp
+++ b/src/input/frontend/qinputdeviceintegration.cpp
@@ -35,15 +35,25 @@
****************************************************************************/
#include "qinputdeviceintegration.h"
+#include "qinputdeviceintegration_p.h"
QT_BEGIN_NAMESPACE
namespace Qt3DInput {
+QInputDeviceIntegrationPrivate::QInputDeviceIntegrationPrivate()
+ : QObjectPrivate()
+{
+}
+
QInputDeviceIntegration::QInputDeviceIntegration(QObject *parent)
- : QObject(parent)
+ : QObject(*new QInputDeviceIntegrationPrivate, parent)
{
+}
+QInputDeviceIntegration::QInputDeviceIntegration(QInputDeviceIntegrationPrivate &dd, QObject *parent)
+ : QObject(dd, parent)
+{
}
} // namespace Qt3DInput
diff --git a/src/input/frontend/qinputdeviceintegration.h b/src/input/frontend/qinputdeviceintegration.h
index 8d76b66de..0bb297ddc 100644
--- a/src/input/frontend/qinputdeviceintegration.h
+++ b/src/input/frontend/qinputdeviceintegration.h
@@ -50,19 +50,25 @@ namespace Qt3DInput {
class QInputAspect;
class QAbstractPhysicalDevice;
+class QInputDeviceIntegrationPrivate;
class QT3DINPUTSHARED_EXPORT QInputDeviceIntegration : public QObject
{
Q_OBJECT
-public:
+protected:
explicit QInputDeviceIntegration(QObject *parent = 0);
+ explicit QInputDeviceIntegration(QInputDeviceIntegrationPrivate &dd, QObject *parent = 0);
+public:
virtual void initialize(Qt3DInput::QInputAspect *aspect) = 0;
virtual QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) = 0;
virtual QAbstractPhysicalDevice *createPhysicalDevice(const QString &name) = 0;
virtual QVector<Qt3DCore::QNodeId> physicalDevices() const = 0;
virtual QAbstractPhysicalDeviceBackendNode *physicalDevice(Qt3DCore::QNodeId id) const = 0;
+
+private:
+ Q_DECLARE_PRIVATE(QInputDeviceIntegration)
};
} // namespace Qt3DInput
diff --git a/src/input/frontend/qinputdeviceintegration_p.h b/src/input/frontend/qinputdeviceintegration_p.h
new file mode 100644
index 000000000..27c63be17
--- /dev/null
+++ b/src/input/frontend/qinputdeviceintegration_p.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 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_QINPUTDEVICEINTEGRATION_P_H
+#define QT3DINPUT_QINPUTDEVICEINTEGRATION_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 <private/qobject_p.h>
+#include <private/qt3dinput_global_p.h>
+
+QT_BEGIN_NAMESPACE
+
+namespace Qt3DInput {
+
+class QInputDeviceIntegration;
+
+class QT3DINPUTSHARED_PRIVATE_EXPORT QInputDeviceIntegrationPrivate : public QObjectPrivate
+{
+public:
+ QInputDeviceIntegrationPrivate();
+
+ Q_DECLARE_PUBLIC(QInputDeviceIntegration)
+};
+
+} // Qt3DInput
+
+QT_END_NAMESPACE
+
+#endif // QT3DINPUT_QINPUTDEVICEINTEGRATION_P_H