Stop using enum references that require C++11.

Use Qt::Foo instead of Qt::Enum::Foo, which is a C++11 extension. When
building with clang without -std=c++11, this results in warnings. With
older GCC versions, the code simply does not build.

This is similar to commit deffdaf9 ("GraphicsHelper: fix switch").

Change-Id: I28389b90bafb3df87187742ef55267ce2df1ba1a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

3 files changed, 29 insertions, 29 deletions

diff --git a/src/input/frontend/qmouseevent.cpp b/src/input/frontend/qmouseevent.cpp
index 41a12a08b..d94925f94 100644
--- a/src/input/frontend/qmouseevent.cpp
+++ b/src/input/frontend/qmouseevent.cpp
@@ -116,15 +116,15 @@ QMouseEvent::Buttons QMouseEvent::button() const
 {
     switch (m_event.button()) {
     case Qt::MouseButton::LeftButton:
-        return QMouseEvent::Buttons::LeftButton;
+        return QMouseEvent::LeftButton;
     case Qt::MouseButton::RightButton:
-        return QMouseEvent::Buttons::RightButton;
+        return QMouseEvent::RightButton;
     case Qt::MouseButton::MiddleButton:
-        return QMouseEvent::Buttons::MiddleButton;
+        return QMouseEvent::MiddleButton;
     case Qt::MouseButton::BackButton:
-        return QMouseEvent::Buttons::BackButton;
+        return QMouseEvent::BackButton;
     default:
-        return QMouseEvent::Buttons::NoButton;
+        return QMouseEvent::NoButton;
     }
 }
 
@@ -144,17 +144,17 @@ QMouseEvent::Modifiers QMouseEvent::modifier() const
 {
     switch (m_event.modifiers()) {
     case Qt::ShiftModifier:
-        return QMouseEvent::Modifiers::ShiftModifier;
+        return QMouseEvent::ShiftModifier;
     case Qt::ControlModifier:
-        return QMouseEvent::Modifiers::ControlModifier;
+        return QMouseEvent::ControlModifier;
     case Qt::AltModifier:
-        return QMouseEvent::Modifiers::AltModifier;
+        return QMouseEvent::AltModifier;
     case Qt::MetaModifier:
-        return QMouseEvent::Modifiers::MetaModifier;
+        return QMouseEvent::MetaModifier;
     case Qt::KeypadModifier:
-        return QMouseEvent::Modifiers::KeypadModifier;
+        return QMouseEvent::KeypadModifier;
     default:
-        return QMouseEvent::Modifiers::NoModifier;
+        return QMouseEvent::NoModifier;
     }
 }
 
@@ -244,17 +244,17 @@ QWheelEvent::Modifiers QWheelEvent::modifier() const
 {
     switch (m_event.modifiers()) {
     case Qt::ShiftModifier:
-        return QWheelEvent::Modifiers::ShiftModifier;
+        return QWheelEvent::ShiftModifier;
     case Qt::ControlModifier:
-        return QWheelEvent::Modifiers::ControlModifier;
+        return QWheelEvent::ControlModifier;
     case Qt::AltModifier:
-        return QWheelEvent::Modifiers::AltModifier;
+        return QWheelEvent::AltModifier;
     case Qt::MetaModifier:
-        return QWheelEvent::Modifiers::MetaModifier;
+        return QWheelEvent::MetaModifier;
     case Qt::KeypadModifier:
-        return QWheelEvent::Modifiers::KeypadModifier;
+        return QWheelEvent::KeypadModifier;
     default:
-        return QWheelEvent::Modifiers::NoModifier;
+        return QWheelEvent::NoModifier;
     }
 }
 
diff --git a/src/input/frontend/qmouseevent.h b/src/input/frontend/qmouseevent.h
index 109875d38..1b5f41798 100644
--- a/src/input/frontend/qmouseevent.h
+++ b/src/input/frontend/qmouseevent.h
@@ -59,11 +59,11 @@ class QT3DINPUTSHARED_EXPORT QMouseEvent : public QObject
 
 public:
     enum Buttons {
-        LeftButton = Qt::MouseButton::LeftButton,
-        RightButton = Qt::MouseButton::RightButton,
-        MiddleButton = Qt::MouseButton::MiddleButton,
-        BackButton = Qt::MouseButton::BackButton,
-        NoButton = Qt::MouseButton::NoButton
+        LeftButton = Qt::LeftButton,
+        RightButton = Qt::RightButton,
+        MiddleButton = Qt::MiddleButton,
+        BackButton = Qt::BackButton,
+        NoButton = Qt::NoButton
     };
     Q_ENUM(Buttons)
 
@@ -109,11 +109,11 @@ class QT3DINPUTSHARED_EXPORT QWheelEvent : public QObject
 
 public:
     enum Buttons {
-        LeftButton = Qt::MouseButton::LeftButton,
-        RightButton = Qt::MouseButton::RightButton,
-        MiddleButton = Qt::MouseButton::MiddleButton,
-        BackButton = Qt::MouseButton::BackButton,
-        NoButton = Qt::MouseButton::NoButton
+        LeftButton = Qt::LeftButton,
+        RightButton = Qt::RightButton,
+        MiddleButton = Qt::MiddleButton,
+        BackButton = Qt::BackButton,
+        NoButton = Qt::NoButton
     };
     Q_ENUM(Buttons)
 
diff --git a/src/quick3d/quick3d/items/quick3dentityloader.cpp b/src/quick3d/quick3d/items/quick3dentityloader.cpp
index f9a3ea7e4..6770fb2a6 100644
--- a/src/quick3d/quick3d/items/quick3dentityloader.cpp
+++ b/src/quick3d/quick3d/items/quick3dentityloader.cpp
@@ -62,7 +62,7 @@ protected:
         Quick3DEntityLoaderPrivate *priv = Quick3DEntityLoaderPrivate::get(m_loader);
 
         switch (status) {
-        case Status::Ready: {
+        case Ready: {
             Q_ASSERT(priv->m_entity == Q_NULLPTR);
             priv->m_entity = qobject_cast<QEntity *>(object());
             Q_ASSERT(priv->m_entity != Q_NULLPTR);
@@ -71,7 +71,7 @@ protected:
             break;
         }
 
-        case Status::Error: {
+        case Error: {
             QQmlEnginePrivate::warning(qmlEngine(m_loader), errors());
             priv->clear();
             emit m_loader->entityChanged();