From 70e0286f94c60932490a410e4863cf4f42fabc94 Mon Sep 17 00:00:00 2001 From: Jochen Becher Date: Sat, 21 Nov 2015 20:54:19 +0100 Subject: [PATCH] ModelEditor: Use auto keyword Change-Id: I3d36f851227f6f90ddfc7da55169c6a8d4d57c39 Reviewed-by: Tobias Hunger --- .../qmt/controller/namecontroller.cpp | 2 +- .../modeling/qmt/controller/undocommand.cpp | 2 +- .../qmt/diagram_controller/dfactory.cpp | 20 +++---- .../dflatassignmentvisitor.cpp | 18 +++--- .../diagram_controller/diagramcontroller.cpp | 28 ++++----- .../qmt/diagram_controller/dupdatevisitor.cpp | 12 ++-- .../qmt/diagram_scene/diagramscenemodel.cpp | 30 +++++----- .../diagram_scene/items/associationitem.cpp | 2 +- .../qmt/diagram_scene/items/classitem.cpp | 16 ++--- .../qmt/diagram_scene/items/componentitem.cpp | 4 +- .../qmt/diagram_scene/items/itemitem.cpp | 4 +- .../qmt/diagram_scene/items/objectitem.cpp | 8 +-- .../qmt/diagram_scene/items/packageitem.cpp | 2 +- .../qmt/diagram_scene/items/relationitem.cpp | 2 +- .../qmt/diagram_scene/latchcontroller.cpp | 8 +-- .../diagram_scene/parts/alignbuttonsitem.cpp | 2 +- .../diagram_scene/parts/relationstarter.cpp | 2 +- .../qmt/diagram_ui/diagramsmanager.cpp | 6 +- .../qmt/diagram_ui/sceneinspector.cpp | 6 +- .../qmt/diagram_widgets_ui/diagramsview.cpp | 6 +- .../stackeddiagramsview.cpp | 6 +- .../documentcontroller.cpp | 8 +-- .../modeling/qmt/model/msourceexpansion.cpp | 4 +- .../qmt/model_controller/mclonevisitor.cpp | 12 ++-- .../mflatassignmentvisitor.cpp | 12 ++-- .../qmt/model_controller/modelcontroller.cpp | 60 +++++++++---------- .../modeling/qmt/model_ui/treemodel.cpp | 20 +++---- .../qmt/model_ui/treemodelmanager.cpp | 10 ++-- .../qmt/model_widgets_ui/modeltreeview.cpp | 14 ++--- .../qmt/model_widgets_ui/propertiesview.cpp | 8 +-- .../model_widgets_ui/propertiesviewmview.cpp | 4 +- .../project_controller/projectcontroller.cpp | 2 +- .../modeling/qmt/style/defaultstyleengine.cpp | 8 +-- .../qmt/tasks/diagramscenecontroller.cpp | 36 +++++------ .../modeling/qmt/tasks/finddiagramvisitor.cpp | 2 +- .../qmt/tasks/findrootdiagramvisitor.cpp | 2 +- .../qtserialization/inc/qark/qxmlinarchive.h | 6 +- .../inc/qark/serialize_container.h | 2 +- .../qtserialization/inc/qark/typeregistry.h | 2 +- .../qtserialization/src/savingrefmap.cpp | 2 +- 40 files changed, 200 insertions(+), 200 deletions(-) diff --git a/src/libs/3rdparty/modeling/qmt/controller/namecontroller.cpp b/src/libs/3rdparty/modeling/qmt/controller/namecontroller.cpp index fb99bca57f7..8600a00e926 100644 --- a/src/libs/3rdparty/modeling/qmt/controller/namecontroller.cpp +++ b/src/libs/3rdparty/modeling/qmt/controller/namecontroller.cpp @@ -147,7 +147,7 @@ QList NameController::buildElementsPath(const QString &filePath, bool i QStringList::const_iterator splittedEnd = splitted.end(); if (ignoreLastFilePathPart || splitted.last().isEmpty()) splittedEnd = --splittedEnd; - for (QStringList::const_iterator it = splitted.cbegin(); it != splittedEnd; ++it) { + for (auto it = splitted.cbegin(); it != splittedEnd; ++it) { QString packageName = qmt::NameController::convertFileNameToElementName(*it); relativeElements.append(packageName); } diff --git a/src/libs/3rdparty/modeling/qmt/controller/undocommand.cpp b/src/libs/3rdparty/modeling/qmt/controller/undocommand.cpp index 03bc6e545db..8ee68656437 100644 --- a/src/libs/3rdparty/modeling/qmt/controller/undocommand.cpp +++ b/src/libs/3rdparty/modeling/qmt/controller/undocommand.cpp @@ -57,7 +57,7 @@ void UndoCommand::setDoNotMerge(bool doNotMerge) bool UndoCommand::mergeWith(const QUndoCommand *other) { - const UndoCommand *otherCommand = dynamic_cast(other); + auto otherCommand = dynamic_cast(other); if (!otherCommand) return false; if (otherCommand->m_doNotMerge) diff --git a/src/libs/3rdparty/modeling/qmt/diagram_controller/dfactory.cpp b/src/libs/3rdparty/modeling/qmt/diagram_controller/dfactory.cpp index ec3f6ebc494..16390947e42 100644 --- a/src/libs/3rdparty/modeling/qmt/diagram_controller/dfactory.cpp +++ b/src/libs/3rdparty/modeling/qmt/diagram_controller/dfactory.cpp @@ -70,7 +70,7 @@ void DFactory::visitMElement(const MElement *element) void DFactory::visitMObject(const MObject *object) { - DObject *diagramObject = dynamic_cast(m_product); + auto diagramObject = dynamic_cast(m_product); QMT_CHECK(diagramObject); diagramObject->setModelUid(object->uid()); visitMElement(object); @@ -79,7 +79,7 @@ void DFactory::visitMObject(const MObject *object) void DFactory::visitMPackage(const MPackage *package) { QMT_CHECK(!m_product); - DPackage *diagramPackage = new DPackage(); + auto diagramPackage = new DPackage(); m_product = diagramPackage; visitMObject(package); } @@ -87,7 +87,7 @@ void DFactory::visitMPackage(const MPackage *package) void DFactory::visitMClass(const MClass *klass) { QMT_CHECK(!m_product); - DClass *diagramKlass = new DClass(); + auto diagramKlass = new DClass(); m_product = diagramKlass; visitMObject(klass); } @@ -95,7 +95,7 @@ void DFactory::visitMClass(const MClass *klass) void DFactory::visitMComponent(const MComponent *component) { QMT_CHECK(!m_product); - DComponent *diagramComponent = new DComponent(); + auto diagramComponent = new DComponent(); m_product = diagramComponent; visitMObject(component); } @@ -103,7 +103,7 @@ void DFactory::visitMComponent(const MComponent *component) void DFactory::visitMDiagram(const MDiagram *diagram) { QMT_CHECK(!m_product); - DDiagram *diagramDiagram = new DDiagram(); + auto diagramDiagram = new DDiagram(); m_product = diagramDiagram; visitMObject(diagram); } @@ -117,14 +117,14 @@ void DFactory::visitMCanvasDiagram(const MCanvasDiagram *diagram) void DFactory::visitMItem(const MItem *item) { QMT_CHECK(!m_product); - DItem *diagramItem = new DItem(); + auto diagramItem = new DItem(); m_product = diagramItem; visitMObject(item); } void DFactory::visitMRelation(const MRelation *relation) { - DRelation *diagramRelation = dynamic_cast(m_product); + auto diagramRelation = dynamic_cast(m_product); QMT_CHECK(diagramRelation); diagramRelation->setModelUid(relation->uid()); visitMElement(relation); @@ -133,7 +133,7 @@ void DFactory::visitMRelation(const MRelation *relation) void DFactory::visitMDependency(const MDependency *dependency) { QMT_CHECK(!m_product); - DDependency *diagramDependency = new DDependency(); + auto diagramDependency = new DDependency(); m_product = diagramDependency; visitMRelation(dependency); } @@ -141,7 +141,7 @@ void DFactory::visitMDependency(const MDependency *dependency) void DFactory::visitMInheritance(const MInheritance *inheritance) { QMT_CHECK(!m_product); - DInheritance *diagramInheritance = new DInheritance(); + auto diagramInheritance = new DInheritance(); m_product = diagramInheritance; visitMRelation(inheritance); } @@ -149,7 +149,7 @@ void DFactory::visitMInheritance(const MInheritance *inheritance) void DFactory::visitMAssociation(const MAssociation *association) { QMT_CHECK(!m_product); - DAssociation *diagramAssociation = new DAssociation(); + auto diagramAssociation = new DAssociation(); m_product = diagramAssociation; visitMRelation(association); } diff --git a/src/libs/3rdparty/modeling/qmt/diagram_controller/dflatassignmentvisitor.cpp b/src/libs/3rdparty/modeling/qmt/diagram_controller/dflatassignmentvisitor.cpp index d40c54e480c..5024087158c 100644 --- a/src/libs/3rdparty/modeling/qmt/diagram_controller/dflatassignmentvisitor.cpp +++ b/src/libs/3rdparty/modeling/qmt/diagram_controller/dflatassignmentvisitor.cpp @@ -63,7 +63,7 @@ void DFlatAssignmentVisitor::visitDElement(const DElement *element) void DFlatAssignmentVisitor::visitDObject(const DObject *object) { visitDElement(object); - DObject *target = dynamic_cast(m_target); + auto target = dynamic_cast(m_target); QMT_CHECK(target); target->setStereotypes(object->stereotypes()); target->setName(object->name()); @@ -85,7 +85,7 @@ void DFlatAssignmentVisitor::visitDPackage(const DPackage *package) void DFlatAssignmentVisitor::visitDClass(const DClass *klass) { visitDObject(klass); - DClass *target = dynamic_cast(m_target); + auto target = dynamic_cast(m_target); QMT_CHECK(target); target->setUmlNamespace(klass->umlNamespace()); target->setTemplateParameters(klass->templateParameters()); @@ -98,7 +98,7 @@ void DFlatAssignmentVisitor::visitDClass(const DClass *klass) void DFlatAssignmentVisitor::visitDComponent(const DComponent *component) { visitDObject(component); - DComponent *target = dynamic_cast(m_target); + auto target = dynamic_cast(m_target); QMT_CHECK(target); target->setPlainShape(component->isPlainShape()); } @@ -111,7 +111,7 @@ void DFlatAssignmentVisitor::visitDDiagram(const DDiagram *diagram) void DFlatAssignmentVisitor::visitDItem(const DItem *item) { visitDObject(item); - DItem *target = dynamic_cast(m_target); + auto target = dynamic_cast(m_target); QMT_CHECK(target); target->setVariety(target->variety()); target->setShapeEditable(target->isShapeEditable()); @@ -121,7 +121,7 @@ void DFlatAssignmentVisitor::visitDItem(const DItem *item) void DFlatAssignmentVisitor::visitDRelation(const DRelation *relation) { visitDElement(relation); - DRelation *target = dynamic_cast(m_target); + auto target = dynamic_cast(m_target); QMT_CHECK(target); target->setStereotypes(relation->stereotypes()); target->setIntermediatePoints(relation->intermediatePoints()); @@ -135,7 +135,7 @@ void DFlatAssignmentVisitor::visitDInheritance(const DInheritance *inheritance) void DFlatAssignmentVisitor::visitDDependency(const DDependency *dependency) { visitDRelation(dependency); - DDependency *target = dynamic_cast(m_target); + auto target = dynamic_cast(m_target); QMT_CHECK(target); target->setDirection(dependency->direction()); } @@ -143,7 +143,7 @@ void DFlatAssignmentVisitor::visitDDependency(const DDependency *dependency) void DFlatAssignmentVisitor::visitDAssociation(const DAssociation *association) { visitDRelation(association); - DAssociation *target = dynamic_cast(m_target); + auto target = dynamic_cast(m_target); QMT_CHECK(target); target->setEndA(association->endA()); target->setEndB(association->endB()); @@ -152,7 +152,7 @@ void DFlatAssignmentVisitor::visitDAssociation(const DAssociation *association) void DFlatAssignmentVisitor::visitDAnnotation(const DAnnotation *annotation) { visitDElement(annotation); - DAnnotation *target = dynamic_cast(m_target); + auto target = dynamic_cast(m_target); target->setText(annotation->text()); target->setPos(annotation->pos()); target->setRect(annotation->rect()); @@ -163,7 +163,7 @@ void DFlatAssignmentVisitor::visitDAnnotation(const DAnnotation *annotation) void DFlatAssignmentVisitor::visitDBoundary(const DBoundary *boundary) { visitDElement(boundary); - DBoundary *target = dynamic_cast(m_target); + auto target = dynamic_cast(m_target); target->setText(boundary->text()); target->setPos(boundary->pos()); target->setRect(boundary->rect()); diff --git a/src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.cpp b/src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.cpp index 197c27a23db..f7055998487 100644 --- a/src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.cpp +++ b/src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.cpp @@ -118,7 +118,7 @@ public: bool mergeWith(const UndoCommand *other) { - const UpdateElementCommand *otherUpdateCommand = dynamic_cast(other); + auto otherUpdateCommand = dynamic_cast(other); if (!otherUpdateCommand) return false; if (diagramKey() != otherUpdateCommand->diagramKey()) @@ -403,7 +403,7 @@ void DiagramController::addElement(DElement *element, MDiagram *diagram) emit beginInsertElement(row, diagram); updateElementFromModel(element, diagram, false); if (m_undoController) { - AddElementsCommand *undoCommand = new AddElementsCommand(this, diagram->uid(), tr("Add Object")); + auto undoCommand = new AddElementsCommand(this, diagram->uid(), tr("Add Object")); m_undoController->push(undoCommand); undoCommand->add(element->uid()); } @@ -418,7 +418,7 @@ void DiagramController::removeElement(DElement *element, MDiagram *diagram) int row = diagram->diagramElements().indexOf(element); emit beginRemoveElement(row, diagram); if (m_undoController) { - RemoveElementsCommand *undoCommand = new RemoveElementsCommand(this, diagram->uid(), tr("Remove Object")); + auto undoCommand = new RemoveElementsCommand(this, diagram->uid(), tr("Remove Object")); m_undoController->push(undoCommand); undoCommand->add(element); } @@ -511,7 +511,7 @@ void DiagramController::pasteElements(const DContainer &diagramContainer, MDiagr } // fix all keys referencing between pasting elements foreach(DElement *clonedElement, clonedElements) { - DRelation *relation = dynamic_cast(clonedElement); + auto relation = dynamic_cast(clonedElement); if (relation) updateRelationKeys(relation, renewedKeys); } @@ -524,7 +524,7 @@ void DiagramController::pasteElements(const DContainer &diagramContainer, MDiagr int row = diagram->diagramElements().size(); emit beginInsertElement(row, diagram); if (m_undoController) { - AddElementsCommand *undoCommand = new AddElementsCommand(this, diagram->uid(), tr("Paste")); + auto undoCommand = new AddElementsCommand(this, diagram->uid(), tr("Paste")); m_undoController->push(undoCommand); undoCommand->add(clonedElement->uid()); } @@ -534,12 +534,12 @@ void DiagramController::pasteElements(const DContainer &diagramContainer, MDiagr } } foreach (DElement *clonedElement, clonedElements) { - DRelation *clonedRelation = dynamic_cast(clonedElement); + auto clonedRelation = dynamic_cast(clonedElement); if (clonedRelation && areRelationEndsOnDiagram(clonedRelation, diagram)) { int row = diagram->diagramElements().size(); emit beginInsertElement(row, diagram); if (m_undoController) { - AddElementsCommand *undoCommand = new AddElementsCommand(this, diagram->uid(), tr("Paste")); + auto undoCommand = new AddElementsCommand(this, diagram->uid(), tr("Paste")); m_undoController->push(undoCommand); undoCommand->add(clonedElement->uid()); } @@ -596,7 +596,7 @@ void DiagramController::onEndUpdateObject(int row, const MObject *parent) { MObject *modelObject = m_modelController->object(row, parent); QMT_CHECK(modelObject); - MPackage *modelPackage = dynamic_cast(modelObject); + auto modelPackage = dynamic_cast(modelObject); foreach (MDiagram *diagram, m_allDiagrams) { DObject *object = findDelegate(modelObject, diagram); if (object) { @@ -626,7 +626,7 @@ void DiagramController::onEndInsertObject(int row, const MObject *owner) QMT_CHECK(owner); MObject *modelObject = m_modelController->object(row, owner); - if (MDiagram *modelDiagram = dynamic_cast(modelObject)) { + if (auto modelDiagram = dynamic_cast(modelObject)) { QMT_CHECK(!m_allDiagrams.contains(modelDiagram)); m_allDiagrams.append(modelDiagram); } @@ -659,7 +659,7 @@ void DiagramController::onEndMoveObject(int row, const MObject *owner) // if diagram was moved update all elements because of changed context MObject *modelObject = m_modelController->object(row, owner); QMT_CHECK(modelObject); - MDiagram *modelDiagram = dynamic_cast(modelObject); + auto modelDiagram = dynamic_cast(modelObject); if (modelDiagram) { emit beginResetDiagram(modelDiagram); foreach (DElement *diagramElement, modelDiagram->diagramElements()) @@ -732,7 +732,7 @@ void DiagramController::deleteElements(const DSelection &diagramSelection, MDiag int row = diagram->diagramElements().indexOf(element); emit beginRemoveElement(diagram->diagramElements().indexOf(element), diagram); if (m_undoController) { - RemoveElementsCommand *cutCommand = new RemoveElementsCommand(this, diagram->uid(), commandLabel); + auto cutCommand = new RemoveElementsCommand(this, diagram->uid(), commandLabel); m_undoController->push(cutCommand); cutCommand->add(element); } @@ -773,7 +773,7 @@ void DiagramController::removeObjects(MObject *modelObject) if (object.hasTarget()) removeObjects(object.target()); } - if (MDiagram *diagram = dynamic_cast(modelObject)) { + if (auto diagram = dynamic_cast(modelObject)) { emit diagramAboutToBeRemoved(diagram); QMT_CHECK(m_allDiagrams.contains(diagram)); m_allDiagrams.removeOne(diagram); @@ -797,10 +797,10 @@ void DiagramController::removeRelations(MRelation *modelRelation) void DiagramController::removeRelations(DElement *element, MDiagram *diagram) { - DObject *diagramObject = dynamic_cast(element); + auto diagramObject = dynamic_cast(element); if (diagramObject) { foreach (DElement *diagramElement, diagram->diagramElements()) { - if (DRelation *diagramRelation = dynamic_cast(diagramElement)) { + if (auto diagramRelation = dynamic_cast(diagramElement)) { if (diagramRelation->endAUid() == diagramObject->uid() || diagramRelation->endBUid() == diagramObject->uid()) { removeElement(diagramRelation, diagram); diff --git a/src/libs/3rdparty/modeling/qmt/diagram_controller/dupdatevisitor.cpp b/src/libs/3rdparty/modeling/qmt/diagram_controller/dupdatevisitor.cpp index d001c8f2f11..bab5e50861e 100644 --- a/src/libs/3rdparty/modeling/qmt/diagram_controller/dupdatevisitor.cpp +++ b/src/libs/3rdparty/modeling/qmt/diagram_controller/dupdatevisitor.cpp @@ -76,7 +76,7 @@ void DUpdateVisitor::visitMElement(const MElement *element) void DUpdateVisitor::visitMObject(const MObject *object) { - DObject *dobject = dynamic_cast(m_target); + auto dobject = dynamic_cast(m_target); QMT_CHECK(dobject); if (isUpdating(object->stereotypes() != dobject->stereotypes())) dobject->setStereotypes(object->stereotypes()); @@ -111,7 +111,7 @@ void DUpdateVisitor::visitMPackage(const MPackage *package) void DUpdateVisitor::visitMClass(const MClass *klass) { - DClass *dclass = dynamic_cast(m_target); + auto dclass = dynamic_cast(m_target); QMT_CHECK(dclass); if (isUpdating(klass->umlNamespace() != dclass->umlNamespace())) dclass->setUmlNamespace(klass->umlNamespace()); @@ -139,7 +139,7 @@ void DUpdateVisitor::visitMCanvasDiagram(const MCanvasDiagram *diagram) void DUpdateVisitor::visitMItem(const MItem *item) { - DItem *ditem = dynamic_cast(m_target); + auto ditem = dynamic_cast(m_target); QMT_CHECK(ditem); if (isUpdating(item->isShapeEditable() != ditem->isShapeEditable())) ditem->setShapeEditable(item->isShapeEditable()); @@ -150,7 +150,7 @@ void DUpdateVisitor::visitMItem(const MItem *item) void DUpdateVisitor::visitMRelation(const MRelation *relation) { - DRelation *drelation = dynamic_cast(m_target); + auto drelation = dynamic_cast(m_target); QMT_CHECK(drelation); if (isUpdating(relation->stereotypes() != drelation->stereotypes())) drelation->setStereotypes(relation->stereotypes()); @@ -161,7 +161,7 @@ void DUpdateVisitor::visitMRelation(const MRelation *relation) void DUpdateVisitor::visitMDependency(const MDependency *dependency) { - DDependency *ddependency = dynamic_cast(m_target); + auto ddependency = dynamic_cast(m_target); QMT_CHECK(ddependency); if (isUpdating(dependency->direction() != ddependency->direction())) ddependency->setDirection(dependency->direction()); @@ -175,7 +175,7 @@ void DUpdateVisitor::visitMInheritance(const MInheritance *inheritance) void DUpdateVisitor::visitMAssociation(const MAssociation *association) { - DAssociation *dassociation = dynamic_cast(m_target); + auto dassociation = dynamic_cast(m_target); QMT_CHECK(dassociation); DAssociationEnd endA; endA.setName(association->endA().name()); diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramscenemodel.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramscenemodel.cpp index 7cfbbae43bc..e270bd56352 100644 --- a/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramscenemodel.cpp +++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramscenemodel.cpp @@ -254,7 +254,7 @@ DElement *DiagramSceneModel::element(QGraphicsItem *item) const bool DiagramSceneModel::isElementEditable(const DElement *element) const { - IEditable *editable = dynamic_cast(m_elementToItemMap.value(element)); + auto editable = dynamic_cast(m_elementToItemMap.value(element)); return editable != 0 && editable->isEditable(); } @@ -277,14 +277,14 @@ void DiagramSceneModel::selectElement(DElement *element) void DiagramSceneModel::editElement(DElement *element) { - IEditable *editable = dynamic_cast(m_elementToItemMap.value(element)); + auto editable = dynamic_cast(m_elementToItemMap.value(element)); if (editable != 0 && editable->isEditable()) editable->edit(); } void DiagramSceneModel::copyToClipboard() { - QMimeData *mimeData = new QMimeData(); + auto mimeData = new QMimeData(); // Selections would also render to the clipboard m_graphicsScene->clearSelection(); @@ -461,11 +461,11 @@ void DiagramSceneModel::moveSelectedItems(QGraphicsItem *grabbedItem, const QPoi if (delta != QPointF(0.0, 0.0)) { foreach (QGraphicsItem *item, m_selectedItems) { - if (IMoveable *moveable = dynamic_cast(item)) + if (auto moveable = dynamic_cast(item)) moveable->moveDelta(delta); } foreach (QGraphicsItem *item, m_secondarySelectedItems) { - if (IMoveable *moveable = dynamic_cast(item)) + if (auto moveable = dynamic_cast(item)) moveable->moveDelta(delta); } } @@ -474,11 +474,11 @@ void DiagramSceneModel::moveSelectedItems(QGraphicsItem *grabbedItem, const QPoi void DiagramSceneModel::alignSelectedItemsPositionOnRaster() { foreach (QGraphicsItem *item, m_selectedItems) { - if (IMoveable *moveable = dynamic_cast(item)) + if (auto moveable = dynamic_cast(item)) moveable->alignItemPositionToRaster(RASTER_WIDTH, RASTER_HEIGHT); } foreach (QGraphicsItem *item, m_secondarySelectedItems) { - if (IMoveable *moveable = dynamic_cast(item)) + if (auto moveable = dynamic_cast(item)) moveable->alignItemPositionToRaster(RASTER_WIDTH, RASTER_HEIGHT); } } @@ -495,7 +495,7 @@ QList DiagramSceneModel::collectCollidingObjectItems(const QGra { QList collidingItems; - const IResizable *resizable = dynamic_cast(item); + auto resizable = dynamic_cast(item); if (!resizable) return collidingItems; QRectF rect = resizable->rect(); @@ -504,7 +504,7 @@ QList DiagramSceneModel::collectCollidingObjectItems(const QGra switch (collidingMode) { case CollidingInnerItems: foreach (QGraphicsItem *candidate, m_graphicsItems) { - if (const IResizable *candidateResizable = dynamic_cast(candidate)) { + if (auto candidateResizable = dynamic_cast(candidate)) { QRectF candidateRect = candidateResizable->rect(); candidateRect.translate(candidateResizable->pos()); if (candidateRect.left() >= rect.left() && candidateRect.right() <= rect.right() @@ -516,7 +516,7 @@ QList DiagramSceneModel::collectCollidingObjectItems(const QGra break; case CollidingItems: foreach (QGraphicsItem *candidate, m_graphicsItems) { - if (const IResizable *candidateResizable = dynamic_cast(candidate)) { + if (auto candidateResizable = dynamic_cast(candidate)) { QRectF candidateRect = candidateResizable->rect(); candidateRect.translate(candidateResizable->pos()); if (candidateRect.left() <= rect.right() && candidateRect.right() >= rect.left() @@ -528,7 +528,7 @@ QList DiagramSceneModel::collectCollidingObjectItems(const QGra break; case CollidingOuterItems: foreach (QGraphicsItem *candidate, m_graphicsItems) { - if (const IResizable *candidateResizable = dynamic_cast(candidate)) { + if (auto candidateResizable = dynamic_cast(candidate)) { QRectF candidateRect = candidateResizable->rect(); candidateRect.translate(candidateResizable->pos()); if (candidateRect.left() <= rect.left() && candidateRect.right() >= rect.right() @@ -761,7 +761,7 @@ void DiagramSceneModel::onSelectionChanged() // select all relations where both ends are primary or secondary selected foreach (DElement *element, m_diagram->diagramElements()) { - DRelation *relation = dynamic_cast(element); + auto relation = dynamic_cast(element); if (relation) { QGraphicsItem *relationItem = m_elementToItemMap.value(relation); QMT_CHECK(relationItem); @@ -784,7 +784,7 @@ void DiagramSceneModel::onSelectionChanged() foreach (QGraphicsItem *item, m_secondarySelectedItems) { if (!newSecondarySelectedItems.contains(item)) { - ISelectable *selectable = dynamic_cast(item); + auto selectable = dynamic_cast(item); QMT_CHECK(selectable); selectable->setSecondarySelected(false); selectionChanged = true; @@ -792,7 +792,7 @@ void DiagramSceneModel::onSelectionChanged() } foreach (QGraphicsItem *item, newSecondarySelectedItems) { if (!m_secondarySelectedItems.contains(item)) { - ISelectable *selectable = dynamic_cast(item); + auto selectable = dynamic_cast(item); QMT_CHECK(selectable); selectable->setSecondarySelected(true); selectionChanged = true; @@ -894,7 +894,7 @@ void DiagramSceneModel::updateFocusItem(const QSet &selectedIte void DiagramSceneModel::unsetFocusItem() { if (m_focusItem) { - if (ISelectable *oldSelectable = dynamic_cast(m_focusItem)) + if (auto oldSelectable = dynamic_cast(m_focusItem)) oldSelectable->setFocusSelected(false); else QMT_CHECK(false); diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/associationitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/associationitem.cpp index 568aa369684..4ed5bca6520 100644 --- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/associationitem.cpp +++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/associationitem.cpp @@ -140,7 +140,7 @@ void AssociationItem::placeEndLabels(const QLineF &lineSegment, QGraphicsItem *e QPointF rectPlacement; GeometryUtilities::Side alignedSide = GeometryUtilities::SideUnspecified; - if (IIntersectionable *objectItem = dynamic_cast(endItem)) { + if (auto objectItem = dynamic_cast(endItem)) { QPointF intersectionPoint; QLineF intersectionLine; diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/classitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/classitem.cpp index f4fc7ec5fca..5337f638376 100644 --- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/classitem.cpp +++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/classitem.cpp @@ -93,7 +93,7 @@ void ClassItem::update() updateStereotypeIconDisplay(); - DClass *diagramClass = dynamic_cast(object()); + auto diagramClass = dynamic_cast(object()); QMT_CHECK(diagramClass); const Style *style = adaptedStyle(stereotypeIconId()); @@ -315,20 +315,20 @@ void ClassItem::relationDrawn(const QString &id, const QPointF &toScenePos, cons DElement *targetElement = diagramSceneModel()->findTopmostElement(toScenePos); if (targetElement) { if (id == QLatin1String("inheritance")) { - DClass *baseClass = dynamic_cast(targetElement); + auto baseClass = dynamic_cast(targetElement); if (baseClass) { - DClass *derivedClass = dynamic_cast(object()); + auto derivedClass = dynamic_cast(object()); QMT_CHECK(derivedClass); diagramSceneModel()->diagramSceneController()->createInheritance(derivedClass, baseClass, intermediatePoints, diagramSceneModel()->diagram()); } } else if (id == QLatin1String("dependency")) { - DObject *dependantObject = dynamic_cast(targetElement); + auto dependantObject = dynamic_cast(targetElement); if (dependantObject) diagramSceneModel()->diagramSceneController()->createDependency(object(), dependantObject, intermediatePoints, diagramSceneModel()->diagram()); } else if (id == QLatin1String("association")) { - DClass *assoziatedClass = dynamic_cast(targetElement); + auto assoziatedClass = dynamic_cast(targetElement); if (assoziatedClass) { - DClass *derivedClass = dynamic_cast(object()); + auto derivedClass = dynamic_cast(object()); QMT_CHECK(derivedClass); diagramSceneModel()->diagramSceneController()->createAssociation(derivedClass, assoziatedClass, intermediatePoints, diagramSceneModel()->diagram()); } @@ -348,7 +348,7 @@ bool ClassItem::extendContextMenu(QMenu *menu) bool ClassItem::handleSelectedContextMenuAction(QAction *action) { - ContextMenuAction *klassAction = dynamic_cast(action); + auto klassAction = dynamic_cast(action); if (klassAction) { if (klassAction->id() == QStringLiteral("showDefinition")) { diagramSceneModel()->diagramSceneController()->elementTasks()->openClassDefinition(object(), diagramSceneModel()->diagram()); @@ -543,7 +543,7 @@ void ClassItem::updateMembers(const Style *style) QString *currentGroup = 0; QString *text = 0; - DClass *dclass = dynamic_cast(object()); + auto dclass = dynamic_cast(object()); QMT_CHECK(dclass); // TODO move bool haveIconFonts into class Style? diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/componentitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/componentitem.cpp index 90021c1e9d7..f8a3d0fc23f 100644 --- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/componentitem.cpp +++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/componentitem.cpp @@ -242,7 +242,7 @@ void ComponentItem::relationDrawn(const QString &id, const QPointF &toScenePos, DElement *targetElement = diagramSceneModel()->findTopmostElement(toScenePos); if (targetElement) { if (id == QStringLiteral("dependency")) { - DObject *dependantObject = dynamic_cast(targetElement); + auto dependantObject = dynamic_cast(targetElement); if (dependantObject) diagramSceneModel()->diagramSceneController()->createDependency(object(), dependantObject, intermediatePoints, diagramSceneModel()->diagram()); } @@ -251,7 +251,7 @@ void ComponentItem::relationDrawn(const QString &id, const QPointF &toScenePos, bool ComponentItem::hasPlainShape() const { - DComponent *diagramComponent = dynamic_cast(object()); + auto diagramComponent = dynamic_cast(object()); QMT_CHECK(diagramComponent); return diagramComponent->isPlainShape(); } diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/itemitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/itemitem.cpp index d917d8fd66b..de2d81296bd 100644 --- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/itemitem.cpp +++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/itemitem.cpp @@ -78,7 +78,7 @@ void ItemItem::update() prepareGeometryChange(); updateStereotypeIconDisplay(); - DItem *diagramItem = dynamic_cast(object()); + auto diagramItem = dynamic_cast(object()); Q_UNUSED(diagramItem); // avoid warning about unsed variable QMT_CHECK(diagramItem); @@ -198,7 +198,7 @@ void ItemItem::relationDrawn(const QString &id, const QPointF &toScenePos, const DElement *targetElement = diagramSceneModel()->findTopmostElement(toScenePos); if (targetElement) { if (id == QStringLiteral("dependency")) { - DObject *dependantObject = dynamic_cast(targetElement); + auto dependantObject = dynamic_cast(targetElement); if (dependantObject) diagramSceneModel()->diagramSceneController()->createDependency(object(), dependantObject, intermediatePoints, diagramSceneModel()->diagram()); } diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/objectitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/objectitem.cpp index aeb40c77e22..bd094e7dbcc 100644 --- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/objectitem.cpp +++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/objectitem.cpp @@ -561,7 +561,7 @@ const Style *ObjectItem::adaptedStyle(const QString &stereotypeIconId) { QList collidingObjects; foreach (const QGraphicsItem *item, m_diagramSceneModel->collectCollidingObjectItems(this, DiagramSceneModel::CollidingItems)) { - if (const ObjectItem *objectItem = dynamic_cast(item)) + if (auto objectItem = dynamic_cast(item)) collidingObjects.append(objectItem->object()); } QColor baseColor; @@ -591,7 +591,7 @@ bool ObjectItem::showContext() const MObject *owner = mobject->owner(); if (owner) { foreach (QGraphicsItem *item, m_diagramSceneModel->collectCollidingObjectItems(this, DiagramSceneModel::CollidingOuterItems)) { - if (ObjectItem *objectItem = dynamic_cast(item)) { + if (auto objectItem = dynamic_cast(item)) { if (objectItem->object()->modelUid().isValid() && objectItem->object()->modelUid() == owner->uid()) { showContext = false; break; @@ -688,7 +688,7 @@ void ObjectItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) QAction *selectedAction = menu.exec(event->screenPos()); if (selectedAction) { if (!handleSelectedContextMenuAction(selectedAction)) { - ContextMenuAction *action = dynamic_cast(selectedAction); + auto action = dynamic_cast(selectedAction); QMT_CHECK(action); if (action->id() == QStringLiteral("openDiagram")) { m_diagramSceneModel->diagramSceneController()->elementTasks()->openDiagram(m_object, m_diagramSceneModel->diagram()); @@ -733,7 +733,7 @@ QSizeF ObjectItem::minimumSize(const QSet &items) const { QSizeF minimumSize(0.0, 0.0); foreach (QGraphicsItem *item, items) { - if (IResizable *resizable = dynamic_cast(item)) { + if (auto resizable = dynamic_cast(item)) { QSizeF size = resizable->minimumSize(); if (size.width() > minimumSize.width()) minimumSize.setWidth(size.width()); diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/packageitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/packageitem.cpp index d7538fce7ff..6268e444d0e 100644 --- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/packageitem.cpp +++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/packageitem.cpp @@ -213,7 +213,7 @@ void PackageItem::relationDrawn(const QString &id, const QPointF &toScenePos, co DElement *targetElement = diagramSceneModel()->findTopmostElement(toScenePos); if (targetElement) { if (id == QStringLiteral("dependency")) { - DObject *dependantObject = dynamic_cast(targetElement); + auto dependantObject = dynamic_cast(targetElement); if (dependantObject) diagramSceneModel()->diagramSceneController()->createDependency(object(), dependantObject, intermediatePoints, diagramSceneModel()->diagram()); } diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/relationitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/relationitem.cpp index 0b0bbd136b3..a109f8e20cc 100644 --- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/relationitem.cpp +++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/relationitem.cpp @@ -468,7 +468,7 @@ QPointF RelationItem::calcEndPoint(const Uid &end, const QPointF &otherEndPos, i { QGraphicsItem *endItem = m_diagramSceneModel->graphicsItem(end); QMT_CHECK(endItem); - IIntersectionable *endObjectItem = dynamic_cast(endItem); + auto endObjectItem = dynamic_cast(endItem); QPointF endPos; if (endObjectItem) { DObject *endObject = m_diagramSceneModel->diagramController()->findElement(end, m_diagramSceneModel->diagram()); diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/latchcontroller.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/latchcontroller.cpp index c219dfdb8c5..f1ce82f59ad 100644 --- a/src/libs/3rdparty/modeling/qmt/diagram_scene/latchcontroller.cpp +++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/latchcontroller.cpp @@ -116,7 +116,7 @@ void LatchController::mouseMoveEventLatching(QGraphicsSceneMouseEvent *event) if (!m_diagramSceneModel->focusItem()) return; - ILatchable *palpedLatchable = dynamic_cast(m_diagramSceneModel->focusItem()); + auto palpedLatchable = dynamic_cast(m_diagramSceneModel->focusItem()); if (!palpedLatchable) return; @@ -135,7 +135,7 @@ void LatchController::mouseMoveEventLatching(QGraphicsSceneMouseEvent *event) foreach (QGraphicsItem *item, m_diagramSceneModel->graphicsItems()) { if (item != m_diagramSceneModel->focusItem() && !m_diagramSceneModel->isSelectedItem(item)) { - if (ILatchable *latchable = dynamic_cast(item)) { + if (auto latchable = dynamic_cast(item)) { QList horizontals = latchable->horizontalLatches(horizAction, false); foreach (const ILatchable::Latch &palpedLatch, palpedHorizontals) { foreach (const ILatchable::Latch &latch, horizontals) { @@ -226,7 +226,7 @@ void LatchController::mouseReleaseEventLatching(QGraphicsSceneMouseEvent *event) case ILatchable::Hcenter: foreach (QGraphicsItem *item, m_diagramSceneModel->selectedItems()) { DElement *element = m_diagramSceneModel->element(item); - if (DObject *selectedObject = dynamic_cast(element)) { + if (auto selectedObject = dynamic_cast(element)) { m_diagramSceneModel->diagramController()->startUpdateElement(selectedObject, m_diagramSceneModel->diagram(), DiagramController::UpdateGeometry); QPointF newPos = selectedObject->pos(); newPos.setX(newPos.x() + m_horizontalDist); @@ -251,7 +251,7 @@ void LatchController::mouseReleaseEventLatching(QGraphicsSceneMouseEvent *event) case ILatchable::Vcenter: foreach (QGraphicsItem *item, m_diagramSceneModel->selectedItems()) { DElement *element = m_diagramSceneModel->element(item); - if (DObject *selectedObject = dynamic_cast(element)) { + if (auto selectedObject = dynamic_cast(element)) { m_diagramSceneModel->diagramController()->startUpdateElement(selectedObject, m_diagramSceneModel->diagram(), DiagramController::UpdateGeometry); QPointF newPos = selectedObject->pos(); newPos.setY(newPos.y() + m_verticalDist); diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignbuttonsitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignbuttonsitem.cpp index 0202bacbb5a..15f14bf10a4 100644 --- a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignbuttonsitem.cpp +++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignbuttonsitem.cpp @@ -126,7 +126,7 @@ void AlignButtonsItem::clear() void AlignButtonsItem::addButton(IAlignable::AlignType alignType, const QString &identifier, qreal pos) { - AlignButtonItem *item = new AlignButtonItem(alignType, identifier, m_alignable, this); + auto item = new AlignButtonItem(alignType, identifier, m_alignable, this); switch (alignType) { case IAlignable::AlignLeft: { diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/relationstarter.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/relationstarter.cpp index 15f58e97f1a..a2d54a44a53 100644 --- a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/relationstarter.cpp +++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/relationstarter.cpp @@ -83,7 +83,7 @@ void RelationStarter::addArrow(const QString &id, ArrowItem::Shaft shaft, { QMT_CHECK(!id.isEmpty()); prepareGeometryChange(); - ArrowItem *arrow = new ArrowItem(this); + auto arrow = new ArrowItem(this); arrow->setArrowSize(10.0); arrow->setDiamondSize(15.0); arrow->setShaft(shaft); diff --git a/src/libs/3rdparty/modeling/qmt/diagram_ui/diagramsmanager.cpp b/src/libs/3rdparty/modeling/qmt/diagram_ui/diagramsmanager.cpp index 6e2e2d0c611..11da885e96a 100644 --- a/src/libs/3rdparty/modeling/qmt/diagram_ui/diagramsmanager.cpp +++ b/src/libs/3rdparty/modeling/qmt/diagram_ui/diagramsmanager.cpp @@ -128,7 +128,7 @@ void DiagramsManager::setStereotypeController(StereotypeController *stereotypeCo DiagramSceneModel *DiagramsManager::bindDiagramSceneModel(MDiagram *diagram) { if (!m_diagramUidToManagedDiagramMap.contains(diagram->uid())) { - DiagramSceneModel *diagramSceneModel = new DiagramSceneModel(); + auto diagramSceneModel = new DiagramSceneModel(); diagramSceneModel->setDiagramController(m_diagramController); diagramSceneModel->setDiagramSceneController(m_diagramSceneController); diagramSceneModel->setStyleController(m_styleController); @@ -138,7 +138,7 @@ DiagramSceneModel *DiagramsManager::bindDiagramSceneModel(MDiagram *diagram) this, &DiagramsManager::diagramActivated); connect(diagramSceneModel, &DiagramSceneModel::selectionHasChanged, this, &DiagramsManager::diagramSelectionChanged); - ManagedDiagram *managedDiagram = new ManagedDiagram(diagramSceneModel, diagram->name()); + auto managedDiagram = new ManagedDiagram(diagramSceneModel, diagram->name()); m_diagramUidToManagedDiagramMap.insert(diagram->uid(), managedDiagram); } return diagramSceneModel(diagram); @@ -191,7 +191,7 @@ void DiagramsManager::onDataChanged(const QModelIndex &topleft, const QModelInde { for (int row = topleft.row(); row <= bottomright.row(); ++row) { QModelIndex index = m_model->QStandardItemModel::index(row, 0, topleft.parent()); - MDiagram *diagram = dynamic_cast(m_model->element(index)); + auto diagram = dynamic_cast(m_model->element(index)); if (diagram) { ManagedDiagram *managedDiagram = m_diagramUidToManagedDiagramMap.value(diagram->uid()); if (managedDiagram && managedDiagram->diagramName() != diagram->name()) { diff --git a/src/libs/3rdparty/modeling/qmt/diagram_ui/sceneinspector.cpp b/src/libs/3rdparty/modeling/qmt/diagram_ui/sceneinspector.cpp index 5e32dae608e..23b7680a824 100644 --- a/src/libs/3rdparty/modeling/qmt/diagram_ui/sceneinspector.cpp +++ b/src/libs/3rdparty/modeling/qmt/diagram_ui/sceneinspector.cpp @@ -70,7 +70,7 @@ QSizeF SceneInspector::minimalSize(const DElement *element, const MDiagram *diag const QGraphicsItem *item = diagramSceneModel->graphicsItem(const_cast(element)); QMT_CHECK(item); if (item) { - if (const IResizable *resizable = dynamic_cast(item)) + if (auto resizable = dynamic_cast(item)) return resizable->minimumSize(); } } @@ -86,7 +86,7 @@ IMoveable *SceneInspector::moveable(const DElement *element, const MDiagram *dia QGraphicsItem *item = diagramSceneModel->graphicsItem(const_cast(element)); QMT_CHECK(item); if (item) { - if (IMoveable *moveable = dynamic_cast(item)) + if (auto moveable = dynamic_cast(item)) return moveable; } } @@ -102,7 +102,7 @@ IResizable *SceneInspector::resizable(const DElement *element, const MDiagram *d QGraphicsItem *item = diagramSceneModel->graphicsItem(const_cast(element)); QMT_CHECK(item); if (item) { - if (IResizable *resizeable = dynamic_cast(item)) + if (auto resizeable = dynamic_cast(item)) return resizeable; } } diff --git a/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/diagramsview.cpp b/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/diagramsview.cpp index 250a65f55cd..38b566093ab 100644 --- a/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/diagramsview.cpp +++ b/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/diagramsview.cpp @@ -67,7 +67,7 @@ void DiagramsView::openDiagram(MDiagram *diagram) DiagramView *diagramView = m_diagramViews.value(diagram->uid()); if (!diagramView) { DiagramSceneModel *diagramSceneModel = m_diagramsManager->bindDiagramSceneModel(diagram); - DiagramView *diagramView = new DiagramView(this); + auto diagramView = new DiagramView(this); diagramView->setDiagramSceneModel(diagramSceneModel); int tabIndex = addTab(diagramView, diagram->name()); setCurrentIndex(tabIndex); @@ -95,7 +95,7 @@ void DiagramsView::closeDiagram(const MDiagram *diagram) void DiagramsView::closeAllDiagrams() { for (int i = count() - 1; i >= 0; --i) { - DiagramView *diagramView = dynamic_cast(widget(i)); + auto diagramView = dynamic_cast(widget(i)); if (diagramView) { removeTab(i); delete diagramView; @@ -126,7 +126,7 @@ void DiagramsView::onDiagramRenamed(const MDiagram *diagram) MDiagram *DiagramsView::diagram(int tabIndex) const { - DiagramView *diagramView = dynamic_cast(widget(tabIndex)); + auto diagramView = dynamic_cast(widget(tabIndex)); return diagram(diagramView); } diff --git a/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/stackeddiagramsview.cpp b/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/stackeddiagramsview.cpp index 498a1f88900..89ee2a8d26d 100644 --- a/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/stackeddiagramsview.cpp +++ b/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/stackeddiagramsview.cpp @@ -63,7 +63,7 @@ void StackedDiagramsView::openDiagram(MDiagram *diagram) DiagramView *diagramView = m_diagramViews.value(diagram->uid()); if (!diagramView) { DiagramSceneModel *diagramSceneModel = m_diagramsManager->bindDiagramSceneModel(diagram); - DiagramView *diagramView = new DiagramView(this); + auto diagramView = new DiagramView(this); diagramView->setDiagramSceneModel(diagramSceneModel); int tabIndex = addWidget(diagramView); setCurrentIndex(tabIndex); @@ -91,7 +91,7 @@ void StackedDiagramsView::closeDiagram(const MDiagram *diagram) void StackedDiagramsView::closeAllDiagrams() { for (int i = count() - 1; i >= 0; --i) { - DiagramView *diagramView = dynamic_cast(widget(i)); + auto diagramView = dynamic_cast(widget(i)); if (diagramView) { removeWidget(diagramView); delete diagramView; @@ -115,7 +115,7 @@ void StackedDiagramsView::onDiagramRenamed(const MDiagram *diagram) MDiagram *StackedDiagramsView::diagram(int tabIndex) const { - DiagramView *diagramView = dynamic_cast(widget(tabIndex)); + auto diagramView = dynamic_cast(widget(tabIndex)); return diagram(diagramView); } diff --git a/src/libs/3rdparty/modeling/qmt/document_controller/documentcontroller.cpp b/src/libs/3rdparty/modeling/qmt/document_controller/documentcontroller.cpp index dbf2beb1f3a..912100e82c8 100644 --- a/src/libs/3rdparty/modeling/qmt/document_controller/documentcontroller.cpp +++ b/src/libs/3rdparty/modeling/qmt/document_controller/documentcontroller.cpp @@ -219,7 +219,7 @@ void DocumentController::selectAllOnDiagram(MDiagram *diagram) MPackage *DocumentController::createNewPackage(MPackage *parent) { - MPackage *newPackage = new MPackage(); + auto newPackage = new MPackage(); newPackage->setName(tr("New Package")); m_modelController->addObject(parent, newPackage); return newPackage; @@ -227,7 +227,7 @@ MPackage *DocumentController::createNewPackage(MPackage *parent) MClass *DocumentController::createNewClass(MPackage *parent) { - MClass *newClass = new MClass(); + auto newClass = new MClass(); newClass->setName(tr("New Class")); m_modelController->addObject(parent, newClass); return newClass; @@ -235,7 +235,7 @@ MClass *DocumentController::createNewClass(MPackage *parent) MComponent *DocumentController::createNewComponent(MPackage *parent) { - MComponent *newComponent = new MComponent(); + auto newComponent = new MComponent(); newComponent->setName(tr("New Component")); m_modelController->addObject(parent, newComponent); return newComponent; @@ -243,7 +243,7 @@ MComponent *DocumentController::createNewComponent(MPackage *parent) MCanvasDiagram *DocumentController::createNewCanvasDiagram(MPackage *parent) { - MCanvasDiagram *newDiagram = new MCanvasDiagram(); + auto newDiagram = new MCanvasDiagram(); if (!m_diagramSceneController->findDiagramBySearchId(parent, parent->name())) newDiagram->setName(parent->name()); else diff --git a/src/libs/3rdparty/modeling/qmt/model/msourceexpansion.cpp b/src/libs/3rdparty/modeling/qmt/model/msourceexpansion.cpp index 03440935331..7088bb0c868 100644 --- a/src/libs/3rdparty/modeling/qmt/model/msourceexpansion.cpp +++ b/src/libs/3rdparty/modeling/qmt/model/msourceexpansion.cpp @@ -62,9 +62,9 @@ MSourceExpansion &MSourceExpansion::operator=(const MSourceExpansion &rhs) MSourceExpansion *MSourceExpansion::clone(const MElement &rhs) const { - MSourceExpansion *rightExpansion = dynamic_cast(rhs.expansion()); + auto rightExpansion = dynamic_cast(rhs.expansion()); QMT_CHECK(rightExpansion); - MSourceExpansion *expansion = new MSourceExpansion(*rightExpansion); + auto expansion = new MSourceExpansion(*rightExpansion); return expansion; } diff --git a/src/libs/3rdparty/modeling/qmt/model_controller/mclonevisitor.cpp b/src/libs/3rdparty/modeling/qmt/model_controller/mclonevisitor.cpp index e62c30b13ab..81cdaf0fdb7 100644 --- a/src/libs/3rdparty/modeling/qmt/model_controller/mclonevisitor.cpp +++ b/src/libs/3rdparty/modeling/qmt/model_controller/mclonevisitor.cpp @@ -89,7 +89,7 @@ void MCloneVisitor::visitMComponent(const MComponent *component) void MCloneVisitor::visitMDiagram(const MDiagram *diagram) { QMT_CHECK(m_cloned); - MDiagram *cloned = dynamic_cast(m_cloned); + auto cloned = dynamic_cast(m_cloned); QMT_CHECK(cloned); foreach (const DElement *element, diagram->diagramElements()) { DCloneDeepVisitor visitor; @@ -156,13 +156,13 @@ void MCloneDeepVisitor::visitMObject(const MObject *object) { QMT_CHECK(m_cloned); visitMElement(object); - MObject *cloned = dynamic_cast(m_cloned); + auto cloned = dynamic_cast(m_cloned); QMT_CHECK(cloned); foreach (const Handle &handle, object->children()) { if (handle.hasTarget()) { MCloneDeepVisitor visitor; handle.target()->accept(&visitor); - MObject *clonedChild = dynamic_cast(visitor.cloned()); + auto clonedChild = dynamic_cast(visitor.cloned()); QMT_CHECK(clonedChild); cloned->addChild(clonedChild); } else { @@ -173,7 +173,7 @@ void MCloneDeepVisitor::visitMObject(const MObject *object) if (handle.hasTarget()) { MCloneDeepVisitor visitor; handle.target()->accept(&visitor); - MRelation *clonedRelation = dynamic_cast(visitor.cloned()); + auto clonedRelation = dynamic_cast(visitor.cloned()); QMT_CHECK(clonedRelation); cloned->addRelation(clonedRelation); } else { @@ -206,7 +206,7 @@ void MCloneDeepVisitor::visitMComponent(const MComponent *component) void MCloneDeepVisitor::visitMDiagram(const MDiagram *diagram) { QMT_CHECK(m_cloned); - MDiagram *cloned = dynamic_cast(m_cloned); + auto cloned = dynamic_cast(m_cloned); QMT_CHECK(cloned); foreach (const DElement *element, diagram->diagramElements()) { DCloneDeepVisitor visitor; @@ -235,7 +235,7 @@ void MCloneDeepVisitor::visitMRelation(const MRelation *relation) { QMT_CHECK(m_cloned); visitMElement(relation); - MRelation *cloned = dynamic_cast(m_cloned); + auto cloned = dynamic_cast(m_cloned); QMT_CHECK(cloned); cloned->setEndAUid(relation->endAUid()); cloned->setEndBUid(relation->endBUid()); diff --git a/src/libs/3rdparty/modeling/qmt/model_controller/mflatassignmentvisitor.cpp b/src/libs/3rdparty/modeling/qmt/model_controller/mflatassignmentvisitor.cpp index 28a03bf89bc..61c12533c6d 100644 --- a/src/libs/3rdparty/modeling/qmt/model_controller/mflatassignmentvisitor.cpp +++ b/src/libs/3rdparty/modeling/qmt/model_controller/mflatassignmentvisitor.cpp @@ -58,7 +58,7 @@ void MFlatAssignmentVisitor::visitMElement(const MElement *element) void MFlatAssignmentVisitor::visitMObject(const MObject *object) { visitMElement(object); - MObject *targetObject = dynamic_cast(m_target); + auto targetObject = dynamic_cast(m_target); QMT_CHECK(targetObject); targetObject->setName(object->name()); } @@ -71,7 +71,7 @@ void MFlatAssignmentVisitor::visitMPackage(const MPackage *package) void MFlatAssignmentVisitor::visitMClass(const MClass *klass) { visitMObject(klass); - MClass *targetClass = dynamic_cast(m_target); + auto targetClass = dynamic_cast(m_target); QMT_CHECK(targetClass); targetClass->setUmlNamespace(klass->umlNamespace()); targetClass->setTemplateParameters(klass->templateParameters()); @@ -96,7 +96,7 @@ void MFlatAssignmentVisitor::visitMCanvasDiagram(const MCanvasDiagram *diagram) void MFlatAssignmentVisitor::visitMItem(const MItem *item) { visitMObject(item); - MItem *targetItem = dynamic_cast(m_target); + auto targetItem = dynamic_cast(m_target); QMT_CHECK(targetItem); targetItem->setVarietyEditable(item->isVarietyEditable()); targetItem->setVariety(item->variety()); @@ -106,7 +106,7 @@ void MFlatAssignmentVisitor::visitMItem(const MItem *item) void MFlatAssignmentVisitor::visitMRelation(const MRelation *relation) { visitMElement(relation); - MRelation *targetRelation = dynamic_cast(m_target); + auto targetRelation = dynamic_cast(m_target); QMT_CHECK(targetRelation); targetRelation->setName(relation->name()); } @@ -114,7 +114,7 @@ void MFlatAssignmentVisitor::visitMRelation(const MRelation *relation) void MFlatAssignmentVisitor::visitMDependency(const MDependency *dependency) { visitMRelation(dependency); - MDependency *targetDependency = dynamic_cast(m_target); + auto targetDependency = dynamic_cast(m_target); QMT_CHECK(targetDependency); targetDependency->setDirection(dependency->direction()); } @@ -127,7 +127,7 @@ void MFlatAssignmentVisitor::visitMInheritance(const MInheritance *inheritance) void MFlatAssignmentVisitor::visitMAssociation(const MAssociation *association) { visitMRelation(association); - MAssociation *targetAssociation = dynamic_cast(m_target); + auto targetAssociation = dynamic_cast(m_target); QMT_CHECK(targetAssociation); targetAssociation->setEndA(association->endA()); targetAssociation->setEndB(association->endB()); diff --git a/src/libs/3rdparty/modeling/qmt/model_controller/modelcontroller.cpp b/src/libs/3rdparty/modeling/qmt/model_controller/modelcontroller.cpp index 77433292203..3d116fae105 100644 --- a/src/libs/3rdparty/modeling/qmt/model_controller/modelcontroller.cpp +++ b/src/libs/3rdparty/modeling/qmt/model_controller/modelcontroller.cpp @@ -87,7 +87,7 @@ public: bool mergeWith(const UndoCommand *other) { - const UpdateObjectCommand *updateCommand = dynamic_cast(other); + auto updateCommand = dynamic_cast(other); if (!updateCommand) return false; if (m_object->uid() != updateCommand->m_object->uid()) @@ -125,7 +125,7 @@ private: emit m_modelController->beginUpdateObject(row, parent); MCloneVisitor cloneVisitor; object->accept(&cloneVisitor); - MObject *newObject = dynamic_cast(cloneVisitor.cloned()); + auto newObject = dynamic_cast(cloneVisitor.cloned()); QMT_CHECK(newObject); MFlatAssignmentVisitor assignVisitor(object); m_object->accept(&assignVisitor); @@ -162,7 +162,7 @@ public: bool mergeWith(const UndoCommand *other) { - const UpdateRelationCommand *updateCommand = dynamic_cast(other); + auto updateCommand = dynamic_cast(other); if (!updateCommand) return false; if (m_relation->uid() != updateCommand->m_relation->uid()) @@ -196,7 +196,7 @@ private: emit m_modelController->beginUpdateRelation(row, owner); MCloneVisitor cloneVisitor; relation->accept(&cloneVisitor); - MRelation *newRelation = dynamic_cast(cloneVisitor.cloned()); + auto newRelation = dynamic_cast(cloneVisitor.cloned()); QMT_CHECK(newRelation); MFlatAssignmentVisitor assignVisitor(relation); m_relation->accept(&assignVisitor); @@ -251,7 +251,7 @@ public: case TypeObject: { emit m_modelController->beginInsertObject(clone.m_indexOfElement, owner); - MObject *object = dynamic_cast(clone.m_clonedElement); + auto object = dynamic_cast(clone.m_clonedElement); QMT_CHECK(object); m_modelController->mapObject(object); owner->insertChild(clone.m_indexOfElement, object); @@ -263,7 +263,7 @@ public: case TypeRelation: { emit m_modelController->beginInsertRelation(clone.m_indexOfElement, owner); - MRelation *relation = dynamic_cast(clone.m_clonedElement); + auto relation = dynamic_cast(clone.m_clonedElement); QMT_CHECK(relation); m_modelController->mapRelation(relation); owner->insertRelation(clone.m_indexOfElement, relation); @@ -362,11 +362,11 @@ public: clone.m_elementKey = element->uid(); clone.m_ownerKey = owner->uid(); - if (MObject *object = dynamic_cast(element)) { + if (auto object = dynamic_cast(element)) { clone.m_elementType = TypeObject; clone.m_indexOfElement = owner->children().indexOf(object); QMT_CHECK(clone.m_indexOfElement >= 0); - } else if (MRelation *relation = dynamic_cast(element)) { + } else if (auto relation = dynamic_cast(element)) { clone.m_elementType = TypeRelation; clone.m_indexOfElement = owner->relations().indexOf(relation); QMT_CHECK(clone.m_indexOfElement >= 0); @@ -447,7 +447,7 @@ public: case TypeObject: { emit m_modelController->beginInsertObject(clone.m_indexOfElement, owner); - MObject *object = dynamic_cast(clone.m_clonedElement); + auto object = dynamic_cast(clone.m_clonedElement); QMT_CHECK(object); m_modelController->mapObject(object); owner->insertChild(clone.m_indexOfElement, object); @@ -459,7 +459,7 @@ public: case TypeRelation: { emit m_modelController->beginInsertRelation(clone.m_indexOfElement, owner); - MRelation *relation = dynamic_cast(clone.m_clonedElement); + auto relation = dynamic_cast(clone.m_clonedElement); QMT_CHECK(relation); m_modelController->mapRelation(relation); owner->insertRelation(clone.m_indexOfElement, relation); @@ -681,7 +681,7 @@ void ModelController::addObject(MPackage *parentPackage, MObject *object) emit beginInsertObject(row, parentPackage); mapObject(object); if (m_undoController) { - AddElementsCommand *undoCommand = new AddElementsCommand(this, tr("Add Object")); + auto undoCommand = new AddElementsCommand(this, tr("Add Object")); m_undoController->push(undoCommand); undoCommand->add(TypeObject, object->uid(), parentPackage->uid()); } @@ -706,7 +706,7 @@ void ModelController::removeObject(MObject *object) if (!m_isResettingModel) emit beginRemoveObject(row, owner); if (m_undoController) { - RemoveElementsCommand *undoCommand = new RemoveElementsCommand(this, tr("Delete Object")); + auto undoCommand = new RemoveElementsCommand(this, tr("Delete Object")); m_undoController->push(undoCommand); undoCommand->add(object, object->owner()); } @@ -731,7 +731,7 @@ void ModelController::startUpdateObject(MObject *object) } else { row = parent->children().indexOf(object); } - if (MPackage *package = dynamic_cast(object)) + if (auto package = dynamic_cast(object)) m_oldPackageName = package->name(); if (!m_isResettingModel) emit beginUpdateObject(row, parent); @@ -756,7 +756,7 @@ void ModelController::finishUpdateObject(MObject *object, bool cancelled) QList relations = findRelationsOfObject(object); foreach (MRelation *relation, relations) emit relationEndChanged(relation, object); - if (MPackage *package = dynamic_cast(object)) { + if (auto package = dynamic_cast(object)) { if (m_oldPackageName != package->name()) emit packageNameChanged(package, m_oldPackageName); } @@ -780,7 +780,7 @@ void ModelController::moveObject(MPackage *newOwner, MObject *object) if (!m_isResettingModel) emit beginMoveObject(formerRow, formerOwner); if (m_undoController) { - MoveObjectCommand *undoCommand = new MoveObjectCommand(this, object); + auto undoCommand = new MoveObjectCommand(this, object); m_undoController->push(undoCommand); } formerOwner->decontrolChild(object); @@ -811,7 +811,7 @@ void ModelController::addRelation(MObject *owner, MRelation *relation) emit beginInsertRelation(row, owner); mapRelation(relation); if (m_undoController) { - AddElementsCommand *undoCommand = new AddElementsCommand(this, tr("Add Relation")); + auto undoCommand = new AddElementsCommand(this, tr("Add Relation")); m_undoController->push(undoCommand); undoCommand->add(TypeRelation, relation->uid(), owner->uid()); } @@ -832,7 +832,7 @@ void ModelController::removeRelation(MRelation *relation) if (!m_isResettingModel) emit beginRemoveRelation(row, owner); if (m_undoController) { - RemoveElementsCommand *undoCommand = new RemoveElementsCommand(this, tr("Delete Relation")); + auto undoCommand = new RemoveElementsCommand(this, tr("Delete Relation")); m_undoController->push(undoCommand); undoCommand->add(relation, owner); } @@ -884,7 +884,7 @@ void ModelController::moveRelation(MObject *newOwner, MRelation *relation) if (!m_isResettingModel) emit beginMoveRelation(formerRow, formerOwner); if (m_undoController) { - MoveRelationCommand *undoCommand = new MoveRelationCommand(this, relation); + auto undoCommand = new MoveRelationCommand(this, relation); m_undoController->push(undoCommand); } formerOwner->decontrolRelation(relation); @@ -945,7 +945,7 @@ void ModelController::pasteElements(MObject *owner, const MContainer &modelConta // insert all elements bool added = false; foreach (MElement *clonedElement, clonedElements) { - if (MObject *object = dynamic_cast(clonedElement)) { + if (auto object = dynamic_cast(clonedElement)) { MObject *objectOwner = owner; if (!dynamic_cast(owner)) objectOwner = owner->owner(); @@ -954,19 +954,19 @@ void ModelController::pasteElements(MObject *owner, const MContainer &modelConta emit beginInsertObject(row, objectOwner); mapObject(object); if (m_undoController) { - AddElementsCommand *undoCommand = new AddElementsCommand(this, tr("Paste")); + auto undoCommand = new AddElementsCommand(this, tr("Paste")); m_undoController->push(undoCommand); undoCommand->add(TypeObject, object->uid(), objectOwner->uid()); } objectOwner->insertChild(row, object); emit endInsertObject(row, objectOwner); added = true; - } else if (MRelation *relation = dynamic_cast(clonedElement)) { + } else if (auto relation = dynamic_cast(clonedElement)) { int row = owner->relations().size(); emit beginInsertRelation(row, owner); mapRelation(relation); if (m_undoController) { - AddElementsCommand *undoCommand = new AddElementsCommand(this, tr("Paste")); + auto undoCommand = new AddElementsCommand(this, tr("Paste")); m_undoController->push(undoCommand); undoCommand->add(TypeRelation, relation->uid(), owner->uid()); } @@ -998,13 +998,13 @@ void ModelController::deleteElements(const MSelection &modelSelection, const QSt foreach (MElement *element, simplifiedSelection.elements()) { // element may have been deleted indirectly by predecessor element in loop if ((element = findElement(element->uid()))) { - if (MObject *object = dynamic_cast(element)) { + if (auto object = dynamic_cast(element)) { removeRelatedRelations(object); MObject *owner = object->owner(); int row = owner->children().indexOf(object); emit beginRemoveObject(row, owner); if (m_undoController) { - RemoveElementsCommand *cutCommand = new RemoveElementsCommand(this, commandLabel); + auto cutCommand = new RemoveElementsCommand(this, commandLabel); m_undoController->push(cutCommand); cutCommand->add(element, owner); } @@ -1012,12 +1012,12 @@ void ModelController::deleteElements(const MSelection &modelSelection, const QSt owner->removeChild(object); emit endRemoveObject(row, owner); removed = true; - } else if (MRelation *relation = dynamic_cast(element)) { + } else if (auto relation = dynamic_cast(element)) { MObject *owner = relation->owner(); int row = owner->relations().indexOf(relation); emit beginRemoveRelation(row, owner); if (m_undoController) { - RemoveElementsCommand *cutCommand = new RemoveElementsCommand(this, commandLabel); + auto cutCommand = new RemoveElementsCommand(this, commandLabel); m_undoController->push(cutCommand); cutCommand->add(element, owner); } @@ -1057,7 +1057,7 @@ void ModelController::renewElementKey(MElement *element, QHash *renewe Uid newKey = element->uid(); renewedKeys->insert(oldKey, newKey); } - MObject *object = dynamic_cast(element); + auto object = dynamic_cast(element); if (object) { foreach (const Handle &child, object->children()) renewElementKey(child.target(), renewedKeys); @@ -1069,12 +1069,12 @@ void ModelController::renewElementKey(MElement *element, QHash *renewe void ModelController::updateRelationKeys(MElement *element, const QHash &renewedKeys) { - if (MObject *object = dynamic_cast(element)) { + if (auto object = dynamic_cast(element)) { foreach (const Handle &handle, object->relations()) updateRelationEndKeys(handle.target(), renewedKeys); foreach (const Handle &child, object->children()) updateRelationKeys(child.target(), renewedKeys); - } else if (MRelation *relation = dynamic_cast(element)) { + } else if (auto relation = dynamic_cast(element)) { updateRelationEndKeys(relation, renewedKeys); } } @@ -1195,7 +1195,7 @@ void ModelController::verifyModelIntegrity() const QMT_CHECK(relationsMap.contains(relation->uid())); } QMT_CHECK(objectRelationsMap.size() == m_objectRelationsMap.size()); - for (QMultiHash::const_iterator it = m_objectRelationsMap.cbegin(); it != m_objectRelationsMap.cend(); ++it) { + for (auto it = m_objectRelationsMap.cbegin(); it != m_objectRelationsMap.cend(); ++it) { QMT_CHECK(objectRelationsMap.contains(it.key(), it.value())); } } diff --git a/src/libs/3rdparty/modeling/qmt/model_ui/treemodel.cpp b/src/libs/3rdparty/modeling/qmt/model_ui/treemodel.cpp index 5e48bbe8952..48a3885e7d7 100644 --- a/src/libs/3rdparty/modeling/qmt/model_ui/treemodel.cpp +++ b/src/libs/3rdparty/modeling/qmt/model_ui/treemodel.cpp @@ -402,7 +402,7 @@ MElement *TreeModel::element(const QModelIndex &index) const QStandardItem *item = itemFromIndex(index); if (item) { if (item->parent()) { - ModelItem *parentModelItem = dynamic_cast(item->parent()); + auto parentModelItem = dynamic_cast(item->parent()); QMT_CHECK(parentModelItem); const MObject *parentObject = m_itemToObjectMap.value(parentModelItem); QMT_CHECK(parentObject); @@ -429,7 +429,7 @@ MElement *TreeModel::element(const QModelIndex &index) const QModelIndex TreeModel::indexOf(const MElement *element) const { - if (const MObject *object = dynamic_cast(element)) { + if (auto object = dynamic_cast(element)) { if (!object->owner()) { QMT_CHECK(element == m_modelController->rootPackage()); return QStandardItemModel::index(0, 0); @@ -443,7 +443,7 @@ QModelIndex TreeModel::indexOf(const MElement *element) const QModelIndex parentIndex = indexFromItem(item); int row = parentObject->children().indexOf(object); return QStandardItemModel::index(row, 0, parentIndex); - } else if (const MRelation *relation = dynamic_cast(element)) { + } else if (auto relation = dynamic_cast(element)) { QMT_CHECK(relation->owner()); MObject *owner = relation->owner(); ModelItem *item = m_objectToItemMap.value(owner); @@ -519,9 +519,9 @@ void TreeModel::onEndUpdateObject(int row, const MObject *parent) QModelIndex elementIndex = this->QStandardItemModel::index(row, 0, parentIndex); MElement *element = TreeModel::element(elementIndex); if (element) { - MObject *object = dynamic_cast(element); + auto object = dynamic_cast(element); if (object) { - ModelItem *item = dynamic_cast(itemFromIndex(elementIndex)); + auto item = dynamic_cast(itemFromIndex(elementIndex)); QMT_CHECK(item); ItemUpdater visitor(this, item); element->accept(&visitor); @@ -620,9 +620,9 @@ void TreeModel::onEndUpdateRelation(int row, const MObject *parent) QModelIndex elementIndex = QStandardItemModel::index(row, 0, parentIndex); MElement *element = TreeModel::element(elementIndex); if (element) { - MRelation *relation = dynamic_cast(element); + auto relation = dynamic_cast(element); if (relation) { - ModelItem *item = dynamic_cast(itemFromIndex(elementIndex)); + auto item = dynamic_cast(itemFromIndex(elementIndex)); QMT_CHECK(item); ItemUpdater visitor(this, item); element->accept(&visitor); @@ -710,7 +710,7 @@ void TreeModel::onRelationEndChanged(MRelation *relation, MObject *endObject) QModelIndex elementIndex = QStandardItemModel::index(row, 0, parentIndex); QMT_CHECK(elementIndex.isValid()); - ModelItem *item = dynamic_cast(itemFromIndex(elementIndex)); + auto item = dynamic_cast(itemFromIndex(elementIndex)); QMT_CHECK(item); QString label = createRelationLabel(relation); @@ -788,14 +788,14 @@ QString TreeModel::createObjectLabel(const MObject *object) QMT_CHECK(object); if (object->name().isEmpty()) { - if (const MItem *item = dynamic_cast(object)) { + if (auto item = dynamic_cast(object)) { if (!item->variety().isEmpty()) return QString(QStringLiteral("[%1]")).arg(item->variety()); } return tr("[unnamed]"); } - if (const MClass *klass = dynamic_cast(object)) { + if (auto klass = dynamic_cast(object)) { if (!klass->umlNamespace().isEmpty()) return QString(QStringLiteral("%1 [%2]")).arg(klass->name()).arg(klass->umlNamespace()); } diff --git a/src/libs/3rdparty/modeling/qmt/model_ui/treemodelmanager.cpp b/src/libs/3rdparty/modeling/qmt/model_ui/treemodelmanager.cpp index 90f9c81f9cb..793c2e3241b 100644 --- a/src/libs/3rdparty/modeling/qmt/model_ui/treemodelmanager.cpp +++ b/src/libs/3rdparty/modeling/qmt/model_ui/treemodelmanager.cpp @@ -66,7 +66,7 @@ void TreeModelManager::setModelTreeView(ModelTreeViewInterface *modelTreeView) bool TreeModelManager::isRootPackageSelected() const { foreach (const QModelIndex &index, m_modelTreeView->selectedSourceModelIndexes()) { - MObject *object = dynamic_cast(m_treeModel->element(index)); + auto object = dynamic_cast(m_treeModel->element(index)); if (object && !object->owner()) return true; } @@ -90,9 +90,9 @@ MPackage *TreeModelManager::selectedPackage() const { MElement *element = m_treeModel->element(m_modelTreeView->currentSourceModelIndex()); QMT_CHECK(element); - if (MPackage *package = dynamic_cast(element)) { + if (auto package = dynamic_cast(element)) { return package; - } else if (MObject *object = dynamic_cast(element)) { + } else if (auto object = dynamic_cast(element)) { package = dynamic_cast(object->owner()); if (package) return package; @@ -106,9 +106,9 @@ MSelection TreeModelManager::selectedObjects() const MSelection modelSelection; foreach (const QModelIndex &index, m_modelTreeView->selectedSourceModelIndexes()) { MElement *element = m_treeModel->element(index); - if (MObject *object = dynamic_cast(element)) + if (auto object = dynamic_cast(element)) modelSelection.append(object->uid(), m_treeModel->modelController()->ownerKey(object)); - else if (MRelation *relation = dynamic_cast(element)) + else if (auto relation = dynamic_cast(element)) modelSelection.append(relation->uid(), m_treeModel->modelController()->ownerKey(relation)); } return modelSelection; diff --git a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/modeltreeview.cpp b/src/libs/3rdparty/modeling/qmt/model_widgets_ui/modeltreeview.cpp index b4265a95675..34e30ab7d59 100644 --- a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/modeltreeview.cpp +++ b/src/libs/3rdparty/modeling/qmt/model_widgets_ui/modeltreeview.cpp @@ -144,7 +144,7 @@ void ModelTreeView::startDrag(Qt::DropActions supportedActions) } } - QMimeData *mimeData = new QMimeData; + auto mimeData = new QMimeData; mimeData->setData(QStringLiteral("text/model-elements"), dragData); if (dragIcon.isNull()) @@ -153,7 +153,7 @@ void ModelTreeView::startDrag(Qt::DropActions supportedActions) QPixmap pixmap(48, 48); pixmap = dragIcon.pixmap(48, 48); - QDrag *drag = new QDrag(this); + auto drag = new QDrag(this); drag->setMimeData(mimeData); drag->setHotSpot(QPoint(pixmap.width()/2, pixmap.height()/2)); drag->setPixmap(pixmap); @@ -209,7 +209,7 @@ void ModelTreeView::dropEvent(QDropEvent *event) TreeModel *treeModel = m_sortedTreeModel->treeModel(); QMT_CHECK(treeModel); MElement *targetModelElement = treeModel->element(dropSourceModelIndex); - if (MObject *targetModelObject = dynamic_cast(targetModelElement)) { + if (auto targetModelObject = dynamic_cast(targetModelElement)) { QDataStream dataStream(event->mimeData()->data(QStringLiteral("text/model-elements"))); while (dataStream.status() == QDataStream::Ok) { QString key; @@ -217,15 +217,15 @@ void ModelTreeView::dropEvent(QDropEvent *event) if (!key.isEmpty()) { MElement *modelElement = treeModel->modelController()->findElement(Uid(key)); if (modelElement) { - if (MObject *modelObject = dynamic_cast(modelElement)) { - if (MPackage *targetModelPackage = dynamic_cast(targetModelObject)) { + if (auto modelObject = dynamic_cast(modelElement)) { + if (auto targetModelPackage = dynamic_cast(targetModelObject)) { treeModel->modelController()->moveObject(targetModelPackage, modelObject); } else if ((targetModelPackage = dynamic_cast(targetModelObject->owner()))) { treeModel->modelController()->moveObject(targetModelPackage, modelObject); } else { QMT_CHECK(false); } - } else if (MRelation *modelRelation = dynamic_cast(modelElement)) { + } else if (auto modelRelation = dynamic_cast(modelElement)) { treeModel->modelController()->moveRelation(targetModelObject, modelRelation); } } @@ -272,7 +272,7 @@ void ModelTreeView::contextMenuEvent(QContextMenuEvent *event) } QAction *selectedAction = menu.exec(event->globalPos()); if (selectedAction) { - ContextMenuAction *action = dynamic_cast(selectedAction); + auto action = dynamic_cast(selectedAction); QMT_CHECK(action); if (action->id() == QStringLiteral("showDefinition")) { m_elementTasks->openClassDefinition(melement); diff --git a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesview.cpp b/src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesview.cpp index 84b40a0a73e..db0890d242d 100644 --- a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesview.cpp +++ b/src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesview.cpp @@ -387,9 +387,9 @@ void PropertiesView::beginUpdate(MElement *modelElement) { QMT_CHECK(modelElement); - if (MObject *object = dynamic_cast(modelElement)) { + if (auto object = dynamic_cast(modelElement)) { m_modelController->startUpdateObject(object); - } else if (MRelation *relation = dynamic_cast(modelElement)) { + } else if (auto relation = dynamic_cast(modelElement)) { m_modelController->startUpdateRelation(relation); } else { QMT_CHECK(false); @@ -400,9 +400,9 @@ void PropertiesView::endUpdate(MElement *modelElement, bool cancelled) { QMT_CHECK(modelElement); - if (MObject *object = dynamic_cast(modelElement)) { + if (auto object = dynamic_cast(modelElement)) { m_modelController->finishUpdateObject(object, cancelled); - } else if (MRelation *relation = dynamic_cast(modelElement)) { + } else if (auto relation = dynamic_cast(modelElement)) { m_modelController->finishUpdateRelation(relation, cancelled); } else { QMT_CHECK(false); diff --git a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesviewmview.cpp b/src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesviewmview.cpp index 41c843b2b40..8272278d896 100644 --- a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesviewmview.cpp +++ b/src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesviewmview.cpp @@ -504,7 +504,7 @@ void PropertiesView::MView::visitMClass(const MClass *klass) QMT_CHECK(!m_classMembersParseButton); m_classMembersStatusLabel = new QLabel(m_topWidget); m_classMembersParseButton = new QPushButton(QStringLiteral("Clean Up"), m_topWidget); - QHBoxLayout *layout = new QHBoxLayout(); + auto layout = new QHBoxLayout(); layout->addWidget(m_classMembersStatusLabel); layout->addWidget(m_classMembersParseButton); layout->setStretch(0, 1); @@ -1392,7 +1392,7 @@ QList PropertiesView::MView::filter(const QList &elements) { QList filtered; foreach (V *element, elements) { - T *t = dynamic_cast(element); + auto t = dynamic_cast(element); if (t) filtered.append(t); } diff --git a/src/libs/3rdparty/modeling/qmt/project_controller/projectcontroller.cpp b/src/libs/3rdparty/modeling/qmt/project_controller/projectcontroller.cpp index f53d3dc3ddb..8d202f955d3 100644 --- a/src/libs/3rdparty/modeling/qmt/project_controller/projectcontroller.cpp +++ b/src/libs/3rdparty/modeling/qmt/project_controller/projectcontroller.cpp @@ -60,7 +60,7 @@ ProjectController::~ProjectController() void ProjectController::newProject(const QString &fileName) { m_project.reset(new Project()); - MPackage *rootPackage = new MPackage(); + auto rootPackage = new MPackage(); rootPackage->setName(tr("Model")); m_project->setRootPackage(rootPackage); m_project->setFileName(fileName); diff --git a/src/libs/3rdparty/modeling/qmt/style/defaultstyleengine.cpp b/src/libs/3rdparty/modeling/qmt/style/defaultstyleengine.cpp index ffeeaa4fcec..fd250f029d1 100644 --- a/src/libs/3rdparty/modeling/qmt/style/defaultstyleengine.cpp +++ b/src/libs/3rdparty/modeling/qmt/style/defaultstyleengine.cpp @@ -201,7 +201,7 @@ const Style *DefaultStyleEngine::applyObjectStyle(const Style *baseStyle, StyleE headerFont.setBold(true); } - Style *style = new Style(baseStyle->type()); + auto style = new Style(baseStyle->type()); QPen linePen = baseStyle->linePen(); linePen.setColor(lineColor); linePen.setWidth(lineWidth); @@ -335,7 +335,7 @@ const Style *DefaultStyleEngine::applyRelationStyle(const Style *baseStyle, cons RelationStyleKey key(elementType, styledRelation.endA() ? styledRelation.endA()->visualPrimaryRole() : DObject::PrimaryRoleNormal); const Style *derivedStyle = m_relationStyleMap.value(key); if (!derivedStyle) { - Style *style = new Style(baseStyle->type()); + auto style = new Style(baseStyle->type()); const DObject *object = styledRelation.endA(); ObjectVisuals objectVisuals(object ? object->visualPrimaryRole() : DObject::PrimaryRoleNormal, @@ -389,7 +389,7 @@ const Style *DefaultStyleEngine::applyAnnotationStyle(const Style *baseStyle, DA AnnotationStyleKey key(visualRole); const Style *derivedStyle = m_annotationStyleMap.value(key); if (!derivedStyle) { - Style *style = new Style(baseStyle->type()); + auto style = new Style(baseStyle->type()); QFont normalFont; QBrush textBrush = baseStyle->textBrush(); switch (visualRole) { @@ -430,7 +430,7 @@ const Style *DefaultStyleEngine::applyBoundaryStyle(const Style *baseStyle, cons BoundaryStyleKey key; const Style *derivedStyle = m_boundaryStyleMap.value(key); if (!derivedStyle) { - Style *style = new Style(baseStyle->type()); + auto style = new Style(baseStyle->type()); style->setNormalFont(baseStyle->normalFont()); style->setTextBrush(baseStyle->textBrush()); m_boundaryStyleMap.insert(key, style); diff --git a/src/libs/3rdparty/modeling/qmt/tasks/diagramscenecontroller.cpp b/src/libs/3rdparty/modeling/qmt/tasks/diagramscenecontroller.cpp index 61d31342861..46794d825fc 100644 --- a/src/libs/3rdparty/modeling/qmt/tasks/diagramscenecontroller.cpp +++ b/src/libs/3rdparty/modeling/qmt/tasks/diagramscenecontroller.cpp @@ -155,7 +155,7 @@ void DiagramSceneController::createDependency(DObject *endAObject, DObject *endB if (endAModelObject == endBModelObject) return; - MDependency *modelDependency = new MDependency(); + auto modelDependency = new MDependency(); modelDependency->setEndAUid(endAModelObject->uid()); modelDependency->setEndBUid(endBModelObject->uid()); modelDependency->setDirection(MDependency::AToB); @@ -182,7 +182,7 @@ void DiagramSceneController::createInheritance(DClass *derivedClass, DClass *bas if (derivedModelClass == baseModelClass) return; - MInheritance *modelInheritance = new MInheritance(); + auto modelInheritance = new MInheritance(); modelInheritance->setDerived(derivedModelClass->uid()); modelInheritance->setBase(baseModelClass->uid()); m_modelController->addRelation(derivedModelClass, modelInheritance); @@ -209,7 +209,7 @@ void DiagramSceneController::createAssociation(DClass *endAClass, DClass *endBCl if (endAModelObject == endBModelObject && intermediatePoints.count() < 2) return; - MAssociation *modelAssociation = new MAssociation(); + auto modelAssociation = new MAssociation(); modelAssociation->setEndAUid(endAModelObject->uid()); MAssociationEnd endA = modelAssociation->endA(); endA.setNavigable(true); @@ -231,7 +231,7 @@ bool DiagramSceneController::isAddingAllowed(const Uid &modelElementKey, MDiagra QMT_CHECK(modelElement); if (m_diagramController->hasDelegate(modelElement, diagram)) return false; - if (MRelation *modelRelation = dynamic_cast(modelElement)) { + if (auto modelRelation = dynamic_cast(modelElement)) { MObject *endAModelObject = m_modelController->findObject(modelRelation->endAUid()); QMT_CHECK(endAModelObject); DObject *endADiagramObject = m_diagramController->findDelegate(endAModelObject, diagram); @@ -258,14 +258,14 @@ void DiagramSceneController::dropNewElement(const QString &newElementId, const Q DElement *topMostElementAtPos, const QPointF &pos, MDiagram *diagram) { if (newElementId == QLatin1String(ELEMENT_TYPE_ANNOTATION)) { - DAnnotation *annotation = new DAnnotation(); + auto annotation = new DAnnotation(); annotation->setText(QStringLiteral("")); annotation->setPos(pos - QPointF(10.0, 10.0)); m_diagramController->addElement(annotation, diagram); alignOnRaster(annotation, diagram); emit newElementCreated(annotation, diagram); } else if (newElementId == QLatin1String(ELEMENT_TYPE_BOUNDARY)) { - DBoundary *boundary = new DBoundary(); + auto boundary = new DBoundary(); boundary->setPos(pos); m_diagramController->addElement(boundary, diagram); alignOnRaster(boundary, diagram); @@ -275,25 +275,25 @@ void DiagramSceneController::dropNewElement(const QString &newElementId, const Q MObject *newObject = 0; QString newName; if (newElementId == QLatin1String(ELEMENT_TYPE_PACKAGE)) { - MPackage *package = new MPackage(); + auto package = new MPackage(); newName = tr("New Package"); if (!stereotype.isEmpty()) package->setStereotypes(QStringList() << stereotype); newObject = package; } else if (newElementId == QLatin1String(ELEMENT_TYPE_COMPONENT)) { - MComponent *component = new MComponent(); + auto component = new MComponent(); newName = tr("New Component"); if (!stereotype.isEmpty()) component->setStereotypes(QStringList() << stereotype); newObject = component; } else if (newElementId == QLatin1String(ELEMENT_TYPE_CLASS)) { - MClass *klass = new MClass(); + auto klass = new MClass(); newName = tr("New Class"); if (!stereotype.isEmpty()) klass->setStereotypes(QStringList() << stereotype); newObject = klass; } else if (newElementId == QLatin1String(ELEMENT_TYPE_ITEM)) { - MItem *item = new MItem(); + auto item = new MItem(); newName = tr("New Item"); if (!stereotype.isEmpty()) { item->setVariety(stereotype); @@ -324,9 +324,9 @@ void DiagramSceneController::dropNewModelElement(MObject *modelObject, MPackage MPackage *DiagramSceneController::findSuitableParentPackage(DElement *topmostDiagramElement, MDiagram *diagram) { MPackage *parentPackage = 0; - if (DPackage *diagramPackage = dynamic_cast(topmostDiagramElement)) { + if (auto diagramPackage = dynamic_cast(topmostDiagramElement)) { parentPackage = m_modelController->findObject(diagramPackage->modelUid()); - } else if (DObject *diagramObject = dynamic_cast(topmostDiagramElement)) { + } else if (auto diagramObject = dynamic_cast(topmostDiagramElement)) { MObject *modelObject = m_modelController->findObject(diagramObject->modelUid()); if (modelObject) parentPackage = dynamic_cast(modelObject->owner()); @@ -343,7 +343,7 @@ MDiagram *DiagramSceneController::findDiagramBySearchId(MPackage *package, const QString diagramSearchId = NameController::calcElementNameSearchId(diagramName); foreach (const Handle &handle, package->children()) { if (handle.hasTarget()) { - if (MDiagram *diagram = dynamic_cast(handle.target())) { + if (auto diagram = dynamic_cast(handle.target())) { if (NameController::calcElementNameSearchId(diagram->name()) == diagramSearchId) return diagram; } @@ -497,7 +497,7 @@ void DiagramSceneController::alignPosition(DObject *object, const DSelection &se { foreach (const DSelection::Index &index, selection.indices()) { DElement *element = m_diagramController->findElement(index.elementKey(), diagram); - if (DObject *selectedObject = dynamic_cast(element)) { + if (auto selectedObject = dynamic_cast(element)) { if (selectedObject != object) { QPointF newPos = aligner(object, selectedObject); if (newPos != selectedObject->pos()) { @@ -524,7 +524,7 @@ void DiagramSceneController::alignSize(DObject *object, const DSelection &select size.setHeight(object->rect().height()); foreach (const DSelection::Index &index, selection.indices()) { DElement *element = m_diagramController->findElement(index.elementKey(), diagram); - if (DObject *selectedObject = dynamic_cast(element)) { + if (auto selectedObject = dynamic_cast(element)) { QRectF newRect = aligner(selectedObject, size); if (newRect != selectedObject->rect()) { m_diagramController->startUpdateElement(selectedObject, diagram, DiagramController::UpdateGeometry); @@ -569,7 +569,7 @@ DObject *DiagramSceneController::addObject(MObject *modelObject, const QPointF & DFactory factory; modelObject->accept(&factory); - DObject *diagramObject = dynamic_cast(factory.product()); + auto diagramObject = dynamic_cast(factory.product()); QMT_CHECK(diagramObject); diagramObject->setPos(pos); m_diagramController->addElement(diagramObject, diagram); @@ -578,7 +578,7 @@ DObject *DiagramSceneController::addObject(MObject *modelObject, const QPointF & // add all relations between any other element on diagram and new element foreach (DElement *delement, diagram->diagramElements()) { if (delement != diagramObject) { - DObject *dobject = dynamic_cast(delement); + auto dobject = dynamic_cast(delement); if (dobject) { MObject *mobject = m_modelController->findObject(dobject->modelUid()); if (mobject) { @@ -629,7 +629,7 @@ DRelation *DiagramSceneController::addRelation(MRelation *modelRelation, const Q DFactory factory; modelRelation->accept(&factory); - DRelation *diagramRelation = dynamic_cast(factory.product()); + auto diagramRelation = dynamic_cast(factory.product()); QMT_CHECK(diagramRelation); MObject *endAModelObject = m_modelController->findObject(modelRelation->endAUid()); diff --git a/src/libs/3rdparty/modeling/qmt/tasks/finddiagramvisitor.cpp b/src/libs/3rdparty/modeling/qmt/tasks/finddiagramvisitor.cpp index df8f81f72dd..6408c72cea4 100644 --- a/src/libs/3rdparty/modeling/qmt/tasks/finddiagramvisitor.cpp +++ b/src/libs/3rdparty/modeling/qmt/tasks/finddiagramvisitor.cpp @@ -49,7 +49,7 @@ void FindDiagramVisitor::visitMObject(const MObject *object) { foreach (const Handle &child, object->children()) { if (child.hasTarget()) { - if (MDiagram *diagram = dynamic_cast(child.target())) { + if (auto diagram = dynamic_cast(child.target())) { m_diagram = diagram; return; } diff --git a/src/libs/3rdparty/modeling/qmt/tasks/findrootdiagramvisitor.cpp b/src/libs/3rdparty/modeling/qmt/tasks/findrootdiagramvisitor.cpp index df0b374bada..2ca32432427 100644 --- a/src/libs/3rdparty/modeling/qmt/tasks/findrootdiagramvisitor.cpp +++ b/src/libs/3rdparty/modeling/qmt/tasks/findrootdiagramvisitor.cpp @@ -49,7 +49,7 @@ void FindRootDiagramVisitor::visitMObject(MObject *object) // first search flat foreach(const Handle &child, object->children()) { if (child.hasTarget()) { - MDiagram *diagram = dynamic_cast(child.target()); + auto diagram = dynamic_cast(child.target()); if (diagram) { m_diagram = diagram; return; diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/qxmlinarchive.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/qxmlinarchive.h index 3d44065b88c..49e438025e3 100644 --- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/qxmlinarchive.h +++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/qxmlinarchive.h @@ -310,7 +310,7 @@ public: void append(const Tag &tag) { - TagNode *node = new TagNode(tag); + auto node = new TagNode(tag); if (!m_nodeStack.empty()) m_nodeStack.top()->append(node); m_nodeStack.push(node); @@ -319,7 +319,7 @@ public: template void append(const Object &object) { - ObjectNode *node = new ObjectNode(object); + auto node = new ObjectNode(object); if (!m_nodeStack.empty()) m_nodeStack.top()->append(node); m_nodeStack.push(node); @@ -528,7 +528,7 @@ private: return; } else { bool foundTag = false; - for (Node::ChildrenType::const_iterator it = node->children().begin(); + for (auto it = node->children().begin(); it != node->children().end(); ++it) { if ((*it)->qualifiedName() == xmlTag.m_tagName) { diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize_container.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize_container.h index 771407dcbd7..14fbec44559 100644 --- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize_container.h +++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize_container.h @@ -180,7 +180,7 @@ template inline void save(Archive &archive, const QHash &hash, const Parameters &) { archive << tag(QStringLiteral("qhash")); - for (typename QHash::const_iterator it = hash.begin(); it != hash.end(); ++it) { + for (auto it = hash.begin(); it != hash.end(); ++it) { impl::KeyValuePair pair(it.key(), it.value()); archive << attr("item", pair); } diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/typeregistry.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/typeregistry.h index 15beaae8bbb..a0dd9e4af76 100644 --- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/typeregistry.h +++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/typeregistry.h @@ -201,7 +201,7 @@ Archive &savePointer(Archive &ar, BASE * const &p) template Archive &loadPointer(Archive &ar, BASE *&p) { - DERIVED *t = new DERIVED(); + auto t = new DERIVED(); load(ar, *t, Parameters()); p = t; return ar; diff --git a/src/libs/3rdparty/modeling/qtserialization/src/savingrefmap.cpp b/src/libs/3rdparty/modeling/qtserialization/src/savingrefmap.cpp index 81b0c67de88..5808b347806 100644 --- a/src/libs/3rdparty/modeling/qtserialization/src/savingrefmap.cpp +++ b/src/libs/3rdparty/modeling/qtserialization/src/savingrefmap.cpp @@ -36,7 +36,7 @@ namespace impl { int SavingRefMap::countDanglingReferences() { int dangling = 0; - for (MapType::const_iterator it = m_references.begin(); it != m_references.end(); ++it) { + for (auto it = m_references.begin(); it != m_references.end(); ++it) { if (!it.value().second) ++dangling; }