diff --git a/src/plugins/designer/editordata.h b/src/plugins/designer/editordata.h index 74b429c2e4708668c265c7f18156f0a0f7d606f0..aada8d9b54ea84093dd11ae3e0cb1375fef0082a 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 dd168cd85fa8b7aa7459b041dc7c38fda376b08a..567fdcf444aa67f11979de64734a362ac7093a38 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 fc83ddede0734a4cfe198bbc9d2df0d3b7b44741..6ba98dbb681626fa1d8fee1b6dde13d02dca0644 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 be673f0e8a11325af435c17268bb6aa09b87eb6a..7763e819e8a9e3d72213fdc24158ef452cf6aa8f 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 7cdd1d1cb40cefeab2757d4e3bdb199f8a193351..05fb4e9270066956d43ec64c11ae700ed2ce790d 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 d1c597904fd27b9923a9a02ecea82647f01a152a..fe0cacb73f97fab2b360bdd18458b36420bec634 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 c69824470f216dd5b82ffc558453f52d90381c20..0f8919d23348bb0348330574459d6cee37c42dd2 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; };