feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Modeling: Avoid more QStringList slicing when creating QList<QString>

Browse Source 
Change-Id: I067d187b83e4f810c17ac1636e72f0d914d1ea35
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-04-29 09:49:40 +02:00
parent 26b409c610
commit 3d674f7c22
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/modeleditor/componentviewcontroller.cpp
View File

@@ -190,7 +190,7 @@ void UpdateIncludeDependenciesVisitor::visitMComponent(qmt::MComponent *componen
if (!m_modelUtilities->haveDependency(component, includeComponent)) { if (!m_modelUtilities->haveDependency(component, includeComponent)) {
auto dependency = new qmt::MDependency; auto dependency = new qmt::MDependency;
dependency->setFlags(qmt::MElement::ReverseEngineered); dependency->setFlags(qmt::MElement::ReverseEngineered);
dependency->setStereotypes(QStringList() << "include"); dependency->setStereotypes({"include"});
dependency->setDirection(qmt::MDependency::AToB); dependency->setDirection(qmt::MDependency::AToB);
dependency->setSource(component->uid()); dependency->setSource(component->uid());
dependency->setTarget(includeComponent->uid()); dependency->setTarget(includeComponent->uid());

4
src/plugins/modeleditor/modeleditor.cpp
View File

@@ -1119,11 +1119,11 @@ void ModelEditor::initToolbars()
if (!tool.m_stereotype.isEmpty() && stereotypeIconElement != qmt::StereotypeIcon::ElementAny) { if (!tool.m_stereotype.isEmpty() && stereotypeIconElement != qmt::StereotypeIcon::ElementAny) {
const qmt::Style *style = documentController->styleController()->adaptStyle(styleEngineElementType); const qmt::Style *style = documentController->styleController()->adaptStyle(styleEngineElementType);
icon = stereotypeController->createIcon( icon = stereotypeController->createIcon(
stereotypeIconElement, QStringList() << tool.m_stereotype, stereotypeIconElement, {tool.m_stereotype},
QString(), style, QSize(128, 128), QMarginsF(6.0, 4.0, 6.0, 8.0), 8.0); QString(), style, QSize(128, 128), QMarginsF(6.0, 4.0, 6.0, 8.0), 8.0);
if (!icon.isNull()) { if (!icon.isNull()) {
QString stereotypeIconId = stereotypeController->findStereotypeIconId( QString stereotypeIconId = stereotypeController->findStereotypeIconId(
stereotypeIconElement, QStringList() << tool.m_stereotype); stereotypeIconElement, {tool.m_stereotype});
qmt::StereotypeIcon stereotypeIcon = stereotypeController->findStereotypeIcon(stereotypeIconId); qmt::StereotypeIcon stereotypeIcon = stereotypeController->findStereotypeIcon(stereotypeIconId);
if (stereotypeIcon.hasName()) if (stereotypeIcon.hasName())
newElementName = stereotypeIcon.name(); newElementName = stereotypeIcon.name();

6
src/plugins/modeleditor/packageviewcontroller.cpp
View File

@@ -104,7 +104,7 @@ void PackageViewController::createAncestorDependencies(qmt::MObject *object1, qm
auto dependency = new qmt::MDependency; auto dependency = new qmt::MDependency;
dependency->setFlags(qmt::MElement::ReverseEngineered); dependency->setFlags(qmt::MElement::ReverseEngineered);
// TODO set stereotype for testing purpose // TODO set stereotype for testing purpose
dependency->setStereotypes(QStringList() << "same stereotype"); dependency->setStereotypes({"same stereotype"});
dependency->setDirection(qmt::MDependency::AToB); dependency->setDirection(qmt::MDependency::AToB);
dependency->setSource(componentAncestors.at(index1)->uid()); dependency->setSource(componentAncestors.at(index1)->uid());
dependency->setTarget(includeComponentAncestors.at(index2)->uid()); dependency->setTarget(includeComponentAncestors.at(index2)->uid());
@@ -125,7 +125,7 @@ void PackageViewController::createAncestorDependencies(qmt::MObject *object1, qm
auto dependency = new qmt::MDependency; auto dependency = new qmt::MDependency;
dependency->setFlags(qmt::MElement::ReverseEngineered); dependency->setFlags(qmt::MElement::ReverseEngineered);
// TODO set stereotype for testing purpose // TODO set stereotype for testing purpose
dependency->setStereotypes(QStringList() << "ancestor"); dependency->setStereotypes({"ancestor"});
dependency->setDirection(qmt::MDependency::AToB); dependency->setDirection(qmt::MDependency::AToB);
dependency->setSource(componentAncestors.at(componentHighestAncestorIndex)->uid()); dependency->setSource(componentAncestors.at(componentHighestAncestorIndex)->uid());
dependency->setTarget(includeComponentAncestors.at(includeComponentHighestAncestorIndex)->uid()); dependency->setTarget(includeComponentAncestors.at(includeComponentHighestAncestorIndex)->uid());
@@ -140,7 +140,7 @@ void PackageViewController::createAncestorDependencies(qmt::MObject *object1, qm
auto dependency = new qmt::MDependency; auto dependency = new qmt::MDependency;
dependency->setFlags(qmt::MElement::ReverseEngineered); dependency->setFlags(qmt::MElement::ReverseEngineered);
// TODO set stereotype for testing purpose // TODO set stereotype for testing purpose
dependency->setStereotypes(QStringList() << "parents"); dependency->setStereotypes({"parents"});
dependency->setDirection(qmt::MDependency::AToB); dependency->setDirection(qmt::MDependency::AToB);
dependency->setSource(componentAncestors.at(0)->uid()); dependency->setSource(componentAncestors.at(0)->uid());
dependency->setTarget(includeComponentAncestors.at(0)->uid()); dependency->setTarget(includeComponentAncestors.at(0)->uid());

4
src/plugins/modeleditor/pxnodecontroller.cpp
View File

@@ -302,7 +302,7 @@ void PxNodeController::onMenuActionTriggered(PxNodeController::MenuAction *actio
package->setFlags(qmt::MElement::ReverseEngineered); package->setFlags(qmt::MElement::ReverseEngineered);
package->setName(action->elementName); package->setName(action->elementName);
if (!action->packageStereotype.isEmpty()) if (!action->packageStereotype.isEmpty())
package->setStereotypes(QStringList() << action->packageStereotype); package->setStereotypes({action->packageStereotype});
newObject = package; newObject = package;
if (action->type == MenuAction::TYPE_ADD_PACKAGE_AND_DIAGRAM) { if (action->type == MenuAction::TYPE_ADD_PACKAGE_AND_DIAGRAM) {
auto diagram = new qmt::MCanvasDiagram(); auto diagram = new qmt::MCanvasDiagram();
@@ -317,7 +317,7 @@ void PxNodeController::onMenuActionTriggered(PxNodeController::MenuAction *actio
package->setFlags(qmt::MElement::ReverseEngineered); package->setFlags(qmt::MElement::ReverseEngineered);
package->setName(action->elementName); package->setName(action->elementName);
if (!action->packageStereotype.isEmpty()) if (!action->packageStereotype.isEmpty())
package->setStereotypes(QStringList() << action->packageStereotype); package->setStereotypes({action->packageStereotype});
d->diagramSceneController->modelController()->undoController()->beginMergeSequence(tr("Create Component Model")); d->diagramSceneController->modelController()->undoController()->beginMergeSequence(tr("Create Component Model"));
QStringList relativeElements = qmt::NameController::buildElementsPath( QStringList relativeElements = qmt::NameController::buildElementsPath(
d->pxnodeUtilities->calcRelativePath(filePath, d->anchorFolder), true); d->pxnodeUtilities->calcRelativePath(filePath, d->anchorFolder), true);