Qt Designer: Use member initialization in the application's classes

Task-number: QTBUG-118473
Change-Id: I261ddf780fa005ef7cabf8cec9b1e3404136bb86
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit f2300356dfabfec81739f580d8d177c4af04471f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

10 files changed, 13 insertions, 21 deletions

diff --git a/src/designer/src/designer/mainwindow.cpp b/src/designer/src/designer/mainwindow.cpp
index 8f85ed4aa..ee3313cc6 100644
--- a/src/designer/src/designer/mainwindow.cpp
+++ b/src/designer/src/designer/mainwindow.cpp
@@ -274,8 +274,7 @@ bool ToolBarManager::restoreState(const QByteArray &state, int version)
 
 DockedMainWindow::DockedMainWindow(QDesignerWorkbench *wb,
                                    QMenu *toolBarMenu,
-                                   const QList<QDesignerToolWindow *> &toolWindows) :
-    m_toolBarManager(nullptr)
+                                   const QList<QDesignerToolWindow *> &toolWindows)
 {
     setObjectName(u"MDIWindow"_s);
     setWindowTitle(mainWindowTitle());
diff --git a/src/designer/src/designer/mainwindow.h b/src/designer/src/designer/mainwindow.h
index 0ca39a7fe..df41d6f34 100644
--- a/src/designer/src/designer/mainwindow.h
+++ b/src/designer/src/designer/mainwindow.h
@@ -142,7 +142,7 @@ private slots:
     void slotSubWindowActivated(QMdiSubWindow*);
 
 private:
-    ToolBarManager *m_toolBarManager;
+    ToolBarManager *m_toolBarManager = nullptr;
 };
 
 QT_END_NAMESPACE
