From f061fe9e1b2c2e9562a7026e7bf6d4b909268890 Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Thu, 14 Feb 2019 12:44:36 +0100 Subject: [PATCH] QmlDesigner: Fix reordering compiler warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit src/plugins/qmldesigner/components/propertyeditor/gradientmodel.h: In constructor ‘GradientModel::GradientModel(QObject*)’: src/plugins/qmldesigner/components/propertyeditor/gradientmodel.h:94:10: warning: ‘GradientModel::m_locked’ will be initialized after [-Wreorder] bool m_locked; ^~~~~~~~ src/plugins/qmldesigner/components/propertyeditor/gradientmodel.h:93:13: warning: ‘QString GradientModel::m_gradientTypeName’ [-Wreorder] QString m_gradientTypeName; ^~~~~~~~~~~~~~~~~~ src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp: 41:1: warning: when initialized here [-Wreorder] GradientModel::GradientModel(QObject *parent) : ^~~~~~~~~~~~~ Change-Id: If5157b4a5703a98afa4934b08a88fb7ca6e4d2b4 Reviewed-by: Tim Jenssen --- .../qmldesigner/components/propertyeditor/gradientmodel.cpp | 3 +-- .../qmldesigner/components/propertyeditor/gradientmodel.h | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp b/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp index 40e74e13be4..8c0c3228580 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp @@ -39,8 +39,7 @@ #include GradientModel::GradientModel(QObject *parent) : - QAbstractListModel(parent), m_locked(false) - ,m_gradientTypeName("Gradient") + QAbstractListModel(parent) { } diff --git a/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.h b/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.h index aa7cdaa32f4..a4ff2255b52 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.h +++ b/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.h @@ -90,8 +90,8 @@ private: private: QmlDesigner::QmlItemNode m_itemNode; QString m_gradientPropertyName; - QString m_gradientTypeName; - bool m_locked; + QString m_gradientTypeName = "Gradient"; + bool m_locked = false; bool hasShapesImport() const; void ensureShapesImport(); void setupGradientProperties(const QmlDesigner::ModelNode &gradient);