From cfaa21174e72dc00d073f3d6f6ce7f68330afff9 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 4 Jan 2021 12:31:09 +0100 Subject: Merge QAbstractPlanarVideoOutput into QAbstractVideoOutput And while we're at it, sanitize the signature of the virtual map() method. Change-Id: I8feb09e1dd6abdd9f480e202568ff84e6c3c08a9 Reviewed-by: Doris Verria Reviewed-by: Lars Knoll --- tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp') diff --git a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp index aea3e0e61..14f9309db 100644 --- a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp +++ b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp @@ -101,7 +101,7 @@ public: [[nodiscard]] QVariant handle() const override { return m_textureId; } - uchar *map(MapMode, int *, int *) override { return nullptr; } + MapData map(MapMode) override { return {}; } void unmap() override {} [[nodiscard]] MapMode mapMode() const override { return NotMapped; } @@ -118,7 +118,7 @@ public: : QAbstractVideoBuffer(UserHandle) {} - uchar *map(MapMode, int *, int *) override { return nullptr; } + MapData map(MapMode) override { return {}; } void unmap() override {} [[nodiscard]] MapMode mapMode() const override { return NotMapped; } }; -- cgit v1.2.3