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

CPoiMapModel: Make use of push_back over operator<<

This commit is contained in:
Lioncash 2020-07-10 12:08:19 -04:00
parent c4bf754722
commit 33fced1b7b
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Editor/WorldEditor/CPoiMapModel.cpp
View File

@ -70,7 +70,7 @@ void CPoiMapModel::AddPOI(CScriptNode *pPOI)
const int NewIndex = static_cast<int>(mpPoiToWorld->NumMappedPOIs()); const int NewIndex = static_cast<int>(mpPoiToWorld->NumMappedPOIs());
beginInsertRows(QModelIndex(), NewIndex, NewIndex); beginInsertRows(QModelIndex(), NewIndex, NewIndex);
QList<CModelNode*> *pList = new QList<CModelNode*>; auto* pList = new QList<CModelNode*>();
mModelMap[pPOI] = pList; mModelMap[pPOI] = pList;
mpPoiToWorld->AddPoi(pPOI->Instance()->InstanceID()); mpPoiToWorld->AddPoi(pPOI->Instance()->InstanceID());
@ -115,8 +115,10 @@ void CPoiMapModel::RemoveMapping(const QModelIndex& rkIndex, CModelNode *pNode)
mpPoiToWorld->RemovePoiMeshMap(pPOI->Instance()->InstanceID(), pNode->FindMeshID()); mpPoiToWorld->RemovePoiMeshMap(pPOI->Instance()->InstanceID(), pNode->FindMeshID());
} }
else else
{
mpPoiToWorld->RemovePoiMeshMap(pPOI->Instance()->InstanceID(), pNode->FindMeshID()); mpPoiToWorld->RemovePoiMeshMap(pPOI->Instance()->InstanceID(), pNode->FindMeshID());
} }
}
bool CPoiMapModel::IsPoiTracked(CScriptNode *pPOI) const bool CPoiMapModel::IsPoiTracked(CScriptNode *pPOI) const
{ {
@ -125,7 +127,8 @@ bool CPoiMapModel::IsPoiTracked(CScriptNode *pPOI) const
bool CPoiMapModel::IsModelMapped(const QModelIndex& rkIndex, CModelNode *pNode) const bool CPoiMapModel::IsModelMapped(const QModelIndex& rkIndex, CModelNode *pNode) const
{ {
if (!pNode) return false; if (!pNode)
return false;
CScriptNode *pPOI = PoiNodePointer(rkIndex); CScriptNode *pPOI = PoiNodePointer(rkIndex);
@ -134,7 +137,8 @@ bool CPoiMapModel::IsModelMapped(const QModelIndex& rkIndex, CModelNode *pNode)
QList<CModelNode*> *pList = mModelMap[pPOI]; QList<CModelNode*> *pList = mModelMap[pPOI];
return (pList->contains(pNode)); return (pList->contains(pNode));
} }
else return false;
return false;
} }
CScriptNode* CPoiMapModel::PoiNodePointer(const QModelIndex& rkIndex) const CScriptNode* CPoiMapModel::PoiNodePointer(const QModelIndex& rkIndex) const
@ -186,25 +190,24 @@ void CPoiMapModel::OnMapChange(CWorld*, CGameArea *pArea)
if (pPoiNode) if (pPoiNode)
{ {
QList<CModelNode*> *pModelList = new QList<CModelNode*>; auto* pModelList = new QList<CModelNode*>();
for (const auto modelID : pkMap->ModelIDs) for (const auto modelID : pkMap->ModelIDs)
{ {
if (NodeMap.contains(modelID)) if (NodeMap.contains(modelID))
*pModelList << NodeMap[modelID]; pModelList->push_back(NodeMap[modelID]);
} }
mModelMap[pPoiNode] = pModelList; mModelMap[pPoiNode] = pModelList;
} }
} }
} }
else else
{ {
QList<QList<CModelNode*>*> Lists = mModelMap.values(); QList<QList<CModelNode*>*> Lists = mModelMap.values();
for (auto it = Lists.begin(); it != Lists.end(); it++) for (auto* list : Lists)
delete *it; delete list;
mModelMap.clear(); mModelMap.clear();
} }