From 706b0874f50db5005c43775051c93fc05902279d Mon Sep 17 00:00:00 2001 From: Jochen Becher Date: Sat, 8 Jul 2017 09:57:38 +0200 Subject: ModelEditor: Fix a number of trivial coverity issues Change-Id: Ie61e017b993ac788284611fb40052e5f59521a56 Reviewed-by: Tobias Hunger --- src/libs/modelinglib/qmt/model_controller/modelcontroller.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/libs/modelinglib/qmt/model_controller/modelcontroller.cpp') diff --git a/src/libs/modelinglib/qmt/model_controller/modelcontroller.cpp b/src/libs/modelinglib/qmt/model_controller/modelcontroller.cpp index 2b940f012a..3b97b1e460 100644 --- a/src/libs/modelinglib/qmt/model_controller/modelcontroller.cpp +++ b/src/libs/modelinglib/qmt/model_controller/modelcontroller.cpp @@ -505,9 +505,10 @@ private: QMT_CHECK(object); MObject *formerOwner = object->owner(); int formerRow = formerOwner->children().indexOf(object); + MObject *newOwner = m_modelController->findObject(m_ownerKey); + QMT_CHECK(newOwner); emit m_modelController->beginMoveObject(formerRow, formerOwner); formerOwner->decontrolChild(object); - MObject *newOwner = m_modelController->findObject(m_ownerKey); newOwner->insertChild(m_indexOfElement, object); int newRow = m_indexOfElement; m_ownerKey = formerOwner->uid(); @@ -560,9 +561,10 @@ private: QMT_CHECK(relation); MObject *formerOwner = relation->owner(); int formerRow = formerOwner->relations().indexOf(relation); + MObject *newOwner = m_modelController->findObject(m_ownerKey); + QMT_CHECK(newOwner); emit m_modelController->beginMoveRelation(formerRow, formerOwner); formerOwner->decontrolRelation(relation); - MObject *newOwner = m_modelController->findObject(m_ownerKey); newOwner->insertRelation(m_indexOfElement, relation); int newRow = m_indexOfElement; m_ownerKey = formerOwner->uid(); -- cgit v1.2.1