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>

2 files changed, 8 insertions, 16 deletions

diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 455de52319..ef31e475ea 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -1763,7 +1763,7 @@ Qt::KeyboardModifiers QGuiApplication::keyboardModifiers()
 */
 Qt::KeyboardModifiers QGuiApplication::queryKeyboardModifiers()
 {
-    CHECK_QAPP_INSTANCE(Qt::KeyboardModifiers(0))
+    CHECK_QAPP_INSTANCE(Qt::KeyboardModifiers{})
     QPlatformIntegration *pi = QGuiApplicationPrivate::platformIntegration();
     return pi->queryKeyboardModifiers();
 }
diff --git a/src/gui/kernel/qplatformdialoghelper.cpp b/src/gui/kernel/qplatformdialoghelper.cpp
index 4bee153489..15ac4acf91 100644
--- a/src/gui/kernel/qplatformdialoghelper.cpp
+++ b/src/gui/kernel/qplatformdialoghelper.cpp
@@ -186,7 +186,7 @@ QVariant  QPlatformDialogHelper::defaultStyleHint(QPlatformDialogHelper::StyleHi
 class QFontDialogOptionsPrivate : public QSharedData
 {
 public:
-    QFontDialogOptionsPrivate() : options(0) {}
+    QFontDialogOptionsPrivate() = default;
 
     QFontDialogOptions::FontDialogOptions options;
     QString windowTitle;
@@ -328,7 +328,7 @@ Q_GLOBAL_STATIC(QColorDialogStaticData, qColorDialogStaticData)
 class QColorDialogOptionsPrivate : public QSharedData
 {
 public:
-    QColorDialogOptionsPrivate() : options(0) {}
+    QColorDialogOptionsPrivate() = default;
     // Write out settings around destruction of dialogs
     ~QColorDialogOptionsPrivate() { qColorDialogStaticData()->writeSettings(); }
 
@@ -465,24 +465,16 @@ void QPlatformColorDialogHelper::setOptions(const QSharedPointer<QColorDialogOpt
 class QFileDialogOptionsPrivate : public QSharedData
 {
 public:
-    QFileDialogOptionsPrivate() : options(0),
-        viewMode(QFileDialogOptions::Detail),
-        fileMode(QFileDialogOptions::AnyFile),
-        acceptMode(QFileDialogOptions::AcceptOpen),
-        filters(QDir::AllEntries | QDir::NoDotAndDotDot | QDir::AllDirs),
-        useDefaultNameFilters(true)
-    {}
-
     QFileDialogOptions::FileDialogOptions options;
     QString windowTitle;
 
-    QFileDialogOptions::ViewMode viewMode;
-    QFileDialogOptions::FileMode fileMode;
-    QFileDialogOptions::AcceptMode acceptMode;
+    QFileDialogOptions::ViewMode viewMode = QFileDialogOptions::Detail;
+    QFileDialogOptions::FileMode fileMode = QFileDialogOptions::AnyFile;
+    QFileDialogOptions::AcceptMode acceptMode = QFileDialogOptions::AcceptOpen;
     QString labels[QFileDialogOptions::DialogLabelCount];
-    QDir::Filters filters;
+    QDir::Filters filters = QDir::AllEntries | QDir::NoDotAndDotDot | QDir::AllDirs;
     QList<QUrl> sidebarUrls;
-    bool useDefaultNameFilters;
+    bool useDefaultNameFilters = true;
     QStringList nameFilters;
     QStringList mimeTypeFilters;
     QString defaultSuffix;