OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

AppFwk Clang : Reorder initialization order to match declaration order

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Fwk/AppFwk/cafProjectDataModel/cafPdmObject.h
View File

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

4
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiItem.cpp
View File

@ -47,8 +47,8 @@ namespace caf
///
//--------------------------------------------------------------------------------------------------
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_icon(anIcon),
m_level(0)

6
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiItem.h
View File

@ -69,10 +69,10 @@ public:
private:
friend class PdmUiItem;
QString m_uiName;
QString m_toolTip;
QString m_extraDebugText;
QString m_whatsThis;
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
int m_isHidden; ///< UiItem should be hidden. -1 means not set
int m_isTreeChildrenHidden; ///< Children of UiItem should be hidden. -1 means not set

40
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiTreeOrdering.cpp
View File

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

2
Fwk/AppFwk/cafUserInterface/cafPdmUiListEditor.cpp
View File

@ -64,7 +64,7 @@
class MyStringListModel : public QStringListModel
{
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
{