Qt Designer: introduce member initialization

Fix warnings emitted by clang, use default constructors where
applicable.

Initialize remaining member variables about which clang warns
about missing initialization in the constructor.

Change-Id: Ic23a1f36f7507dc728ca6daf0d2067727125c0a9
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
 

3 files changed, 35 insertions, 37 deletions

diff --git a/src/designer/src/components/formeditor/embeddedoptionspage.cpp b/src/designer/src/components/formeditor/embeddedoptionspage.cpp
index e17b2b6df..c09571070 100644
--- a/src/designer/src/components/formeditor/embeddedoptionspage.cpp
+++ b/src/designer/src/components/formeditor/embeddedoptionspage.cpp
@@ -109,9 +109,9 @@ private:
     QLabel *m_descriptionLabel;
 
     DeviceProfileList m_sortedProfiles;
-    EmbeddedOptionsControl *m_q;
-    bool m_dirty;
+    EmbeddedOptionsControl *m_q = nullptr;
     QSet<QString> m_usedProfiles;
+    bool m_dirty = false;
 };
 
 EmbeddedOptionsControlPrivate::EmbeddedOptionsControlPrivate(QDesignerFormEditorInterface *core) :
@@ -120,9 +120,7 @@ EmbeddedOptionsControlPrivate::EmbeddedOptionsControlPrivate(QDesignerFormEditor
     m_addButton(new QToolButton),
     m_editButton(new QToolButton),
     m_deleteButton(new QToolButton),
-    m_descriptionLabel(new QLabel),
-    m_q(0),
-    m_dirty(false)
+    m_descriptionLabel(new QLabel)
 {
     m_descriptionLabel->setMinimumHeight(80);
     // Determine used profiles to lock them
diff --git a/src/designer/src/components/formeditor/formwindow.h b/src/designer/src/components/formeditor/formwindow.h
index 9edfa5d53..e2fb78400 100644
--- a/src/designer/src/components/formeditor/formwindow.h
+++ b/src/designer/src/components/formeditor/formwindow.h
@@ -320,10 +320,10 @@ private:
 
     FormEditor *m_core;
     FormWindowCursor *m_cursor;
-    QWidget *m_mainContainer;
-    QWidget *m_currentWidget;
+    QWidget *m_mainContainer = nullptr;
+    QWidget *m_currentWidget = nullptr;
 
-    bool m_blockSelectionChanged;
+    bool m_blockSelectionChanged = false;
 
     QPoint m_rectAnchor;
     QRect m_currRect;
@@ -340,18 +340,18 @@ private:
 
     QString m_fileName;
 
-    typedef QPair<QPalette ,bool> PaletteAndFill;
-    typedef QMap<QWidget*, PaletteAndFill> WidgetPaletteMap;
+    using PaletteAndFill = QPair<QPalette ,bool>;
+    using WidgetPaletteMap = QMap<QWidget*, PaletteAndFill>;
     WidgetPaletteMap m_palettesBeforeHighlight;
 
-    QRubberBand *m_rubberBand;
+    QRubberBand *m_rubberBand = nullptr;
 
-    QTimer *m_selectionChangedTimer;
-    QTimer *m_checkSelectionTimer;
-    QTimer *m_geometryChangedTimer;
+    QTimer *m_selectionChangedTimer = nullptr;
+    QTimer *m_checkSelectionTimer = nullptr;
+    QTimer *m_geometryChangedTimer = nullptr;
 
     FormWindowWidgetStack *m_widgetStack;
-    WidgetEditorTool *m_widgetEditor;
+    WidgetEditorTool *m_widgetEditor = nullptr;
 
     QStringList m_resourceFiles;
 
diff --git a/src/designer/src/components/formeditor/formwindowmanager.h b/src/designer/src/components/formeditor/formwindowmanager.h
index 16fa319f4..f2f007186 100644
--- a/src/designer/src/components/formeditor/formwindowmanager.h
+++ b/src/designer/src/components/formeditor/formwindowmanager.h
@@ -133,38 +133,38 @@ private:
 
     // edit actions
 #if QT_CONFIG(clipboard)
-    QAction *m_actionCut;
-    QAction *m_actionCopy;
-    QAction *m_actionPaste;
+    QAction *m_actionCut = nullptr;
+    QAction *m_actionCopy = nullptr;
+    QAction *m_actionPaste = nullptr;
 #endif
-    QAction *m_actionSelectAll;
-    QAction *m_actionDelete;
-    QAction *m_actionLower;
-    QAction *m_actionRaise;
+    QAction *m_actionSelectAll = nullptr;
+    QAction *m_actionDelete = nullptr;
+    QAction *m_actionLower = nullptr;
+    QAction *m_actionRaise = nullptr;
     // layout actions
-    QAction *m_actionHorizontalLayout;
-    QAction *m_actionVerticalLayout;
-    QAction *m_actionFormLayout;
-    QAction *m_actionSplitHorizontal;
-    QAction *m_actionSplitVertical;
-    QAction *m_actionGridLayout;
-    QAction *m_actionBreakLayout;
-    QAction *m_actionSimplifyLayout;
-    QAction *m_actionAdjustSize;
+    QAction *m_actionHorizontalLayout = nullptr;
+    QAction *m_actionVerticalLayout = nullptr;
+    QAction *m_actionFormLayout = nullptr;
+    QAction *m_actionSplitHorizontal = nullptr;
+    QAction *m_actionSplitVertical = nullptr;
+    QAction *m_actionGridLayout = nullptr;
+    QAction *m_actionBreakLayout = nullptr;
+    QAction *m_actionSimplifyLayout = nullptr;
+    QAction *m_actionAdjustSize = nullptr;
     // preview actions
-    QAction *m_actionDefaultPreview;
-    mutable PreviewActionGroup *m_actionGroupPreviewInStyle;
-    QAction *m_actionShowFormWindowSettingsDialog;
+    QAction *m_actionDefaultPreview = nullptr;
+    mutable PreviewActionGroup *m_actionGroupPreviewInStyle = nullptr;
+    QAction *m_actionShowFormWindowSettingsDialog = nullptr;
 
-    QAction *m_actionUndo;
-    QAction *m_actionRedo;
+    QAction *m_actionUndo = nullptr;
+    QAction *m_actionRedo = nullptr;
 
     QSet<QWidget *> getUnsortedLayoutsToBeBroken(bool firstOnly) const;
     bool hasLayoutsToBeBroken() const;
     QWidgetList layoutsToBeBroken(QWidget *w) const;
     QWidgetList layoutsToBeBroken() const;
 
-    QUndoGroup *m_undoGroup;
+    QUndoGroup *m_undoGroup = nullptr;
 
 };