diff options
author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-07 14:25:30 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:10:33 +0200 |
commit | bc331abe8e8ffaa3db12be7ae69e7b658dd700ac (patch) | |
tree | 5e8aeaba53f8967b4962dcbf05077b9bfed7fa06 /src/compositor/wayland_wrapper/qwlsurface.cpp | |
parent | 35d27a6761bb375ca8457c8be11dcd57eb9de554 (diff) |
Remove the Surface role functionality
This replaced by the QWaylandExtension and QWaylandExtensionContainers
Change-Id: Iba0299725542ede618b636fb2d40715acfcb3b51
Diffstat (limited to 'src/compositor/wayland_wrapper/qwlsurface.cpp')
-rw-r--r-- | src/compositor/wayland_wrapper/qwlsurface.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/compositor/wayland_wrapper/qwlsurface.cpp b/src/compositor/wayland_wrapper/qwlsurface.cpp index 961163b88..45194f13a 100644 --- a/src/compositor/wayland_wrapper/qwlsurface.cpp +++ b/src/compositor/wayland_wrapper/qwlsurface.cpp @@ -123,8 +123,6 @@ Surface::Surface(struct wl_client *client, uint32_t id, int version, QWaylandCom , m_destroyed(false) , m_contentOrientation(Qt::PrimaryOrientation) , m_visibility(QWindow::Hidden) - , m_role(0) - , m_roleHandler(0) { m_pending.buffer = 0; m_pending.newlyAttached = false; @@ -146,17 +144,6 @@ Surface::~Surface() c->destroy(); } -bool Surface::setRole(const SurfaceRole *role, wl_resource *errorResource, uint32_t errorCode) -{ - if (m_role && m_role != role) { - wl_resource_post_error(errorResource, errorCode, "Cannot assign role %s to wl_surface@%d, already has role %s\n", role->name, - wl_resource_get_id(resource()->handle), m_role->name); - return false; - } - m_role = role; - return true; -} - Surface *Surface::fromResource(struct ::wl_resource *resource) { return static_cast<Surface *>(Resource::fromResource(resource)->surface_object); |