From 67ced4da5ab6f9bb63303a0850457d7a526866d3 Mon Sep 17 00:00:00 2001
From: Sona Kurazyan <sona.kurazyan@qt.io>
Date: Tue, 26 Jan 2021 14:19:15 +0100
Subject: [PATCH] QMovie: initialize the private members while declaring them

Change-Id: Ie9c1484c8ad3483da3d559e1703770cdf22cec5e
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
---
 src/gui/image/qmovie.cpp | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/gui/image/qmovie.cpp b/src/gui/image/qmovie.cpp
index 6c5922df0f..26ab96d0a3 100644
--- a/src/gui/image/qmovie.cpp
+++ b/src/gui/image/qmovie.cpp
@@ -247,20 +247,20 @@ public:
     void _q_loadNextFrame();
     void _q_loadNextFrame(bool starting);
 
-    QImageReader *reader;
-    int speed;
-    QMovie::MovieState movieState;
+    QImageReader *reader = nullptr;
+    int speed = 100;
+    QMovie::MovieState movieState = QMovie::NotRunning;
     QRect frameRect;
     QPixmap currentPixmap;
-    int currentFrameNumber;
-    int nextFrameNumber;
-    int greatestFrameNumber;
-    int nextDelay;
-    int playCounter;
-    qint64 initialDevicePos;
-    QMovie::CacheMode cacheMode;
-    bool haveReadAll;
-    bool isFirstIteration;
+    int currentFrameNumber = -1;
+    int nextFrameNumber = 0;
+    int greatestFrameNumber = -1;
+    int nextDelay = 0;
+    int playCounter = -1;
+    qint64 initialDevicePos = 0;
+    QMovie::CacheMode cacheMode = QMovie::CacheNone;
+    bool haveReadAll = false;
+    bool isFirstIteration = true;
     QMap<int, QFrameInfo> frameMap;
     QString absoluteFilePath;
 
@@ -270,10 +270,6 @@ public:
 /*! \internal
  */
 QMoviePrivate::QMoviePrivate(QMovie *qq)
-    : reader(nullptr), speed(100), movieState(QMovie::NotRunning),
-      currentFrameNumber(-1), nextFrameNumber(0), greatestFrameNumber(-1),
-      nextDelay(0), playCounter(-1),
-      cacheMode(QMovie::CacheNone), haveReadAll(false), isFirstIteration(true)
 {
     q_ptr = qq;
     nextImageTimer.setSingleShot(true);