summaryrefslogtreecommitdiff
path: root/src/render/picking
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2016-03-02 23:14:11 -0800
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2016-03-03 16:01:34 +0000
commit7a208d76ed96bb506899becfe680df06f95451c7 (patch)
treee32ae9e0caa4a5a3e374219b94c0f464f0038823 /src/render/picking
parent35b0520dc2ccdd1cdfc46f9f1d8d24889e0a3a1d (diff)
downloadqt3d-7a208d76ed96bb506899becfe680df06f95451c7.tar.gz
Fix build in C++98 mode: enums aren't namespacesv5.6.05.6.0
trianglesextractor.cpp:73:28: error: ‘Qt3DRender::QAttribute::DataType’ is not a class or namespace Change-Id: Ic747cc2ab45e4dc6bb70ffff14384407a2997a70 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/render/picking')
-rw-r--r--src/render/picking/qobjectpicker.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/render/picking/qobjectpicker.cpp b/src/render/picking/qobjectpicker.cpp
index 96b3bb9f6..87dfd50f3 100644
--- a/src/render/picking/qobjectpicker.cpp
+++ b/src/render/picking/qobjectpicker.cpp
@@ -230,13 +230,13 @@ void QObjectPickerPrivate::propagateEvent(QPickEvent *event, EventType type)
if ((objectPicker = qobject_cast<Qt3DRender::QObjectPicker *>(c)) != Q_NULLPTR) {
QObjectPickerPrivate *objectPickerPrivate = static_cast<QObjectPickerPrivate *>(QObjectPickerPrivate::get(objectPicker));
switch (type) {
- case EventType::Pressed:
+ case Pressed:
objectPickerPrivate->pressedEvent(event);
break;
- case EventType::Released:
+ case Released:
objectPickerPrivate->releasedEvent(event);
break;
- case EventType::Clicked:
+ case Clicked:
objectPickerPrivate->clickedEvent(event);
break;
}
@@ -259,7 +259,7 @@ void QObjectPickerPrivate::pressedEvent(QPickEvent *event)
m_acceptedLastPressedEvent = event->isAccepted();
if (!m_acceptedLastPressedEvent) {
// Travel parents to transmit the event
- propagateEvent(event, EventType::Pressed);
+ propagateEvent(event, Pressed);
} else {
q->setPressed(true);
}
@@ -273,7 +273,7 @@ void QObjectPickerPrivate::clickedEvent(QPickEvent *event)
Q_Q(QObjectPicker);
emit q->clicked(event);
if (!event->isAccepted())
- propagateEvent(event, EventType::Clicked);
+ propagateEvent(event, Clicked);
}
/*!
@@ -287,7 +287,7 @@ void QObjectPickerPrivate::releasedEvent(QPickEvent *event)
q->setPressed(false);
} else {
event->setAccepted(false);
- propagateEvent(event, EventType::Released);
+ propagateEvent(event, Released);
}
}