summaryrefslogtreecommitdiffstats
path: root/src/input
diff options
context:
space:
mode:
Diffstat (limited to 'src/input')
-rw-r--r--src/input/frontend/qabstractphysicaldevice.h4
-rw-r--r--src/input/frontend/qaxisactionhandler.h2
-rw-r--r--src/input/frontend/qinputaspect.h2
-rw-r--r--src/input/frontend/qinputdeviceintegration.h4
-rw-r--r--src/input/frontend/qkeyboardcontroller.h4
-rw-r--r--src/input/frontend/qkeyboardinput.h4
-rw-r--r--src/input/frontend/qmousecontroller.h4
-rw-r--r--src/input/frontend/qmouseinput.h4
8 files changed, 14 insertions, 14 deletions
diff --git a/src/input/frontend/qabstractphysicaldevice.h b/src/input/frontend/qabstractphysicaldevice.h
index 8056a195b..5565bbaeb 100644
--- a/src/input/frontend/qabstractphysicaldevice.h
+++ b/src/input/frontend/qabstractphysicaldevice.h
@@ -54,7 +54,7 @@ class QT3DINPUTSHARED_EXPORT QAbstractPhysicalDevice : public Qt3DCore::QNode
{
Q_OBJECT
public:
- explicit QAbstractPhysicalDevice(Qt3DCore::QNode *parent = 0);
+ explicit QAbstractPhysicalDevice(Qt3DCore::QNode *parent = Q_NULLPTR);
~QAbstractPhysicalDevice();
virtual int axisCount() const = 0;
@@ -70,7 +70,7 @@ public:
QVector<QAxisSetting *> axisSettings() const;
protected:
- QAbstractPhysicalDevice(QAbstractPhysicalDevicePrivate &dd, Qt3DCore::QNode *parent = 0);
+ QAbstractPhysicalDevice(QAbstractPhysicalDevicePrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR);
Q_DECLARE_PRIVATE(QAbstractPhysicalDevice)
void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
};
diff --git a/src/input/frontend/qaxisactionhandler.h b/src/input/frontend/qaxisactionhandler.h
index 388014f01..ed3c17884 100644
--- a/src/input/frontend/qaxisactionhandler.h
+++ b/src/input/frontend/qaxisactionhandler.h
@@ -70,7 +70,7 @@ Q_SIGNALS:
protected:
Q_DECLARE_PRIVATE(QAxisActionHandler)
- QAxisActionHandler(QAxisActionHandlerPrivate &dd, Qt3DCore::QNode *parent = 0);
+ QAxisActionHandler(QAxisActionHandlerPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR);
void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
diff --git a/src/input/frontend/qinputaspect.h b/src/input/frontend/qinputaspect.h
index 7a5b298af..4d81a2a51 100644
--- a/src/input/frontend/qinputaspect.h
+++ b/src/input/frontend/qinputaspect.h
@@ -57,7 +57,7 @@ class QT3DINPUTSHARED_EXPORT QInputAspect : public Qt3DCore::QAbstractAspect
Q_OBJECT
Q_PROPERTY(Qt3DCore::QCamera* camera READ camera WRITE setCamera)
public:
- explicit QInputAspect(QObject *parent = 0);
+ explicit QInputAspect(QObject *parent = Q_NULLPTR);
Qt3DCore::QCamera *camera() const;
QAbstractPhysicalDevice *createPhysicalDevice(const QString &name);
diff --git a/src/input/frontend/qinputdeviceintegration.h b/src/input/frontend/qinputdeviceintegration.h
index 2ea8ea1ae..4816f2989 100644
--- a/src/input/frontend/qinputdeviceintegration.h
+++ b/src/input/frontend/qinputdeviceintegration.h
@@ -62,8 +62,8 @@ class QT3DINPUTSHARED_EXPORT QInputDeviceIntegration : public QObject
{
Q_OBJECT
protected:
- explicit QInputDeviceIntegration(QObject *parent = 0);
- explicit QInputDeviceIntegration(QInputDeviceIntegrationPrivate &dd, QObject *parent = 0);
+ explicit QInputDeviceIntegration(QObject *parent = Q_NULLPTR);
+ explicit QInputDeviceIntegration(QInputDeviceIntegrationPrivate &dd, QObject *parent = Q_NULLPTR);
template<class Frontend>
void registerBackendType(const Qt3DCore::QBackendNodeFunctorPtr &functor)
diff --git a/src/input/frontend/qkeyboardcontroller.h b/src/input/frontend/qkeyboardcontroller.h
index e929629d9..da57604b4 100644
--- a/src/input/frontend/qkeyboardcontroller.h
+++ b/src/input/frontend/qkeyboardcontroller.h
@@ -53,7 +53,7 @@ class QT3DINPUTSHARED_EXPORT QKeyboardController : public Qt3DInput::QAbstractPh
Q_PROPERTY(Qt3DInput::QKeyboardInput *activeInput READ activeInput NOTIFY activeInputChanged)
public:
- explicit QKeyboardController(QNode *parent = 0);
+ explicit QKeyboardController(QNode *parent = Q_NULLPTR);
~QKeyboardController();
QKeyboardInput *activeInput() const;
@@ -66,7 +66,7 @@ public:
int buttonIdentifier(const QString &name) const Q_DECL_FINAL;
protected:
- QKeyboardController(QKeyboardControllerPrivate &dd, QNode *parent = 0);
+ QKeyboardController(QKeyboardControllerPrivate &dd, QNode *parent = Q_NULLPTR);
void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
Q_SIGNALS:
diff --git a/src/input/frontend/qkeyboardinput.h b/src/input/frontend/qkeyboardinput.h
index b7bc1a97d..0640ffc45 100644
--- a/src/input/frontend/qkeyboardinput.h
+++ b/src/input/frontend/qkeyboardinput.h
@@ -54,7 +54,7 @@ class QT3DINPUTSHARED_EXPORT QKeyboardInput : public Qt3DCore::QComponent
Q_PROPERTY(Qt3DInput::QKeyboardController *controller READ controller WRITE setController NOTIFY controllerChanged)
Q_PROPERTY(bool focus READ focus WRITE setFocus NOTIFY focusChanged)
public:
- explicit QKeyboardInput(QNode *parent = 0);
+ explicit QKeyboardInput(QNode *parent = Q_NULLPTR);
~QKeyboardInput();
QKeyboardController *controller() const;
@@ -113,7 +113,7 @@ Q_SIGNALS:
void released(Qt3DInput::QKeyEvent *event);
protected:
- QKeyboardInput(QKeyboardInputPrivate &dd, QNode *parent = 0);
+ QKeyboardInput(QKeyboardInputPrivate &dd, QNode *parent = Q_NULLPTR);
void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
void keyEvent(QKeyEvent *event);
diff --git a/src/input/frontend/qmousecontroller.h b/src/input/frontend/qmousecontroller.h
index 3773c652c..0394522ea 100644
--- a/src/input/frontend/qmousecontroller.h
+++ b/src/input/frontend/qmousecontroller.h
@@ -52,7 +52,7 @@ class QT3DINPUTSHARED_EXPORT QMouseController : public Qt3DInput::QAbstractPhysi
Q_OBJECT
Q_PROPERTY(float sensitivity READ sensitivity WRITE setSensitivity NOTIFY sensitivityChanged)
public:
- explicit QMouseController(Qt3DCore::QNode *parent = 0);
+ explicit QMouseController(Qt3DCore::QNode *parent = Q_NULLPTR);
~QMouseController();
enum Axis {
@@ -84,7 +84,7 @@ Q_SIGNALS:
void sensitivityChanged(float value);
protected:
- QMouseController(QMouseControllerPrivate &dd, Qt3DCore::QNode *parent = 0);
+ QMouseController(QMouseControllerPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR);
void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
diff --git a/src/input/frontend/qmouseinput.h b/src/input/frontend/qmouseinput.h
index ec6176bfd..72183bd12 100644
--- a/src/input/frontend/qmouseinput.h
+++ b/src/input/frontend/qmouseinput.h
@@ -55,7 +55,7 @@ class QT3DINPUTSHARED_EXPORT QMouseInput : public Qt3DCore::QComponent
Q_PROPERTY(bool containsMouse READ containsMouse NOTIFY containsMouseChanged)
public:
- explicit QMouseInput(QNode *parent = 0);
+ explicit QMouseInput(QNode *parent = Q_NULLPTR);
~QMouseInput();
QMouseController *controller() const;
@@ -82,7 +82,7 @@ Q_SIGNALS:
void wheel(Qt3DInput::QWheelEvent *wheel);
protected:
- QMouseInput(QMouseInputPrivate &dd, Qt3DCore::QNode *parent = 0);
+ QMouseInput(QMouseInputPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR);
void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
void mouseEvent(Qt3DInput::QMouseEvent *event);