From 24e8a42aa76e1a14aac7e8692b816946307f11a8 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 20 Aug 2016 12:14:53 +0300 Subject: [PATCH] VPatternConverter use QStringLiteral where possible. --HG-- branch : develop --- src/libs/ifc/xml/vpatternconverter.cpp | 216 ++++++++++++++----------- 1 file changed, 126 insertions(+), 90 deletions(-) diff --git a/src/libs/ifc/xml/vpatternconverter.cpp b/src/libs/ifc/xml/vpatternconverter.cpp index d481947e7..16378182d 100644 --- a/src/libs/ifc/xml/vpatternconverter.cpp +++ b/src/libs/ifc/xml/vpatternconverter.cpp @@ -64,6 +64,45 @@ const QString VPatternConverter::CurrentSchema = QStringLiteral("://schema/pa //VPatternConverter::PatternMinVer; // <== DON'T FORGET TO UPDATE TOO!!!! //VPatternConverter::PatternMaxVer; // <== DON'T FORGET TO UPDATE TOO!!!! +// The list of all string we use for conversion +// Better to use global variables because repeating QStringLiteral blows up code size +const QString strUnit = QStringLiteral("unit"); +const QString strVersion = QStringLiteral("version"); +const QString strName = QStringLiteral("name"); +const QString strBase = QStringLiteral("base"); +const QString strFormula = QStringLiteral("formula"); +const QString strId = QStringLiteral("id"); +const QString strKGrowth = QStringLiteral("kgrowth"); +const QString strKSize = QStringLiteral("ksize"); +const QString strPoint = QStringLiteral("point"); +const QString strLength = QStringLiteral("length"); +const QString strAngle = QStringLiteral("angle"); +const QString strC1Radius = QStringLiteral("c1Radius"); +const QString strC2Radius = QStringLiteral("c2Radius"); +const QString strCRadius = QStringLiteral("cRadius"); +const QString strArc = QStringLiteral("arc"); +const QString strAngle1 = QStringLiteral("angle1"); +const QString strAngle2 = QStringLiteral("angle2"); +const QString strRadius = QStringLiteral("radius"); +const QString strPathPoint = QStringLiteral("pathPoint"); +const QString strKAsm1 = QStringLiteral("kAsm1"); +const QString strKAsm2 = QStringLiteral("kAsm2"); +const QString strPath = QStringLiteral("path"); +const QString strType = QStringLiteral("type"); +const QString strCutArc = QStringLiteral("cutArc"); +const QString strCutSpline = QStringLiteral("cutSpline"); +const QString strCutSplinePath = QStringLiteral("cutSplinePath"); +const QString strColor = QStringLiteral("color"); +const QString strMeasurements = QStringLiteral("measurements"); +const QString strIncrement = QStringLiteral("increment"); +const QString strIncrements = QStringLiteral("increments"); +const QString strModeling = QStringLiteral("modeling"); +const QString strTools = QStringLiteral("tools"); +const QString strIdTool = QStringLiteral("idTool"); +const QString strIdObject = QStringLiteral("idObject"); +const QString strChildren = QStringLiteral("children"); +const QString strChild = QStringLiteral("child"); + //--------------------------------------------------------------------------------------------------------------------- VPatternConverter::VPatternConverter(const QString &fileName) :VAbstractConverter(fileName) @@ -345,12 +384,12 @@ void VPatternConverter::ToV0_3_3() //--------------------------------------------------------------------------------------------------------------------- void VPatternConverter::TagUnitToV0_2_0() { - QDomElement unit = createElement("unit"); + QDomElement unit = createElement(strUnit); QDomText newNodeText = createTextNode(MUnitV0_1_4()); unit.appendChild(newNodeText); QDomElement patternElement = documentElement(); - patternElement.insertAfter(unit, patternElement.firstChildElement("version")); + patternElement.insertAfter(unit, patternElement.firstChildElement(strVersion)); } //--------------------------------------------------------------------------------------------------------------------- @@ -385,16 +424,16 @@ QSet VPatternConverter::FixIncrementsToV0_2_0() QDomElement domElement = domNode.toElement(); if (domElement.isNull() == false) { - if (domElement.tagName() == "increment") + if (domElement.tagName() == strIncrement) { try { - const QString name = GetParametrString(domElement, "name"); + const QString name = GetParametrString(domElement, strName); names.insert(name); - domElement.setAttribute("name", "#"+name); + domElement.setAttribute(strName, QLatin1String("#")+name); - const QString base = GetParametrString(domElement, "base"); - domElement.setAttribute("formula", base); + const QString base = GetParametrString(domElement, strBase); + domElement.setAttribute(strFormula, base); } catch (VExceptionEmptyParameter &e) { @@ -402,10 +441,10 @@ QSet VPatternConverter::FixIncrementsToV0_2_0() excep.AddMoreInformation(e.ErrorMessage()); throw excep; } - domElement.removeAttribute("id"); - domElement.removeAttribute("kgrowth"); - domElement.removeAttribute("ksize"); - domElement.removeAttribute("base"); + domElement.removeAttribute(strId); + domElement.removeAttribute(strKGrowth); + domElement.removeAttribute(strKSize); + domElement.removeAttribute(strBase); } } } @@ -418,15 +457,15 @@ QSet VPatternConverter::FixIncrementsToV0_2_0() void VPatternConverter::FixPointExpressionsToV0_2_0(const QSet &names) { QString formula; - const QDomNodeList list = elementsByTagName("point"); + const QDomNodeList list = elementsByTagName(strPoint); for (int i=0; i < list.size(); ++i) { QDomElement dom = list.at(i).toElement(); try { - formula = GetParametrString(dom, "length"); - dom.setAttribute("length", FixIncrementInFormulaToV0_2_0(formula, names)); + formula = GetParametrString(dom, strLength); + dom.setAttribute(strLength, FixIncrementInFormulaToV0_2_0(formula, names)); } catch (VExceptionEmptyParameter &e) { @@ -435,8 +474,8 @@ void VPatternConverter::FixPointExpressionsToV0_2_0(const QSet &names) try { - formula = GetParametrString(dom, "angle"); - dom.setAttribute("angle", FixIncrementInFormulaToV0_2_0(formula, names)); + formula = GetParametrString(dom, strAngle); + dom.setAttribute(strAngle, FixIncrementInFormulaToV0_2_0(formula, names)); } catch (VExceptionEmptyParameter &e) { @@ -444,8 +483,8 @@ void VPatternConverter::FixPointExpressionsToV0_2_0(const QSet &names) } try { - formula = GetParametrString(dom, "c1Radius"); - dom.setAttribute("c1Radius", FixIncrementInFormulaToV0_2_0(formula, names)); + formula = GetParametrString(dom, strC1Radius); + dom.setAttribute(strC1Radius, FixIncrementInFormulaToV0_2_0(formula, names)); } catch (VExceptionEmptyParameter &e) { @@ -454,8 +493,8 @@ void VPatternConverter::FixPointExpressionsToV0_2_0(const QSet &names) try { - formula = GetParametrString(dom, "c2Radius"); - dom.setAttribute("c2Radius", FixIncrementInFormulaToV0_2_0(formula, names)); + formula = GetParametrString(dom, strC2Radius); + dom.setAttribute(strC2Radius, FixIncrementInFormulaToV0_2_0(formula, names)); } catch (VExceptionEmptyParameter &e) { @@ -464,8 +503,8 @@ void VPatternConverter::FixPointExpressionsToV0_2_0(const QSet &names) try { - formula = GetParametrString(dom, "cRadius"); - dom.setAttribute("cRadius", FixIncrementInFormulaToV0_2_0(formula, names)); + formula = GetParametrString(dom, strCRadius); + dom.setAttribute(strCRadius, FixIncrementInFormulaToV0_2_0(formula, names)); } catch (VExceptionEmptyParameter &e) { @@ -478,15 +517,15 @@ void VPatternConverter::FixPointExpressionsToV0_2_0(const QSet &names) void VPatternConverter::FixArcExpressionsToV0_2_0(const QSet &names) { QString formula; - const QDomNodeList list = elementsByTagName("arc"); + const QDomNodeList list = elementsByTagName(strArc); for (int i=0; i < list.size(); ++i) { QDomElement dom = list.at(i).toElement(); try { - formula = GetParametrString(dom, "angle1"); - dom.setAttribute("angle1", FixIncrementInFormulaToV0_2_0(formula, names)); + formula = GetParametrString(dom, strAngle1); + dom.setAttribute(strAngle1, FixIncrementInFormulaToV0_2_0(formula, names)); } catch (VExceptionEmptyParameter &e) { @@ -495,8 +534,8 @@ void VPatternConverter::FixArcExpressionsToV0_2_0(const QSet &names) try { - formula = GetParametrString(dom, "angle2"); - dom.setAttribute("angle2", FixIncrementInFormulaToV0_2_0(formula, names)); + formula = GetParametrString(dom, strAngle2); + dom.setAttribute(strAngle2, FixIncrementInFormulaToV0_2_0(formula, names)); } catch (VExceptionEmptyParameter &e) { @@ -505,8 +544,8 @@ void VPatternConverter::FixArcExpressionsToV0_2_0(const QSet &names) try { - formula = GetParametrString(dom, "radius"); - dom.setAttribute("radius", FixIncrementInFormulaToV0_2_0(formula, names)); + formula = GetParametrString(dom, strRadius); + dom.setAttribute(strRadius, FixIncrementInFormulaToV0_2_0(formula, names)); } catch (VExceptionEmptyParameter &e) { @@ -515,8 +554,8 @@ void VPatternConverter::FixArcExpressionsToV0_2_0(const QSet &names) try { - formula = GetParametrString(dom, "length"); - dom.setAttribute("length", FixIncrementInFormulaToV0_2_0(formula, names)); + formula = GetParametrString(dom, strLength); + dom.setAttribute(strLength, FixIncrementInFormulaToV0_2_0(formula, names)); } catch (VExceptionEmptyParameter &e) { @@ -529,15 +568,15 @@ void VPatternConverter::FixArcExpressionsToV0_2_0(const QSet &names) void VPatternConverter::FixPathPointExpressionsToV0_2_0(const QSet &names) { QString formula; - const QDomNodeList list = elementsByTagName("pathPoint"); + const QDomNodeList list = elementsByTagName(strPathPoint); for (int i=0; i < list.size(); ++i) { QDomElement dom = list.at(i).toElement(); try { - formula = GetParametrString(dom, "kAsm1"); - dom.setAttribute("kAsm1", FixIncrementInFormulaToV0_2_0(formula, names)); + formula = GetParametrString(dom, strKAsm1); + dom.setAttribute(strKAsm1, FixIncrementInFormulaToV0_2_0(formula, names)); } catch (VExceptionEmptyParameter &e) { @@ -546,8 +585,8 @@ void VPatternConverter::FixPathPointExpressionsToV0_2_0(const QSet &nam try { - formula = GetParametrString(dom, "kAsm2"); - dom.setAttribute("kAsm2", FixIncrementInFormulaToV0_2_0(formula, names)); + formula = GetParametrString(dom, strKAsm2); + dom.setAttribute(strKAsm2, FixIncrementInFormulaToV0_2_0(formula, names)); } catch (VExceptionEmptyParameter &e) { @@ -556,8 +595,8 @@ void VPatternConverter::FixPathPointExpressionsToV0_2_0(const QSet &nam try { - formula = GetParametrString(dom, "angle"); - dom.setAttribute("angle", FixIncrementInFormulaToV0_2_0(formula, names)); + formula = GetParametrString(dom, strAngle); + dom.setAttribute(strAngle, FixIncrementInFormulaToV0_2_0(formula, names)); } catch (VExceptionEmptyParameter &e) { @@ -570,15 +609,15 @@ void VPatternConverter::FixPathPointExpressionsToV0_2_0(const QSet &nam void VPatternConverter::ConvertPointExpressionsToV0_2_0(const QMap &names) { QString formula; - const QDomNodeList list = elementsByTagName("point"); + const QDomNodeList list = elementsByTagName(strPoint); for (int i=0; i < list.size(); ++i) { QDomElement dom = list.at(i).toElement(); try { - formula = GetParametrString(dom, "length"); - dom.setAttribute("length", FixMeasurementInFormulaToV0_2_0(formula, names)); + formula = GetParametrString(dom, strLength); + dom.setAttribute(strLength, FixMeasurementInFormulaToV0_2_0(formula, names)); } catch (VExceptionEmptyParameter &e) { @@ -587,8 +626,8 @@ void VPatternConverter::ConvertPointExpressionsToV0_2_0(const QMap &names) { QString formula; - const QDomNodeList list = elementsByTagName("arc"); + const QDomNodeList list = elementsByTagName(strArc); for (int i=0; i < list.size(); ++i) { QDomElement dom = list.at(i).toElement(); try { - formula = GetParametrString(dom, "angle1"); - dom.setAttribute("angle1", FixMeasurementInFormulaToV0_2_0(formula, names)); + formula = GetParametrString(dom, strAngle1); + dom.setAttribute(strAngle1, FixMeasurementInFormulaToV0_2_0(formula, names)); } catch (VExceptionEmptyParameter &e) { @@ -647,8 +686,8 @@ void VPatternConverter::ConvertArcExpressionsToV0_2_0(const QMap &names) { QString formula; - const QDomNodeList list = elementsByTagName("pathPoint"); + const QDomNodeList list = elementsByTagName(strPathPoint); for (int i=0; i < list.size(); ++i) { QDomElement dom = list.at(i).toElement(); try { - formula = GetParametrString(dom, "kAsm1"); - dom.setAttribute("kAsm1", FixMeasurementInFormulaToV0_2_0(formula, names)); + formula = GetParametrString(dom, strKAsm1); + dom.setAttribute(strKAsm1, FixMeasurementInFormulaToV0_2_0(formula, names)); } catch (VExceptionEmptyParameter &e) { @@ -698,8 +737,8 @@ void VPatternConverter::ConvertPathPointExpressionsToV0_2_0(const QMap children; QDomElement childNode = node.nextSibling().toElement(); - const QString attrIdTool = QStringLiteral("idTool"); while (not childNode.isNull()) { - if (childNode.hasAttribute(attrIdTool) && childNode.attribute(attrIdTool).toUInt() == toolId) + if (childNode.hasAttribute(strIdTool) && childNode.attribute(strIdTool).toUInt() == toolId) { - children.append(childNode.attribute(QStringLiteral("idObject")).toUInt()); + children.append(childNode.attribute(strIdObject).toUInt()); } else { @@ -961,11 +997,11 @@ void VPatternConverter::SaveChildrenToolUnionToV0_2_4(quint32 id, const QVector< return; } - QDomElement tagChildren = createElement(QString("children")); + QDomElement tagChildren = createElement(strChildren); for (int i=0; i