From 2c871dfd38d89d6415c2c25d47b4a0e9c8b2ef11 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Fri, 22 Nov 2019 15:34:38 +0100
Subject: Avoid initializing QFlags with 0 or nullptr in further cases

Amends qtbase/af2daafde72db02454d24b7d691aa6861525ab99.
Where applicable, port over to member initialization, thus also
fixing nullptr warnings.

Change-Id: Iaaf2dbbbcf2952253390b8839fd15a1b17be32c0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/gui/painting/qpainter.cpp     | 11 ++---------
 src/gui/painting/qpainter_p.h     | 20 ++++++++++----------
 src/gui/painting/qpainterpath.cpp |  2 +-
 3 files changed, 13 insertions(+), 20 deletions(-)

(limited to 'src/gui/painting')

diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 4336ff66be..d5cec1b45a 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -7786,16 +7786,9 @@ QPainterState::QPainterState(const QPainterState *s)
 }
 
 QPainterState::QPainterState()
-    : brushOrigin(0, 0), bgBrush(Qt::white), clipOperation(Qt::NoClip),
-      renderHints(0),
-      wx(0), wy(0), ww(0), wh(0), vx(0), vy(0), vw(0), vh(0),
-      opacity(1), WxF(false), VxF(false), clipEnabled(true),
-      bgMode(Qt::TransparentMode), painter(0),
-      layoutDirection(QGuiApplication::layoutDirection()),
-      composition_mode(QPainter::CompositionMode_SourceOver),
-      emulationSpecifier(0), changeFlags(0)
+    : brushOrigin(0, 0), WxF(false), VxF(false), clipEnabled(true),
+      layoutDirection(QGuiApplication::layoutDirection())
 {
-    dirtyFlags = { };
 }
 
 QPainterState::~QPainterState()
diff --git a/src/gui/painting/qpainter_p.h b/src/gui/painting/qpainter_p.h
index 29d4880eb9..285bd90502 100644
--- a/src/gui/painting/qpainter_p.h
+++ b/src/gui/painting/qpainter_p.h
@@ -154,29 +154,29 @@ public:
     QFont deviceFont;
     QPen pen;
     QBrush brush;
-    QBrush bgBrush;             // background brush
+    QBrush bgBrush = Qt::white; // background brush
     QRegion clipRegion;
     QPainterPath clipPath;
-    Qt::ClipOperation clipOperation;
+    Qt::ClipOperation clipOperation = Qt::NoClip;
     QPainter::RenderHints renderHints;
     QVector<QPainterClipInfo> clipInfo; // ### Make me smaller and faster to copy around...
     QTransform worldMatrix;       // World transformation matrix, not window and viewport
     QTransform matrix;            // Complete transformation matrix,
     QTransform redirectionMatrix;
-    int wx, wy, ww, wh;         // window rectangle
-    int vx, vy, vw, vh;         // viewport rectangle
-    qreal opacity;
+    int wx = 0, wy = 0, ww = 0, wh = 0; // window rectangle
+    int vx = 0, vy = 0, vw = 0, vh = 0; // viewport rectangle
+    qreal opacity = 1;
 
     uint WxF:1;                 // World transformation
     uint VxF:1;                 // View transformation
     uint clipEnabled:1;
 
-    Qt::BGMode bgMode;
-    QPainter *painter;
+    Qt::BGMode bgMode = Qt::TransparentMode;
+    QPainter *painter = nullptr;
     Qt::LayoutDirection layoutDirection;
-    QPainter::CompositionMode composition_mode;
-    uint emulationSpecifier;
-    uint changeFlags;
+    QPainter::CompositionMode composition_mode = QPainter::CompositionMode_SourceOver;
+    uint emulationSpecifier = 0;
+    uint changeFlags = 0;
 };
 
 struct QPainterDummyState
diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp
index 1fb37ece56..859122c3b9 100644
--- a/src/gui/painting/qpainterpath.cpp
+++ b/src/gui/painting/qpainterpath.cpp
@@ -1253,7 +1253,7 @@ void QPainterPath::addText(const QPointF &point, const QFont &f, const QString &
             fe->addOutlineToPath(x, y, glyphs, this,
                                  si.analysis.bidiLevel % 2
                                  ? QTextItem::RenderFlags(QTextItem::RightToLeft)
-                                 : QTextItem::RenderFlags(0));
+                                 : QTextItem::RenderFlags{});
 
             const qreal lw = fe->lineThickness().toReal();
             if (f.d->underline) {
-- 
cgit v1.2.3