summaryrefslogtreecommitdiffstats
path: root/src/render/picking
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@theqtcompany.com>2015-12-08 11:50:37 +0200
committerTomi Korpipää <tomi.korpipaa@theqtcompany.com>2015-12-09 05:18:19 +0000
commit0e15154c9f0d982096a551efc53fd363d2b2f68d (patch)
tree4917ca73c44a92297db7cc3dbd72d2716481ccc7 /src/render/picking
parent036ea9fcfdd343c805e1a900528e7a2367d6c373 (diff)
Added parameters to signals and made setters Q_SLOTS
Change-Id: Icec2f9f207221e35ffdeeb594bb9b4dc6ef890f1 Task-number: QTBUG-49797 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/picking')
-rw-r--r--src/render/picking/qobjectpicker.cpp6
-rw-r--r--src/render/picking/qobjectpicker.h10
-rw-r--r--src/render/picking/qpickevent.cpp2
-rw-r--r--src/render/picking/qpickevent.h4
4 files changed, 13 insertions, 9 deletions
diff --git a/src/render/picking/qobjectpicker.cpp b/src/render/picking/qobjectpicker.cpp
index 6213c6d0b..96b3bb9f6 100644
--- a/src/render/picking/qobjectpicker.cpp
+++ b/src/render/picking/qobjectpicker.cpp
@@ -128,7 +128,7 @@ void QObjectPicker::setHoverEnabled(bool hoverEnabled)
Q_D(QObjectPicker);
if (hoverEnabled != d->m_hoverEnabled) {
d->m_hoverEnabled = hoverEnabled;
- emit hoverEnabledChanged();
+ emit hoverEnabledChanged(hoverEnabled);
}
}
@@ -199,7 +199,7 @@ void QObjectPicker::setPressed(bool pressed)
if (d->m_pressed != pressed) {
const bool blocked = blockNotifications(true);
d->m_pressed = pressed;
- emit pressedChanged();
+ emit pressedChanged(pressed);
blockNotifications(blocked);
}
}
@@ -210,7 +210,7 @@ void QObjectPicker::setContainsMouse(bool containsMouse)
if (d->m_containsMouse != containsMouse) {
const bool blocked = blockNotifications(true);
d->m_containsMouse = containsMouse;
- emit containsMouseChanged();
+ emit containsMouseChanged(containsMouse);
blockNotifications(blocked);
}
}
diff --git a/src/render/picking/qobjectpicker.h b/src/render/picking/qobjectpicker.h
index 81126796f..b64fb2694 100644
--- a/src/render/picking/qobjectpicker.h
+++ b/src/render/picking/qobjectpicker.h
@@ -59,21 +59,23 @@ public:
explicit QObjectPicker(QNode *parent = Q_NULLPTR);
~QObjectPicker();
- void setHoverEnabled(bool hoverEnabled);
bool hoverEnabled() const;
bool containsMouse() const;
bool isPressed() const;
+public Q_SLOTS:
+ void setHoverEnabled(bool hoverEnabled);
+
Q_SIGNALS:
void pressed(Qt3DRender::QPickEvent *event);
void released(Qt3DRender::QPickEvent *event);
void clicked(Qt3DRender::QPickEvent *event);
void entered();
void exited();
- void hoverEnabledChanged();
- void pressedChanged();
- void containsMouseChanged();
+ void hoverEnabledChanged(bool hoverEnabled);
+ void pressedChanged(bool pressed);
+ void containsMouseChanged(bool containsMouse);
protected:
void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
diff --git a/src/render/picking/qpickevent.cpp b/src/render/picking/qpickevent.cpp
index b2f7179b1..e90bc24c0 100644
--- a/src/render/picking/qpickevent.cpp
+++ b/src/render/picking/qpickevent.cpp
@@ -73,7 +73,7 @@ void QPickEvent::setAccepted(bool accepted)
Q_D(QPickEvent);
if (accepted != d->m_accepted) {
d->m_accepted = accepted;
- emit acceptedChanged();
+ emit acceptedChanged(accepted);
}
}
diff --git a/src/render/picking/qpickevent.h b/src/render/picking/qpickevent.h
index 5a9408516..793377ad8 100644
--- a/src/render/picking/qpickevent.h
+++ b/src/render/picking/qpickevent.h
@@ -55,10 +55,12 @@ public:
~QPickEvent();
bool isAccepted() const;
+
+public Q_SLOTS:
void setAccepted(bool accepted);
Q_SIGNALS:
- void acceptedChanged();
+ void acceptedChanged(bool accepted);
private:
Q_DECLARE_PRIVATE(QPickEvent)