summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Brianceau <jbriance@cisco.com>2015-07-22 12:33:58 +0200
committerJulien Brianceau <jbriance@cisco.com>2015-10-01 09:10:48 +0000
commit9d408649458a274864ae2e7c2d67b4fa3cabbfcd (patch)
treec2ea738908737da9096b9b5de40cc2f98d38f97a
parent5dd83e3e1af568d75318af4ae11783a8e9f2ccea (diff)
Remove scoped enums to fix builds without C++11 support.5.5
Change-Id: I4f83fdb59a60bb1f1720047f0b442d70192be5da Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
-rw-r--r--src/compositor/compositor_api/qwaylandsurface.cpp2
-rw-r--r--src/compositor/compositor_api/qwaylandsurfaceinterface.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp
index e5ecb15b..bae6468c 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 35577737..cddd231d 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)
{
}