Added parameters to signals and made setters Q_SLOTS

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

14 files changed, 46 insertions, 39 deletions

diff --git a/src/input/frontend/qaction.cpp b/src/input/frontend/qaction.cpp
index 7de29d503..dcb26e8c5 100644
--- a/src/input/frontend/qaction.cpp
+++ b/src/input/frontend/qaction.cpp
@@ -69,7 +69,7 @@ void QAction::setName(const QString &name)
     Q_D(QAction);
     if (d->m_name != name) {
         d->m_name = name;
-        emit nameChanged();
+        emit nameChanged(name);
     }
 }
 
diff --git a/src/input/frontend/qaction.h b/src/input/frontend/qaction.h
index fb9103f47..80c0a264d 100644
--- a/src/input/frontend/qaction.h
+++ b/src/input/frontend/qaction.h
@@ -55,15 +55,17 @@ public:
     explicit QAction(Qt3DCore::QNode *parent = Q_NULLPTR);
     ~QAction();
 
-    void setName(const QString &name);
     QString name() const;
 
     void addInput(QActionInput *input);
     void removeInput(QActionInput *input);
     QVector<QActionInput *> inputs() const;
 
+public Q_SLOTS:
+    void setName(const QString &name);
+
 Q_SIGNALS:
-    void nameChanged();
+    void nameChanged(const QString &name);
 
     void started(const QString &name);
     void finished(const QString &name);
diff --git a/src/input/frontend/qactioninput.cpp b/src/input/frontend/qactioninput.cpp
index dd0773dc8..252e858a4 100644
--- a/src/input/frontend/qactioninput.cpp
+++ b/src/input/frontend/qactioninput.cpp
@@ -80,7 +80,7 @@ void QActionInput::setSourceDevice(QAbstractPhysicalDevice *sourceDevice)
             sourceDevice->setParent(this);
 
         d->m_sourceDevice = sourceDevice;
-        emit sourceDeviceChanged();
+        emit sourceDeviceChanged(sourceDevice);
     }
 }
 
@@ -95,7 +95,7 @@ void QActionInput::setKeys(const QVariantList &keys)
     Q_D(QActionInput);
     if (d->m_keys != keys) {
         d->m_keys = keys;
-        emit keysChanged();
+        emit keysChanged(keys);
     }
 }
 
diff --git a/src/input/frontend/qactioninput.h b/src/input/frontend/qactioninput.h
index 37e9c7957..1b895832d 100644
--- a/src/input/frontend/qactioninput.h
+++ b/src/input/frontend/qactioninput.h
@@ -57,15 +57,16 @@ public:
     explicit QActionInput(Qt3DCore::QNode *parent = Q_NULLPTR);
     ~QActionInput();
 
-    void setSourceDevice(QAbstractPhysicalDevice *sourceDevice);
     QAbstractPhysicalDevice *sourceDevice() const;
+    QVariantList keys() const;
 
+public Q_SLOTS:
+    void setSourceDevice(QAbstractPhysicalDevice *sourceDevice);
     void setKeys(const QVariantList &keys);
-    QVariantList keys() const;
 
 Q_SIGNALS:
-    void sourceDeviceChanged();
-    void keysChanged();
+    void sourceDeviceChanged(QAbstractPhysicalDevice *sourceDevice);
+    void keysChanged(const QVariantList &keys);
 
 protected:
     void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
diff --git a/src/input/frontend/qaxis.cpp b/src/input/frontend/qaxis.cpp
index f443df50e..c2eb4e32b 100644
--- a/src/input/frontend/qaxis.cpp
+++ b/src/input/frontend/qaxis.cpp
@@ -68,7 +68,7 @@ void QAxis::setName(const QString &name)
     Q_D(QAxis);
     if (d->m_name != name) {
         d->m_name = name;
-        emit nameChanged();
+        emit nameChanged(name);
     }
 }
 
diff --git a/src/input/frontend/qaxis.h b/src/input/frontend/qaxis.h
index ca6594e6e..b326d5ee6 100644
--- a/src/input/frontend/qaxis.h
+++ b/src/input/frontend/qaxis.h
@@ -54,15 +54,17 @@ public:
     explicit QAxis(Qt3DCore::QNode *parent = Q_NULLPTR);
     ~QAxis();
 
