From 43d12496c684b5f2b08c6a8c0b994f06efc25712 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Mon, 8 Oct 2018 13:29:17 +0200 Subject: Clean up ShmServerBuffer's unused and shadowing members Change-Id: I588ccc782f593ec83a87f75bd88d98f873366395 Reviewed-by: Paul Olav Tvete --- .../shm-emulation-server/shmserverbufferintegration.cpp | 16 +++++++++------- .../shm-emulation-server/shmserverbufferintegration.h | 4 +--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.cpp b/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.cpp index 0c43b089a..73ff9e6e8 100644 --- a/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.cpp +++ b/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.cpp @@ -88,13 +88,13 @@ static QOpenGLTexture *createTextureFromShm(const QString &key, int w, int h, in namespace QtWaylandClient { -ShmServerBuffer::ShmServerBuffer(ShmServerBufferIntegration *integration, const QString &key, int32_t width, int32_t height, int32_t bytes_per_line, int32_t format) - : m_integration(integration) - , m_key(key) - , m_bpl(bytes_per_line) - , m_format(format) + +ShmServerBuffer::ShmServerBuffer(const QString &key, const QSize& size, int bytesPerLine, QWaylandServerBuffer::Format format) + : m_key(key) + , m_bpl(bytesPerLine) { - m_size = QSize(width, height); + m_format = format; + m_size = size; } ShmServerBuffer::~ShmServerBuffer() @@ -132,7 +132,9 @@ void ShmServerBufferIntegration::wlDisplayHandleGlobal(void *data, ::wl_registry void QtWaylandClient::ShmServerBufferIntegration::shm_emulation_server_buffer_server_buffer_created(qt_server_buffer *id, const QString &key, int32_t width, int32_t height, int32_t bytes_per_line, int32_t format) { - auto *server_buffer = new ShmServerBuffer(this, key, width, height, bytes_per_line, format); + QSize size(width, height); + auto fmt = QWaylandServerBuffer::Format(format); + auto *server_buffer = new ShmServerBuffer(key, size, bytes_per_line, fmt); qt_server_buffer_set_user_data(id, server_buffer); } diff --git a/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.h b/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.h index fef7cfe47..b162d6924 100644 --- a/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.h +++ b/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.h @@ -57,15 +57,13 @@ class ShmServerBufferIntegration; class ShmServerBuffer : public QWaylandServerBuffer { public: - ShmServerBuffer(ShmServerBufferIntegration *integration, const QString &key, int32_t width, int32_t height, int32_t bytes_per_line, int32_t format); + ShmServerBuffer(const QString &key, const QSize &size, int bytesPerLine, QWaylandServerBuffer::Format format); ~ShmServerBuffer() override; QOpenGLTexture* toOpenGlTexture() override; private: - ShmServerBufferIntegration *m_integration = nullptr; QOpenGLTexture *m_texture = nullptr; QString m_key; int m_bpl; - int m_format; }; class ShmServerBufferIntegration -- cgit v1.2.3