From 7a208d76ed96bb506899becfe680df06f95451c7 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Wed, 2 Mar 2016 23:14:11 -0800
Subject: Fix build in C++98 mode: enums aren't namespaces
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/input/frontend/qmouseevent.cpp        |  8 ++++----
 src/render/backend/trianglesextractor.cpp |  2 +-
 src/render/picking/qobjectpicker.cpp      | 12 ++++++------
 src/render/renderstates/qpointsize.cpp    |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/input/frontend/qmouseevent.cpp b/src/input/frontend/qmouseevent.cpp
index 6b62ea908..1a78cda27 100644
--- a/src/input/frontend/qmouseevent.cpp
+++ b/src/input/frontend/qmouseevent.cpp
@@ -129,13 +129,13 @@ QMouseEvent::~QMouseEvent()
 QMouseEvent::Buttons QMouseEvent::button() const
 {
     switch (m_event.button()) {
-    case Qt::MouseButton::LeftButton:
+    case Qt::LeftButton:
         return QMouseEvent::LeftButton;
-    case Qt::MouseButton::RightButton:
+    case Qt::RightButton:
         return QMouseEvent::RightButton;
-    case Qt::MouseButton::MiddleButton:
+    case Qt::MiddleButton:
         return QMouseEvent::MiddleButton;
-    case Qt::MouseButton::BackButton:
+    case Qt::BackButton:
         return QMouseEvent::BackButton;
     default:
         return QMouseEvent::NoButton;
diff --git a/src/render/backend/trianglesextractor.cpp b/src/render/backend/trianglesextractor.cpp
index 85eba29df..6d4643fd6 100644
--- a/src/render/backend/trianglesextractor.cpp
+++ b/src/render/backend/trianglesextractor.cpp
@@ -70,7 +70,7 @@ bool isTriangleBased(Qt3DRender::QGeometryRenderer::PrimitiveType type) Q_DECL_N
 struct BufferInfo
 {
     BufferInfo()
-        : type(QAttribute::DataType::Float)
+        : type(QAttribute::Float)
         , dataSize(0)
         , count(0)
         , byteStride(0)
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);
     }
 }
 
diff --git a/src/render/renderstates/qpointsize.cpp b/src/render/renderstates/qpointsize.cpp
index 69bb8c8e6..c9a3c1607 100644
--- a/src/render/renderstates/qpointsize.cpp
+++ b/src/render/renderstates/qpointsize.cpp
@@ -67,7 +67,7 @@ public:
  */
 
 QPointSize::QPointSize(Qt3DCore::QNode *parent)
-    : QRenderState(*new QPointSizePrivate(Specification::Programmable, 0.f), parent)
+    : QRenderState(*new QPointSizePrivate(Programmable, 0.f), parent)
 {
 }
 
@@ -90,7 +90,7 @@ float QPointSize::value() const
 
 bool QPointSize::isProgrammable() const
 {
-    return (specification() == QPointSize::Specification::Programmable);
+    return (specification() == QPointSize::Programmable);
 }
 
 void QPointSize::setSpecification(Specification spec)
-- 
cgit v1.2.1