-    void setName(const QString &name);
     QString name() const;
 
     void addInput(QAxisInput *input);
     void removeInput(QAxisInput *input);
     QVector<QAxisInput *> inputs() const;
 
+public Q_SLOTS:
+    void setName(const QString &name);
+
 Q_SIGNALS:
-    void nameChanged();
+    void nameChanged(const QString &name);
 
 protected:
     void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
diff --git a/src/input/frontend/qaxisinput.cpp b/src/input/frontend/qaxisinput.cpp
index 35f16beb0..efad7d095 100644
--- a/src/input/frontend/qaxisinput.cpp
+++ b/src/input/frontend/qaxisinput.cpp
@@ -78,7 +78,7 @@ void QAxisInput::setSourceDevice(QAbstractPhysicalDevice *sourceDevice)
             sourceDevice->setParent(this);
 
         d->m_sourceDevice = sourceDevice;
-        emit sourceDeviceChanged();
+        emit sourceDeviceChanged(sourceDevice);
     }
 }
 
@@ -93,7 +93,7 @@ void QAxisInput::setScale(float scale)
     Q_D(QAxisInput);
     if (d->m_scale != scale) {
         d->m_scale = scale;
-        emit scaleChanged();
+        emit scaleChanged(scale);
     }
 }
 
@@ -108,7 +108,7 @@ void QAxisInput::setAxis(int axis)
     Q_D(QAxisInput);
     if (d->m_axis != axis) {
         d->m_axis = axis;
-        emit axisChanged();
+        emit axisChanged(axis);
     }
 }
 
@@ -123,7 +123,7 @@ void QAxisInput::setKeys(const QVariantList &keys)
     Q_D(QAxisInput);
     if (keys != d->m_keys) {
         d->m_keys = keys;
-        emit keysChanged();
+        emit keysChanged(keys);
     }
 }
 
diff --git a/src/input/frontend/qaxisinput.h b/src/input/frontend/qaxisinput.h
index b28e85a3a..9ba3f8ef1 100644
--- a/src/input/frontend/qaxisinput.h
+++ b/src/input/frontend/qaxisinput.h
@@ -60,23 +60,22 @@ public:
     explicit QAxisInput(Qt3DCore::QNode *parent = Q_NULLPTR);
     ~QAxisInput();
 
-    void setSourceDevice(QAbstractPhysicalDevice *sourceDevice);
     QAbstractPhysicalDevice *sourceDevice() const;
-
-    void setScale(float scale);
     float scale() const;
-
-    void setAxis(int axis);
     int axis() const;
+    QVariantList keys() const;
 
+public Q_SLOTS:
+    void setSourceDevice(QAbstractPhysicalDevice *sourceDevice);
+    void setScale(float scale);
+    void setAxis(int axis);
     void setKeys(const QVariantList &keys);
-    QVariantList keys() const;
 
 Q_SIGNALS:
-    void sourceDeviceChanged();
-    void scaleChanged();
-    void axisChanged();
-    void keysChanged();
+    void sourceDeviceChanged(QAbstractPhysicalDevice *sourceDevice);
+    void scaleChanged(float scale);
+    void axisChanged(int axis);
+    void keysChanged(const QVariantList &keys);
 
 protected:
     void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
diff --git a/src/input/frontend/qkeyboardcontroller.cpp b/src/input/frontend/qkeyboardcontroller.cpp
index a49a2a307..77b54c7fa 100644
--- a/src/input/frontend/qkeyboardcontroller.cpp
+++ b/src/input/frontend/qkeyboardcontroller.cpp
@@ -291,7 +291,7 @@ void QKeyboardController::setActiveInput(QKeyboardInput *activeInput)
     Q_D(QKeyboardController);
     if (d->m_activeInput != activeInput) {
         d->m_activeInput = activeInput;
-        emit activeInputChanged();
+        emit activeInputChanged(activeInput);
     }
 }
 
