diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2016-07-01 09:44:46 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2016-07-11 12:13:30 +0000 |
| commit | 48e241740974ca1b8ba7d654958c423ca9ec9e0e (patch) | |
| tree | baa3a2a0aac05ff3a8a8b54be8a22f1e7d943a80 /src/compositor/wayland_wrapper | |
| parent | 839f40ccf522bef3ed4b499899a23393a9a8a1aa (diff) | |
Compositor: Rename shm to sharedMemory
sharedMemory is much clearer and will increase the readability of the code and
API.
Change-Id: Ibb6d7424fa8d44a94a0f4ddf476a564eb235323f
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@hawaiios.org>
Diffstat (limited to 'src/compositor/wayland_wrapper')
| -rw-r--r-- | src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp | 8 | ||||
| -rw-r--r-- | src/compositor/wayland_wrapper/qwlsurfacebuffer_p.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp b/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp index c2441fae1..71ae6e212 100644 --- a/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp +++ b/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp @@ -44,7 +44,7 @@ #include <QtCore/QDebug> #include <wayland-server-protocol.h> -#include "qwaylandshmformathelper_p.h" +#include "qwaylandsharedmemoryformathelper_p.h" #include <QtWaylandCompositor/private/qwaylandcompositor_p.h> @@ -176,7 +176,7 @@ QSize SurfaceBuffer::size() const QWaylandSurface::Origin SurfaceBuffer::origin() const { - if (isShm()) { + if (isSharedMemory()) { return QWaylandSurface::OriginTopLeft; } @@ -201,7 +201,7 @@ QImage SurfaceBuffer::image() const QWaylandBufferRef::BufferFormatEgl SurfaceBuffer::bufferFormatEgl() const { - Q_ASSERT(isShm() == false); + Q_ASSERT(isSharedMemory() == false); if (QtWayland::ClientBufferIntegration *clientInt = QWaylandCompositorPrivate::get(m_compositor)->clientBufferIntegration()) return clientInt->bufferFormat(m_buffer); @@ -212,7 +212,7 @@ QWaylandBufferRef::BufferFormatEgl SurfaceBuffer::bufferFormatEgl() const void SurfaceBuffer::bindToTexture() const { Q_ASSERT(m_compositor); - if (isShm()) { + if (isSharedMemory()) { QImage image = this->image(); if (image.hasAlphaChannel()) { if (image.format() != QImage::Format_RGBA8888) { diff --git a/src/compositor/wayland_wrapper/qwlsurfacebuffer_p.h b/src/compositor/wayland_wrapper/qwlsurfacebuffer_p.h index 95e7e8158..609581493 100644 --- a/src/compositor/wayland_wrapper/qwlsurfacebuffer_p.h +++ b/src/compositor/wayland_wrapper/qwlsurfacebuffer_p.h @@ -101,7 +101,7 @@ public: QSize size() const; QWaylandSurface::Origin origin() const; - bool isShm() const { return wl_shm_buffer_get(m_buffer); } + bool isSharedMemory() const { return wl_shm_buffer_get(m_buffer); } QImage image() const; QWaylandBufferRef::BufferFormatEgl bufferFormatEgl() const; |