feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix reordering compiler warning

Browse Source 
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 <tim.jenssen@qt.io>
This commit is contained in:
Andre Hartmann
2019-02-14 12:44:36 +01:00
committed by André Hartmann
parent 992df45cd5
commit f061fe9e1b
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp
View File

@@ -39,8 +39,7 @@
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
GradientModel::GradientModel(QObject *parent) : GradientModel::GradientModel(QObject *parent) :
QAbstractListModel(parent), m_locked(false) QAbstractListModel(parent)
,m_gradientTypeName("Gradient")
{ {
} }

4
src/plugins/qmldesigner/components/propertyeditor/gradientmodel.h
View File

@@ -90,8 +90,8 @@ private:
private: private:
QmlDesigner::QmlItemNode m_itemNode; QmlDesigner::QmlItemNode m_itemNode;
QString m_gradientPropertyName; QString m_gradientPropertyName;
QString m_gradientTypeName; QString m_gradientTypeName = "Gradient";
bool m_locked; bool m_locked = false;
bool hasShapesImport() const; bool hasShapesImport() const;
void ensureShapesImport(); void ensureShapesImport();
void setupGradientProperties(const QmlDesigner::ModelNode &gradient); void setupGradientProperties(const QmlDesigner::ModelNode &gradient);