From 655e8b6eab04f6db70ebaf2005ef297ea80784de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Thu, 22 Aug 2019 16:43:05 +0200
Subject: widgets: Class initialize QWidgetRepaintManager members

Change-Id: Icc06ae8f5f542810d651e4834055cbcd1c1a4e2e
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
---
 src/widgets/kernel/qwidgetrepaintmanager.cpp |  6 +-----
 src/widgets/kernel/qwidgetrepaintmanager_p.h | 17 +++++++++++------
 2 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/widgets/kernel/qwidgetrepaintmanager.cpp b/src/widgets/kernel/qwidgetrepaintmanager.cpp
index 177d362249..c4e557fb2f 100644
--- a/src/widgets/kernel/qwidgetrepaintmanager.cpp
+++ b/src/widgets/kernel/qwidgetrepaintmanager.cpp
@@ -112,12 +112,8 @@ private:
 // ---------------------------------------------------------------------------
 
 QWidgetRepaintManager::QWidgetRepaintManager(QWidget *topLevel)
-    : tlw(topLevel),
-      updateRequestSent(0),
-      textureListWatcher(0),
-      perfFrames(0)
+    : tlw(topLevel), store(tlw->backingStore())
 {
-    store = tlw->backingStore();
     Q_ASSERT(store);
 
     // Ensure all existing subsurfaces and static widgets are added to their respective lists.
diff --git a/src/widgets/kernel/qwidgetrepaintmanager_p.h b/src/widgets/kernel/qwidgetrepaintmanager_p.h
index 59fe25cdfe..470d63f99e 100644
--- a/src/widgets/kernel/qwidgetrepaintmanager_p.h
+++ b/src/widgets/kernel/qwidgetrepaintmanager_p.h
@@ -126,19 +126,24 @@ private:
 
     QRect topLevelRect() const { return tlw->data->crect; }
 
-    QWidget *tlw;
-    QRegion dirtyOnScreen; // needsFlush
+    QWidget *tlw = nullptr;
+    QBackingStore *store = nullptr;
+
     QRegion dirty; // needsRepaint
+    QRegion dirtyOnScreen; // needsFlush
+
     QVector<QWidget *> dirtyWidgets;
     QVector<QWidget *> dirtyRenderToTextureWidgets;
     QVector<QWidget *> dirtyOnScreenWidgets;
+
     QList<QWidget *> staticWidgets;
-    QBackingStore *store;
-    uint updateRequestSent : 1;
 
-    QPlatformTextureListWatcher *textureListWatcher;
+    QPlatformTextureListWatcher *textureListWatcher = nullptr;
+
+    bool updateRequestSent = false;
+
     QElapsedTimer perfTime;
-    int perfFrames;
+    int perfFrames = 0;
 
     Q_DISABLE_COPY_MOVE(QWidgetRepaintManager)
 };
-- 
cgit v1.2.3