diff --git a/src/input/frontend/qkeyboardcontroller.h b/src/input/frontend/qkeyboardcontroller.h
index a96b56bfa..aafbd3e57 100644
--- a/src/input/frontend/qkeyboardcontroller.h
+++ b/src/input/frontend/qkeyboardcontroller.h
@@ -70,7 +70,7 @@ protected:
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
 
 Q_SIGNALS:
-    void activeInputChanged();
+    void activeInputChanged(QKeyboardInput *activeInput);
 
 private:
     Q_DECLARE_PRIVATE(QKeyboardController)
diff --git a/src/input/frontend/qkeyboardinput.cpp b/src/input/frontend/qkeyboardinput.cpp
index a36f306ea..1d055410c 100644
--- a/src/input/frontend/qkeyboardinput.cpp
+++ b/src/input/frontend/qkeyboardinput.cpp
@@ -206,7 +206,7 @@ void QKeyboardInput::setController(QKeyboardController *controller)
             controller->setParent(this);
 
         d->m_controller = controller;
-        emit controllerChanged();
+        emit controllerChanged(controller);
     }
 }
 
@@ -241,7 +241,7 @@ void QKeyboardInput::setFocus(bool focus)
     Q_D(QKeyboardInput);
     if (d->m_focus != focus) {
         d->m_focus = focus;
-        emit focusChanged();
+        emit focusChanged(focus);
     }
 }
 
diff --git a/src/input/frontend/qkeyboardinput.h b/src/input/frontend/qkeyboardinput.h
index 592361a4a..49e6af087 100644
--- a/src/input/frontend/qkeyboardinput.h
+++ b/src/input/frontend/qkeyboardinput.h
@@ -57,14 +57,16 @@ public:
     explicit QKeyboardInput(QNode *parent = 0);
     ~QKeyboardInput();
 
-    void setController(QKeyboardController *controller);
     QKeyboardController *controller() const;
     bool focus() const;
+
+public Q_SLOTS:
+    void setController(QKeyboardController *controller);
     void setFocus(bool focus);
 
 Q_SIGNALS:
-    void controllerChanged();
-    void focusChanged();
+    void controllerChanged(QKeyboardController *controller);
+    void focusChanged(bool focus);
 
     void digit0Pressed(Qt3DInput::Q3DKeyEvent *event);
     void digit1Pressed(Qt3DInput::Q3DKeyEvent *event);
diff --git a/src/input/frontend/qmouseinput.cpp b/src/input/frontend/qmouseinput.cpp
index 3fbafda47..235c06538 100644
--- a/src/input/frontend/qmouseinput.cpp
+++ b/src/input/frontend/qmouseinput.cpp
@@ -101,7 +101,7 @@ void QMouseInput::setController(QMouseController *controller)
     Q_D(QMouseInput);
     if (d->m_controller != controller) {
         d->m_controller = controller;
-        emit controllerChanged();
+        emit controllerChanged(controller);
     }
 }
 
@@ -186,7 +186,7 @@ void QMouseInput::setContainsMouse(bool contains)
     Q_D(QMouseInput);
     if (contains != d->m_containsMouse) {
         d->m_containsMouse = contains;
-        emit containsMouseChanged();
+        emit containsMouseChanged(contains);
     }
 }
 
diff --git a/src/input/frontend/qmouseinput.h b/src/input/frontend/qmouseinput.h
index 5eca4dd4f..c31576a84 100644
--- a/src/input/frontend/qmouseinput.h
+++ b/src/input/frontend/qmouseinput.h
@@ -58,14 +58,15 @@ public:
     explicit QMouseInput(QNode *parent = 0);
     ~QMouseInput();
 
-    void setController(QMouseController *controller);
     QMouseController *controller() const;
-
     bool containsMouse() const;
 
+public Q_SLOTS:
+    void setController(QMouseController *controller);
+
 Q_SIGNALS:
-    void controllerChanged();
-    void containsMouseChanged();
+    void controllerChanged(QMouseController *controller);
+    void containsMouseChanged(bool containsMouse);
 
     void clicked(Qt3DInput::Q3DMouseEvent *mouse);
     void doubleClicked(Qt3DInput::Q3DMouseEvent *mouse);