diff options
author | Jochen Becher <jochen_becher@gmx.de> | 2017-07-31 13:48:27 +0200 |
---|---|---|
committer | Jochen Becher <jochen_becher@gmx.de> | 2017-08-07 17:04:30 +0000 |
commit | 48d63575b023af4e03ab6a5c5e668bef4deb7b3f (patch) | |
tree | 49512d08ef39c364bef9353ef4aea0210b5004a5 /src/libs/modelinglib/qtserialization | |
parent | 247d47c2662470ef308e5d046442e23591d9e643 (diff) |
ModelEditor: Use more member initializers in modelinglib
Change-Id: I8e0a93e0b83c45e0e8c20a92657340b24a346849
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Diffstat (limited to 'src/libs/modelinglib/qtserialization')
3 files changed, 7 insertions, 12 deletions
diff --git a/src/libs/modelinglib/qtserialization/inc/qark/qxmlinarchive.h b/src/libs/modelinglib/qtserialization/inc/qark/qxmlinarchive.h index 6a52047dd57..e4ba311a854 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/qxmlinarchive.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/qxmlinarchive.h @@ -296,9 +296,7 @@ private: public: explicit QXmlInArchive(QXmlStreamReader &stream) - : m_stream(stream), - m_endTagWasRead(false), - m_currentRefNode(nullptr) + : m_stream(stream) { } @@ -837,10 +835,10 @@ private: inline void skipUntilEndOfTag(const XmlTag &xmlTag); QXmlStreamReader &m_stream; - bool m_endTagWasRead; + bool m_endTagWasRead = false; QStack<Node *> m_nodeStack; impl::LoadingRefMap m_loadingRefMap; - Node *m_currentRefNode; + Node *m_currentRefNode = nullptr; }; QXmlInArchive::XmlTag QXmlInArchive::readTag() diff --git a/src/libs/modelinglib/qtserialization/inc/qark/qxmloutarchive.h b/src/libs/modelinglib/qtserialization/inc/qark/qxmloutarchive.h index 91525173cbc..8c51d0a2c49 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/qxmloutarchive.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/qxmloutarchive.h @@ -52,8 +52,7 @@ public: static const bool outArchive = true; QXmlOutArchive(QXmlStreamWriter &stream) - : m_stream(stream), - m_isNextPointerAReference(false) + : m_stream(stream) { } @@ -322,7 +321,7 @@ public: private: QXmlStreamWriter &m_stream; impl::SavingRefMap m_savingRefMap; - bool m_isNextPointerAReference; + bool m_isNextPointerAReference = false; }; } // namespace qark diff --git a/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h b/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h index 4e631d94f53..c92ac8f3760 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h @@ -119,8 +119,6 @@ public: typedef Archive &(*LoadFuncType)(Archive &, BASE * &p); explicit TypeInfo() - : m_saveFunc(nullptr), - m_loadFunc(nullptr) { } @@ -135,8 +133,8 @@ public: return m_saveFunc == rhs.m_saveFunc && m_loadFunc == rhs.m_loadFunc; } - SaveFuncType m_saveFunc; - LoadFuncType m_loadFunc; + SaveFuncType m_saveFunc = nullptr; + LoadFuncType m_loadFunc = nullptr; }; typedef QHash<QString, TypeInfo> MapType; |