From 4e30217f61e8cdff50c035a27d2da1f93d38aa88 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 1 Aug 2018 13:49:38 +0200 Subject: [PATCH] QmlDesigner: Fix clazy warnings Move initializers to class. Change-Id: I782b1fd8d432df741829510412326e1221ad52d5 Reviewed-by: Alessandro Portale --- .../designercore/instances/nodeinstance.cpp | 27 +++++++------------ .../designercore/metainfo/itemlibraryinfo.cpp | 8 +++--- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp index f857ccf2b3f..15d09e45169 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp @@ -43,18 +43,9 @@ class ProxyNodeInstanceData { public: ProxyNodeInstanceData() - : parentInstanceId(-1), - penWidth(1), - isAnchoredBySibling(false), - isAnchoredByChildren(false), - hasContent(false), - isMovable(false), - isResizable(false), - isInLayoutable(false), - directUpdates(false) {} - qint32 parentInstanceId; + qint32 parentInstanceId{-1}; ModelNode modelNode; QRectF boundingRect; QRectF contentItemBoundingRect; @@ -64,14 +55,14 @@ public: QTransform contentTransform; QTransform contentItemTransform; QTransform sceneTransform; - int penWidth; - bool isAnchoredBySibling; - bool isAnchoredByChildren; - bool hasContent; - bool isMovable; - bool isResizable; - bool isInLayoutable; - bool directUpdates; + int penWidth{1}; + bool isAnchoredBySibling{false}; + bool isAnchoredByChildren{false}; + bool hasContent{false}; + bool isMovable{false}; + bool isResizable{false}; + bool isInLayoutable{false}; + bool directUpdates{false}; QHash propertyValues; diff --git a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp index 0d6015e97ca..7c5ee2f7aab 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp @@ -37,13 +37,13 @@ namespace Internal { class ItemLibraryEntryData : public QSharedData { public: - ItemLibraryEntryData() : majorVersion(-1), minorVersion(-1) - { } + ItemLibraryEntryData() + {} QString name; TypeName typeName; QString category; - int majorVersion; - int minorVersion; + int majorVersion{-1}; + int minorVersion{-1}; QString libraryEntryIconPath; QIcon typeIcon; QList properties;