From 04d0e09568bce29fa272c80bdd3490c7d947a1c4 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 29 Apr 2020 09:18:01 +0200 Subject: [PATCH] Modeling: Avoid QStringList constructor when creating QList This avoids slicing, is shorter, and will do the right thing no matter what the QList/QVector/QStringList discussion will end up with. Change-Id: I3e317e1677f3942aacf83401324f7022bd164823 Reviewed-by: Eike Ziller --- .../qmt/diagram_scene/items/stereotypedisplayvisitor.cpp | 4 ++-- .../modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp | 2 +- src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/stereotypedisplayvisitor.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/stereotypedisplayvisitor.cpp index 0fdb273c0b4..7c25863417a 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/stereotypedisplayvisitor.cpp +++ b/src/libs/modelinglib/qmt/diagram_scene/items/stereotypedisplayvisitor.cpp @@ -151,9 +151,9 @@ void StereotypeDisplayVisitor::visitDItem(const DItem *item) m_stereotypeSmartDisplay = DObject::StereotypeIcon; visitDObject(item); if (m_stereotypeIconId.isEmpty() && !item->shape().isEmpty()) - m_stereotypeIconId = m_stereotypeController->findStereotypeIconId(StereotypeIcon::ElementItem, QStringList(item->shape())); + m_stereotypeIconId = m_stereotypeController->findStereotypeIconId(StereotypeIcon::ElementItem, {item->shape()}); if (m_shapeIconId.isEmpty() && !item->variety().isEmpty()) - m_shapeIconId = m_stereotypeController->findStereotypeIconId(StereotypeIcon::ElementItem, QStringList(item->variety())); + m_shapeIconId = m_stereotypeController->findStereotypeIconId(StereotypeIcon::ElementItem, {item->variety()}); updateShapeIcon(); } diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp index 4af7b782859..fbb0f2520db 100644 --- a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp +++ b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp @@ -1518,7 +1518,7 @@ void PropertiesView::MView::setTitle(const MItem *item, const QList &elemen if (elements.size() == 1) { if (item && !item->isVarietyEditable()) { QString stereotypeIconId = m_propertiesView->stereotypeController() - ->findStereotypeIconId(StereotypeIcon::ElementItem, QStringList(item->variety())); + ->findStereotypeIconId(StereotypeIcon::ElementItem, {item->variety()}); if (!stereotypeIconId.isEmpty()) { StereotypeIcon stereotypeIcon = m_propertiesView->stereotypeController()->findStereotypeIcon(stereotypeIconId); m_propertiesTitle = stereotypeIcon.title(); diff --git a/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp index ec15b0f7d88..9995cd30419 100644 --- a/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp +++ b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp @@ -101,7 +101,7 @@ public: endItems = customRelation.endItems(); QString stereotypeIconId = m_stereotypeController->findStereotypeIconId(StereotypeIcon::ElementItem, object->stereotypes()); if (stereotypeIconId.isEmpty() && !m_variety.isEmpty()) - stereotypeIconId = m_stereotypeController->findStereotypeIconId(StereotypeIcon::ElementItem, QStringList(m_variety)); + stereotypeIconId = m_stereotypeController->findStereotypeIconId(StereotypeIcon::ElementItem, {m_variety}); m_accepted = endItems.contains(stereotypeIconId); } }