From 94d7603d5114eacaf648e0b0d2dcae5e161e0217 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Fri, 24 May 2019 22:06:09 +0200
Subject: QWidget: replace manual memory management with unique_ptr [1/N]:
 widgetTextures
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use a vector<unique_ptr> (QVector cannot hold move-only classes), adapt
to different API.

Change-Id: Iece4b1bfcb35a02aac05935963e1e7f8c986b18d
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 src/widgets/kernel/qwidget_p.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/widgets/kernel/qwidget_p.h')

diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h
index 7cb9a3895a..8fb325c763 100644
--- a/src/widgets/kernel/qwidget_p.h
+++ b/src/widgets/kernel/qwidget_p.h
@@ -75,6 +75,9 @@
 #include <private/qgesture_p.h>
 #include <qpa/qplatformbackingstore.h>
 
+#include <vector>
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 
 // Extra QWidget data
@@ -184,7 +187,7 @@ struct QTLWExtra {
     // ### TODO replace initialScreenIndex with QScreen *, in case the screens change at runtime
     int initialScreenIndex; // Screen number when passing a QDesktop[Screen]Widget as parent.
 
-    QVector<QPlatformTextureList *> widgetTextures;
+    std::vector<std::unique_ptr<QPlatformTextureList>> widgetTextures;
 
     // *************************** Cross-platform bit fields ****************************
     uint opacity : 8;
-- 
cgit v1.2.3