Platform support/Windows classes: Use member initialization

Use C++ 11 member initialization in value-type structs.

Task-number: QTBUG-51673
Change-Id: Ic45ab21c738ec7b7d526e30a1de2e19206da89ed
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

6 files changed, 22 insertions, 41 deletions

diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
index b8d997bc35..d71af4b232 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
@@ -591,12 +591,7 @@ namespace {
 */
 
 QWindowsFontEngineData::QWindowsFontEngineData()
-    : clearTypeEnabled(false)
-    , fontSmoothingGamma(QWindowsFontDatabase::fontSmoothingGamma())
-#if !defined(QT_NO_DIRECTWRITE)
-    , directWriteFactory(0)
-    , directWriteGdiInterop(0)
-#endif
+    : fontSmoothingGamma(QWindowsFontDatabase::fontSmoothingGamma())
 {
     // from qapplication_win.cpp
     UINT result = 0;
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
index b7ebfc033f..5a37778be4 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
@@ -74,12 +74,12 @@ public:
 
     uint pow_gamma[256];
 
-    bool clearTypeEnabled;
+    bool clearTypeEnabled = false;
     qreal fontSmoothingGamma;
-    HDC hdc;
+    HDC hdc = 0;
 #if !defined(QT_NO_DIRECTWRITE)
-    IDWriteFactory *directWriteFactory;
-    IDWriteGdiInterop *directWriteGdiInterop;
+    IDWriteFactory *directWriteFactory = nullptr;
+    IDWriteGdiInterop *directWriteGdiInterop = nullptr;
 #endif
 };
 
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontengine.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontengine.cpp
index 9fc6fec915..23bbc291ed 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontengine.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontengine.cpp
@@ -248,21 +248,9 @@ QWindowsFontEngine::QWindowsFontEngine(const QString &name,
     : QFontEngine(Win),
     m_fontEngineData(fontEngineData),
     _name(name),
-    hfont(0),
     m_logfont(lf),
     ttf(0),
-    hasOutline(0),
-    cmap(0),
-    cmapSize(0),
-    lbearing(SHRT_MIN),
-    rbearing(SHRT_MIN),
-    x_height(-1),
-    synthesized_flags(-1),
-    lineWidth(-1),
-    widthCache(0),
-    widthCacheSize(0),
-    designAdvances(0),
-    designAdvancesSize(0)
+    hasOutline(0)
 {
     qCDebug(lcQpaFonts) << __FUNCTION__ << name << lf.lfHeight;
     hfont = CreateFontIndirect(&m_logfont);
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h b/src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h
index 709de7d11d..5119adc0eb 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h
@@ -145,29 +145,29 @@ private:
 
     const QString     _name;
     QString     uniqueFamilyName;
-    HFONT       hfont;
+    HFONT       hfont = 0;
     const LOGFONT     m_logfont;
     uint        ttf        : 1;
     uint        hasOutline : 1;
     uint        hasUnreliableOutline : 1;
     uint        cffTable   : 1;
     TEXTMETRIC  tm;
-    const unsigned char *cmap;
-    int cmapSize;
+    const unsigned char *cmap = nullptr;
+    int cmapSize = 0;
     QByteArray cmapTable;
-    mutable qreal lbearing;
-    mutable qreal rbearing;
+    mutable qreal lbearing = SHRT_MIN;
+    mutable qreal rbearing = SHRT_MIN;
     QFixed designToDevice;
-    int unitsPerEm;
-    QFixed x_height;
+    int unitsPerEm = 0;
+    QFixed x_height = -1;
     FaceId _faceId;
 
-    mutable int synthesized_flags;
-    mutable QFixed lineWidth;
-    mutable unsigned char *widthCache;
-    mutable uint widthCacheSize;
-    mutable QFixed *designAdvances;
-    mutable int designAdvancesSize;
+    mutable int synthesized_flags = -1;
+    mutable QFixed lineWidth = -1;
+    mutable unsigned char *widthCache = nullptr;
+    mutable uint widthCacheSize = 0;
+    mutable QFixed *designAdvances = nullptr;
+    mutable int designAdvancesSize = 0;
 };
 
 class QWindowsMultiFontEngine : public QFontEngineMulti
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsnativeimage.cpp b/src/platformsupport/fontdatabases/windows/qwindowsnativeimage.cpp
index 7022615511..f8fcff952a 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsnativeimage.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsnativeimage.cpp
@@ -110,9 +110,7 @@ static inline HBITMAP createDIB(HDC hdc, int width, int height,
 
 QWindowsNativeImage::QWindowsNativeImage(int width, int height,
                                          QImage::Format format) :
-    m_hdc(createDC()),
-    m_bitmap(0),
-    m_null_bitmap(0)
+    m_hdc(createDC())
 {
     if (width != 0 && height != 0) {
         uchar *bits;
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsnativeimage_p.h b/src/platformsupport/fontdatabases/windows/qwindowsnativeimage_p.h
index c27c0d1e98..6c47a527d2 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsnativeimage_p.h
+++ b/src/platformsupport/fontdatabases/windows/qwindowsnativeimage_p.h
@@ -80,8 +80,8 @@ private:
     const HDC m_hdc;
     QImage m_image;
 
-    HBITMAP m_bitmap;
-    HBITMAP m_null_bitmap;
+    HBITMAP m_bitmap = 0;
+    HBITMAP m_null_bitmap = 0;
 };
 
 QT_END_NAMESPACE