AxioDL
/
PrimeWorldEditor
mirror of https://github.com/AxioDL/PrimeWorldEditor.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CInstanceModel: Make use of in-class initializers where applicable

This commit is contained in:
Lioncash 2020-06-28 03:48:56 -04:00
parent 832889f029
commit 6962f8e026
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Editor/WorldEditor/CInstancesModel.cpp
View File

@ -31,11 +31,6 @@ CInstancesModel::CInstancesModel(CWorldEditor *pEditor, QObject *pParent)
: QAbstractItemModel(pParent)
, mpEditor(pEditor)
, mpScene(pEditor->Scene())
, mpArea(nullptr)
, mpCurrentGame(nullptr)
, mModelType(EInstanceModelType::Layers)
, mShowColumnEnabled(true)
, mChangingLayout(false)
{
mBaseItems << "Script";
@ -50,9 +45,7 @@ CInstancesModel::CInstancesModel(CWorldEditor *pEditor, QObject *pParent)
connect(mpEditor, SIGNAL(InstancesLayerChanged(QList<CScriptNode*>)), this, SLOT(InstancesLayerPostChange(QList<CScriptNode*>)));
}
CInstancesModel::~CInstancesModel()
{
}
CInstancesModel::~CInstancesModel() = default;
QVariant CInstancesModel::headerData(int Section, Qt::Orientation Orientation, int Role) const
{

27
src/Editor/WorldEditor/CInstancesModel.h
View File

@ -27,23 +27,24 @@ public:
private:
CWorldEditor *mpEditor;
CScene *mpScene;
CGameArea *mpArea;
CGameTemplate *mpCurrentGame;
EInstanceModelType mModelType;
CGameArea *mpArea = nullptr;
CGameTemplate *mpCurrentGame = nullptr;
EInstanceModelType mModelType{EInstanceModelType::Layers};
QList<CScriptTemplate*> mTemplateList;
QStringList mBaseItems;
bool mShowColumnEnabled;
bool mChangingLayout;
bool mShowColumnEnabled = true;
bool mChangingLayout = false;
public:
explicit CInstancesModel(CWorldEditor *pEditor, QObject *pParent = 0);
~CInstancesModel();
QVariant headerData(int Section, Qt::Orientation Orientation, int Role) const;
QModelIndex index(int Row, int Column, const QModelIndex& rkParent = QModelIndex()) const;
QModelIndex parent(const QModelIndex& rkChild) const;
int rowCount(const QModelIndex& rkParent) const;
int columnCount(const QModelIndex& rkParent) const;
QVariant data(const QModelIndex& rkIndex, int Role) const;
explicit CInstancesModel(CWorldEditor *pEditor, QObject *pParent = nullptr);
~CInstancesModel() override;
QVariant headerData(int Section, Qt::Orientation Orientation, int Role) const override;
QModelIndex index(int Row, int Column, const QModelIndex& rkParent = QModelIndex()) const override;
QModelIndex parent(const QModelIndex& rkChild) const override;
int rowCount(const QModelIndex& rkParent) const override;
int columnCount(const QModelIndex& rkParent) const override;
QVariant data(const QModelIndex& rkIndex, int Role) const override;
void SetModelType(EInstanceModelType Type);
void SetShowColumnEnabled(bool Enabled);