From a9292c1b29d319661a67aa19981fb9474c5dcfba Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 28 Jun 2020 04:29:46 -0400 Subject: [PATCH] CPoiMapModel: Make use of in-class initializers where applicable --- src/Editor/WorldEditor/CPoiMapModel.cpp | 4 +--- src/Editor/WorldEditor/CPoiMapModel.h | 11 ++++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/Editor/WorldEditor/CPoiMapModel.cpp b/src/Editor/WorldEditor/CPoiMapModel.cpp index 2c252db6..aed622a9 100644 --- a/src/Editor/WorldEditor/CPoiMapModel.cpp +++ b/src/Editor/WorldEditor/CPoiMapModel.cpp @@ -4,11 +4,9 @@ #include #include -CPoiMapModel::CPoiMapModel(CWorldEditor *pEditor, QObject *pParent /*= 0*/) +CPoiMapModel::CPoiMapModel(CWorldEditor *pEditor, QObject *pParent) : QAbstractListModel(pParent) , mpEditor(pEditor) - , mpArea(nullptr) - , mpPoiToWorld(nullptr) { connect(pEditor, SIGNAL(MapChanged(CWorld*,CGameArea*)), this, SLOT(OnMapChange(CWorld*,CGameArea*))); } diff --git a/src/Editor/WorldEditor/CPoiMapModel.h b/src/Editor/WorldEditor/CPoiMapModel.h index 217b2570..8e47514f 100644 --- a/src/Editor/WorldEditor/CPoiMapModel.h +++ b/src/Editor/WorldEditor/CPoiMapModel.h @@ -16,16 +16,17 @@ class CPoiMapModel : public QAbstractListModel Q_OBJECT CWorldEditor *mpEditor; - CGameArea *mpArea; + CGameArea *mpArea = nullptr; TResPtr mpPoiToWorld; QMap*> mModelMap; public: - explicit CPoiMapModel(CWorldEditor *pEditor, QObject *pParent = 0); - QVariant headerData(int Section, Qt::Orientation Orientation, int Role) const; - int rowCount(const QModelIndex& rkParent) const; - QVariant data(const QModelIndex& rkIndex, int Role) const; + explicit CPoiMapModel(CWorldEditor *pEditor, QObject *pParent = nullptr); + + QVariant headerData(int Section, Qt::Orientation Orientation, int Role) const override; + int rowCount(const QModelIndex& rkParent) const override; + QVariant data(const QModelIndex& rkIndex, int Role) const override; void AddPOI(CScriptNode *pPOI); void AddMapping(const QModelIndex& rkIndex, CModelNode *pNode);