diff --git a/src/designer/src/designer/newform.cpp b/src/designer/src/designer/newform.cpp
index 467c5dd84..3c77bc6a6 100644
--- a/src/designer/src/designer/newform.cpp
+++ b/src/designer/src/designer/newform.cpp
@@ -40,8 +40,7 @@ NewForm::NewForm(QDesignerWorkbench *workbench, QWidget *parentWidget, const QSt
       m_workbench(workbench),
       m_chkShowOnStartup(new QCheckBox(tr("Show this Dialog on Startup"))),
       m_createButton(new QPushButton(QApplication::translate("NewForm", "C&reate", nullptr))),
-      m_recentButton(new QPushButton(QApplication::translate("NewForm", "Recent", nullptr))),
-      m_buttonBox(nullptr)
+      m_recentButton(new QPushButton(QApplication::translate("NewForm", "Recent", nullptr)))
 {
     setWindowTitle(tr("New Form"));
     QDesignerSettings settings(m_workbench->core());
diff --git a/src/designer/src/designer/newform.h b/src/designer/src/designer/newform.h
index 02395ee7e..e13f68571 100644
--- a/src/designer/src/designer/newform.h
+++ b/src/designer/src/designer/newform.h
@@ -58,7 +58,7 @@ private:
     QCheckBox *m_chkShowOnStartup;
     QPushButton *m_createButton;
     QPushButton *m_recentButton;
-    QDialogButtonBox *m_buttonBox;
+    QDialogButtonBox *m_buttonBox = nullptr;
 };
 
 QT_END_NAMESPACE
diff --git a/src/designer/src/designer/qdesigner.cpp b/src/designer/src/designer/qdesigner.cpp
index 8b35cbccc..8a2336060 100644
--- a/src/designer/src/designer/qdesigner.cpp
+++ b/src/designer/src/designer/qdesigner.cpp
@@ -50,10 +50,7 @@ static void designerMessageHandler(QtMsgType type, const QMessageLogContext &con
 }
 
 QDesigner::QDesigner(int &argc, char **argv)
-    : QApplication(argc, argv),
-      m_server(nullptr),
-      m_client(nullptr),
-      m_workbench(0), m_suppressNewFormShow(false)
+    : QApplication(argc, argv)
 {
     setOrganizationName(u"QtProject"_s);
     QGuiApplication::setApplicationDisplayName(QLatin1StringView(designerDisplayName));
diff --git a/src/designer/src/designer/qdesigner.h b/src/designer/src/designer/qdesigner.h
index d9b830f38..4a12e48f3 100644
--- a/src/designer/src/designer/qdesigner.h
+++ b/src/designer/src/designer/qdesigner.h
@@ -56,15 +56,15 @@ private slots:
 private:
     void showErrorMessageBox(const QString &);
 
-    QDesignerServer *m_server;
-    QDesignerClient *m_client;
-    QDesignerWorkbench *m_workbench;
+    QDesignerServer *m_server = nullptr;
+    QDesignerClient *m_client = nullptr;
+    QDesignerWorkbench *m_workbench = nullptr;
     QPointer<MainWindowBase> m_mainWindow;
     QPointer<QErrorMessage> m_errorMessageDialog;
 
     QString m_initializationErrors;
     QString m_lastErrorMessage;
-    bool m_suppressNewFormShow;
+    bool m_suppressNewFormShow = false;
 };
 
 QT_END_NAMESPACE
diff --git a/src/designer/src/designer/qdesigner_formwindow.cpp b/src/designer/src/designer/qdesigner_formwindow.cpp
index 3c6dc2f12..44db4df03 100644
--- a/src/designer/src/designer/qdesigner_formwindow.cpp
+++ b/src/designer/src/designer/qdesigner_formwindow.cpp
@@ -34,9 +34,7 @@ QDesignerFormWindow::QDesignerFormWindow(QDesignerFormWindowInterface *editor, Q
     : QWidget(parent, flags),
       m_editor(editor),
       m_workbench(workbench),
-      m_action(new QAction(this)),
-      m_initialized(false),
-      m_windowTitleInitialized(false)
+      m_action(new QAction(this))
 {
     Q_ASSERT(workbench);
 
diff --git a/src/designer/src/designer/qdesigner_formwindow.h b/src/designer/src/designer/qdesigner_formwindow.h
index 539820543..6e509fcdd 100644
--- a/src/designer/src/designer/qdesigner_formwindow.h
+++ b/src/designer/src/designer/qdesigner_formwindow.h
@@ -50,8 +50,8 @@ private:
     QPointer<QDesignerFormWindowInterface> m_editor;
     QPointer<QDesignerWorkbench> m_workbench;
     QAction *m_action;
-    bool m_initialized;
-    bool m_windowTitleInitialized;
+    bool m_initialized = false;
+    bool m_windowTitleInitialized = false;
 };
 
 QT_END_NAMESPACE
diff --git a/src/designer/src/designer/qdesigner_server.cpp b/src/designer/src/designer/qdesigner_server.cpp
index f12a360d1..5fd5c63ba 100644
--- a/src/designer/src/designer/qdesigner_server.cpp
+++ b/src/designer/src/designer/qdesigner_server.cpp
@@ -22,7 +22,6 @@ using namespace Qt::StringLiterals;
 QDesignerServer::QDesignerServer(QObject *parent)
     : QObject(parent)
 {
-    m_socket = nullptr;
     m_server = new QTcpServer(this);
     if (m_server->listen(QHostAddress::LocalHost, 0)) {
         connect(m_server, &QTcpServer::newConnection,
diff --git a/src/designer/src/designer/qdesigner_server.h b/src/designer/src/designer/qdesigner_server.h
index 1d6759693..d45345599 100644
--- a/src/designer/src/designer/qdesigner_server.h
+++ b/src/designer/src/designer/qdesigner_server.h
@@ -29,7 +29,7 @@ private slots:
 
 private:
     QTcpServer *m_server;
-    QTcpSocket *m_socket;
+    QTcpSocket *m_socket = nullptr;
 };
 
 class QDesignerClient: public QObject