diff options
| author | Jochen Becher <jochen_becher@gmx.de> | 2017-07-30 21:35:16 +0200 |
|---|---|---|
| committer | Jochen Becher <jochen_becher@gmx.de> | 2017-08-05 20:35:23 +0000 |
| commit | 2b311792c54e6a142a94f3c606c884fd3f267fe0 (patch) | |
| tree | 5ca29562cd7bee9cafb484fdf0cd637c2b14c62f /src/libs/modelinglib | |
| parent | a9284cd6455c883ee0f69e2b6c4034503cf258d7 (diff) | |
ModelEditor: Remove QStringLiteral from modelinglib
Change-Id: I76de9e2b97b11c2c01136a0c395447fd10698906
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/libs/modelinglib')
27 files changed, 499 insertions, 500 deletions
diff --git a/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.cpp b/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.cpp index 50b1f26a9b7..444c3e83cbd 100644 --- a/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.cpp +++ b/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.cpp @@ -232,88 +232,88 @@ void StereotypeDefinitionParser::parse(ITextSource *source) TextScanner textScanner; textScanner.setKeywords( QList<QPair<QString, int> >() - << qMakePair(QString(QStringLiteral("icon")), KEYWORD_ICON) - << qMakePair(QString(QStringLiteral("id")), KEYWORD_ID) - << qMakePair(QString(QStringLiteral("title")), KEYWORD_TITLE) - << qMakePair(QString(QStringLiteral("elements")), KEYWORD_ELEMENTS) - << qMakePair(QString(QStringLiteral("stereotype")), KEYWORD_STEREOTYPE) - << qMakePair(QString(QStringLiteral("width")), KEYWORD_WIDTH) - << qMakePair(QString(QStringLiteral("height")), KEYWORD_HEIGHT) - << qMakePair(QString(QStringLiteral("minwidth")), KEYWORD_MINWIDTH) - << qMakePair(QString(QStringLiteral("minheight")), KEYWORD_MINHEIGHT) - << qMakePair(QString(QStringLiteral("locksize")), KEYWORD_LOCK_SIZE) - << qMakePair(QString(QStringLiteral("display")), KEYWORD_DISPLAY) - << qMakePair(QString(QStringLiteral("textalignment")), KEYWORD_TEXTALIGN) - << qMakePair(QString(QStringLiteral("basecolor")), KEYWORD_BASECOLOR) - << qMakePair(QString(QStringLiteral("shape")), KEYWORD_SHAPE) - << qMakePair(QString(QStringLiteral("circle")), KEYWORD_CIRCLE) - << qMakePair(QString(QStringLiteral("ellipse")), KEYWORD_ELLIPSE) - << qMakePair(QString(QStringLiteral("line")), KEYWORD_LINE) - << qMakePair(QString(QStringLiteral("rect")), KEYWORD_RECT) - << qMakePair(QString(QStringLiteral("roundedrect")), KEYWORD_ROUNDEDRECT) - << qMakePair(QString(QStringLiteral("arc")), KEYWORD_ARC) - << qMakePair(QString(QStringLiteral("moveto")), KEYWORD_MOVETO) - << qMakePair(QString(QStringLiteral("lineto")), KEYWORD_LINETO) - << qMakePair(QString(QStringLiteral("arcmoveto")), KEYWORD_ARCMOVETO) - << qMakePair(QString(QStringLiteral("arcto")), KEYWORD_ARCTO) - << qMakePair(QString(QStringLiteral("close")), KEYWORD_CLOSE) - << qMakePair(QString(QStringLiteral("x")), KEYWORD_X) - << qMakePair(QString(QStringLiteral("y")), KEYWORD_Y) - << qMakePair(QString(QStringLiteral("x0")), KEYWORD_X0) - << qMakePair(QString(QStringLiteral("y0")), KEYWORD_Y0) - << qMakePair(QString(QStringLiteral("x1")), KEYWORD_X1) - << qMakePair(QString(QStringLiteral("y1")), KEYWORD_Y1) - << qMakePair(QString(QStringLiteral("radius")), KEYWORD_RADIUS) - << qMakePair(QString(QStringLiteral("radiusx")), KEYWORD_RADIUS_X) - << qMakePair(QString(QStringLiteral("radiusy")), KEYWORD_RADIUS_Y) - << qMakePair(QString(QStringLiteral("start")), KEYWORD_START) - << qMakePair(QString(QStringLiteral("span")), KEYWORD_SPAN) - << qMakePair(QString(QStringLiteral("toolbar")), KEYWORD_TOOLBAR) - << qMakePair(QString(QStringLiteral("priority")), KEYWORD_PRIORITY) - << qMakePair(QString(QStringLiteral("tools")), KEYWORD_TOOLS) - << qMakePair(QString(QStringLiteral("tool")), KEYWORD_TOOL) - << qMakePair(QString(QStringLiteral("element")), KEYWORD_ELEMENT) - << qMakePair(QString(QStringLiteral("separator")), KEYWORD_SEPARATOR) - << qMakePair(QString(QStringLiteral("relation")), KEYWORD_RELATION) - << qMakePair(QString(QStringLiteral("dependency")), KEYWORD_DEPENDENCY) - << qMakePair(QString(QStringLiteral("inheritance")), KEYWORD_INHERITANCE) - << qMakePair(QString(QStringLiteral("association")), KEYWORD_ASSOCIATION) - << qMakePair(QString(QStringLiteral("name")), KEYWORD_NAME) - << qMakePair(QString(QStringLiteral("direction")), KEYWORD_DIRECTION) - << qMakePair(QString(QStringLiteral("atob")), KEYWORD_ATOB) - << qMakePair(QString(QStringLiteral("btoa")), KEYWORD_BTOA) - << qMakePair(QString(QStringLiteral("bi")), KEYWORD_BI) - << qMakePair(QString(QStringLiteral("end")), KEYWORD_END) - << qMakePair(QString(QStringLiteral("a")), KEYWORD_A) - << qMakePair(QString(QStringLiteral("b")), KEYWORD_B) - << qMakePair(QString(QStringLiteral("role")), KEYWORD_ROLE) - << qMakePair(QString(QStringLiteral("cardinality")), KEYWORD_CARDINALITY) - << qMakePair(QString(QStringLiteral("navigable")), KEYWORD_NAVIGABLE) - << qMakePair(QString(QStringLiteral("relationship")), KEYWORD_RELATIONSHIP) - << qMakePair(QString(QStringLiteral("aggregation")), KEYWORD_AGGREGATION) - << qMakePair(QString(QStringLiteral("composition")), KEYWORD_COMPOSITION) - << qMakePair(QString(QStringLiteral("shaft")), KEYWORD_SHAFT) - << qMakePair(QString(QStringLiteral("head")), KEYWORD_HEAD) - << qMakePair(QString(QStringLiteral("diamond")), KEYWORD_DIAMOND) - << qMakePair(QString(QStringLiteral("triangle")), KEYWORD_TRIANGLE) - << qMakePair(QString(QStringLiteral("filled")), KEYWORD_FILLED) - << qMakePair(QString(QStringLiteral("pattern")), KEYWORD_PATTERN) - << qMakePair(QString(QStringLiteral("solid")), KEYWORD_SOLID) - << qMakePair(QString(QStringLiteral("dot")), KEYWORD_DOT) - << qMakePair(QString(QStringLiteral("dash")), KEYWORD_DASH) - << qMakePair(QString(QStringLiteral("dashdot")), KEYWORD_DASHDOT) - << qMakePair(QString(QStringLiteral("dashdotdot")), KEYWORD_DASHDOTDOT) - << qMakePair(QString(QStringLiteral("color")), KEYWORD_COLOR) + << qMakePair(QString("icon"), KEYWORD_ICON) + << qMakePair(QString("id"), KEYWORD_ID) + << qMakePair(QString("title"), KEYWORD_TITLE) + << qMakePair(QString("elements"), KEYWORD_ELEMENTS) + << qMakePair(QString("stereotype"), KEYWORD_STEREOTYPE) + << qMakePair(QString("width"), KEYWORD_WIDTH) + << qMakePair(QString("height"), KEYWORD_HEIGHT) + << qMakePair(QString("minwidth"), KEYWORD_MINWIDTH) + << qMakePair(QString("minheight"), KEYWORD_MINHEIGHT) + << qMakePair(QString("locksize"), KEYWORD_LOCK_SIZE) + << qMakePair(QString("display"), KEYWORD_DISPLAY) + << qMakePair(QString("textalignment"), KEYWORD_TEXTALIGN) + << qMakePair(QString("basecolor"), KEYWORD_BASECOLOR) + << qMakePair(QString("shape"), KEYWORD_SHAPE) + << qMakePair(QString("circle"), KEYWORD_CIRCLE) + << qMakePair(QString("ellipse"), KEYWORD_ELLIPSE) + << qMakePair(QString("line"), KEYWORD_LINE) + << qMakePair(QString("rect"), KEYWORD_RECT) + << qMakePair(QString("roundedrect"), KEYWORD_ROUNDEDRECT) + << qMakePair(QString("arc"), KEYWORD_ARC) + << qMakePair(QString("moveto"), KEYWORD_MOVETO) + << qMakePair(QString("lineto"), KEYWORD_LINETO) + << qMakePair(QString("arcmoveto"), KEYWORD_ARCMOVETO) + << qMakePair(QString("arcto"), KEYWORD_ARCTO) + << qMakePair(QString("close"), KEYWORD_CLOSE) + << qMakePair(QString("x"), KEYWORD_X) + << qMakePair(QString("y"), KEYWORD_Y) + << qMakePair(QString("x0"), KEYWORD_X0) + << qMakePair(QString("y0"), KEYWORD_Y0) + << qMakePair(QString("x1"), KEYWORD_X1) + << qMakePair(QString("y1"), KEYWORD_Y1) + << qMakePair(QString("radius"), KEYWORD_RADIUS) + << qMakePair(QString("radiusx"), KEYWORD_RADIUS_X) + << qMakePair(QString("radiusy"), KEYWORD_RADIUS_Y) + << qMakePair(QString("start"), KEYWORD_START) + << qMakePair(QString("span"), KEYWORD_SPAN) + << qMakePair(QString("toolbar"), KEYWORD_TOOLBAR) + << qMakePair(QString("priority"), KEYWORD_PRIORITY) + << qMakePair(QString("tools"), KEYWORD_TOOLS) + << qMakePair(QString("tool"), KEYWORD_TOOL) + << qMakePair(QString("element"), KEYWORD_ELEMENT) + << qMakePair(QString("separator"), KEYWORD_SEPARATOR) + << qMakePair(QString("relation"), KEYWORD_RELATION) + << qMakePair(QString("dependency"), KEYWORD_DEPENDENCY) + << qMakePair(QString("inheritance"), KEYWORD_INHERITANCE) + << qMakePair(QString("association"), KEYWORD_ASSOCIATION) + << qMakePair(QString("name"), KEYWORD_NAME) + << qMakePair(QString("direction"), KEYWORD_DIRECTION) + << qMakePair(QString("atob"), KEYWORD_ATOB) + << qMakePair(QString("btoa"), KEYWORD_BTOA) + << qMakePair(QString("bi"), KEYWORD_BI) + << qMakePair(QString("end"), KEYWORD_END) + << qMakePair(QString("a"), KEYWORD_A) + << qMakePair(QString("b"), KEYWORD_B) + << qMakePair(QString("role"), KEYWORD_ROLE) + << qMakePair(QString("cardinality"), KEYWORD_CARDINALITY) + << qMakePair(QString("navigable"), KEYWORD_NAVIGABLE) + << qMakePair(QString("relationship"), KEYWORD_RELATIONSHIP) + << qMakePair(QString("aggregation"), KEYWORD_AGGREGATION) + << qMakePair(QString("composition"), KEYWORD_COMPOSITION) + << qMakePair(QString("shaft"), KEYWORD_SHAFT) + << qMakePair(QString("head"), KEYWORD_HEAD) + << qMakePair(QString("diamond"), KEYWORD_DIAMOND) + << qMakePair(QString("triangle"), KEYWORD_TRIANGLE) + << qMakePair(QString("filled"), KEYWORD_FILLED) + << qMakePair(QString("pattern"), KEYWORD_PATTERN) + << qMakePair(QString("solid"), KEYWORD_SOLID) + << qMakePair(QString("dot"), KEYWORD_DOT) + << qMakePair(QString("dash"), KEYWORD_DASH) + << qMakePair(QString("dashdot"), KEYWORD_DASHDOT) + << qMakePair(QString("dashdotdot"), KEYWORD_DASHDOTDOT) + << qMakePair(QString("color"), KEYWORD_COLOR) ); textScanner.setOperators( QList<QPair<QString, int> >() - << qMakePair(QString(QStringLiteral(";")), OPERATOR_SEMICOLON) - << qMakePair(QString(QStringLiteral("{")), OPERATOR_BRACE_OPEN) - << qMakePair(QString(QStringLiteral("}")), OPERATOR_BRACE_CLOSE) - << qMakePair(QString(QStringLiteral(":")), OPERATOR_COLON) - << qMakePair(QString(QStringLiteral(",")), OPERATOR_COMMA) - << qMakePair(QString(QStringLiteral(".")), OPERATOR_PERIOD) - << qMakePair(QString(QStringLiteral("-")), OPERATOR_MINUS) + << qMakePair(QString(";"), OPERATOR_SEMICOLON) + << qMakePair(QString("{"), OPERATOR_BRACE_OPEN) + << qMakePair(QString("}"), OPERATOR_BRACE_CLOSE) + << qMakePair(QString(":"), OPERATOR_COLON) + << qMakePair(QString(","), OPERATOR_COMMA) + << qMakePair(QString("."), OPERATOR_PERIOD) + << qMakePair(QString("-"), OPERATOR_MINUS) ); textScanner.setSource(source); @@ -346,7 +346,7 @@ void StereotypeDefinitionParser::parseFile() else if (token.type() == Token::TokenKeyword && token.subtype() == KEYWORD_ASSOCIATION) parseRelation(CustomRelation::Element::Association); else - throw StereotypeDefinitionParserError(QStringLiteral("Expected 'Icon', 'Toolbar', 'Relation', 'Dependency', 'Inheritance' or 'Association'."), token.sourcePos()); + throw StereotypeDefinitionParserError("Expected 'Icon', 'Toolbar', 'Relation', 'Dependency', 'Inheritance' or 'Association'.", token.sourcePos()); } } @@ -368,11 +368,11 @@ void StereotypeDefinitionParser::parseIcon() case KEYWORD_ELEMENTS: { const static QHash<QString, StereotypeIcon::Element> elementNames = QHash<QString, StereotypeIcon::Element>() - << qMakePair(QString(QStringLiteral("package")), StereotypeIcon::ElementPackage) - << qMakePair(QString(QStringLiteral("component")), StereotypeIcon::ElementComponent) - << qMakePair(QString(QStringLiteral("class")), StereotypeIcon::ElementClass) - << qMakePair(QString(QStringLiteral("diagram")), StereotypeIcon::ElementDiagram) - << qMakePair(QString(QStringLiteral("item")), StereotypeIcon::ElementItem); + << qMakePair(QString("package"), StereotypeIcon::ElementPackage) + << qMakePair(QString("component"), StereotypeIcon::ElementComponent) + << qMakePair(QString("class"), StereotypeIcon::ElementClass) + << qMakePair(QString("diagram"), StereotypeIcon::ElementDiagram) + << qMakePair(QString("item"), StereotypeIcon::ElementItem); parseEnums<StereotypeIcon::Element>( parseIdentifierListProperty(), elementNames, token.sourcePos(), [&](StereotypeIcon::Element element) { elements.insert(element); }); @@ -396,11 +396,11 @@ void StereotypeDefinitionParser::parseIcon() case KEYWORD_LOCK_SIZE: { const static QHash<QString, StereotypeIcon::SizeLock> lockNames = QHash<QString, StereotypeIcon::SizeLock>() - << qMakePair(QString(QStringLiteral("none")), StereotypeIcon::LockNone) - << qMakePair(QString(QStringLiteral("width")), StereotypeIcon::LockWidth) - << qMakePair(QString(QStringLiteral("height")), StereotypeIcon::LockHeight) - << qMakePair(QString(QStringLiteral("size")), StereotypeIcon::LockSize) - << qMakePair(QString(QStringLiteral("ratio")), StereotypeIcon::LockRatio); + << qMakePair(QString("none"), StereotypeIcon::LockNone) + << qMakePair(QString("width"), StereotypeIcon::LockWidth) + << qMakePair(QString("height"), StereotypeIcon::LockHeight) + << qMakePair(QString("size"), StereotypeIcon::LockSize) + << qMakePair(QString("ratio"), StereotypeIcon::LockRatio); parseEnum<StereotypeIcon::SizeLock>( parseIdentifierProperty(), lockNames, token.sourcePos(), [&](StereotypeIcon::SizeLock lock) { stereotypeIcon.setSizeLock(lock); }); @@ -409,11 +409,11 @@ void StereotypeDefinitionParser::parseIcon() case KEYWORD_DISPLAY: { const static QHash<QString, StereotypeIcon::Display> displayNames = QHash<QString, StereotypeIcon::Display>() - << qMakePair(QString(QStringLiteral("none")), StereotypeIcon::DisplayNone) - << qMakePair(QString(QStringLiteral("label")), StereotypeIcon::DisplayLabel) - << qMakePair(QString(QStringLiteral("decoration")), StereotypeIcon::DisplayDecoration) - << qMakePair(QString(QStringLiteral("icon")), StereotypeIcon::DisplayIcon) - << qMakePair(QString(QStringLiteral("smart")), StereotypeIcon::DisplaySmart); + << qMakePair(QString("none"), StereotypeIcon::DisplayNone) + << qMakePair(QString("label"), StereotypeIcon::DisplayLabel) + << qMakePair(QString("decoration"), StereotypeIcon::DisplayDecoration) + << qMakePair(QString("icon"), StereotypeIcon::DisplayIcon) + << qMakePair(QString("smart"), StereotypeIcon::DisplaySmart); parseEnum<StereotypeIcon::Display>( parseIdentifierProperty(), displayNames, token.sourcePos(), [&](StereotypeIcon::Display display) { stereotypeIcon.setDisplay(display); }); @@ -422,9 +422,9 @@ void StereotypeDefinitionParser::parseIcon() case KEYWORD_TEXTALIGN: { const static QHash<QString, StereotypeIcon::TextAlignment> alignNames = QHash<QString, StereotypeIcon::TextAlignment>() - << qMakePair(QString(QStringLiteral("below")), StereotypeIcon::TextalignBelow) - << qMakePair(QString(QStringLiteral("center")), StereotypeIcon::TextalignCenter) - << qMakePair(QString(QStringLiteral("none")), StereotypeIcon::TextalignNone); + << qMakePair(QString("below"), StereotypeIcon::TextalignBelow) + << qMakePair(QString("center"), StereotypeIcon::TextalignCenter) + << qMakePair(QString("none"), StereotypeIcon::TextalignNone); parseEnum<StereotypeIcon::TextAlignment>( parseIdentifierProperty(), alignNames, token.sourcePos(), [&](StereotypeIcon::TextAlignment align) { stereotypeIcon.setTextAlignment(align); }); @@ -445,7 +445,7 @@ void StereotypeDefinitionParser::parseIcon() stereotypeIcon.setElements(elements); stereotypeIcon.setStereotypes(stereotypes); if (stereotypeIcon.id().isEmpty()) - throw StereotypeDefinitionParserError(QStringLiteral("Missing id in Icon definition."), d->m_scanner->sourcePos()); + throw StereotypeDefinitionParserError("Missing id in Icon definition.", d->m_scanner->sourcePos()); emit iconParsed(stereotypeIcon); } @@ -595,7 +595,7 @@ QHash<int, StereotypeDefinitionParser::IconCommandParameter> StereotypeDefinitio while (readProperty(&token)) { if (parameters.contains(token.subtype())) { if (values.contains(token.subtype())) - throw StereotypeDefinitionParserError(QStringLiteral("Property given twice."), token.sourcePos()); + throw StereotypeDefinitionParserError("Property given twice.", token.sourcePos()); IconCommandParameter parameter = parameters.value(token.subtype()); if (parameter.type() == IconCommandParameter::ShapeValue) parameter.setShapeValue(ShapeValueF(parseFloatProperty(), parameter.unit(), parameter.origin())); @@ -611,9 +611,9 @@ QHash<int, StereotypeDefinitionParser::IconCommandParameter> StereotypeDefinitio break; } if (values.count() < parameters.count()) - throw StereotypeDefinitionParserError(QStringLiteral("Missing some properties."), token.sourcePos()); + throw StereotypeDefinitionParserError("Missing some properties.", token.sourcePos()); else if (values.count() > parameters.count()) - throw StereotypeDefinitionParserError(QStringLiteral("Too many properties given."), token.sourcePos()); + throw StereotypeDefinitionParserError("Too many properties given.", token.sourcePos()); return values; } @@ -644,9 +644,9 @@ void StereotypeDefinitionParser::parseRelation(CustomRelation::Element element) case KEYWORD_DIRECTION: { const static QHash<QString, CustomRelation::Direction> directionNames = QHash<QString, CustomRelation::Direction>() - << qMakePair(QString(QStringLiteral("atob")), CustomRelation::Direction::AtoB) - << qMakePair(QString(QStringLiteral("btoa")), CustomRelation::Direction::BToA) - << qMakePair(QString(QStringLiteral("bi")), CustomRelation::Direction::Bi); + << qMakePair(QString("atob"), CustomRelation::Direction::AtoB) + << qMakePair(QString("btoa"), CustomRelation::Direction::BToA) + << qMakePair(QString("bi"), CustomRelation::Direction::Bi); if (element != CustomRelation::Element::Dependency) throwUnknownPropertyError(token); parseEnum<CustomRelation::Direction>( @@ -657,11 +657,11 @@ void StereotypeDefinitionParser::parseRelation(CustomRelation::Element element) case KEYWORD_PATTERN: { const static QHash<QString, CustomRelation::ShaftPattern> patternNames = QHash<QString, CustomRelation::ShaftPattern>() - << qMakePair(QString(QStringLiteral("solid")), CustomRelation::ShaftPattern::Solid) - << qMakePair(QString(QStringLiteral("dash")), CustomRelation::ShaftPattern::Dash) - << qMakePair(QString(QStringLiteral("dot")), CustomRelation::ShaftPattern::Dot) - << qMakePair(QString(QStringLiteral("dashdot")), CustomRelation::ShaftPattern::DashDot) - << qMakePair(QString(QStringLiteral("dashdotdot")), CustomRelation::ShaftPattern::DashDotDot); + << qMakePair(QString("solid"), CustomRelation::ShaftPattern::Solid) + << qMakePair(QString("dash"), CustomRelation::ShaftPattern::Dash) + << qMakePair(QString("dot"), CustomRelation::ShaftPattern::Dot) + << qMakePair(QString("dashdot"), CustomRelation::ShaftPattern::DashDot) + << qMakePair(QString("dashdotdot"), CustomRelation::ShaftPattern::DashDotDot); if (element != CustomRelation::Element::Relation) throwUnknownPropertyError(token); parseEnum<CustomRelation::ShaftPattern>( @@ -688,10 +688,10 @@ void StereotypeDefinitionParser::parseRelation(CustomRelation::Element element) relation.setColorType(CustomRelation::ColorType::Custom); relation.setColor(QColor(colorName)); } else { - throw StereotypeDefinitionParserError(QString(QStringLiteral("Unexpected value \"%1\" for color.")).arg(colorValue), token.sourcePos()); + throw StereotypeDefinitionParserError(QString("Unexpected value \"%1\" for color.").arg(colorValue), token.sourcePos()); } } else { - throw StereotypeDefinitionParserError(QStringLiteral("Unexpected value for color."), token.sourcePos()); + throw StereotypeDefinitionParserError("Unexpected value for color.", token.sourcePos()); } break; } @@ -706,7 +706,7 @@ void StereotypeDefinitionParser::parseRelation(CustomRelation::Element element) } relation.setStereotypes(stereotypes); if (relation.id().isEmpty()) - throw StereotypeDefinitionParserError(QStringLiteral("Missing id in Relation definition."), d->m_scanner->sourcePos()); + throw StereotypeDefinitionParserError("Missing id in Relation definition.", d->m_scanner->sourcePos()); emit relationParsed(relation); } @@ -727,7 +727,7 @@ void StereotypeDefinitionParser::parseRelationEnd(CustomRelation *relation) else if (endName == "b") isEndB = true; else - throw StereotypeDefinitionParserError(QString(QStringLiteral("Unexpected value \"%1\" for end.")).arg(endValue), token.sourcePos()); + throw StereotypeDefinitionParserError(QString("Unexpected value \"%1\" for end.").arg(endValue), token.sourcePos()); break; } case KEYWORD_ELEMENTS: @@ -761,9 +761,9 @@ void StereotypeDefinitionParser::parseRelationEnd(CustomRelation *relation) if (relation->element() != CustomRelation::Element::Association) throwUnknownPropertyError(token); const static QHash<QString, CustomRelation::Relationship> relationshipNames = QHash<QString, CustomRelation::Relationship>() - << qMakePair(QString(QStringLiteral("association")), CustomRelation::Relationship::Association) - << qMakePair(QString(QStringLiteral("aggregation")), CustomRelation::Relationship::Aggregation) - << qMakePair(QString(QStringLiteral("composition")), CustomRelation::Relationship::Composition); + << qMakePair(QString("association"), CustomRelation::Relationship::Association) + << qMakePair(QString("aggregation"), CustomRelation::Relationship::Aggregation) + << qMakePair(QString("composition"), CustomRelation::Relationship::Composition); parseEnum<CustomRelation::Relationship>( parseIdentifierProperty(), relationshipNames, token.sourcePos(), [&](CustomRelation::Relationship relationship) { relationEnd.setRelationship(relationship); }); @@ -774,12 +774,12 @@ void StereotypeDefinitionParser::parseRelationEnd(CustomRelation *relation) if (relation->element() != CustomRelation::Element::Relation) throwUnknownPropertyError(token); const static QHash<QString, CustomRelation::Head> headNames = QHash<QString, CustomRelation::Head>() - << qMakePair(QString(QStringLiteral("none")), CustomRelation::Head::None) - << qMakePair(QString(QStringLiteral("arrow")), CustomRelation::Head::Arrow) - << qMakePair(QString(QStringLiteral("triangle")), CustomRelation::Head::Triangle) - << qMakePair(QString(QStringLiteral("filledtriangle")), CustomRelation::Head::FilledTriangle) - << qMakePair(QString(QStringLiteral("diamond")), CustomRelation::Head::Diamond) - << qMakePair(QString(QStringLiteral("filleddiamond")), CustomRelation::Head::FilledDiamond); + << qMakePair(QString("none"), CustomRelation::Head::None) + << qMakePair(QString("arrow"), CustomRelation::Head::Arrow) + << qMakePair(QString("triangle"), CustomRelation::Head::Triangle) + << qMakePair(QString("filledtriangle"), CustomRelation::Head::FilledTriangle) + << qMakePair(QString("diamond"), CustomRelation::Head::Diamond) + << qMakePair(QString("filleddiamond"), CustomRelation::Head::FilledDiamond); parseEnum<CustomRelation::Head>( parseIdentifierProperty(), headNames, token.sourcePos(), [&](CustomRelation::Head head) { relationEnd.setHead(head); }); @@ -833,7 +833,7 @@ void StereotypeDefinitionParser::parseToolbar() break; } if (toolbar.id().isEmpty()) - throw StereotypeDefinitionParserError(QStringLiteral("Missing id in Toolbar definition."), d->m_scanner->sourcePos()); + throw StereotypeDefinitionParserError("Missing id in Toolbar definition.", d->m_scanner->sourcePos()); emit toolbarParsed(toolbar); } @@ -879,16 +879,16 @@ void StereotypeDefinitionParser::parseToolbarTool(const Toolbar *toolbar, Toolba QString element = parseIdentifierProperty(); if (toolbar->toolbarType() == Toolbar::ObjectToolbar) { static QSet<QString> elementNames = QSet<QString>() - << QStringLiteral("package") - << QStringLiteral("component") - << QStringLiteral("class") - << QStringLiteral("item") - << QStringLiteral("annotation") - << QStringLiteral("boundary") - << QStringLiteral("swimlane"); + << "package" + << "component" + << "class" + << "item" + << "annotation" + << "boundary" + << "swimlane"; QString elementName = element.toLower(); if (!elementNames.contains(elementName)) - throw StereotypeDefinitionParserError(QString(QStringLiteral("Unexpected value \"%1\" for element.")).arg(element), token.sourcePos()); + throw StereotypeDefinitionParserError(QString("Unexpected value \"%1\" for element.").arg(element), token.sourcePos()); tool->m_elementType = elementName; } else { static QSet<QString> relationNames = QSet<QString>() @@ -932,7 +932,7 @@ void StereotypeDefinitionParser::parseEnum(const QString &identifier, { const QString name = identifier.toLower(); if (!identifierNames.contains(name)) - throw StereotypeDefinitionParserError(QString(QStringLiteral("Unexpected value \"%1\".")).arg(identifier), sourcePos); + throw StereotypeDefinitionParserError(QString("Unexpected value \"%1\".").arg(identifier), sourcePos); setter(identifierNames.value(name)); } @@ -967,7 +967,7 @@ QList<QString> StereotypeDefinitionParser::parseIdentifierListProperty() for (;;) { Token token = d->m_scanner->read(); if (token.type() != Token::TokenIdentifier && token.type() != Token::TokenKeyword) { - throw StereotypeDefinitionParserError(QStringLiteral("Expected identifier."), token.sourcePos()); + throw StereotypeDefinitionParserError("Expected identifier.", token.sourcePos()); } identifiers.append(token.text()); token = d->m_scanner->read(); @@ -1001,7 +1001,7 @@ QString StereotypeDefinitionParser::parseStringExpression() { Token token = d->m_scanner->read(); if (token.type() != Token::TokenString) - throw StereotypeDefinitionParserError(QStringLiteral("Expected string constant."), token.sourcePos()); + throw StereotypeDefinitionParserError("Expected string constant.", token.sourcePos()); return token.text(); } @@ -1022,7 +1022,7 @@ qreal StereotypeDefinitionParser::parseFloatExpression() QMT_CHECK(ok); return value; } else { - throw StereotypeDefinitionParserError(QStringLiteral("Expected number constant."), token.sourcePos()); + throw StereotypeDefinitionParserError("Expected number constant.", token.sourcePos()); } } } @@ -1040,7 +1040,7 @@ int StereotypeDefinitionParser::parseIntExpression() QMT_CHECK(ok); return value; } else { - throw StereotypeDefinitionParserError(QStringLiteral("Expected integer constant."), token.sourcePos()); + throw StereotypeDefinitionParserError("Expected integer constant.", token.sourcePos()); } } } @@ -1049,7 +1049,7 @@ QString StereotypeDefinitionParser::parseIdentifierExpression() { Token token = d->m_scanner->read(); if (token.type() != Token::TokenIdentifier && token.type() != Token::TokenKeyword) - throw StereotypeDefinitionParserError(QStringLiteral("Expected identifier."), token.sourcePos()); + throw StereotypeDefinitionParserError("Expected identifier.", token.sourcePos()); return token.text(); } @@ -1058,12 +1058,12 @@ bool StereotypeDefinitionParser::parseBoolExpression() Token token = d->m_scanner->read(); if (token.type() == Token::TokenIdentifier) { QString value = token.text().toLower(); - if (value == QStringLiteral("yes") || value == QStringLiteral("true")) + if (value == "yes" || value == "true") return true; - else if (value == QStringLiteral("no") || value == QStringLiteral("false")) + else if (value == "no" || value == "false") return false; } - throw StereotypeDefinitionParserError(QStringLiteral("Expected 'yes', 'no', 'true' or 'false'."), token.sourcePos()); + throw StereotypeDefinitionParserError("Expected 'yes', 'no', 'true' or 'false'.", token.sourcePos()); } QColor StereotypeDefinitionParser::parseColorExpression() @@ -1077,7 +1077,7 @@ QColor StereotypeDefinitionParser::parseColorExpression() return color; } } - throw StereotypeDefinitionParserError(QStringLiteral("Expected color name."), token.sourcePos()); + throw StereotypeDefinitionParserError("Expected color name.", token.sourcePos()); } StereotypeDefinitionParser::Value StereotypeDefinitionParser::parseExpression() @@ -1092,7 +1092,7 @@ StereotypeDefinitionParser::Value StereotypeDefinitionParser::parseExpression() else if (v.type() == Float) return Value(Float, QVariant(-v.value().toDouble())); else - throw StereotypeDefinitionParserError(QStringLiteral("Illegal number expression."), token.sourcePos()); + throw StereotypeDefinitionParserError("Illegal number expression.", token.sourcePos()); } else if (token.type() == Token::TokenInteger) { bool ok = false; int value = token.text().toInt(&ok); @@ -1110,24 +1110,24 @@ StereotypeDefinitionParser::Value StereotypeDefinitionParser::parseExpression() color.setNamedColor(value); return Value(Color, QVariant(color)); } else { - throw StereotypeDefinitionParserError(QStringLiteral("Invalid color."), token.sourcePos()); + throw StereotypeDefinitionParserError("Invalid color.", token.sourcePos()); } } else if (token.type() == Token::TokenIdentifier || token.type() == Token::TokenKeyword) { QString value = token.text().toLower(); - if (value == QStringLiteral("yes") || value == QStringLiteral("true")) + if (value == "yes" || value == "true") return Value(Boolean, QVariant(true)); - else if (value == QStringLiteral("no") || value == QStringLiteral("false")) + else if (value == "no" || value == "false") return Value(Boolean, QVariant(false)); else return Value(Identifier, QVariant(token.text())); } - throw StereotypeDefinitionParserError(QStringLiteral("Syntax error in expression."), token.sourcePos()); + throw StereotypeDefinitionParserError("Syntax error in expression.", token.sourcePos()); } void StereotypeDefinitionParser::expectBlockBegin() { skipEOLTokens(); - expectOperator(OPERATOR_BRACE_OPEN, QStringLiteral("{")); + expectOperator(OPERATOR_BRACE_OPEN, "{"); } bool StereotypeDefinitionParser::readProperty(Token *token) @@ -1140,13 +1140,13 @@ bool StereotypeDefinitionParser::readProperty(Token *token) else if (token->type() == Token::TokenIdentifier) throwUnknownPropertyError(*token); else - throw StereotypeDefinitionParserError(QStringLiteral("Syntax error."), token->sourcePos()); + throw StereotypeDefinitionParserError("Syntax error.", token->sourcePos()); return false; // will never be reached but avoids compiler warning } void StereotypeDefinitionParser::throwUnknownPropertyError(const Token &token) { - throw StereotypeDefinitionParserError(QString(QStringLiteral("Unknown property '%1'.")).arg(token.text()), token.sourcePos()); + throw StereotypeDefinitionParserError(QString("Unknown property '%1'.").arg(token.text()), token.sourcePos()); } bool StereotypeDefinitionParser::expectPropertySeparatorOrBlockEnd() @@ -1165,7 +1165,7 @@ bool StereotypeDefinitionParser::expectPropertySeparatorOrBlockEnd() else d->m_scanner->unread(token); if (!ok) - throw StereotypeDefinitionParserError(QStringLiteral("Expected ';', '}' or end-of-line."), token.sourcePos()); + throw StereotypeDefinitionParserError("Expected ';', '}' or end-of-line.", token.sourcePos()); return true; } @@ -1183,7 +1183,7 @@ void StereotypeDefinitionParser::skipOptionalEmptyBlock() if (isOperator(token, OPERATOR_BRACE_OPEN)) { token = readNextToken(); if (!isOperator(token, OPERATOR_BRACE_CLOSE)) - throw StereotypeDefinitionParserError(QStringLiteral("Expected '}' in empty block."), token.sourcePos()); + throw StereotypeDefinitionParserError("Expected '}' in empty block.", token.sourcePos()); } else { d->m_scanner->unread(token); d->m_scanner->unread(eolToken); @@ -1191,7 +1191,7 @@ void StereotypeDefinitionParser::skipOptionalEmptyBlock() } else if (isOperator(token, OPERATOR_BRACE_OPEN)) { token = readNextToken(); if (!isOperator(token, OPERATOR_BRACE_CLOSE)) - throw StereotypeDefinitionParserError(QStringLiteral("Expected '}' in empty block."), token.sourcePos()); + throw StereotypeDefinitionParserError("Expected '}' in empty block.", token.sourcePos()); } else { d->m_scanner->unread(token); } @@ -1200,7 +1200,7 @@ void StereotypeDefinitionParser::skipOptionalEmptyBlock() qreal StereotypeDefinitionParser::expectAbsoluteValue(const ShapeValueF &value, const SourcePos &sourcePos) { if (value.unit() != ShapeValueF::UnitAbsolute || value.origin() != ShapeValueF::OriginSmart) - throw StereotypeDefinitionParserError(QStringLiteral("Expected absolute value"), sourcePos); + throw StereotypeDefinitionParserError("Expected absolute value", sourcePos); return value.value(); } @@ -1213,12 +1213,12 @@ void StereotypeDefinitionParser::expectOperator(int op, const QString &opName) { Token token = d->m_scanner->read(); if (!isOperator(token, op)) - throw StereotypeDefinitionParserError(QString(QStringLiteral("Expected '%1'.")).arg(opName), token.sourcePos()); + throw StereotypeDefinitionParserError(QString("Expected '%1'.").arg(opName), token.sourcePos()); } void StereotypeDefinitionParser::expectColon() { - expectOperator(OPERATOR_COLON, QStringLiteral(":")); + expectOperator(OPERATOR_COLON, ":"); } void StereotypeDefinitionParser::skipEOLTokens() diff --git a/src/libs/modelinglib/qmt/config/textscanner.cpp b/src/libs/modelinglib/qmt/config/textscanner.cpp index 80c13c80d0a..3b156147bd1 100644 --- a/src/libs/modelinglib/qmt/config/textscanner.cpp +++ b/src/libs/modelinglib/qmt/config/textscanner.cpp @@ -129,7 +129,7 @@ Token TextScanner::read() else if (d->m_operatorFirstCharsSet.contains(sourceChar.ch)) return scanOperator(sourceChar); else - throw TextScannerError(QStringLiteral("Unexpected character."), sourceChar.pos); + throw TextScannerError("Unexpected character.", sourceChar.pos); } void TextScanner::unread(const Token &token) @@ -201,9 +201,9 @@ Token TextScanner::scanString(const SourceChar &delimiterChar) else if (sourceChar.ch == QLatin1Char('\'')) text += QLatin1Char('\''); else - throw TextScannerError(QStringLiteral("Unexpected character after '\\' in string constant."), sourceChar.pos); + throw TextScannerError("Unexpected character after '\\' in string constant.", sourceChar.pos); } else if (sourceChar.ch == QChar::LineFeed || sourceChar.ch == QChar::CarriageReturn) { - throw TextScannerError(QStringLiteral("Unexpected end of line in string constant."), sourceChar.pos); + throw TextScannerError("Unexpected end of line in string constant.", sourceChar.pos); } else { text += sourceChar.ch; } diff --git a/src/libs/modelinglib/qmt/controller/namecontroller.cpp b/src/libs/modelinglib/qmt/controller/namecontroller.cpp index 2285fb39716..c2c23c772ab 100644 --- a/src/libs/modelinglib/qmt/controller/namecontroller.cpp +++ b/src/libs/modelinglib/qmt/controller/namecontroller.cpp @@ -135,11 +135,11 @@ QStringList NameController::buildElementsPath(const QString &filePath, bool igno { QList<QString> relativeElements; - QStringList splitted = filePath.split(QStringLiteral("/")); - QStringList::const_iterator splittedEnd = splitted.end(); - if (ignoreLastFilePathPart || splitted.last().isEmpty()) - splittedEnd = --splittedEnd; - for (auto it = splitted.cbegin(); it != splittedEnd; ++it) { + QStringList split = filePath.split("/"); + QStringList::const_iterator splitEnd = split.end(); + if (ignoreLastFilePathPart || split.last().isEmpty()) + splitEnd = --splitEnd; + for (auto it = split.cbegin(); it != splitEnd; ++it) { QString packageName = qmt::NameController::convertFileNameToElementName(*it); relativeElements.append(packageName); } diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp index ca37e4ea6a1..ff8d3eb2965 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp +++ b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp @@ -73,7 +73,7 @@ static const qreal BODY_VERT_BORDER = 4.0; static const qreal BODY_HORIZ_BORDER = 4.0; ClassItem::ClassItem(DClass *klass, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent) - : ObjectItem(QStringLiteral("class"), klass, diagramSceneModel, parent) + : ObjectItem("class", klass, diagramSceneModel, parent) { } @@ -336,7 +336,7 @@ bool ClassItem::extendContextMenu(QMenu *menu) { bool extended = false; if (diagramSceneModel()->diagramSceneController()->elementTasks()->hasClassDefinition(object(), diagramSceneModel()->diagram())) { - menu->addAction(new ContextMenuAction(tr("Show Definition"), QStringLiteral("showDefinition"), menu)); + menu->addAction(new ContextMenuAction(tr("Show Definition"), "showDefinition", menu)); extended = true; } return extended; @@ -344,7 +344,7 @@ bool ClassItem::extendContextMenu(QMenu *menu) bool ClassItem::handleSelectedContextMenuAction(const QString &id) { - if (id == QStringLiteral("showDefinition")) { + if (id == "showDefinition") { diagramSceneModel()->diagramSceneController()->elementTasks()->openClassDefinition(object(), diagramSceneModel()->diagram()); return true; } @@ -675,19 +675,19 @@ void ClassItem::updateMembers(const Style *style) } if (text && !text->isEmpty()) - *text += QStringLiteral("<br/>"); + *text += "<br/>"; bool addNewline = false; bool addSpace = false; if (currentVisibility) *currentVisibility = member.visibility(); if (currentGroup && member.group() != *currentGroup) { - *text += QString(QStringLiteral("[%1]")).arg(member.group()); + *text += QString("[%1]").arg(member.group()); addNewline = true; *currentGroup = member.group(); } if (addNewline) - *text += QStringLiteral("<br/>"); + *text += "<br/>"; bool haveSignal = false; bool haveSlot = false; @@ -697,34 +697,34 @@ void ClassItem::updateMembers(const Style *style) case MClassMember::VisibilityUndefined: break; case MClassMember::VisibilityPublic: - vis = QStringLiteral("+"); + vis = "+"; addSpace = true; break; case MClassMember::VisibilityProtected: - vis = QStringLiteral("#"); + vis = "#"; addSpace = true; break; case MClassMember::VisibilityPrivate: - vis = QStringLiteral("-"); + vis = "-"; addSpace = true; break; case MClassMember::VisibilitySignals: - vis = QStringLiteral(">"); + vis = ">"; haveSignal = true; addSpace = true; break; case MClassMember::VisibilityPrivateSlots: - vis = QStringLiteral("-$"); + vis = "-$"; haveSlot = true; addSpace = true; break; case MClassMember::VisibilityProtectedSlots: - vis = QStringLiteral("#$"); + vis = "#$"; haveSlot = true; addSpace = true; break; case MClassMember::VisibilityPublicSlots: - vis = QStringLiteral("+$"); + vis = "+$"; haveSlot = true; addSpace = true; break; @@ -733,34 +733,34 @@ void ClassItem::updateMembers(const Style *style) } if (member.properties() & MClassMember::PropertyQsignal && !haveSignal) { - *text += QStringLiteral(">"); + *text += ">"; addSpace = true; } if (member.properties() & MClassMember::PropertyQslot && !haveSlot) { - *text += QStringLiteral("$"); + *text += "$"; addSpace = true; } if (addSpace) - *text += QStringLiteral(" "); + *text += " "; if (member.properties() & MClassMember::PropertyQinvokable) - *text += QStringLiteral("invokable "); + *text += "invokable "; if (!member.stereotypes().isEmpty()) { *text += StereotypesItem::format(member.stereotypes()); - *text += QStringLiteral(" "); + *text += " "; } if (member.properties() & MClassMember::PropertyStatic) - *text += QStringLiteral("static "); + *text += "static "; if (member.properties() & MClassMember::PropertyVirtual) - *text += QStringLiteral("virtual "); + *text += "virtual "; *text += member.declaration().toHtmlEscaped(); if (member.properties() & MClassMember::PropertyConst) - *text += QStringLiteral(" const"); + *text += " const"; if (member.properties() & MClassMember::PropertyOverride) - *text += QStringLiteral(" override"); + *text += " override"; if (member.properties() & MClassMember::PropertyFinal) - *text += QStringLiteral(" final"); + *text += " final"; if (member.properties() & MClassMember::PropertyAbstract) - *text += QStringLiteral(" = 0"); + *text += " = 0"; } } diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.cpp index 2f357191ed7..7aca202d20a 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.cpp +++ b/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.cpp @@ -60,7 +60,7 @@ static const qreal BODY_VERT_BORDER = 4.0; static const qreal BODY_HORIZ_BORDER = 4.0; ComponentItem::ComponentItem(DComponent *component, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent) - : ObjectItem(QStringLiteral("component"), component, diagramSceneModel, parent) + : ObjectItem("component", component, diagramSceneModel, parent) { } diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.cpp index 3cc710ff8b8..1d27039e805 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.cpp +++ b/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.cpp @@ -54,7 +54,7 @@ static const qreal BODY_HORIZ_BORDER = 4.0; static const qreal BODY_VERT_BORDER = 4.0; DiagramItem::DiagramItem(DDiagram *diagram, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent) - : ObjectItem(QStringLiteral("diagram"), diagram, diagramSceneModel, parent) + : ObjectItem("diagram", diagram, diagramSceneModel, parent) { } diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.cpp index e919c486a44..e05241a9bea 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.cpp +++ b/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.cpp @@ -55,7 +55,7 @@ static const qreal BODY_VERT_BORDER = 4.0; static const qreal BODY_HORIZ_BORDER = 4.0; ItemItem::ItemItem(DItem *item, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent) - : ObjectItem(QStringLiteral("item"), item, diagramSceneModel, parent) + : ObjectItem("item", item, diagramSceneModel, parent) { } diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp index 5adc3e5eabb..062316894ac 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp +++ b/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp @@ -279,18 +279,18 @@ QList<ILatchable::Latch> ObjectItem::horizontalLatches(ILatchable::Action action QList<ILatchable::Latch> result; switch (action) { case ILatchable::Move: - result << ILatchable::Latch(ILatchable::Left, rect.left(), rect.top(), rect.bottom(), QStringLiteral("left")) - << ILatchable::Latch(ILatchable::Hcenter, rect.center().x(), rect.top(), rect.bottom(), QStringLiteral("center")) - << ILatchable::Latch(ILatchable::Right, rect.right(), rect.top(), rect.bottom(), QStringLiteral("right")); + result << ILatchable::Latch(ILatchable::Left, rect.left(), rect.top(), rect.bottom(), "left") + << ILatchable::Latch(ILatchable::Hcenter, rect.center().x(), rect.top(), rect.bottom(), "center") + << ILatchable::Latch(ILatchable::Right, rect.right(), rect.top(), rect.bottom(), "right"); break; case ILatchable::ResizeLeft: - result << ILatchable::Latch(ILatchable::Left, rect.left(), rect.top(), rect.bottom(), QStringLiteral("left")); + result << ILatchable::Latch(ILatchable::Left, rect.left(), rect.top(), rect.bottom(), "left"); break; case ILatchable::ResizeTop: QMT_CHECK(false); break; case ILatchable::ResizeRight: - result << ILatchable::Latch(ILatchable::Right, rect.right(), rect.top(), rect.bottom(), QStringLiteral("right")); + result << ILatchable::Latch(ILatchable::Right, rect.right(), rect.top(), rect.bottom(), "right"); break; case ILatchable::ResizeBottom: QMT_CHECK(false); @@ -307,21 +307,21 @@ QList<ILatchable::Latch> ObjectItem::verticalLatches(ILatchable::Action action, QList<ILatchable::Latch> result; switch (action) { case ILatchable::Move: - result << ILatchable::Latch(ILatchable::Top, rect.top(), rect.left(), rect.right(), QStringLiteral("top")) - << ILatchable::Latch(ILatchable::Vcenter, rect.center().y(), rect.left(), rect.right(), QStringLiteral("center")) - << ILatchable::Latch(ILatchable::Bottom, rect.bottom(), rect.left(), rect.right(), QStringLiteral("bottom")); + result << ILatchable::Latch(ILatchable::Top, rect.top(), rect.left(), rect.right(), "top") + << ILatchable::Latch(ILatchable::Vcenter, rect.center().y(), rect.left(), rect.right(), "center") + << ILatchable::Latch(ILatchable::Bottom, rect.bottom(), rect.left(), rect.right(), "bottom"); break; case ILatchable::ResizeLeft: QMT_CHECK(false); break; case ILatchable::ResizeTop: - result << ILatchable::Latch(ILatchable::Top, rect.top(), rect.left(), rect.right(), QStringLiteral("top")); + result << ILatchable::Latch(ILatchable::Top, rect.top(), rect.left(), rect.right(), "top"); break; case ILatchable::ResizeRight: QMT_CHECK(false); break; case ILatchable::ResizeBottom: - result << ILatchable::Latch(ILatchable::Bottom, rect.bottom(), rect.left(), rect.right(), QStringLiteral("bottom")); + result << ILatchable::Latch(ILatchable::Bottom, rect.bottom(), rect.left(), rect.right(), "bottom"); break; } return result; @@ -400,49 +400,49 @@ void ObjectItem::align(IAlignable::AlignType alignType, const QString &identifie // but this implementation does not. So assert the names. switch (alignType) { case IAlignable::AlignLeft: - QMT_CHECK(identifier == QStringLiteral("left")); + QMT_CHECK(identifier == "left"); m_diagramSceneModel->diagramSceneController()->alignLeft(m_object, m_diagramSceneModel->selectedElements(), m_diagramSceneModel->diagram()); break; case IAlignable::AlignRight: - QMT_CHECK(identifier == QStringLiteral("right")); + QMT_CHECK(identifier == "right"); m_diagramSceneModel->diagramSceneController()->alignRight(m_object, m_diagramSceneModel->selectedElements(), m_diagramSceneModel->diagram()); break; case IAlignable::AlignTop: - QMT_CHECK(identifier == QStringLiteral("top")); + QMT_CHECK(identifier == "top"); m_diagramSceneModel->diagramSceneController()->alignTop(m_object, m_diagramSceneModel->selectedElements(), m_diagramSceneModel->diagram()); break; case IAlignable::AlignBottom: - QMT_CHECK(identifier == QStringLiteral("bottom")); + QMT_CHECK(identifier == "bottom"); m_diagramSceneModel->diagramSceneController()->alignBottom(m_object, m_diagramSceneModel->selectedElements(), m_diagramSceneModel->diagram()); break; case IAlignable::AlignHcenter: - QMT_CHECK(identifier == QStringLiteral("center")); + QMT_CHECK(identifier == "center"); m_diagramSceneModel->diagramSceneController()->alignHCenter(m_object, m_diagramSceneModel->selectedElements(), m_diagramSceneModel->diagram()); break; case IAlignable::AlignVcenter: - QMT_CHECK(identifier == QStringLiteral("center")); + QMT_CHECK(identifier == "center"); m_diagramSceneModel->diagramSceneController()->alignVCenter(m_object, m_diagramSceneModel->selectedElements(), m_diagramSceneModel->diagram()); break; case IAlignable::AlignWidth: - QMT_CHECK(identifier == QStringLiteral("width")); + QMT_CHECK(identifier == "width"); m_diagramSceneModel->diagramSceneController()->alignWidth(m_object, m_diagramSceneModel->selectedElements(), minimumSize(m_diagramSceneModel->selectedItems()), m_diagramSceneModel->diagram()); break; case IAlignable::AlignHeight: - QMT_CHECK(identifier == QStringLiteral("height")); + QMT_CHECK(identifier == "height"); m_diagramSceneModel->diagramSceneController()->alignHeight(m_object, m_diagramSceneModel->selectedElements(), minimumSize(m_diagramSceneModel->selectedItems()), m_diagramSceneModel->diagram()); break; case IAlignable::AlignSize: - QMT_CHECK(identifier == QStringLiteral("size")); + QMT_CHECK(identifier == "size"); m_diagramSceneModel->diagramSceneController()->alignSize(m_object, m_diagramSceneModel->selectedElements(), minimumSize(m_diagramSceneModel->selectedItems()), m_diagramSceneModel->diagram()); @@ -943,10 +943,10 @@ void ObjectItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) bool addSeparator = false; if (element_tasks->hasDiagram(m_object, m_diagramSceneModel->diagram())) { - menu.addAction(new ContextMenuAction(tr("Open Diagram"), QStringLiteral("openDiagram"), &menu)); + menu.addAction(new ContextMenuAction(tr("Open Diagram"), "openDiagram", &menu)); addSeparator = true; } else if (element_tasks->mayCreateDiagram(m_object, m_diagramSceneModel->diagram())) { - menu.addAction(new ContextMenuAction(tr("Create Diagram"), QStringLiteral("createDiagram"), &menu)); + menu.addAction(new ContextMenuAction(tr("Create Diagram"), "createDiagram", &menu)); addSeparator = true; } if (extendContextMenu(&menu)) @@ -955,26 +955,26 @@ void ObjectItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) addSeparator = true; if (addSeparator) menu.addSeparator(); - menu.addAction(new ContextMenuAction(tr("Remove"), QStringLiteral("remove"), + menu.addAction(new ContextMenuAction(tr("Remove"), "remove", QKeySequence(QKeySequence::Delete), &menu)); - menu.addAction(new ContextMenuAction(tr("Delete"), QStringLiteral("delete"), + menu.addAction(new ContextMenuAction(tr("Delete"), "delete", QKeySequence(Qt::CTRL + Qt::Key_D), &menu)); - //menu.addAction(new ContextMenuAction(tr("Select in Model Tree"), QStringLiteral("selectInModelTree"), &menu)); + //menu.addAction(new ContextMenuAction(tr("Select in Model Tree"), "selectInModelTree", &menu)); QMenu alignMenu; alignMenu.setTitle(tr("Align Objects")); - alignMenu.addAction(new ContextMenuAction(tr("Align Left"), QStringLiteral("alignLeft"), &alignMenu)); - alignMenu.addAction(new ContextMenuAction(tr("Center Vertically"), QStringLiteral("centerVertically"), + alignMenu.addAction(new ContextMenuAction(tr("Align Left"), "alignLeft", &alignMenu)); + alignMenu.addAction(new ContextMenuAction(tr("Center Vertically"), "centerVertically", &alignMenu)); - alignMenu.addAction(new ContextMenuAction(tr("Align Right"), QStringLiteral("alignRight"), &alignMenu)); + alignMenu.addAction(new ContextMenuAction(tr("Align Right"), "alignRight", &alignMenu)); alignMenu.addSeparator(); - alignMenu.addAction(new ContextMenuAction(tr("Align Top"), QStringLiteral("alignTop"), &alignMenu)); - alignMenu.addAction(new ContextMenuAction(tr("Center Horizontally"), QStringLiteral("centerHorizontally"), + alignMenu.addAction(new ContextMenuAction(tr("Align Top"), "alignTop", &alignMenu)); + alignMenu.addAction(new ContextMenuAction(tr("Center Horizontally"), "centerHorizontally", &alignMenu)); - alignMenu.addAction(new ContextMenuAction(tr("Align Bottom"), QStringLiteral("alignBottom"), &alignMenu)); + alignMenu.addAction(new ContextMenuAction(tr("Align Bottom"), "alignBottom", &alignMenu)); alignMenu.addSeparator(); - alignMenu.addAction(new ContextMenuAction(tr("Same Width"), QStringLiteral("sameWidth"), &alignMenu)); - alignMenu.addAction(new ContextMenuAction(tr("Same Height"), QStringLiteral("sameHeight"), &alignMenu)); - alignMenu.addAction(new ContextMenuAction(tr("Same Size"), QStringLiteral("sameSize"), &alignMenu)); + alignMenu.addAction(new ContextMenuAction(tr("Same Width"), "sameWidth", &alignMenu)); + alignMenu.addAction(new ContextMenuAction(tr("Same Height"), "sameHeight", &alignMenu)); + alignMenu.addAction(new ContextMenuAction(tr("Same Size"), "sameSize", &alignMenu)); alignMenu.setEnabled(m_diagramSceneModel->hasMultiObjectsSelection()); menu.addMenu(&alignMenu); @@ -985,40 +985,40 @@ void ObjectItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) bool handled = handleSelectedContextMenuAction(action->id()); handled |= element_tasks->handleContextMenuAction(object(), diagramSceneModel()->diagram(), action->id()); if (!handled) { - if (action->id() == QStringLiteral("openDiagram")) { + if (action->id() == "openDiagram") { m_diagramSceneModel->diagramSceneController()->elementTasks()->openDiagram(m_object, m_diagramSceneModel->diagram()); - } else if (action->id() == QStringLiteral("createDiagram")) { + } else if (action->id() == "createDiagram") { m_diagramSceneModel->diagramSceneController()->elementTasks()->createAndOpenDiagram(m_object, m_diagramSceneModel->diagram()); - } else if (action->id() == QStringLiteral("remove")) { + } else if (action->id() == "remove") { DSelection selection = m_diagramSceneModel->selectedElements(); if (selection.isEmpty()) selection.append(m_object->uid(), m_diagramSceneModel->diagram()->uid()); m_diagramSceneModel->diagramController()->deleteElements(selection, m_diagramSceneModel->diagram()); - } else if (action->id() == QStringLiteral("delete")) { + } else if (action->id() == "delete") { DSelection selection = m_diagramSceneModel->selectedElements(); if (selection.isEmpty()) selection.append(m_object->uid(), m_diagramSceneModel->diagram()->uid()); m_diagramSceneModel->diagramSceneController()->deleteFromDiagram(selection, m_diagramSceneModel->diagram()); - } else if (action->id() == QStringLiteral("selectInModelTree")) { + } else if (action->id() == "selectInModelTree") { // TODO implement - } else if (action->id() == QStringLiteral("alignLeft")) { - align(IAlignable::AlignLeft, QStringLiteral("left")); - } else if (action->id() == QStringLiteral("centerVertically")) { - align(IAlignable::AlignVcenter, QStringLiteral("center")); - } else if (action->id() == QStringLiteral("alignRight")) { - align(IAlignable::AlignRight, QStringLiteral("right")); - } else if (action->id() == QStringLiteral("alignTop")) { - align(IAlignable::AlignTop, QStringLiteral("top")); - } else if (action->id() == QStringLiteral("centerHorizontally")) { - align(IAlignable::AlignHcenter, QStringLiteral("center")); - } else if (action->id() == QStringLiteral("alignBottom")) { - align(IAlignable::AlignBottom, QStringLiteral("bottom")); - } else if (action->id() == QStringLiteral("sameWidth")) { - align(IAlignable::AlignWidth, QStringLiteral("width")); - } else if (action->id() == QStringLiteral("sameHeight")) { - align(IAlignable::AlignHeight, QStringLiteral("height")); - } else if (action->id() == QStringLiteral("sameSize")) { - align(IAlignable::AlignSize, QStringLiteral("size")); + } else if (action->id() == "alignLeft") { + align(IAlignable::AlignLeft, "left"); + } else if (action->id() == "centerVertically") { + align(IAlignable::AlignVcenter, "center"); + } else if (action->id() == "alignRight") { + align(IAlignable::AlignRight, "right"); + } else if (action->id() == "alignTop") { + align(IAlignable::AlignTop, "top"); + } else if (action->id() == "centerHorizontally") { + align(IAlignable::AlignHcenter, "center"); + } else if (action->id() == "alignBottom") { + align(IAlignable::AlignBottom, "bottom"); + } else if (action->id() == "sameWidth") { + align(IAlignable::AlignWidth, "width"); + } else if (action->id() == "sameHeight") { + align(IAlignable::AlignHeight, "height"); + } else if (action->id() == "sameSize") { + align(IAlignable::AlignSize, "size"); } } } diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.cpp index f4bdec34ae4..a865225fbab 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.cpp +++ b/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.cpp @@ -71,7 +71,7 @@ public: }; PackageItem::PackageItem(DPackage *package, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent) - : ObjectItem(QStringLiteral("package"), package, diagramSceneModel, parent) + : ObjectItem("package", package, diagramSceneModel, parent) { } diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp index 1058d45e19c..c3a744d3b66 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp +++ b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp @@ -74,7 +74,7 @@ public: bool baseIsInterface = false; bool lollipopDisplay = false; if (baseObject) { - baseIsInterface = baseObject->stereotypes().contains(QStringLiteral("interface")); + baseIsInterface = baseObject->stereotypes().contains("interface"); if (baseIsInterface) { StereotypeDisplayVisitor stereotypeDisplayVisitor; stereotypeDisplayVisitor.setModelController(m_diagramSceneModel->diagramSceneController()->modelController()); @@ -86,7 +86,7 @@ public: if (lollipopDisplay) { m_arrow->setShaft(ArrowItem::ShaftSolid); m_arrow->setEndHead(ArrowItem::HeadNone); - } else if (baseIsInterface || inheritance->stereotypes().contains(QStringLiteral("realize"))) { + } else if (baseIsInterface || inheritance->stereotypes().contains("realize")) { m_arrow->setShaft(ArrowItem::ShaftDashed); m_arrow->setEndHead(ArrowItem::HeadTriangle); } else { @@ -102,7 +102,7 @@ public: { ArrowItem::Head endAHead = ArrowItem::HeadNone; ArrowItem::Head endBHead = ArrowItem::HeadNone; - bool isRealization = dependency->stereotypes().contains(QStringLiteral("realize")); + bool isRealization = dependency->stereotypes().contains("realize"); switch (dependency->direction()) { case MDependency::AToB: endBHead = isRealization ? ArrowItem::HeadTriangle : ArrowItem::HeadOpen; diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.cpp index f8482e992cb..83c32d84591 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.cpp +++ b/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.cpp @@ -124,42 +124,42 @@ void AlignButtonsItem::addButton(IAlignable::AlignType alignType, const QString switch (alignType) { case IAlignable::AlignLeft: { - static const QPixmap alignLeftPixmap = QPixmap(QStringLiteral(":/modelinglib/25x25/align-left.png")).scaled(NormalPixmapWidth, NormalPixmapHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); + static const QPixmap alignLeftPixmap = QPixmap(":/modelinglib/25x25/align-left.png").scaled(NormalPixmapWidth, NormalPixmapHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); item->setPixmap(alignLeftPixmap); item->setPos(pos - InnerBorder - 3.0, 0); // subtract additional shift of image within pixmap break; } case IAlignable::AlignRight: { - static const QPixmap alignRightPixmap = QPixmap(QStringLiteral(":/modelinglib/25x25/align-right.png")).scaled(NormalPixmapWidth, NormalPixmapHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); + static const QPixmap alignRightPixmap = QPixmap(":/modelinglib/25x25/align-right.png").scaled(NormalPixmapWidth, NormalPixmapHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); item->setPixmap(alignRightPixmap); item->setPos(pos - item->boundingRect().width() + InnerBorder + 3.0, 0); break; } case IAlignable::AlignTop: { - static const QPixmap alignTopPixmap = QPixmap(QStringLiteral(":/modelinglib/25x25/align-top.png")).scaled(NormalPixmapWidth, NormalPixmapHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); + static const QPixmap alignTopPixmap = QPixmap(":/modelinglib/25x25/align-top.png").scaled(NormalPixmapWidth, NormalPixmapHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); item->setPixmap(alignTopPixmap); item->setPos(0, pos - InnerBorder - 3.0); break; } case IAlignable::AlignBottom: { - static const QPixmap alignBottomPixmap = QPixmap(QStringLiteral(":/modelinglib/25x25/align-bottom.png")).scaled(NormalPixmapWidth, NormalPixmapHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); + static const QPixmap alignBottomPixmap = QPixmap(":/modelinglib/25x25/align-bottom.png").scaled(NormalPixmapWidth, NormalPixmapHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); item->setPixmap(alignBottomPixmap); item->setPos(0, pos - item->boundingRect().height() + InnerBorder + 3.0); break; } case IAlignable::AlignHcenter: { - static const QPixmap alignHorizontalPixmap = QPixmap(QStringLiteral(":/modelinglib/25x25/align-horizontal.png")).scaled(NormalPixmapWidth, NormalPixmapHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); + static const QPixmap alignHorizontalPixmap = QPixmap(":/modelinglib/25x25/align-horizontal.png").scaled(NormalPixmapWidth, NormalPixmapHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); item->setPixmap(alignHorizontalPixmap); item->setPos(pos - item->boundingRect().center().x(), 0); break; } case IAlignable::AlignVcenter: { - static const QPixmap alignVerticalPixmap = QPixmap(QStringLiteral(":/modelinglib/25x25/align-vertical.png")).scaled(NormalPixmapWidth, NormalPixmapHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); + static const QPixmap alignVerticalPixmap = QPixmap(":/modelinglib/25x25/align-vertical.png").scaled(NormalPixmapWidth, NormalPixmapHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); item->setPixmap(alignVerticalPixmap); item->setPos(0, pos - item->boundingRect().center().y()); break; diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/contextlabelitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/contextlabelitem.cpp index 4eec6da0765..afda90db4f0 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/parts/contextlabelitem.cpp +++ b/src/libs/modelinglib/qmt/diagram_scene/parts/contextlabelitem.cpp @@ -69,16 +69,16 @@ double ContextLabelItem::height() const void ContextLabelItem::update() { - setText(QString(QStringLiteral("(from %1)")).arg(m_context)); + setText(QString("(from %1)").arg(m_context)); if (m_maxWidth > 0.0) { double contextWidth = boundingRect().width(); if (contextWidth > m_maxWidth) { - setText(QString(QStringLiteral("(%1)")).arg(m_context)); + setText(QString("(%1)").arg(m_context)); contextWidth = boundingRect().width(); } if (contextWidth > m_maxWidth) { QFontMetricsF metrics(font()); - setText(metrics.elidedText(QString(QStringLiteral("(%1)")).arg(m_context), Qt::ElideMiddle, m_maxWidth)); + setText(metrics.elidedText(QString("(%1)").arg(m_context), Qt::ElideMiddle, m_maxWidth)); } } } diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/stereotypesitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/stereotypesitem.cpp index 2c6075590aa..0269bb1e078 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/parts/stereotypesitem.cpp +++ b/src/libs/modelinglib/qmt/diagram_scene/parts/stereotypesitem.cpp @@ -49,7 +49,7 @@ QString StereotypesItem::format(const QList<QString> &stereotypes) bool first = true; foreach (const QString &stereotype, stereotypes) { if (!first) - text += QStringLiteral(", "); + text += ", "; text += stereotype; first = false; } diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/templateparameterbox.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/templateparameterbox.cpp index 51c386c16be..8da88ea4012 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/parts/templateparameterbox.cpp +++ b/src/libs/modelinglib/qmt/diagram_scene/parts/templateparameterbox.cpp @@ -82,7 +82,7 @@ void TemplateParameterBox::updateText() if (m_breakLines) templateText += QLatin1Char('\n'); else - templateText += QStringLiteral(", "); + templateText += ", "; } templateText += parameter; first = false; diff --git a/src/libs/modelinglib/qmt/model_ui/stereotypescontroller.cpp b/src/libs/modelinglib/qmt/model_ui/stereotypescontroller.cpp index 738b0250b51..7f1493dcbcb 100644 --- a/src/libs/modelinglib/qmt/model_ui/stereotypescontroller.cpp +++ b/src/libs/modelinglib/qmt/model_ui/stereotypescontroller.cpp @@ -51,7 +51,7 @@ QString StereotypesController::toString(const QList<QString> &stereotypes) bool first = true; foreach (const QString &stereotype, stereotypes) { if (!first) - s += QStringLiteral(", "); + s += ", "; s += stereotype; first = false; } diff --git a/src/libs/modelinglib/qmt/model_ui/treemodel.cpp b/src/libs/modelinglib/qmt/model_ui/treemodel.cpp index bdedf995b95..da11e43f0f4 100644 --- a/src/libs/modelinglib/qmt/model_ui/treemodel.cpp +++ b/src/libs/modelinglib/qmt/model_ui/treemodel.cpp @@ -95,7 +95,7 @@ public: { QMT_CHECK(!m_item); - static QIcon icon(QStringLiteral(":/modelinglib/48x48/package.png")); + static QIcon icon(":/modelinglib/48x48/package.png"); m_item = new ModelItem(icon, m_treeModel->createObjectLabel(package)); m_item->setData(TreeModel::Package, TreeModel::RoleItemType); visitMObject(package); @@ -106,7 +106,7 @@ public: QMT_CHECK(!m_item); QIcon icon = m_treeModel->createIcon(StereotypeIcon::ElementClass, StyleEngine::TypeClass, klass->stereotypes(), - QStringLiteral(":/modelinglib/48x48/class.png")); + ":/modelinglib/48x48/class.png"); m_item = new ModelItem(icon, m_treeModel->createObjectLabel(klass)); m_item->setData(TreeModel::Element, TreeModel::RoleItemType); m_item->setStereotypes(klass->stereotypes()); @@ -119,7 +119,7 @@ public: QIcon icon = m_treeModel->createIcon(StereotypeIcon::ElementComponent, StyleEngine::TypeComponent, component->stereotypes(), - QStringLiteral(":/modelinglib/48x48/component.png")); + ":/modelinglib/48x48/component.png"); m_item = new ModelItem(icon, m_treeModel->createObjectLabel(component)); m_item->setData(TreeModel::Element, TreeModel::RoleItemType); m_item->setStereotypes(component->stereotypes()); @@ -136,7 +136,7 @@ public: { QMT_CHECK(!m_item); - static QIcon icon(QStringLiteral(":/modelinglib/48x48/canvas-diagram.png")); + static QIcon icon(":/modelinglib/48x48/canvas-diagram.png"); m_item = new ModelItem(icon, m_treeModel->createObjectLabel(diagram)); visitMDiagram(diagram); } @@ -147,7 +147,7 @@ public: QList<QString> stereotypes = item->stereotypes() << item->variety(); QIcon icon = m_treeModel->createIcon(StereotypeIcon::ElementItem, StyleEngine::TypeItem, stereotypes, - QStringLiteral(":/modelinglib/48x48/item.png")); + ":/modelinglib/48x48/item.png"); m_item = new ModelItem(icon, m_treeModel->createObjectLabel(item)); m_item->setData(TreeModel::Element, TreeModel::RoleItemType); m_item->setStereotypes(stereotypes); @@ -166,7 +166,7 @@ public: { QMT_CHECK(!m_item); - static QIcon icon(QStringLiteral(":/modelinglib/48x48/dependency.png")); + static QIcon icon(":/modelinglib/48x48/dependency.png"); m_item = new ModelItem(icon, m_treeModel->createRelationLabel(dependency)); visitMRelation(dependency); } @@ -175,7 +175,7 @@ public: { QMT_CHECK(!m_item); - static QIcon icon(QStringLiteral(":/modelinglib/48x48/inheritance.png")); + static QIcon icon(":/modelinglib/48x48/inheritance.png"); m_item = new ModelItem(icon, m_treeModel->createRelationLabel(inheritance)); visitMRelation(inheritance); } @@ -184,7 +184,7 @@ public: { QMT_CHECK(!m_item); - static QIcon icon(QStringLiteral(":/modelinglib/48x48/association.png")); + static QIcon icon(":/modelinglib/48x48/association.png"); m_item = new ModelItem(icon, m_treeModel->createRelationLabel(association)); visitMRelation(association); } @@ -193,7 +193,7 @@ public: { QMT_CHECK(!m_item); - static QIcon icon(QStringLiteral(":modelinglib/48x48/connection.ong")); + static QIcon icon(":modelinglib/48x48/connection.ong"); m_item = new ModelItem(icon, m_treeModel->createRelationLabel(connection)); visitMRelation(connection); } @@ -234,7 +234,7 @@ public: { if (klass->stereotypes() != m_item->stereotypes()) { QIcon icon = m_treeModel->createIcon(StereotypeIcon::ElementClass, StyleEngine::TypeClass, - klass->stereotypes(), QStringLiteral(":/modelinglib/48x48/class.png")); + klass->stereotypes(), ":/modelinglib/48x48/class.png"); m_item->setIcon(icon); m_item->setStereotypes(klass->stereotypes()); } @@ -246,7 +246,7 @@ public: if (component->stereotypes() != m_item->stereotypes()) { QIcon icon = m_treeModel->createIcon(StereotypeIcon::ElementComponent, StyleEngine::TypeComponent, component->stereotypes(), - QStringLiteral(":/modelinglib/48x48/component.png")); + ":/modelinglib/48x48/component.png"); m_item->setIcon(icon); m_item->setStereotypes(component->stereotypes()); } @@ -268,7 +268,7 @@ public: QList<QString> stereotypes = item->stereotypes() << item->variety(); if (stereotypes != m_item->stereotypes()) { QIcon icon = m_treeModel->createIcon(StereotypeIcon::ElementItem, StyleEngine::TypeItem, stereotypes, - QStringLiteral(":/modelinglib/48x48/item.png")); + ":/modelinglib/48x48/item.png"); m_item->setIcon(icon); m_item->setStereotypes(stereotypes); } @@ -793,14 +793,14 @@ QString TreeModel::createObjectLabel(const MObject *object) if (object->name().isEmpty()) { if (auto item = dynamic_cast<const MItem *>(object)) { if (!item->variety().isEmpty()) - return QString(QStringLiteral("[%1]")).arg(item->variety()); + return QString("[%1]").arg(item->variety()); } return tr("[unnamed]"); } if (auto klass = dynamic_cast<const MClass *>(object)) { if (!klass->umlNamespace().isEmpty()) - return QString(QStringLiteral("%1 [%2]")).arg(klass->name()).arg(klass->umlNamespace()); + return QString("%1 [%2]").arg(klass->name()).arg(klass->umlNamespace()); } return object->name(); } @@ -810,11 +810,11 @@ QString TreeModel::createRelationLabel(const MRelation *relation) QString name; if (!relation->name().isEmpty()) { name += relation->name(); - name += QStringLiteral(": "); + name += ": "; } if (MObject *endA = m_modelController->findObject(relation->endAUid())) name += createObjectLabel(endA); - name += QStringLiteral(" - "); + name += " - "; if (MObject *endB = m_modelController->findObject(relation->endBUid())) name += createObjectLabel(endB); return name; diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/classmembersedit.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/classmembersedit.cpp index 559f21edbb6..3bce8bbd415 100644 --- a/src/libs/modelinglib/qmt/model_widgets_ui/classmembersedit.cpp +++ b/src/libs/modelinglib/qmt/model_widgets_ui/classmembersedit.cpp @@ -94,10 +94,10 @@ QString ClassMembersEdit::Cursor::readWord() } else { if (c == QLatin1Char('<') && m_pos < m_text.length() && m_text.at(m_pos) == QLatin1Char('<')) { ++m_pos; - word = QStringLiteral("<<"); + word = "<<"; } else if (c == QLatin1Char('>') && m_pos < m_text.length() && m_text.at(m_pos) == QLatin1Char('>')) { ++m_pos; - word = QStringLiteral(">>"); + word = ">>"; } else { word = c; } @@ -123,7 +123,7 @@ QString ClassMembersEdit::Cursor::readUntil(const QString &delimiter) { QString s; while (m_isValid) { - if (m_pos >= m_text.length() || m_text.at(m_pos) == QStringLiteral("\n")) { + if (m_pos >= m_text.length() || m_text.at(m_pos) == "\n") { m_isValid = false; return s; } @@ -154,7 +154,7 @@ void ClassMembersEdit::Cursor::skipUntilOrNewline(const QString &delimiter) while (m_isValid) { if (m_pos >= m_text.length()) return; - if (m_text.at(m_pos) == QStringLiteral("\n")) + if (m_text.at(m_pos) == "\n") return; if (m_pos + delimiter.length() <= m_text.length() && QString::compare(m_text.mid(m_pos, delimiter.length()), delimiter, Qt::CaseInsensitive) == 0) { @@ -183,10 +183,10 @@ QString ClassMembersEdit::Cursor::readWordFromRight() } else { if (c == QLatin1Char('<') && m_pos >= 0 && m_text.at(m_pos) == QLatin1Char('<')) { --m_pos; - word = QStringLiteral("<<"); + word = "<<"; } else if (c == QLatin1Char('>') && m_pos >= 0 && m_text.at(m_pos) == QLatin1Char('>')) { --m_pos; - word = QStringLiteral(">>"); + word = ">>"; } else { word = c; } @@ -218,13 +218,13 @@ bool ClassMembersEdit::Cursor::searchOutsideOfBracketsFromRight(const QString &s int brackets = 0; for (;;) { const QString word = readWordFromRight(); - if (!m_isValid || word == QStringLiteral("\n")) + if (!m_isValid || word == "\n") break; if (brackets == 0 && word == s) return true; - else if (word == QStringLiteral("(") || word == QStringLiteral("[") || word == QStringLiteral("{")) + else if (word == "(" || word == "[" || word == "{") ++brackets; - else if (word == QStringLiteral(")") || word == QStringLiteral("]") || word == QStringLiteral("}")) + else if (word == ")" || word == "]" || word == "}") --brackets; } m_isValid = true; @@ -238,12 +238,12 @@ QString ClassMembersEdit::Cursor::extractSubstr(int start, int stop) if (m_isValid && start >= 0 && start < m_text.length() && stop >= start && stop < m_text.length()) return m_text.mid(start, stop - start + 1); m_isValid = false; - return QStringLiteral(""); + return ""; } void ClassMembersEdit::Cursor::skipWhitespaces() { - while (m_isValid && m_pos < m_text.length() && m_text.at(m_pos).isSpace() && m_text.at(m_pos) != QStringLiteral("\n")) + while (m_isValid && m_pos < m_text.length() && m_text.at(m_pos).isSpace() && m_text.at(m_pos) != "\n") ++m_pos; if (m_pos >= m_text.length()) m_isValid = false; @@ -251,7 +251,7 @@ void ClassMembersEdit::Cursor::skipWhitespaces() void ClassMembersEdit::Cursor::skipWhitespacesFromRight() { - while (m_isValid && m_pos >= 0 && m_text.at(m_pos).isSpace() && m_text.at(m_pos) != QStringLiteral("\n")) + while (m_isValid && m_pos >= 0 && m_text.at(m_pos).isSpace() && m_text.at(m_pos) != "\n") --m_pos; if (m_pos < 0) m_isValid = false; @@ -378,29 +378,29 @@ QString ClassMembersEdit::build(const QList<MClassMember> &members) case MClassMember::VisibilityUndefined: break; case MClassMember::VisibilityPublic: - vis = QStringLiteral("public:"); + vis = "public:"; break; case MClassMember::VisibilityProtected: - vis = QStringLiteral("protected:"); + vis = "protected:"; break; case MClassMember::VisibilityPrivate: - vis = QStringLiteral("private:"); + vis = "private:"; break; case MClassMember::VisibilitySignals: - vis = QStringLiteral("signals:"); + vis = "signals:"; break; case MClassMember::VisibilityPrivateSlots: - vis = QStringLiteral("private slots:"); + vis = "private slots:"; break; case MClassMember::VisibilityProtectedSlots: - vis = QStringLiteral("protected slots:"); + vis = "protected slots:"; break; case MClassMember::VisibilityPublicSlots: - vis = QStringLiteral("public slots:"); + vis = "public slots:"; break; } if (!text.isEmpty()) - text += QStringLiteral("\n"); + text += "\n"; text += vis; addNewline = true; addSpace = true; @@ -409,42 +409,42 @@ QString ClassMembersEdit::build(const QList<MClassMember> &members) } if (member.group() != currentGroup) { if (addSpace) - text += QStringLiteral(" "); + text += " "; else if (!text.isEmpty()) - text += QStringLiteral("\n"); - text += QString(QStringLiteral("[%1]")).arg(member.group()); + text += "\n"; + text += QString("[%1]").arg(member.group()); addNewline = true; currentGroup = member.group(); } if (addNewline) - text += QStringLiteral("\n"); + text += "\n"; if (!member.stereotypes().isEmpty()) { StereotypesController ctrl; - text += QString(QStringLiteral("<<%1>> ")).arg(ctrl.toString(member.stereotypes())); + text += QString("<<%1>> ").arg(ctrl.toString(member.stereotypes())); } if (member.properties() & MClassMember::PropertyQsignal) - text += QStringLiteral("signal "); + text += "signal "; if (member.properties() & MClassMember::PropertyQslot) - text += QStringLiteral("slot "); + text += "slot "; if (member.properties() & MClassMember::PropertyQinvokable) - text += QStringLiteral("invokable "); + text += "invokable "; if (member.properties() & MClassMember::PropertyStatic) - text += QStringLiteral("static "); + text += "static "; if (member.properties() & MClassMember::PropertyVirtual) - text += QStringLiteral("virtual "); + text += "virtual "; if (member.properties() & MClassMember::PropertyConstexpr) - text += QStringLiteral("constexpr "); + text += "constexpr "; text += member.declaration(); if (member.properties() & MClassMember::PropertyConst) - text += QStringLiteral(" const"); + text += " const"; if (member.properties() & MClassMember::PropertyOverride) - text += QStringLiteral(" override"); + text += " override"; if (member.properties() & MClassMember::PropertyFinal) - text += QStringLiteral(" final"); + text += " final"; if (member.properties() & MClassMember::PropertyAbstract) - text += QStringLiteral(" = 0"); - text += QStringLiteral(";\n"); + text += " = 0"; + text += ";\n"; } return text; @@ -468,19 +468,19 @@ QList<MClassMember> ClassMembersEdit::parse(const QString &text, bool *ok) member = MClassMember(); QString word = cursor.readWord().toLower(); for (;;) { - if (word == QStringLiteral("public")) { + if (word == "public") { currentVisibility = MClassMember::VisibilityPublic; word = cursor.readWord().toLower(); - } else if (word == QStringLiteral("protected")) { + } else if (word == "protected") { currentVisibility = MClassMember::VisibilityProtected; word = cursor.readWord().toLower(); - } else if (word == QStringLiteral("private")) { + } else if (word == "private") { currentVisibility = MClassMember::VisibilityPrivate; word = cursor.readWord().toLower(); - } else if (word == QStringLiteral("signals")) { + } else if (word == "signals") { currentVisibility = MClassMember::VisibilitySignals; word = cursor.readWord().toLower(); - } else if (word == QStringLiteral("slots")) { + } else if (word == "slots") { switch (currentVisibility) { case MClassMember::VisibilityPrivate: currentVisibility = MClassMember::VisibilityPrivateSlots; @@ -496,34 +496,34 @@ QList<MClassMember> ClassMembersEdit::parse(const QString &text, bool *ok) break; } word = cursor.readWord().toLower(); - } else if (word == QStringLiteral("[")) { - currentGroup = cursor.readUntil(QStringLiteral("]")); + } else if (word == "[") { + currentGroup = cursor.readUntil("]"); word = cursor.readWord().toLower(); - } else if (word == QStringLiteral("<<")) { - QString stereotypes = cursor.readUntil(QStringLiteral(">>")); + } else if (word == "<<") { + QString stereotypes = cursor.readUntil(">>"); StereotypesController ctrl; member.setStereotypes(ctrl.fromString(stereotypes)); word = cursor.readWord().toLower(); - } else if (word == QStringLiteral("static")) { + } else if (word == "static") { member.setProperties(member.properties() | MClassMember::PropertyStatic); word = cursor.readWord().toLower(); - } else if (word == QStringLiteral("virtual")) { + } else if (word == "virtual") { member.setProperties(member.properties() | MClassMember::PropertyVirtual); word = cursor.readWord().toLower(); - } else if (word == QStringLiteral("constexpr") || word == QStringLiteral("q_decl_constexpr") - || word == QStringLiteral("q_decl_relaxed_constexpr")) { + } else if (word == "constexpr" || word == "q_decl_constexpr" + || word == "q_decl_relaxed_constexpr") { member.setProperties(member.properties() | MClassMember::PropertyConstexpr); word = cursor.readWord().toLower(); - } else if (word == QStringLiteral("signal") || word == QStringLiteral("q_signal")) { + } else if (word == "signal" || word == "q_signal") { member.setProperties(member.properties() | MClassMember::PropertyQsignal); word = cursor.readWord().toLower(); - } else if (word == QStringLiteral("slot") || word == QStringLiteral("q_slot")) { + } else if (word == "slot" || word == "q_slot") { member.setProperties(member.properties() | MClassMember::PropertyQslot); word = cursor.readWord().toLower(); - } else if (word == QStringLiteral("invokable") || word == QStringLiteral("q_invokable")) { + } else if (word == "invokable" || word == "q_invokable") { member.setProperties(member.properties() | MClassMember::PropertyQinvokable); word = cursor.readWord().toLower(); - } else if (word == QStringLiteral(":")) { + } else if (word == ":") { word = cursor.readWord().toLower(); } else { cursor.unreadWord(); @@ -532,32 +532,32 @@ QList<MClassMember> ClassMembersEdit::parse(const QString &text, bool *ok) } member.setVisibility(currentVisibility); member.setGroup(currentGroup); - if (word != QStringLiteral("\n")) { + if (word != "\n") { int declarationStart = cursor.position(); - cursor.skipUntilOrNewline(QStringLiteral(";")); + cursor.skipUntilOrNewline(";"); int nextLinePosition = cursor.position(); cursor.setPosition(nextLinePosition - 1); word = cursor.readWordFromRight().toLower(); - if (word != QStringLiteral(";")) + if (word != ";") cursor.unreadWord(); int endPosition = cursor.position(); QString expr; - if (cursor.searchOutsideOfBracketsFromRight(QStringLiteral("="))) + if (cursor.searchOutsideOfBracketsFromRight("=")) expr = cursor.extractSubstr(cursor.position() + 2, endPosition).trimmed(); word = cursor.readWordFromRight().toLower(); for (;;) { // TODO ignore throw(), noexpect(*), - if (word == QStringLiteral("final") || word == QStringLiteral("q_decl_final")) { + if (word == "final" || word == "q_decl_final") { member.setProperties(member.properties() | MClassMember::PropertyFinal); word = cursor.readWordFromRight().toLower(); - } else if (word == QStringLiteral("override") || word == QStringLiteral("q_decl_override")) { + } else if (word == "override" || word == "q_decl_override") { member.setProperties(member.properties() | MClassMember::PropertyOverride); word = cursor.readWordFromRight().toLower(); - } else if (word == QStringLiteral("const")) { + } else if (word == "const") { member.setProperties(member.properties() | MClassMember::PropertyConst); word = cursor.readWordFromRight().toLower(); - } else if (word == QStringLiteral("noexpect")) { + } else if (word == "noexpect") { // just ignore it word = cursor.readWordFromRight().toLower(); } else { @@ -572,9 +572,9 @@ QList<MClassMember> ClassMembersEdit::parse(const QString &text, bool *ok) if (!declaration.isEmpty()) { member.setDeclaration(declaration); // TODO recognize function pointer - if (declaration.endsWith(QStringLiteral(")"))) { + if (declaration.endsWith(")")) { member.setMemberType(MClassMember::MemberMethod); - if (expr == QStringLiteral("0")) + if (expr == "0") member.setProperties(member.properties() | MClassMember::PropertyAbstract); } else { member.setMemberType(MClassMember::MemberAttribute); @@ -584,7 +584,7 @@ QList<MClassMember> ClassMembersEdit::parse(const QString &text, bool *ok) cursor.setPosition(nextLinePosition); if (cursor.atEnd()) return members; - cursor.skip(QStringLiteral("\n")); + cursor.skip("\n"); } else { word = cursor.readWord().toLower(); } diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp index cdb51115061..ecf898a1d92 100644 --- a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp +++ b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp @@ -140,10 +140,10 @@ void ModelTreeView::startDrag(Qt::DropActions supportedActions) } auto mimeData = new QMimeData; - mimeData->setData(QStringLiteral("text/model-elements"), dragData); + mimeData->setData("text/model-elements", dragData); if (dragIcon.isNull()) - dragIcon = QIcon(QStringLiteral(":/modelinglib/48x48/generic.png")); + dragIcon = QIcon(":/modelinglib/48x48/generic.png"); QPixmap pixmap(48, 48); pixmap = dragIcon.pixmap(48, 48); @@ -197,7 +197,7 @@ void ModelTreeView::dropEvent(QDropEvent *event) { bool accept = false; event->setDropAction(Qt::MoveAction); - if (event->mimeData()->hasFormat(QStringLiteral("text/model-elements"))) { + if (event->mimeData()->hasFormat("text/model-elements")) { QModelIndex dropIndex = indexAt(event->pos()); QModelIndex dropSourceModelIndex = m_sortedTreeModel->mapToSource(dropIndex); if (dropSourceModelIndex.isValid()) { @@ -205,7 +205,7 @@ void ModelTreeView::dropEvent(QDropEvent *event) QMT_ASSERT(treeModel, return); MElement *targetModelElement = treeModel->element(dropSourceModelIndex); if (auto targetModelObject = dynamic_cast<MObject *>(targetModelElement)) { - QDataStream dataStream(event->mimeData()->data(QStringLiteral("text/model-elements"))); + QDataStream dataStream(event->mimeData()->data("text/model-elements")); while (dataStream.status() == QDataStream::Ok) { QString key; dataStream >> key; @@ -252,28 +252,28 @@ void ModelTreeView::contextMenuEvent(QContextMenuEvent *event) QMenu menu; bool addSeparator = false; if (m_elementTasks->hasClassDefinition(melement)) { - menu.addAction(new ContextMenuAction(tr("Show Definition"), QStringLiteral("showDefinition"), &menu)); + menu.addAction(new ContextMenuAction(tr("Show Definition"), "showDefinition", &menu)); addSeparator = true; } if (m_elementTasks->hasDiagram(melement)) { - menu.addAction(new ContextMenuAction(tr("Open Diagram"), QStringLiteral("openDiagram"), &menu)); + menu.addAction(new ContextMenuAction(tr("Open Diagram"), "openDiagram", &menu)); addSeparator = true; } if (melement->owner()) { if (addSeparator) menu.addSeparator(); - menu.addAction(new ContextMenuAction(tr("Delete"), QStringLiteral("delete"), + menu.addAction(new ContextMenuAction(tr("Delete"), "delete", QKeySequence(Qt::CTRL + Qt::Key_D), &menu)); } QAction *selectedAction = menu.exec(event->globalPos()); if (selectedAction) { auto action = dynamic_cast<ContextMenuAction *>(selectedAction); QMT_ASSERT(action, return); - if (action->id() == QStringLiteral("showDefinition")) { + if (action->id() == "showDefinition") { m_elementTasks->openClassDefinition(melement); - } else if (action->id() == QStringLiteral("openDiagram")) { + } else if (action->id() == "openDiagram") { m_elementTasks->openDiagram(melement); - } else if (action->id() == QStringLiteral("delete")) { + } else if (action->id() == "delete") { MSelection selection; selection.append(melement->uid(), melement->owner()->uid()); m_sortedTreeModel->treeModel()->modelController()->deleteElements(selection); diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp index af47417aaab..9c3dd9d3629 100644 --- a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp +++ b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp @@ -509,7 +509,7 @@ void PropertiesView::MView::visitMClass(const MClass *klass) layout->addWidget(m_classMembersParseButton); layout->setStretch(0, 1); layout->setStretch(1, 0); - addRow(QStringLiteral(""), layout, "members status"); + addRow("", layout, "members status"); connect(m_classMembersParseButton, &QAbstractButton::clicked, this, &PropertiesView::MView::onParseClassMembers); } @@ -655,7 +655,7 @@ void PropertiesView::MView::visitMAssociation(const MAssociation *association) QList<MAssociation *> selection = filter<MAssociation>(m_modelElements); bool isSingleSelection = selection.size() == 1; if (!m_endALabel) { - m_endALabel = new QLabel(QStringLiteral("<b>") + m_endAName + QStringLiteral("</b>")); + m_endALabel = new QLabel("<b>" + m_endAName + "</b>"); addRow(m_endALabel, "end a"); } if (!m_endAEndName) { @@ -720,7 +720,7 @@ void PropertiesView::MView::visitMAssociation(const MAssociation *association) m_endAKind->setEnabled(isSingleSelection); if (!m_endBLabel) { - m_endBLabel = new QLabel(QStringLiteral("<b>") + m_endBName + QStringLiteral("</b>")); + m_endBLabel = new QLabel("<b>" + m_endBName + "</b>"); addRow(m_endBLabel, "end b"); } if (!m_endBEndName) { @@ -792,7 +792,7 @@ void PropertiesView::MView::visitMConnection(const MConnection *connection) QList<MConnection *> selection = filter<MConnection>(m_modelElements); const bool isSingleSelection = selection.size() == 1; if (!m_endALabel) { - m_endALabel = new QLabel(QStringLiteral("<b>") + m_endAName + QStringLiteral("</b>")); + m_endALabel = new QLabel("<b>" + m_endAName + "</b>"); addRow(m_endALabel, "end a"); } if (!m_endAEndName) { @@ -839,7 +839,7 @@ void PropertiesView::MView::visitMConnection(const MConnection *connection) m_endANavigable->setEnabled(isSingleSelection); if (!m_endBLabel) { - m_endBLabel = new QLabel(QStringLiteral("<b>") + m_endBName + QStringLiteral("</b>")); + m_endBLabel = new QLabel("<b>" + m_endBName + "</b>"); addRow(m_endBLabel, "end b"); } if (!m_endBEndName) { @@ -915,7 +915,7 @@ void PropertiesView::MView::visitDObject(const DObject *object) m_posRectLabel = new QLabel(m_topWidget); addRow(tr("Position and size:"), m_posRectLabel, "position and size"); } - m_posRectLabel->setText(QString(QStringLiteral("(%1,%2):(%3,%4)-(%5,%6)")) + m_posRectLabel->setText(QString("(%1,%2):(%3,%4)-(%5,%6)") .arg(object->pos().x()) .arg(object->pos().y()) .arg(object->rect().left()) @@ -1453,7 +1453,7 @@ void PropertiesView::MView::prepare() m_topLayout->addRow(m_classNameLabel); m_rowToId.append("title"); } - QString title(QStringLiteral("<b>") + m_propertiesTitle + QStringLiteral("</b>")); + QString title("<b>" + m_propertiesTitle + "</b>"); if (m_classNameLabel->text() != title) m_classNameLabel->setText(title); } @@ -1632,7 +1632,7 @@ QString PropertiesView::MView::formatTemplateParameters(const QList<QString> &te bool first = true; foreach (const QString ¶meter, templateParametersList) { if (!first) - templateParamters += QStringLiteral(", "); + templateParamters += ", "; templateParamters += parameter; first = false; } diff --git a/src/libs/modelinglib/qmt/serializer/diagramserializer.cpp b/src/libs/modelinglib/qmt/serializer/diagramserializer.cpp index 893d2008304..d00a5f94075 100644 --- a/src/libs/modelinglib/qmt/serializer/diagramserializer.cpp +++ b/src/libs/modelinglib/qmt/serializer/diagramserializer.cpp @@ -64,7 +64,7 @@ template<class Archive> inline void Access<Archive, DElement>::serialize(Archive &archive, DElement &element) { archive || tag(element) - || attr(QStringLiteral("uid"), element, &DElement::uid, &DElement::setUid) + || attr("uid", element, &DElement::uid, &DElement::setUid) || end; } @@ -114,17 +114,17 @@ inline void Access<Archive, DObject>::serialize(Archive &archive, DObject &objec { archive || tag(object) || base<DElement>(object) - || attr(QStringLiteral("object"), object, &DObject::modelUid, &DObject::setModelUid) - || attr(QStringLiteral("stereotypes"), object, &DObject::stereotypes, &DObject::setStereotypes) - || attr(QStringLiteral("context"), object, &DObject::context, &DObject::setContext) - || attr(QStringLiteral("name"), object, &DObject::name, &DObject::setName) - || attr(QStringLiteral("pos"), object, &DObject::pos, &DObject::setPos) - || attr(QStringLiteral("rect"), object, &DObject::rect, &DObject::setRect) - || attr(QStringLiteral("auto-sized"), object, &DObject::isAutoSized, &DObject::setAutoSized) - || attr(QStringLiteral("visual-role"), object, &visualRole, &setVisualRole) - || attr(QStringLiteral("visual-role2"), object, &DObject::visualSecondaryRole, &DObject::setVisualSecondaryRole) - || attr(QStringLiteral("visual-emphasized"), object, &DObject::isVisualEmphasized, &DObject::setVisualEmphasized) - || attr(QStringLiteral("stereotype-display"), object, &DObject::stereotypeDisplay, &DObject::setStereotypeDisplay) + || attr("object", object, &DObject::modelUid, &DObject::setModelUid) + || attr("stereotypes", object, &DObject::stereotypes, &DObject::setStereotypes) + || attr("context", object, &DObject::context, &DObject::setContext) + || attr("name", object, &DObject::name, &DObject::setName) + || attr("pos", object, &DObject::pos, &DObject::setPos) + || attr("rect", object, &DObject::rect, &DObject::setRect) + || attr("auto-sized", object, &DObject::isAutoSized, &DObject::setAutoSized) + || attr("visual-role", object, &visualRole, &setVisualRole) + || attr("visual-role2", object, &DObject::visualSecondaryRole, &DObject::setVisualSecondaryRole) + || attr("visual-emphasized", object, &DObject::isVisualEmphasized, &DObject::setVisualEmphasized) + || attr("stereotype-display", object, &DObject::stereotypeDisplay, &DObject::setStereotypeDisplay) // depth is not persistent || end; } @@ -160,11 +160,11 @@ inline void Access<Archive, DClass>::serialize(Archive &archive, DClass &klass) { archive || tag(klass) || base<DObject>(klass) - || attr(QStringLiteral("namespace"), klass, &DClass::umlNamespace, &DClass::setUmlNamespace) - || attr(QStringLiteral("template"), klass, &DClass::templateParameters, &DClass::setTemplateParameters) - || attr(QStringLiteral("template-display"), klass, &DClass::templateDisplay, &DClass::setTemplateDisplay) - || attr(QStringLiteral("show-all-members"), klass, &DClass::showAllMembers, &DClass::setShowAllMembers) - || attr(QStringLiteral("visible-members"), klass, &DClass::visibleMembers, &DClass::setVisibleMembers) + || attr("namespace", klass, &DClass::umlNamespace, &DClass::setUmlNamespace) + || attr("template", klass, &DClass::templateParameters, &DClass::setTemplateParameters) + || attr("template-display", klass, &DClass::templateDisplay, &DClass::setTemplateDisplay) + || attr("show-all-members", klass, &DClass::showAllMembers, &DClass::setShowAllMembers) + || attr("visible-members", klass, &DClass::visibleMembers, &DClass::setVisibleMembers) || end; } @@ -182,7 +182,7 @@ inline void Access<Archive, DComponent>::serialize(Archive &archive, DComponent { archive || tag(component) || base<DObject>(component) - || attr(QStringLiteral("plain-shape"), component, &DComponent::isPlainShape, &DComponent::setPlainShape) + || attr("plain-shape", component, &DComponent::isPlainShape, &DComponent::setPlainShape) || end; } @@ -217,9 +217,9 @@ inline void Access<Archive, DItem>::serialize(Archive &archive, DItem &item) { archive || tag(item) || base<DObject>(item) - || attr(QStringLiteral("variety"), item, &DItem::variety, &DItem::setVariety) - || attr(QStringLiteral("shape-editable"), item, &DItem::isShapeEditable, &DItem::setShapeEditable) - || attr(QStringLiteral("shape"), item, &DItem::shape, &DItem::setShape) + || attr("variety", item, &DItem::variety, &DItem::setVariety) + || attr("shape-editable", item, &DItem::isShapeEditable, &DItem::setShapeEditable) + || attr("shape", item, &DItem::shape, &DItem::setShape) || end; } @@ -236,12 +236,12 @@ inline void Access<Archive, DRelation>::serialize(Archive &archive, DRelation &r { archive || tag(relation) || base<DElement>(relation) - || attr(QStringLiteral("object"), relation, &DRelation::modelUid, &DRelation::setModelUid) - || attr(QStringLiteral("stereotypes"), relation, &DRelation::stereotypes, &DRelation::setStereotypes) - || attr(QStringLiteral("a"), relation, &DRelation::endAUid, &DRelation::setEndAUid) - || attr(QStringLiteral("b"), relation, &DRelation::endBUid, &DRelation::setEndBUid) - || attr(QStringLiteral("name"), relation, &DRelation::name, &DRelation::setName) - || attr(QStringLiteral("points"), relation, &DRelation::intermediatePoints, &DRelation::setIntermediatePoints) + || attr("object", relation, &DRelation::modelUid, &DRelation::setModelUid) + || attr("stereotypes", relation, &DRelation::stereotypes, &DRelation::setStereotypes) + || attr("a", relation, &DRelation::endAUid, &DRelation::setEndAUid) + || attr("b", relation, &DRelation::endBUid, &DRelation::setEndBUid) + || attr("name", relation, &DRelation::name, &DRelation::setName) + || attr("points", relation, &DRelation::intermediatePoints, &DRelation::setIntermediatePoints) || end; } @@ -256,7 +256,7 @@ template<class Archive> inline void Access<Archive, DRelation::IntermediatePoint>::serialize(Archive &archive, DRelation::IntermediatePoint &point) { archive || tag(point) - || attr(QStringLiteral("pos"), point, &DRelation::IntermediatePoint::pos, &DRelation::IntermediatePoint::setPos) + || attr("pos", point, &DRelation::IntermediatePoint::pos, &DRelation::IntermediatePoint::setPos) || end; } @@ -291,7 +291,7 @@ inline void Access<Archive, DDependency>::serialize(Archive &archive, DDependenc { archive || tag(dependency) || base<DRelation>(dependency) - || attr(QStringLiteral("direction"), dependency, &DDependency::direction, &DDependency::setDirection) + || attr("direction", dependency, &DDependency::direction, &DDependency::setDirection) || end; } @@ -306,10 +306,10 @@ template<class Archive> inline void Access<Archive, DAssociationEnd>::serialize(Archive &archive, DAssociationEnd &associationEnd) { archive || tag(associationEnd) - || attr(QStringLiteral("name"), associationEnd, &DAssociationEnd::name, &DAssociationEnd::setName) - || attr(QStringLiteral("cradinality"), associationEnd, &DAssociationEnd::cardinality, &DAssociationEnd::setCardinatlity) - || attr(QStringLiteral("navigable"), associationEnd, &DAssociationEnd::isNavigable, &DAssociationEnd::setNavigable) - || attr(QStringLiteral("kind"), associationEnd, &DAssociationEnd::kind, &DAssociationEnd::setKind) + || attr("name", associationEnd, &DAssociationEnd::name, &DAssociationEnd::setName) + || attr("cradinality", associationEnd, &DAssociationEnd::cardinality, &DAssociationEnd::setCardinatlity) + || attr("navigable", associationEnd, &DAssociationEnd::isNavigable, &DAssociationEnd::setNavigable) + || attr("kind", associationEnd, &DAssociationEnd::kind, &DAssociationEnd::setKind) || end; } @@ -323,9 +323,9 @@ inline void Access<Archive, DAssociation>::serialize(Archive &archive, DAssociat { archive || tag(association) || base<DRelation>(association) - || attr(QStringLiteral("class"), association, &DAssociation::assoicationClassUid, &DAssociation::setAssociationClassUid) - || attr(QStringLiteral("a"), association, &DAssociation::endA, &DAssociation::setEndA) - || attr(QStringLiteral("b"), association, &DAssociation::endB, &DAssociation::setEndB) + || attr("class", association, &DAssociation::assoicationClassUid, &DAssociation::setAssociationClassUid) + || attr("a", association, &DAssociation::endA, &DAssociation::setEndA) + || attr("b", association, &DAssociation::endB, &DAssociation::setEndB) || end; } @@ -340,9 +340,9 @@ template<class Archive> inline void Access<Archive, DConnectionEnd>::serialize(Archive &archive, DConnectionEnd &connectionEnd) { archive || tag(connectionEnd) - || attr(QStringLiteral("name"), connectionEnd, &DConnectionEnd::name, &DConnectionEnd::setName) - || attr(QStringLiteral("cradinality"), connectionEnd, &DConnectionEnd::cardinality, &DConnectionEnd::setCardinatlity) - || attr(QStringLiteral("navigable"), connectionEnd, &DConnectionEnd::isNavigable, &DConnectionEnd::setNavigable) + || attr("name", connectionEnd, &DConnectionEnd::name, &DConnectionEnd::setName) + || attr("cradinality", connectionEnd, &DConnectionEnd::cardinality, &DConnectionEnd::setCardinatlity) + || attr("navigable", connectionEnd, &DConnectionEnd::isNavigable, &DConnectionEnd::setNavigable) || end; } @@ -356,9 +356,9 @@ inline void Access<Archive, DConnection>::serialize(Archive &archive, DConnectio { archive || tag(connection) || base<DRelation>(connection) - || attr(QStringLiteral("custom-relation"), connection, &DConnection::customRelationId, &DConnection::setCustomRelationId) - || attr(QStringLiteral("a"), connection, &DConnection::endA, &DConnection::setEndA) - || attr(QStringLiteral("b"), connection, &DConnection::endB, &DConnection::setEndB) + || attr("custom-relation", connection, &DConnection::customRelationId, &DConnection::setCustomRelationId) + || attr("a", connection, &DConnection::endA, &DConnection::setEndA) + || attr("b", connection, &DConnection::endB, &DConnection::setEndB) || end; } @@ -375,11 +375,11 @@ inline void Access<Archive, DAnnotation>::serialize(Archive &archive, DAnnotatio { archive || tag(annotation) || base<DElement>(annotation) - || attr(QStringLiteral("text"), annotation, &DAnnotation::text, &DAnnotation::setText) - || attr(QStringLiteral("pos"), annotation, &DAnnotation::pos, &DAnnotation::setPos) - || attr(QStringLiteral("rect"), annotation, &DAnnotation::rect, &DAnnotation::setRect) - || attr(QStringLiteral("auto-sized"), annotation, &DAnnotation::isAutoSized, &DAnnotation::setAutoSized) - || attr(QStringLiteral("visual-role"), annotation, &DAnnotation::visualRole, &DAnnotation::setVisualRole) + || attr("text", annotation, &DAnnotation::text, &DAnnotation::setText) + || attr("pos", annotation, &DAnnotation::pos, &DAnnotation::setPos) + || attr("rect", annotation, &DAnnotation::rect, &DAnnotation::setRect) + || attr("auto-sized", annotation, &DAnnotation::isAutoSized, &DAnnotation::setAutoSized) + || attr("visual-role", annotation, &DAnnotation::visualRole, &DAnnotation::setVisualRole) || end; } @@ -396,9 +396,9 @@ inline void Access<Archive, DBoundary>::serialize(Archive &archive, DBoundary &b { archive || tag(boundary) || base<DElement>(boundary) - || attr(QStringLiteral("text"), boundary, &DBoundary::text, &DBoundary::setText) - || attr(QStringLiteral("pos"), boundary, &DBoundary::pos, &DBoundary::setPos) - || attr(QStringLiteral("rect"), boundary, &DBoundary::rect, &DBoundary::setRect) + || attr("text", boundary, &DBoundary::text, &DBoundary::setText) + || attr("pos", boundary, &DBoundary::pos, &DBoundary::setPos) + || attr("rect", boundary, &DBoundary::rect, &DBoundary::setRect) || end; } @@ -415,9 +415,9 @@ inline void Access<Archive, DSwimlane>::serialize(Archive &archive, DSwimlane &s { archive || tag(swimlane) || base<DElement>(swimlane) - || attr(QStringLiteral("text"), swimlane, &DSwimlane::text, &DSwimlane::setText) - || attr(QStringLiteral("horizontal"), swimlane, &DSwimlane::isHorizontal, &DSwimlane::setHorizontal) - || attr(QStringLiteral("pos"), swimlane, &DSwimlane::pos, &DSwimlane::setPos) + || attr("text", swimlane, &DSwimlane::text, &DSwimlane::setText) + || attr("horizontal", swimlane, &DSwimlane::isHorizontal, &DSwimlane::setHorizontal) + || attr("pos", swimlane, &DSwimlane::pos, &DSwimlane::setPos) || end; } diff --git a/src/libs/modelinglib/qmt/serializer/infrastructureserializer.h b/src/libs/modelinglib/qmt/serializer/infrastructureserializer.h index 1814fb6a9da..29a0cc69ad0 100644 --- a/src/libs/modelinglib/qmt/serializer/infrastructureserializer.h +++ b/src/libs/modelinglib/qmt/serializer/infrastructureserializer.h @@ -57,9 +57,9 @@ inline void load(Archive &archive, qmt::Uid &uid) template<class Archive, class T> inline void serialize(Archive &archive, qmt::Handle<T> &handle) { - archive || tag(QStringLiteral("handle"), handle) - || attr(QStringLiteral("uid"), handle, &qmt::Handle<T>::uid, &qmt::Handle<T>::setUid) - || attr(QStringLiteral("target"), handle, &qmt::Handle<T>::target, &qmt::Handle<T>::setTarget) + archive || tag("handle", handle) + || attr("uid", handle, &qmt::Handle<T>::uid, &qmt::Handle<T>::setUid) + || attr("target", handle, &qmt::Handle<T>::target, &qmt::Handle<T>::setTarget) || end; } @@ -68,8 +68,8 @@ inline void serialize(Archive &archive, qmt::Handle<T> &handle) template<class Archive, class T> inline void serialize(Archive &archive, qmt::Handles<T> &handles) { - archive || tag(QStringLiteral("handles"), handles) - || attr(QStringLiteral("handles"), handles, &qmt::Handles<T>::get, &qmt::Handles<T>::set) + archive || tag("handles", handles) + || attr("handles", handles, &qmt::Handles<T>::get, &qmt::Handles<T>::set) || end; } diff --git a/src/libs/modelinglib/qmt/serializer/modelserializer.cpp b/src/libs/modelinglib/qmt/serializer/modelserializer.cpp index b6ea080a2ca..66a96472dee 100644 --- a/src/libs/modelinglib/qmt/serializer/modelserializer.cpp +++ b/src/libs/modelinglib/qmt/serializer/modelserializer.cpp @@ -80,8 +80,8 @@ inline void Access<Archive, MSourceExpansion>::serialize(Archive &archive, MSour { archive || tag(sourceExpansion) || base<MExpansion>(sourceExpansion) - || attr(QStringLiteral("source"), sourceExpansion, &MSourceExpansion::sourceId, &MSourceExpansion::setSourceId) - || attr(QStringLiteral("transient"), sourceExpansion, &MSourceExpansion::isTransient, &MSourceExpansion::setTransient) + || attr("source", sourceExpansion, &MSourceExpansion::sourceId, &MSourceExpansion::setSourceId) + || attr("transient", sourceExpansion, &MSourceExpansion::isTransient, &MSourceExpansion::setTransient) || end; } @@ -96,10 +96,10 @@ template<class Archive> inline void Access<Archive, MElement>::serialize(Archive &archive, MElement &element) { archive || tag(element) - || attr(QStringLiteral("uid"), element, &MElement::uid, &MElement::setUid) - || attr(QStringLiteral("flags"), element, &MElement::flags, &MElement::setFlags) - || attr(QStringLiteral("expansion"), element, &MElement::expansion, &MElement::setExpansion) - || attr(QStringLiteral("stereotypes"), element, &MElement::stereotypes, &MElement::setStereotypes) + || attr("uid", element, &MElement::uid, &MElement::setUid) + || attr("flags", element, &MElement::flags, &MElement::setFlags) + || attr("expansion", element, &MElement::expansion, &MElement::setExpansion) + || attr("stereotypes", element, &MElement::stereotypes, &MElement::setStereotypes) || end; } @@ -116,9 +116,9 @@ inline void Access<Archive, MObject>::serialize(Archive &archive, MObject &objec { archive || tag(object) || base<MElement>(object) - || attr(QStringLiteral("name"), object, &MObject::name, &MObject::setName) - || attr(QStringLiteral("children"), object, &MObject::children, &MObject::setChildren) - || attr(QStringLiteral("relations"), object, &MObject::relations, &MObject::setRelations) + || attr("name", object, &MObject::name, &MObject::setName) + || attr("children", object, &MObject::children, &MObject::setChildren) + || attr("relations", object, &MObject::relations, &MObject::setRelations) || end; } @@ -153,9 +153,9 @@ inline void Access<Archive, MClass>::serialize(Archive &archive, MClass &klass) { archive || tag(klass) || base<MObject>(klass) - || attr(QStringLiteral("namespace"), klass, &MClass::umlNamespace, &MClass::setUmlNamespace) - || attr(QStringLiteral("template"), klass, &MClass::templateParameters, &MClass::setTemplateParameters) - || attr(QStringLiteral("members"), klass, &MClass::members, &MClass::setMembers) + || attr("namespace", klass, &MClass::umlNamespace, &MClass::setUmlNamespace) + || attr("template", klass, &MClass::templateParameters, &MClass::setTemplateParameters) + || attr("members", klass, &MClass::members, &MClass::setMembers) || end; } @@ -170,13 +170,13 @@ template<class Archive> inline void Access<Archive, MClassMember>::serialize(Archive &archive, MClassMember &member) { archive || tag(member) - || attr(QStringLiteral("uid"), member, &MClassMember::uid, &MClassMember::setUid) - || attr(QStringLiteral("stereotypes"), member, &MClassMember::stereotypes, &MClassMember::setStereotypes) - || attr(QStringLiteral("group"), member, &MClassMember::group, &MClassMember::setGroup) - || attr(QStringLiteral("visibility"), member, &MClassMember::visibility, &MClassMember::setVisibility) - || attr(QStringLiteral("type"), member, &MClassMember::memberType, &MClassMember::setMemberType) - || attr(QStringLiteral("properties"), member, &MClassMember::properties, &MClassMember::setProperties) - || attr(QStringLiteral("declaration"), member, &MClassMember::declaration, &MClassMember::setDeclaration) + || attr("uid", member, &MClassMember::uid, &MClassMember::setUid) + || attr("stereotypes", member, &MClassMember::stereotypes, &MClassMember::setStereotypes) + || attr("group", member, &MClassMember::group, &MClassMember::setGroup) + || attr("visibility", member, &MClassMember::visibility, &MClassMember::setVisibility) + || attr("type", member, &MClassMember::memberType, &MClassMember::setMemberType) + || attr("properties", member, &MClassMember::properties, &MClassMember::setProperties) + || attr("declaration", member, &MClassMember::declaration, &MClassMember::setDeclaration) || end; } @@ -211,9 +211,9 @@ inline void Access<Archive, MDiagram>::serialize(Archive &archive, MDiagram &dia { archive || tag(diagram) || base<MObject>(diagram) - || attr(QStringLiteral("elements"), diagram, &MDiagram::diagramElements, &MDiagram::setDiagramElements) - || attr(QStringLiteral("last-modified"), diagram, &MDiagram::lastModified, &MDiagram::setLastModified) - || attr(QStringLiteral("toolbarid"), diagram, &MDiagram::toolbarId, &MDiagram::setToolbarId) + || attr("elements", diagram, &MDiagram::diagramElements, &MDiagram::setDiagramElements) + || attr("last-modified", diagram, &MDiagram::lastModified, &MDiagram::setLastModified) + || attr("toolbarid", diagram, &MDiagram::toolbarId, &MDiagram::setToolbarId) || end; } @@ -249,9 +249,9 @@ inline void Access<Archive, MItem>::serialize(Archive &archive, MItem &item) { archive || tag(item) || base<MObject>(item) - || attr(QStringLiteral("variety-editable"), item, &MItem::isVarietyEditable, &MItem::setVarietyEditable) - || attr(QStringLiteral("variety"), item, &MItem::variety, &MItem::setVariety) - || attr(QStringLiteral("shape-editable"), item, &MItem::isShapeEditable, &MItem::setShapeEditable) + || attr("variety-editable", item, &MItem::isVarietyEditable, &MItem::setVarietyEditable) + || attr("variety", item, &MItem::variety, &MItem::setVariety) + || attr("shape-editable", item, &MItem::isShapeEditable, &MItem::setShapeEditable) || end; } @@ -268,9 +268,9 @@ inline void Access<Archive, MRelation>::serialize(Archive &archive, MRelation &r { archive || tag(relation) || base<MElement>(relation) - || attr(QStringLiteral("name"), relation, &MRelation::name, &MRelation::setName) - || attr(QStringLiteral("a"), relation, &MRelation::endAUid, &MRelation::setEndAUid) - || attr(QStringLiteral("b"), relation, &MRelation::endBUid, &MRelation::setEndBUid) + || attr("name", relation, &MRelation::name, &MRelation::setName) + || attr("a", relation, &MRelation::endAUid, &MRelation::setEndAUid) + || attr("b", relation, &MRelation::endBUid, &MRelation::setEndBUid) || end; } @@ -305,7 +305,7 @@ inline void Access<Archive, MDependency>::serialize(Archive &archive, MDependenc { archive || tag(dependency) || base<MRelation>(dependency) - || attr(QStringLiteral("direction"), dependency, &MDependency::direction, &MDependency::setDirection) + || attr("direction", dependency, &MDependency::direction, &MDependency::setDirection) || end; } @@ -320,10 +320,10 @@ template<class Archive> inline void Access<Archive, MAssociationEnd>::serialize(Archive &archive, MAssociationEnd &associationEnd) { archive || tag(associationEnd) - || attr(QStringLiteral("name"), associationEnd, &MAssociationEnd::name, &MAssociationEnd::setName) - || attr(QStringLiteral("cardinality"), associationEnd, &MAssociationEnd::cardinality, &MAssociationEnd::setCardinality) - || attr(QStringLiteral("navigable"), associationEnd, &MAssociationEnd::isNavigable, &MAssociationEnd::setNavigable) - || attr(QStringLiteral("kind"), associationEnd, &MAssociationEnd::kind, &MAssociationEnd::setKind) + || attr("name", associationEnd, &MAssociationEnd::name, &MAssociationEnd::setName) + || attr("cardinality", associationEnd, &MAssociationEnd::cardinality, &MAssociationEnd::setCardinality) + || attr("navigable", associationEnd, &MAssociationEnd::isNavigable, &MAssociationEnd::setNavigable) + || attr("kind", associationEnd, &MAssociationEnd::kind, &MAssociationEnd::setKind) || end; } @@ -337,9 +337,9 @@ inline void Access<Archive, MAssociation>::serialize(Archive &archive, MAssociat { archive || tag(association) || base<MRelation>(association) - || attr(QStringLiteral("class"), association, &MAssociation::assoicationClassUid, &MAssociation::setAssociationClassUid) - || attr(QStringLiteral("a"), association, &MAssociation::endA, &MAssociation::setEndA) - || attr(QStringLiteral("b"), association, &MAssociation::endB, &MAssociation::setEndB) + || attr("class", association, &MAssociation::assoicationClassUid, &MAssociation::setAssociationClassUid) + || attr("a", association, &MAssociation::endA, &MAssociation::setEndA) + || attr("b", association, &MAssociation::endB, &MAssociation::setEndB) || end; } @@ -354,9 +354,9 @@ template<class Archive> inline void Access<Archive, MConnectionEnd>::serialize(Archive &archive, MConnectionEnd &connectionEnd) { archive || tag(connectionEnd) - || attr(QStringLiteral("name"), connectionEnd, &MConnectionEnd::name, &MConnectionEnd::setName) - || attr(QStringLiteral("cardinality"), connectionEnd, &MConnectionEnd::cardinality, &MConnectionEnd::setCardinality) - || attr(QStringLiteral("navigable"), connectionEnd, &MConnectionEnd::isNavigable, &MConnectionEnd::setNavigable) + || attr("name", connectionEnd, &MConnectionEnd::name, &MConnectionEnd::setName) + || attr("cardinality", connectionEnd, &MConnectionEnd::cardinality, &MConnectionEnd::setCardinality) + || attr("navigable", connectionEnd, &MConnectionEnd::isNavigable, &MConnectionEnd::setNavigable) || end; } @@ -370,9 +370,9 @@ inline void Access<Archive, MConnection>::serialize(Archive &archive, MConnectio { archive || tag(connection) || base<MRelation>(connection) - || attr(QStringLiteral("custom-relation"), connection, &MConnection::customRelationId, &MConnection::setCustomRelationId) - || attr(QStringLiteral("a"), connection, &MConnection::endA, &MConnection::setEndA) - || attr(QStringLiteral("b"), connection, &MConnection::endB, &MConnection::setEndB) + || attr("custom-relation", connection, &MConnection::customRelationId, &MConnection::setCustomRelationId) + || attr("a", connection, &MConnection::endA, &MConnection::setEndA) + || attr("b", connection, &MConnection::endB, &MConnection::setEndB) || end; } diff --git a/src/libs/modelinglib/qmt/serializer/projectserializer.cpp b/src/libs/modelinglib/qmt/serializer/projectserializer.cpp index 70d621c8e84..d1ddc8de73b 100644 --- a/src/libs/modelinglib/qmt/serializer/projectserializer.cpp +++ b/src/libs/modelinglib/qmt/serializer/projectserializer.cpp @@ -51,10 +51,10 @@ QARK_REGISTER_TYPE_NAME(Project, "Project") template<class Archive> void serialize(Archive &archive, Project &project) { - archive || qark::tag(QStringLiteral("project"), project) - || qark::attr(QStringLiteral("uid"), project, &Project::uid, &Project::setUid) - || qark::attr(QStringLiteral("root-package"), project, &Project::rootPackage, &Project::setRootPackage) - || qark::attr(QStringLiteral("config-path"), project, &Project::configPath, &Project::setConfigPath) + archive || qark::tag("project", project) + || qark::attr("uid", project, &Project::uid, &Project::setUid) + || qark::attr("root-package", project, &Project::rootPackage, &Project::setRootPackage) + || qark::attr("config-path", project, &Project::configPath, &Project::setConfigPath) || qark::end; } @@ -133,9 +133,9 @@ void ProjectSerializer::load(const QString &fileName, Project *project) archive >> qark::end; archive.endDocument(); } catch (const qark::QXmlInArchive::FileFormatException &) { - throw FileIOException(QStringLiteral("illegal file format"), fileName); + throw FileIOException("illegal file format", fileName); } catch (...) { - throw FileIOException(QStringLiteral("serialization error"), fileName); + throw FileIOException("serialization error", fileName); } #ifdef USE_COMPRESSED_FILES @@ -157,7 +157,7 @@ void ProjectSerializer::write(QXmlStreamWriter *writer, const Project *project) archive << qark::end; archive.endDocument(); } catch (...) { - throw IOException(QStringLiteral("serialization error")); + throw IOException("serialization error"); } } diff --git a/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp index 74ca11bef5a..85fa4b84ce5 100644 --- a/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp +++ b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp @@ -374,7 +374,6 @@ void DiagramSceneController::dropNewElement(const QString &newElementId, const Q { if (newElementId == QLatin1String(ELEMENT_TYPE_ANNOTATION)) { auto annotation = new DAnnotation(); - annotation->setText(QStringLiteral("")); annotation->setPos(pos - QPointF(10.0, 10.0)); m_diagramController->addElement(annotation, diagram); alignOnRaster(annotation, diagram); diff --git a/src/libs/modelinglib/qtserialization/inc/qark/baseclass.h b/src/libs/modelinglib/qtserialization/inc/qark/baseclass.h index 4fae0f2e7a0..d4252eaf48e 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/baseclass.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/baseclass.h @@ -87,13 +87,13 @@ Base<BASE, DERIVED> base(const QString &qualifiedName, DERIVED *&obj, const Para template<class BASE, class DERIVED> Base<BASE, DERIVED> base(DERIVED &obj) { - return Base<BASE, DERIVED>(QString(QStringLiteral("base-%1")).arg(typeUid<BASE>()), obj); + return Base<BASE, DERIVED>(QString("base-%1").arg(typeUid<BASE>()), obj); } template<class BASE, class DERIVED> Base<BASE, DERIVED> base(DERIVED &obj, const Parameters ¶meters) { - return Base<BASE, DERIVED>(QString(QStringLiteral("base-%1")).arg(typeUid<BASE>()), + return Base<BASE, DERIVED>(QString("base-%1").arg(typeUid<BASE>()), obj, parameters); } diff --git a/src/libs/modelinglib/qtserialization/inc/qark/serialize_basic.h b/src/libs/modelinglib/qtserialization/inc/qark/serialize_basic.h index 695c53031dc..1997d6630d9 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/serialize_basic.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/serialize_basic.h @@ -73,7 +73,7 @@ QARK_BASIC_SAVELOAD(QString) template<class Archive> inline void save(Archive &archive, const QPointF &point, const Parameters &) { - archive.write(QString(QStringLiteral("x:%1;y:%2")).arg(point.x()).arg(point.y())); + archive.write(QString("x:%1;y:%2").arg(point.x()).arg(point.y())); } template<class Archive> @@ -81,7 +81,7 @@ inline void load(Archive &archive, QPointF &point, const Parameters &) { QString s; archive.read(&s); - if (QStringParser(s).parse(QStringLiteral("x:%1;y:%2")) + if (QStringParser(s).parse("x:%1;y:%2") .arg(point, &QPointF::setX).arg(point, &QPointF::setY).failed()) { throw typename Archive::FileFormatException(); } @@ -92,7 +92,7 @@ inline void load(Archive &archive, QPointF &point, const Parameters &) template<class Archive> inline void save(Archive &archive, const QRectF &rect, const Parameters &) { - archive.write(QString(QStringLiteral("x:%1;y:%2;w:%3;h:%4")) + archive.write(QString("x:%1;y:%2;w:%3;h:%4") .arg(rect.x()).arg(rect.y()).arg(rect.width()).arg(rect.height())); } @@ -101,7 +101,7 @@ inline void load(Archive &archive, QRectF &point, const Parameters &) { QString s; archive.read(&s); - if (QStringParser(s).parse(QStringLiteral("x:%1;y:%2;w:%3;h:%4")) + if (QStringParser(s).parse("x:%1;y:%2;w:%3;h:%4") .arg(point, &QRectF::setX).arg(point, &QRectF::setY) .arg(point, &QRectF::setWidth).arg(point, &QRectF::setHeight).failed()) { throw typename Archive::FileFormatException(); diff --git a/src/libs/modelinglib/qtserialization/inc/qark/serialize_container.h b/src/libs/modelinglib/qtserialization/inc/qark/serialize_container.h index a9d8e2a9224..723194a64e3 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/serialize_container.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/serialize_container.h @@ -41,7 +41,7 @@ inline void save(Archive &archive, const QList<T> &list, const Parameters &) { archive << tag("qlist"); foreach (const T &t, list) - archive << attr(QStringLiteral("item"), t); + archive << attr("item", t); archive << end; } @@ -51,10 +51,10 @@ inline void save(Archive &archive, const QList<T *> &list, const Parameters &par archive << tag("qlist"); if (parameters.hasFlag(ENFORCE_REFERENCED_ITEMS)) { foreach (const T *t, list) - archive << ref(QStringLiteral("item"), t); + archive << ref("item", t); } else { foreach (const T *t, list) - archive << attr(QStringLiteral("item"), t); + archive << attr("item", t); } archive << end; } @@ -62,21 +62,21 @@ inline void save(Archive &archive, const QList<T *> &list, const Parameters &par template<class Archive, class T> inline void load(Archive &archive, QList<T> &list, const Parameters &) { - archive >> tag(QStringLiteral("qlist")); - archive >> attr<QList<T>, const T &>(QStringLiteral("item"), list, &QList<T>::append); + archive >> tag("qlist"); + archive >> attr<QList<T>, const T &>("item", list, &QList<T>::append); archive >> end; } template<class Archive, class T> inline void load(Archive &archive, QList<T *> &list, const Parameters ¶meters) { - archive >> tag(QStringLiteral("qlist")); + archive >> tag("qlist"); if (parameters.hasFlag(ENFORCE_REFERENCED_ITEMS)) { // why does the following line not compile but the line below selects the correct function? //archive >> ref<QList<T *>, T * const &>("item", list, &QList<T *>::append); - archive >> ref(QStringLiteral("item"), list, &QList<T *>::append); + archive >> ref("item", list, &QList<T *>::append); } else { - archive >> attr<QList<T *>, T * const &>(QStringLiteral("item"), list, &QList<T *>::append); + archive >> attr<QList<T *>, T * const &>("item", list, &QList<T *>::append); } archive >> end; } @@ -88,7 +88,7 @@ inline void save(Archive &archive, const QSet<T> &set, const Parameters &) { archive << tag("qset"); foreach (const T &t, set) - archive << attr(QStringLiteral("item"), t); + archive << attr("item", t); archive << end; } @@ -98,10 +98,10 @@ inline void save(Archive &archive, const QSet<T *> &set, const Parameters ¶m archive << tag("qset"); if (parameters.hasFlag(ENFORCE_REFERENCED_ITEMS)) { foreach (const T *t, set) - archive << ref(QStringLiteral("item"), t); + archive << ref("item", t); } else { foreach (const T *t, set) - archive << attr(QStringLiteral("item"), t); + archive << attr("item", t); } archive << end; } @@ -118,19 +118,19 @@ void insertIntoSet(QSet<T> &set, const T &t) { template<class Archive, class T> inline void load(Archive &archive, QSet<T> &set, const Parameters &) { - archive >> tag(QStringLiteral("qset")); - archive >> attr<QSet<T>, const T &>(QStringLiteral("item"), set, &impl::insertIntoSet<T>); + archive >> tag("qset"); + archive >> attr<QSet<T>, const T &>("item", set, &impl::insertIntoSet<T>); archive >> end; } template<class Archive, class T> inline void load(Archive &archive, QSet<T *> &set, const Parameters ¶meters) { - archive >> tag(QStringLiteral("qset")); + archive >> tag("qset"); if (parameters.hasFlag(ENFORCE_REFERENCED_ITEMS)) - archive >> ref(QStringLiteral("item"), set, &impl::insertIntoSet<T *>); + archive >> ref("item", set, &impl::insertIntoSet<T *>); else - archive >> attr<QSet<T *>, T * const &>(QStringLiteral("item"), set, + archive >> attr<QSet<T *>, T * const &>("item", set, &impl::insertIntoSet<T *>); archive >> end; } @@ -155,25 +155,25 @@ public: template<class Archive, class KEY, class VALUE> inline void save(Archive &archive, const impl::KeyValuePair<KEY, VALUE> &pair, const Parameters &) { - archive << tag(QStringLiteral("pair")) - << attr(QStringLiteral("key"), pair.m_key) - << attr(QStringLiteral("value"), pair.m_value) + archive << tag("pair") + << attr("key", pair.m_key) + << attr("value", pair.m_value) << end; } template<class Archive, class KEY, class VALUE> inline void load(Archive &archive, impl::KeyValuePair<KEY, VALUE> &pair, const Parameters &) { - archive >> tag(QStringLiteral("pair")) - >> attr(QStringLiteral("key"), pair.m_key) - >> attr(QStringLiteral("value"), pair.m_value) + archive >> tag("pair") + >> attr("key", pair.m_key) + >> attr("value", pair.m_value) >> end; } template<class Archive, class KEY, class VALUE> inline void save(Archive &archive, const QHash<KEY, VALUE> &hash, const Parameters &) { - archive << tag(QStringLiteral("qhash")); + archive << tag("qhash"); for (auto it = hash.begin(); it != hash.end(); ++it) { impl::KeyValuePair<KEY, VALUE> pair(it.key(), it.value()); archive << attr("item", pair); @@ -194,8 +194,8 @@ inline void keyValuePairInsert(QHash<KEY, VALUE> &hash, const KeyValuePair<KEY, template<class Archive, class KEY, class VALUE> inline void load(Archive &archive, QHash<KEY, VALUE> &hash, const Parameters &) { - archive >> tag(QStringLiteral("qhash")); - archive >> attr(QStringLiteral("item"), hash, &impl::keyValuePairInsert<KEY, VALUE>); + archive >> tag("qhash"); + archive >> attr("item", hash, &impl::keyValuePairInsert<KEY, VALUE>); archive >> end; } |