AppFwk Clang : Reorder initialization order to match declaration order

This commit is contained in:
Magne Sjaastad 2018-02-23 19:43:48 +01:00
parent f9de64c538
commit 309b1f0749
5 changed files with 27 additions and 27 deletions

View File

@ -139,7 +139,7 @@ namespace caf
class PdmObject : public PdmObjectHandle, public PdmXmlObjectHandle, public PdmUiObjectHandle class PdmObject : public PdmObjectHandle, public PdmXmlObjectHandle, public PdmUiObjectHandle
{ {
public: public:
PdmObject() : PdmObjectHandle(), PdmUiObjectHandle(this, false), PdmXmlObjectHandle(this, false) {} PdmObject() : PdmObjectHandle(), PdmXmlObjectHandle(this, false), PdmUiObjectHandle(this, false) {}
virtual ~PdmObject() {} virtual ~PdmObject() {}
/// Adds field to the internal data structure and sets the file keyword and Ui information /// Adds field to the internal data structure and sets the file keyword and Ui information

View File

@ -47,8 +47,8 @@ namespace caf
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
PdmOptionItemInfo::PdmOptionItemInfo(const QString& anOptionUiText, const QVariant& aValue, bool isReadOnly /* = false */, QIcon anIcon /* = QIcon()*/) PdmOptionItemInfo::PdmOptionItemInfo(const QString& anOptionUiText, const QVariant& aValue, bool isReadOnly /* = false */, QIcon anIcon /* = QIcon()*/)
: m_value(aValue), : m_optionUiText(anOptionUiText),
m_optionUiText(anOptionUiText), m_value(aValue),
m_isReadOnly(isReadOnly), m_isReadOnly(isReadOnly),
m_icon(anIcon), m_icon(anIcon),
m_level(0) m_level(0)

View File

@ -69,10 +69,10 @@ public:
private: private:
friend class PdmUiItem; friend class PdmUiItem;
QString m_uiName; QString m_uiName;
QString m_toolTip;
QString m_extraDebugText;
QString m_whatsThis;
QIcon m_icon; QIcon m_icon;
QString m_toolTip;
QString m_whatsThis;
QString m_extraDebugText;
QString m_editorTypeName; ///< Use this exact type of editor to edit this UiItem QString m_editorTypeName; ///< Use this exact type of editor to edit this UiItem
int m_isHidden; ///< UiItem should be hidden. -1 means not set int m_isHidden; ///< UiItem should be hidden. -1 means not set
int m_isTreeChildrenHidden; ///< Children of UiItem should be hidden. -1 means not set int m_isTreeChildrenHidden; ///< Children of UiItem should be hidden. -1 means not set

View File

@ -140,13 +140,13 @@ bool PdmUiTreeOrdering::containsObject(const PdmObjectHandle* object)
/// Creates an new root PdmUiTreeOrdering item, pointing at a PdmObject /// Creates an new root PdmUiTreeOrdering item, pointing at a PdmObject
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
PdmUiTreeOrdering::PdmUiTreeOrdering(PdmObjectHandle* pdmObject) : PdmUiTreeOrdering::PdmUiTreeOrdering(PdmObjectHandle* pdmObject) :
m_parentItem(nullptr), m_object(pdmObject),
m_field(nullptr), m_field(nullptr),
m_uiItem(nullptr),
m_forgetRemainingFields(false), m_forgetRemainingFields(false),
m_isToIgnoreSubTree(false), m_isToIgnoreSubTree(false),
m_uiItem(nullptr), m_treeItemEditor(nullptr),
m_object(pdmObject), m_parentItem(nullptr)
m_treeItemEditor(nullptr)
{ {
} }
@ -154,13 +154,13 @@ PdmUiTreeOrdering::PdmUiTreeOrdering(PdmObjectHandle* pdmObject) :
/// Creates an new root PdmUiTreeOrdering item, pointing at a field /// Creates an new root PdmUiTreeOrdering item, pointing at a field
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
PdmUiTreeOrdering::PdmUiTreeOrdering( PdmFieldHandle* pdmField ) : PdmUiTreeOrdering::PdmUiTreeOrdering( PdmFieldHandle* pdmField ) :
m_parentItem(nullptr), m_object(nullptr),
m_field(pdmField), m_field(pdmField),
m_uiItem(nullptr),
m_forgetRemainingFields(false), m_forgetRemainingFields(false),
m_isToIgnoreSubTree(false), m_isToIgnoreSubTree(false),
m_uiItem(nullptr), m_treeItemEditor(nullptr),
m_object(nullptr), m_parentItem(nullptr)
m_treeItemEditor(nullptr)
{ {
if (pdmField) m_object = pdmField->ownerObject(); if (pdmField) m_object = pdmField->ownerObject();
} }
@ -169,13 +169,13 @@ PdmUiTreeOrdering::PdmUiTreeOrdering( PdmFieldHandle* pdmField ) :
/// Creates an new root PdmUiTreeOrdering item, as a display item only /// Creates an new root PdmUiTreeOrdering item, as a display item only
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
PdmUiTreeOrdering::PdmUiTreeOrdering(const QString & title, const QString& iconResourceName) : PdmUiTreeOrdering::PdmUiTreeOrdering(const QString & title, const QString& iconResourceName) :
m_parentItem(nullptr), m_object(nullptr),
m_field(nullptr), m_field(nullptr),
m_uiItem(nullptr),
m_forgetRemainingFields(false), m_forgetRemainingFields(false),
m_isToIgnoreSubTree(false), m_isToIgnoreSubTree(false),
m_uiItem(nullptr), m_treeItemEditor(nullptr),
m_object(nullptr), m_parentItem(nullptr)
m_treeItemEditor(nullptr)
{ {
m_uiItem = new PdmUiItem(); m_uiItem = new PdmUiItem();
m_uiItem->setUiName(title); m_uiItem->setUiName(title);
@ -187,13 +187,13 @@ PdmUiTreeOrdering::PdmUiTreeOrdering(const QString & title, const QString& iconR
/// at the end of parents existing child list. /// at the end of parents existing child list.
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
PdmUiTreeOrdering::PdmUiTreeOrdering(PdmUiTreeOrdering* parent, PdmObjectHandle* pdmObject) : PdmUiTreeOrdering::PdmUiTreeOrdering(PdmUiTreeOrdering* parent, PdmObjectHandle* pdmObject) :
m_parentItem(parent), m_object(pdmObject),
m_field(nullptr), m_field(nullptr),
m_uiItem(nullptr),
m_forgetRemainingFields(false), m_forgetRemainingFields(false),
m_isToIgnoreSubTree(false), m_isToIgnoreSubTree(false),
m_uiItem(nullptr), m_treeItemEditor(nullptr),
m_object(pdmObject), m_parentItem(parent)
m_treeItemEditor(nullptr)
{ {
if (m_parentItem) if (m_parentItem)
{ {
@ -206,13 +206,13 @@ PdmUiTreeOrdering::PdmUiTreeOrdering(PdmUiTreeOrdering* parent, PdmObjectHandle*
/// at the end of parents existing child list. /// at the end of parents existing child list.
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
PdmUiTreeOrdering::PdmUiTreeOrdering(PdmUiTreeOrdering* parent , PdmFieldHandle* pdmField ) : PdmUiTreeOrdering::PdmUiTreeOrdering(PdmUiTreeOrdering* parent , PdmFieldHandle* pdmField ) :
m_parentItem(parent), m_object(nullptr),
m_field(pdmField), m_field(pdmField),
m_uiItem(nullptr),
m_forgetRemainingFields(false), m_forgetRemainingFields(false),
m_isToIgnoreSubTree(false), m_isToIgnoreSubTree(false),
m_uiItem(nullptr), m_treeItemEditor(nullptr),
m_object(nullptr), m_parentItem(parent)
m_treeItemEditor(nullptr)
{ {
if (m_parentItem) if (m_parentItem)
{ {

View File

@ -64,7 +64,7 @@
class MyStringListModel : public QStringListModel class MyStringListModel : public QStringListModel
{ {
public: public:
explicit MyStringListModel(QObject *parent = nullptr) : m_isItemsEditable(false), QStringListModel(parent) { } explicit MyStringListModel(QObject *parent = nullptr) : QStringListModel(parent), m_isItemsEditable(false) { }
virtual Qt::ItemFlags flags (const QModelIndex& index) const virtual Qt::ItemFlags flags (const QModelIndex& index) const
{ {