From 4f03ea96a2f684f4c9523245c595c37c9ac5027b Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Mon, 18 Sep 2017 16:48:42 +0200 Subject: [PATCH] QmlDesigner: fix uninitialzed value warnings Change-Id: Ieddd83953b2009656ceecea2f9fedecd54ac9ac8 Reviewed-by: Robert Loehning Reviewed-by: Thomas Hartmann Reviewed-by: Tobias Hunger --- .../qml/qmlpuppet/container/instancecontainer.cpp | 1 - .../qml/qmlpuppet/container/instancecontainer.h | 10 +++++----- .../components/componentcore/findimplementation.cpp | 2 +- .../components/componentcore/selectioncontext.cpp | 6 ++---- .../components/componentcore/selectioncontext.h | 4 ++-- .../formeditor/anchorindicatorgraphicsitem.h | 4 ++-- .../designercore/filemanager/astobjecttextextractor.h | 2 +- .../designercore/filemanager/firstdefinitionfinder.h | 2 +- .../filemanager/moveobjectbeforeobjectvisitor.h | 4 ++-- .../designercore/filemanager/objectlengthcalculator.h | 4 ++-- .../designercore/include/nodeinstanceview.h | 1 - .../qmldesigner/designercore/model/internalnode_p.h | 2 +- .../qmldesigner/designercore/rewritertransaction.h | 2 +- 13 files changed, 20 insertions(+), 24 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/container/instancecontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/instancecontainer.cpp index b77b1d23ae0..bb9ec181610 100644 --- a/share/qtcreator/qml/qmlpuppet/container/instancecontainer.cpp +++ b/share/qtcreator/qml/qmlpuppet/container/instancecontainer.cpp @@ -41,7 +41,6 @@ static TypeName properDelemitingOfType(const TypeName &typeName) } InstanceContainer::InstanceContainer() - : m_instanceId(-1), m_majorNumber(-1), m_minorNumber(-1) { } diff --git a/share/qtcreator/qml/qmlpuppet/container/instancecontainer.h b/share/qtcreator/qml/qmlpuppet/container/instancecontainer.h index f8b4d846800..6dc86bf93c9 100644 --- a/share/qtcreator/qml/qmlpuppet/container/instancecontainer.h +++ b/share/qtcreator/qml/qmlpuppet/container/instancecontainer.h @@ -67,14 +67,14 @@ public: NodeMetaType metaType() const; private: - qint32 m_instanceId; + qint32 m_instanceId = -1; TypeName m_type; - qint32 m_majorNumber; - qint32 m_minorNumber; + qint32 m_majorNumber = -1; + qint32 m_minorNumber = -1; QString m_componentPath; QString m_nodeSource; - qint32 m_nodeSourceType; - qint32 m_metaType; + qint32 m_nodeSourceType = 0; + qint32 m_metaType = 0; }; QDebug operator <<(QDebug debug, const InstanceContainer &command); diff --git a/src/plugins/qmldesigner/components/componentcore/findimplementation.cpp b/src/plugins/qmldesigner/components/componentcore/findimplementation.cpp index 24bffa14d0b..1d88bf56a00 100644 --- a/src/plugins/qmldesigner/components/componentcore/findimplementation.cpp +++ b/src/plugins/qmldesigner/components/componentcore/findimplementation.cpp @@ -231,7 +231,7 @@ private: QString m_typeName; QString m_itemId; - const ObjectValue *m_typeValue; + const ObjectValue *m_typeValue = nullptr; bool m_insideObject = false; }; diff --git a/src/plugins/qmldesigner/components/componentcore/selectioncontext.cpp b/src/plugins/qmldesigner/components/componentcore/selectioncontext.cpp index c3cf12d3cc5..d08a74aa1bc 100644 --- a/src/plugins/qmldesigner/components/componentcore/selectioncontext.cpp +++ b/src/plugins/qmldesigner/components/componentcore/selectioncontext.cpp @@ -30,15 +30,13 @@ namespace QmlDesigner { -SelectionContext::SelectionContext() : - m_toggled(false) +SelectionContext::SelectionContext() { } SelectionContext::SelectionContext(AbstractView *view) : - m_view(view), - m_toggled(false) + m_view(view) { } diff --git a/src/plugins/qmldesigner/components/componentcore/selectioncontext.h b/src/plugins/qmldesigner/components/componentcore/selectioncontext.h index 17e5981e6d4..ad94bae72af 100644 --- a/src/plugins/qmldesigner/components/componentcore/selectioncontext.h +++ b/src/plugins/qmldesigner/components/componentcore/selectioncontext.h @@ -65,9 +65,9 @@ public: private: QPointer m_view; ModelNode m_targetNode; - bool m_showSelectionTools; + bool m_showSelectionTools = false; QPointF m_scenePosition; - bool m_toggled; + bool m_toggled = false; }; } //QmlDesigner diff --git a/src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.h b/src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.h index a6cc8a8f17f..16946b392f2 100644 --- a/src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.h +++ b/src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.h @@ -57,8 +57,8 @@ private: QPointF m_sourceAnchorLineSecondPoint; QPointF m_targetAnchorLineFirstPoint; QPointF m_targetAnchorLineSecondPoint; - AnchorLineType m_sourceAnchorLineType; - AnchorLineType m_targetAnchorLineType; + AnchorLineType m_sourceAnchorLineType = AnchorLineInvalid; + AnchorLineType m_targetAnchorLineType = AnchorLineInvalid; QRectF m_boundingRect; }; diff --git a/src/plugins/qmldesigner/designercore/filemanager/astobjecttextextractor.h b/src/plugins/qmldesigner/designercore/filemanager/astobjecttextextractor.h index a1dfb7b71a0..159b65bdd21 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/astobjecttextextractor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/astobjecttextextractor.h @@ -45,7 +45,7 @@ protected: private: QmlJS::Document::MutablePtr m_document; - quint32 m_location; + quint32 m_location = 0; QString m_text; }; diff --git a/src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.h b/src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.h index 9aca188a607..fb306f8bc46 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.h +++ b/src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.h @@ -48,7 +48,7 @@ protected: private: QmlJS::Document::MutablePtr m_doc; quint32 m_offset; - QmlJS::AST::UiObjectDefinition *m_firstObjectDefinition; + QmlJS::AST::UiObjectDefinition *m_firstObjectDefinition = nullptr; }; diff --git a/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.h index 909c77ef702..7b5f39d1751 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.h @@ -67,8 +67,8 @@ private: bool toEnd; quint32 beforeObjectLocation; - QmlJS::AST::UiObjectDefinition *movingObject; - QmlJS::AST::UiObjectDefinition *beforeObject; + QmlJS::AST::UiObjectDefinition *movingObject = nullptr; + QmlJS::AST::UiObjectDefinition *beforeObject = nullptr; ASTPath movingObjectParents; }; diff --git a/src/plugins/qmldesigner/designercore/filemanager/objectlengthcalculator.h b/src/plugins/qmldesigner/designercore/filemanager/objectlengthcalculator.h index e869bb98b45..1ff31837a1a 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/objectlengthcalculator.h +++ b/src/plugins/qmldesigner/designercore/filemanager/objectlengthcalculator.h @@ -45,8 +45,8 @@ protected: private: QmlJS::Document::MutablePtr m_doc; - quint32 m_offset; - quint32 m_length; + quint32 m_offset = 0; + quint32 m_length = 0; }; } // namespace QmlDesigner diff --git a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h index 800ef1baadd..ebaaf93b3de 100644 --- a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h +++ b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h @@ -193,7 +193,6 @@ private: //variables QHash m_nodeInstanceHash; QHash m_statePreviewImage; - uint m_blockUpdates; QPointer m_nodeInstanceServer; QImage m_baseStatePreviewImage; QTime m_lastCrashTime; diff --git a/src/plugins/qmldesigner/designercore/model/internalnode_p.h b/src/plugins/qmldesigner/designercore/model/internalnode_p.h index c19fca55a85..9f70fe1e94f 100644 --- a/src/plugins/qmldesigner/designercore/model/internalnode_p.h +++ b/src/plugins/qmldesigner/designercore/model/internalnode_p.h @@ -150,7 +150,7 @@ private: QStringList m_scriptFunctionList; QString m_nodeSource; - int m_nodeSourceType; + int m_nodeSourceType = 0; }; uint qHash(const InternalNodePointer& node); diff --git a/src/plugins/qmldesigner/designercore/rewritertransaction.h b/src/plugins/qmldesigner/designercore/rewritertransaction.h index 87e50c53fe4..9a91f0d23f7 100644 --- a/src/plugins/qmldesigner/designercore/rewritertransaction.h +++ b/src/plugins/qmldesigner/designercore/rewritertransaction.h @@ -54,7 +54,7 @@ private: QPointer m_view; QByteArray m_identifier; mutable bool m_valid; - int m_identifierNumber; + int m_identifierNumber = 0; static QList m_identifierList; static bool m_activeIdentifier; bool m_ignoreSemanticChecks = false;