From 9f19981d2a237cdc4d2c9c3a1b2418a472c7b841 Mon Sep 17 00:00:00 2001
From: Julien Brianceau <jbriance@cisco.com>
Date: Wed, 22 Jul 2015 12:33:58 +0200
Subject: [PATCH] Remove scoped enums to fix builds without C++11 support.
Change-Id: Ibe1811ee0b7057d082a55c4ae62e5932f7e10b84
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
---
src/compositor/compositor_api/qwaylandsurface.cpp | 2 +-
src/compositor/compositor_api/qwaylandsurfaceinterface.cpp | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp
index d1bcb6efb..a8dc41fd5 100644
--- a/src/compositor/compositor_api/qwaylandsurface.cpp
+++ b/src/compositor/compositor_api/qwaylandsurface.cpp
@@ -71,7 +71,7 @@ QWaylandSurfacePrivate::QWaylandSurfacePrivate(wl_client *wlClient, quint32 id,
, closing(false)
, refCount(1)
, client(QWaylandClient::fromWlClient(wlClient))
- , windowType(QWaylandSurface::WindowType::None)
+ , windowType(QWaylandSurface::None)
{}
diff --git a/src/compositor/compositor_api/qwaylandsurfaceinterface.cpp b/src/compositor/compositor_api/qwaylandsurfaceinterface.cpp
index 355777377..cddd231dd 100644
--- a/src/compositor/compositor_api/qwaylandsurfaceinterface.cpp
+++ b/src/compositor/compositor_api/qwaylandsurfaceinterface.cpp
@@ -110,7 +110,7 @@ int QWaylandSurfaceOp::type() const
QWaylandSurfaceSetVisibilityOp::QWaylandSurfaceSetVisibilityOp(QWindow::Visibility visibility)
- : QWaylandSurfaceOp(Type::SetVisibility)
+ : QWaylandSurfaceOp(QWaylandSurfaceOp::SetVisibility)
, m_visibility(visibility)
{
}
@@ -121,7 +121,7 @@ QWindow::Visibility QWaylandSurfaceSetVisibilityOp::visibility() const
}
QWaylandSurfaceResizeOp::QWaylandSurfaceResizeOp(const QSize &size)
- : QWaylandSurfaceOp(Type::Resize)
+ : QWaylandSurfaceOp(QWaylandSurfaceOp::Resize)
, m_size(size)
{
}
@@ -132,7 +132,7 @@ QSize QWaylandSurfaceResizeOp::size() const
}
QWaylandSurfacePingOp::QWaylandSurfacePingOp(uint32_t serial)
- : QWaylandSurfaceOp(Type::Ping)
+ : QWaylandSurfaceOp(QWaylandSurfaceOp::Ping)
, m_serial(serial)
{
}
--
GitLab