From 2189464a840a13a51a99458a364667c40d09fb75 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Date: Mon, 1 Jun 2015 17:00:02 +0200
Subject: [PATCH] Qt Designer plugin: Use C++ 11 member initialization.

Simplify/obsolete constructors accordingly.

Change-Id: Id7b974317f2be81a89ff3a279eed95171d34991f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
---
 src/plugins/designer/editordata.h        | 5 ++---
 src/plugins/designer/formwindowfile.cpp  | 4 +---
 src/plugins/designer/formwindowfile.h    | 6 +++---
 src/plugins/designer/resourcehandler.cpp | 4 +---
 src/plugins/designer/resourcehandler.h   | 4 ++--
 src/plugins/designer/settingspage.cpp    | 4 ++--
 src/plugins/designer/settingspage.h      | 4 ++--
 7 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/plugins/designer/editordata.h b/src/plugins/designer/editordata.h
index 74b429c2e47..aada8d9b54e 100644
--- a/src/plugins/designer/editordata.h
+++ b/src/plugins/designer/editordata.h
@@ -42,11 +42,10 @@ namespace Internal {
 class EditorData
 {
 public:
-    EditorData() : formWindowEditor(0), widgetHost(0) {}
     operator bool() const { return formWindowEditor != 0; }
 
-    FormWindowEditor *formWindowEditor;
-    SharedTools::WidgetHost *widgetHost;
+    FormWindowEditor *formWindowEditor = nullptr;
+    SharedTools::WidgetHost *widgetHost = nullptr;
 };
 
 } // namespace Internal
diff --git a/src/plugins/designer/formwindowfile.cpp b/src/plugins/designer/formwindowfile.cpp
index dd168cd85fa..567fdcf444a 100644
--- a/src/plugins/designer/formwindowfile.cpp
+++ b/src/plugins/designer/formwindowfile.cpp
@@ -52,9 +52,7 @@ namespace Designer {
 namespace Internal {
 
 FormWindowFile::FormWindowFile(QDesignerFormWindowInterface *form, QObject *parent)
-  : m_shouldAutoSave(false),
-    m_formWindow(form),
-    m_isModified(false)
+  : m_formWindow(form)
 {
     setMimeType(QLatin1String(Designer::Constants::FORM_MIMETYPE));
     setParent(parent);
diff --git a/src/plugins/designer/formwindowfile.h b/src/plugins/designer/formwindowfile.h
index fc83ddede07..6ba98dbb681 100644
--- a/src/plugins/designer/formwindowfile.h
+++ b/src/plugins/designer/formwindowfile.h
@@ -84,12 +84,12 @@ private slots:
 
 private:
     QString m_suggestedName;
-    bool m_shouldAutoSave;
+    bool m_shouldAutoSave = false;
     // Might actually go out of scope before the IEditor due
     // to deleting the WidgetHost which owns it.
     QPointer<QDesignerFormWindowInterface> m_formWindow;
-    bool m_isModified;
-    ResourceHandler *m_resourceHandler;
+    bool m_isModified = false;
+    ResourceHandler *m_resourceHandler = nullptr;
 };
 
 } // namespace Internal
diff --git a/src/plugins/designer/resourcehandler.cpp b/src/plugins/designer/resourcehandler.cpp
index be673f0e8a1..7763e819e8a 100644
--- a/src/plugins/designer/resourcehandler.cpp
+++ b/src/plugins/designer/resourcehandler.cpp
@@ -83,9 +83,7 @@ void QrcFilesVisitor::visitFolderNode(FolderNode *folderNode)
 // ------------ ResourceHandler
 ResourceHandler::ResourceHandler(QDesignerFormWindowInterface *fw) :
     QObject(fw),
-    m_form(fw),
-    m_initialized(false),
-    m_handlingResources(false)
+    m_form(fw)
 {
 }
 
diff --git a/src/plugins/designer/resourcehandler.h b/src/plugins/designer/resourcehandler.h
index 7cdd1d1cb40..05fb4e92700 100644
--- a/src/plugins/designer/resourcehandler.h
+++ b/src/plugins/designer/resourcehandler.h
@@ -70,8 +70,8 @@ private:
 
     QDesignerFormWindowInterface * const m_form;
     QStringList m_originalUiQrcPaths;
-    bool m_initialized;
-    bool m_handlingResources;
+    bool m_initialized = false;
+    bool m_handlingResources = false;
 };
 
 } // namespace Internal
diff --git a/src/plugins/designer/settingspage.cpp b/src/plugins/designer/settingspage.cpp
index d1c597904fd..fe0cacb73f9 100644
--- a/src/plugins/designer/settingspage.cpp
+++ b/src/plugins/designer/settingspage.cpp
@@ -39,7 +39,7 @@
 using namespace Designer::Internal;
 
 SettingsPage::SettingsPage(QDesignerOptionsPageInterface *designerPage) :
-    m_designerPage(designerPage), m_initialized(false)
+    m_designerPage(designerPage)
 {
     setId(Core::Id::fromString(m_designerPage->name()));
     setDisplayName(m_designerPage->name());
@@ -72,7 +72,7 @@ void SettingsPage::finish()
 }
 
 SettingsPageProvider::SettingsPageProvider(QObject *parent)
-    : IOptionsPageProvider(parent), m_initialized(false)
+    : IOptionsPageProvider(parent)
 {
     setCategory(Designer::Constants::SETTINGS_CATEGORY);
     setDisplayCategory(QCoreApplication::translate("Designer",
diff --git a/src/plugins/designer/settingspage.h b/src/plugins/designer/settingspage.h
index c69824470f2..0f8919d2334 100644
--- a/src/plugins/designer/settingspage.h
+++ b/src/plugins/designer/settingspage.h
@@ -57,7 +57,7 @@ public:
 
 private:
     QDesignerOptionsPageInterface *m_designerPage;
-    bool m_initialized;
+    bool m_initialized = false;
     QPointer<QWidget> m_widget;
 };
 
@@ -72,7 +72,7 @@ public:
     bool matches(const QString &searchKeyWord) const override;
 
 private:
-    mutable bool m_initialized;
+    mutable bool m_initialized = false;
     mutable QStringList m_keywords;
 };