From 28f806a77908a59c317ddd9aa754dfb8e7541c08 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 11 Feb 2015 12:43:50 +0200 Subject: [PATCH] Refactoring. More good looking code. --HG-- branch : feature --- src/app/dialogs/app/dialoghistory.cpp | 2 +- src/app/dialogs/app/dialogincrements.cpp | 4 ++-- src/app/tools/drawTools/vdrawtool.cpp | 6 +++--- src/app/tools/drawTools/vtoolcut.cpp | 2 +- src/app/tools/drawTools/vtoolline.cpp | 2 +- src/app/tools/drawTools/vtoolsplinepath.cpp | 2 +- src/app/tools/nodeDetails/vabstractnode.cpp | 2 +- src/app/tools/nodeDetails/vnodearc.cpp | 2 +- src/app/tools/nodeDetails/vnodepoint.cpp | 4 ++-- src/app/tools/nodeDetails/vnodespline.cpp | 2 +- src/app/tools/nodeDetails/vnodesplinepath.cpp | 2 +- src/app/tools/vabstracttool.cpp | 2 +- src/app/tools/vtooldetail.cpp | 2 +- src/app/tools/vtooluniondetails.cpp | 2 +- src/app/undocommands/adddet.cpp | 2 +- src/app/undocommands/adddetnode.cpp | 2 +- src/app/undocommands/addtocalc.cpp | 4 ++-- src/app/undocommands/adduniondetails.cpp | 2 +- src/app/undocommands/deletedetail.cpp | 4 ++-- src/app/undocommands/movedetail.cpp | 6 +++--- src/app/undocommands/movelabel.cpp | 4 ++-- src/app/undocommands/movespline.cpp | 2 +- src/app/undocommands/movesplinepath.cpp | 2 +- src/app/undocommands/movespoint.cpp | 4 ++-- src/app/undocommands/savedetailoptions.cpp | 4 ++-- src/app/undocommands/savetooloptions.cpp | 4 ++-- src/libs/ifc/xml/vdomdocument.cpp | 6 ++++++ src/libs/ifc/xml/vdomdocument.h | 1 + 28 files changed, 45 insertions(+), 38 deletions(-) diff --git a/src/app/dialogs/app/dialoghistory.cpp b/src/app/dialogs/app/dialoghistory.cpp index b284365ad..e906cd494 100644 --- a/src/app/dialogs/app/dialoghistory.cpp +++ b/src/app/dialogs/app/dialoghistory.cpp @@ -200,7 +200,7 @@ void DialogHistory::FillTable() */ QString DialogHistory::Record(const VToolRecord &tool) { - const QDomElement domElem = doc->elementById(QString().setNum(tool.getId())); + const QDomElement domElem = doc->elementById(tool.getId()); if (domElem.isElement() == false) { qDebug()<<"Can't find element by id"<RemoveIncrement(itemName->text()); quint32 id = qvariant_cast(itemName->data(Qt::UserRole)); - QDomElement domElement = doc->elementById(QString().setNum(id)); + QDomElement domElement = doc->elementById(id); if (domElement.isElement()) { QDomNodeList list = doc->elementsByTagName(VPattern::TagIncrements); @@ -750,7 +750,7 @@ void DialogIncrements::IncrementChanged ( qint32 row, qint32 column ) const QTableWidgetItem *itemName = ui->tableWidgetIncrement->item(row, 0); const QTableWidgetItem *item = ui->tableWidgetIncrement->item(row, column); const quint32 id = qvariant_cast(itemName->data(Qt::UserRole)); - QDomElement domElement = doc->elementById(QString().setNum(id)); + QDomElement domElement = doc->elementById(id); if (domElement.isElement() == false) { qCDebug(vDialog)<<"Cant't find increment with id = "<elementById(QString().setNum(id)); + QDomElement oldDomElement = doc->elementById(id); if (oldDomElement.isElement()) { QDomElement newDomElement = oldDomElement.cloneNode().toElement(); @@ -148,7 +148,7 @@ void VDrawTool::AddToFile() */ void VDrawTool::RefreshDataInFile() { - QDomElement domElement = doc->elementById(QString().setNum(id)); + QDomElement domElement = doc->elementById(id); if (domElement.isElement()) { QSharedPointer obj = VAbstractTool::data.GetGObject(id); @@ -176,7 +176,7 @@ QColor VDrawTool::CorrectColor(const QColor &color) const //--------------------------------------------------------------------------------------------------------------------- void VDrawTool::ReadAttributes() { - const QDomElement domElement = doc->elementById(QString().setNum(id)); + const QDomElement domElement = doc->elementById(id); if (domElement.isElement()) { ReadToolAttributes(domElement); diff --git a/src/app/tools/drawTools/vtoolcut.cpp b/src/app/tools/drawTools/vtoolcut.cpp index 192fc1e69..7eefbc110 100644 --- a/src/app/tools/drawTools/vtoolcut.cpp +++ b/src/app/tools/drawTools/vtoolcut.cpp @@ -146,7 +146,7 @@ void VToolCut::FullUpdateCurveFromFile(const QString &attrCurve) { Q_ASSERT_X(attrCurve.isEmpty() == false, Q_FUNC_INFO, "attribute name is empty"); - QDomElement domElement = doc->elementById(QString().setNum(id)); + QDomElement domElement = doc->elementById(id); if (domElement.isElement()) { formula = domElement.attribute(AttrLength, ""); diff --git a/src/app/tools/drawTools/vtoolline.cpp b/src/app/tools/drawTools/vtoolline.cpp index 1f879afb9..8f9f8003e 100644 --- a/src/app/tools/drawTools/vtoolline.cpp +++ b/src/app/tools/drawTools/vtoolline.cpp @@ -275,7 +275,7 @@ void VToolLine::AddToFile() */ void VToolLine::RefreshDataInFile() { - QDomElement domElement = doc->elementById(QString().setNum(id)); + QDomElement domElement = doc->elementById(id); if (domElement.isElement()) { QSharedPointer obj = QSharedPointer (); diff --git a/src/app/tools/drawTools/vtoolsplinepath.cpp b/src/app/tools/drawTools/vtoolsplinepath.cpp index 7c82241a8..9c7b4157f 100644 --- a/src/app/tools/drawTools/vtoolsplinepath.cpp +++ b/src/app/tools/drawTools/vtoolsplinepath.cpp @@ -335,7 +335,7 @@ void VToolSplinePath::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) */ void VToolSplinePath::RefreshDataInFile() { - QDomElement domElement = doc->elementById(QString().setNum(id)); + QDomElement domElement = doc->elementById(id); if (domElement.isElement() == false) { qDebug()<<"Can't find element with id="<DecrementReferens(idNode); - QDomElement domElement = doc->elementById(QString().setNum(id)); + QDomElement domElement = doc->elementById(id); if (domElement.isElement()) { QDomNode element = domElement.parentNode(); diff --git a/src/app/tools/nodeDetails/vnodearc.cpp b/src/app/tools/nodeDetails/vnodearc.cpp index d7c0aeb68..865671106 100644 --- a/src/app/tools/nodeDetails/vnodearc.cpp +++ b/src/app/tools/nodeDetails/vnodearc.cpp @@ -164,7 +164,7 @@ void VNodeArc::AddToFile() */ void VNodeArc::RefreshDataInFile() { - QDomElement domElement = doc->elementById(QString().setNum(id)); + QDomElement domElement = doc->elementById(id); if (domElement.isElement()) { doc->SetAttribute(domElement, AttrIdObject, idNode); diff --git a/src/app/tools/nodeDetails/vnodepoint.cpp b/src/app/tools/nodeDetails/vnodepoint.cpp index 952d1e4e6..638ef3277 100644 --- a/src/app/tools/nodeDetails/vnodepoint.cpp +++ b/src/app/tools/nodeDetails/vnodepoint.cpp @@ -180,7 +180,7 @@ void VNodePoint::AddToFile() void VNodePoint::RefreshDataInFile() { const QSharedPointer point = VAbstractTool::data.GeometricObject(id); - QDomElement domElement = doc->elementById(QString().setNum(id)); + QDomElement domElement = doc->elementById(id); if (domElement.isElement()) { doc->SetAttribute(domElement, AttrIdObject, idNode); @@ -253,7 +253,7 @@ void VNodePoint::NameChangePosition(const QPointF &pos) */ void VNodePoint::UpdateNamePosition(qreal mx, qreal my) { - QDomElement domElement = doc->elementById(QString().setNum(id)); + QDomElement domElement = doc->elementById(id); if (domElement.isElement()) { doc->SetAttribute(domElement, AttrMx, QString().setNum(qApp->fromPixel(mx))); diff --git a/src/app/tools/nodeDetails/vnodespline.cpp b/src/app/tools/nodeDetails/vnodespline.cpp index a83545287..0982190d7 100644 --- a/src/app/tools/nodeDetails/vnodespline.cpp +++ b/src/app/tools/nodeDetails/vnodespline.cpp @@ -167,7 +167,7 @@ void VNodeSpline::AddToFile() */ void VNodeSpline::RefreshDataInFile() { - QDomElement domElement = doc->elementById(QString().setNum(id)); + QDomElement domElement = doc->elementById(id); if (domElement.isElement()) { doc->SetAttribute(domElement, AttrIdObject, QString().setNum(idNode)); diff --git a/src/app/tools/nodeDetails/vnodesplinepath.cpp b/src/app/tools/nodeDetails/vnodesplinepath.cpp index a2654e473..7b8c3f5da 100644 --- a/src/app/tools/nodeDetails/vnodesplinepath.cpp +++ b/src/app/tools/nodeDetails/vnodesplinepath.cpp @@ -170,7 +170,7 @@ void VNodeSplinePath::AddToFile() */ void VNodeSplinePath::RefreshDataInFile() { - QDomElement domElement = doc->elementById(QString().setNum(id)); + QDomElement domElement = doc->elementById(id); if (domElement.isElement()) { doc->SetAttribute(domElement, AttrIdObject, QString().setNum(idNode)); diff --git a/src/app/tools/vabstracttool.cpp b/src/app/tools/vabstracttool.cpp index 194c5b5c7..d01708581 100644 --- a/src/app/tools/vabstracttool.cpp +++ b/src/app/tools/vabstracttool.cpp @@ -310,7 +310,7 @@ int VAbstractTool::ConfirmDeletion() void VAbstractTool::SaveOption(QSharedPointer &obj) { qCDebug(vTool)<<"Saving tool options"; - QDomElement oldDomElement = doc->elementById(QString().setNum(id)); + QDomElement oldDomElement = doc->elementById(id); if (oldDomElement.isElement()) { QDomElement newDomElement = oldDomElement.cloneNode().toElement(); diff --git a/src/app/tools/vtooldetail.cpp b/src/app/tools/vtooldetail.cpp index 744f8a8a1..cab1ed4b5 100644 --- a/src/app/tools/vtooldetail.cpp +++ b/src/app/tools/vtooldetail.cpp @@ -304,7 +304,7 @@ void VToolDetail::AddToFile() */ void VToolDetail::RefreshDataInFile() { - QDomElement domElement = doc->elementById(QString().setNum(id)); + QDomElement domElement = doc->elementById(id); if (domElement.isElement()) { VDetail det = VAbstractTool::data.GetDetail(id); diff --git a/src/app/tools/vtooluniondetails.cpp b/src/app/tools/vtooluniondetails.cpp index 32350ad1d..087afa9f3 100644 --- a/src/app/tools/vtooluniondetails.cpp +++ b/src/app/tools/vtooluniondetails.cpp @@ -750,7 +750,7 @@ void VToolUnionDetails::AddToFile() */ void VToolUnionDetails::RefreshDataInFile() { - QDomElement domElement = doc->elementById(QString().setNum(id)); + QDomElement domElement = doc->elementById(id); if (domElement.isElement()) { doc->SetAttribute(domElement, AttrIndexD1, indexD1); diff --git a/src/app/undocommands/adddet.cpp b/src/app/undocommands/adddet.cpp index de773f50d..8641c05c5 100644 --- a/src/app/undocommands/adddet.cpp +++ b/src/app/undocommands/adddet.cpp @@ -50,7 +50,7 @@ void AddDet::undo() QDomElement element; if (doc->GetActivNodeElement(VPattern::TagDetails, element)) { - QDomElement domElement = doc->elementById(QString().setNum(nodeId)); + QDomElement domElement = doc->elementById(nodeId); if (domElement.isElement()) { if (element.removeChild(domElement).isNull()) diff --git a/src/app/undocommands/adddetnode.cpp b/src/app/undocommands/adddetnode.cpp index fc483ed0c..993c7a00a 100644 --- a/src/app/undocommands/adddetnode.cpp +++ b/src/app/undocommands/adddetnode.cpp @@ -49,7 +49,7 @@ void AddDetNode::undo() QDomElement modelingElement; if (doc->GetActivNodeElement(VPattern::TagModeling, modelingElement)) { - QDomElement domElement = doc->elementById(QString().setNum(nodeId)); + QDomElement domElement = doc->elementById(nodeId); if (domElement.isElement()) { if (modelingElement.removeChild(domElement).isNull()) diff --git a/src/app/undocommands/addtocalc.cpp b/src/app/undocommands/addtocalc.cpp index 87f205c1f..30cbb631a 100644 --- a/src/app/undocommands/addtocalc.cpp +++ b/src/app/undocommands/addtocalc.cpp @@ -56,7 +56,7 @@ void AddToCalc::undo() QDomElement calcElement; if (doc->GetActivNodeElement(VPattern::TagCalculation, calcElement)) { - QDomElement domElement = doc->elementById(QString().setNum(nodeId)); + QDomElement domElement = doc->elementById(nodeId); if (domElement.isElement()) { if (calcElement.removeChild(domElement).isNull()) @@ -102,7 +102,7 @@ void AddToCalc::redo() } else { - QDomElement refElement = doc->elementById(QString().setNum(cursor)); + QDomElement refElement = doc->elementById(cursor); if (refElement.isElement()) { calcElement.insertAfter(xml, refElement); diff --git a/src/app/undocommands/adduniondetails.cpp b/src/app/undocommands/adduniondetails.cpp index 9f5a8549e..e5ed9f1e3 100644 --- a/src/app/undocommands/adduniondetails.cpp +++ b/src/app/undocommands/adduniondetails.cpp @@ -49,7 +49,7 @@ void AddUnionDetails::undo() QDomElement modelingElement; if (doc->GetActivNodeElement(VPattern::TagModeling, modelingElement)) { - QDomElement domElement = doc->elementById(QString().setNum(nodeId)); + QDomElement domElement = doc->elementById(nodeId); if (domElement.isElement()) { if (modelingElement.removeChild(domElement).isNull()) diff --git a/src/app/undocommands/deletedetail.cpp b/src/app/undocommands/deletedetail.cpp index a67794df3..fd7fecac7 100644 --- a/src/app/undocommands/deletedetail.cpp +++ b/src/app/undocommands/deletedetail.cpp @@ -36,7 +36,7 @@ DeleteDetail::DeleteDetail(VPattern *doc, quint32 id, QUndoCommand *parent) { setText(tr("Delete tool")); nodeId = id; - QDomElement domElement = doc->elementById(QString().setNum(id)); + QDomElement domElement = doc->elementById(id); if (domElement.isElement()) { xml = domElement.cloneNode().toElement(); @@ -77,7 +77,7 @@ void DeleteDetail::redo() { qCDebug(vUndo)<<"Redo."; - QDomElement domElement = doc->elementById(QString().setNum(nodeId)); + QDomElement domElement = doc->elementById(nodeId); if (domElement.isElement()) { parentNode.removeChild(domElement); diff --git a/src/app/undocommands/movedetail.cpp b/src/app/undocommands/movedetail.cpp index 8d5b42b16..025457337 100644 --- a/src/app/undocommands/movedetail.cpp +++ b/src/app/undocommands/movedetail.cpp @@ -42,7 +42,7 @@ MoveDetail::MoveDetail(VPattern *doc, const double &x, const double &y, const qu nodeId = id; SCASSERT(scene != nullptr); - QDomElement domElement = doc->elementById(QString().setNum(id)); + QDomElement domElement = doc->elementById(id); if (domElement.isElement()) { oldX = qApp->toPixel(doc->GetParametrDouble(domElement, VAbstractTool::AttrMx, "0.0")); @@ -64,7 +64,7 @@ void MoveDetail::undo() { qCDebug(vUndo)<<"Undo."; - QDomElement domElement = doc->elementById(QString().setNum(nodeId)); + QDomElement domElement = doc->elementById(nodeId); if (domElement.isElement()) { SaveCoordinates(domElement, oldX, oldY); @@ -86,7 +86,7 @@ void MoveDetail::redo() { qCDebug(vUndo)<<"Redo."; - QDomElement domElement = doc->elementById(QString().setNum(nodeId)); + QDomElement domElement = doc->elementById(nodeId); if (domElement.isElement()) { SaveCoordinates(domElement, newX, newY); diff --git a/src/app/undocommands/movelabel.cpp b/src/app/undocommands/movelabel.cpp index eaada78e2..1d7d3858e 100644 --- a/src/app/undocommands/movelabel.cpp +++ b/src/app/undocommands/movelabel.cpp @@ -46,7 +46,7 @@ MoveLabel::MoveLabel(VPattern *doc, const double &x, const double &y, const quin qCDebug(vUndo)<<"Label new My"<elementById(QString().setNum(id)); + QDomElement domElement = doc->elementById(id); if (domElement.isElement()) { oldMx = qApp->toPixel(doc->GetParametrDouble(domElement, VAbstractTool::AttrMx, "0.0")); @@ -114,7 +114,7 @@ void MoveLabel::Do(double mx, double my) qCDebug(vUndo)<<"New mx"<elementById(QString().setNum(nodeId)); + QDomElement domElement = doc->elementById(nodeId); if (domElement.isElement()) { doc->SetAttribute(domElement, VAbstractTool::AttrMx, QString().setNum(qApp->fromPixel(mx))); diff --git a/src/app/undocommands/movespline.cpp b/src/app/undocommands/movespline.cpp index a59ac23c8..2b1eddfe4 100644 --- a/src/app/undocommands/movespline.cpp +++ b/src/app/undocommands/movespline.cpp @@ -88,7 +88,7 @@ int MoveSpline::id() const //--------------------------------------------------------------------------------------------------------------------- void MoveSpline::Do(const VSpline &spl) { - QDomElement domElement = doc->elementById(QString().setNum(nodeId)); + QDomElement domElement = doc->elementById(nodeId); if (domElement.isElement()) { doc->SetAttribute(domElement, VAbstractTool::AttrAngle1, QString().setNum(spl.GetAngle1())); diff --git a/src/app/undocommands/movesplinepath.cpp b/src/app/undocommands/movesplinepath.cpp index 86f72b5a3..44a4e53e9 100644 --- a/src/app/undocommands/movesplinepath.cpp +++ b/src/app/undocommands/movesplinepath.cpp @@ -86,7 +86,7 @@ int MoveSplinePath::id() const //--------------------------------------------------------------------------------------------------------------------- void MoveSplinePath::Do(const VSplinePath &splPath) { - QDomElement domElement = doc->elementById(QString().setNum(nodeId)); + QDomElement domElement = doc->elementById(nodeId); if (domElement.isElement()) { doc->SetAttribute(domElement, VToolSplinePath::AttrKCurve, QString().setNum(splPath.GetKCurve())); diff --git a/src/app/undocommands/movespoint.cpp b/src/app/undocommands/movespoint.cpp index dbc04eaf6..668594e90 100644 --- a/src/app/undocommands/movespoint.cpp +++ b/src/app/undocommands/movespoint.cpp @@ -46,7 +46,7 @@ MoveSPoint::MoveSPoint(VPattern *doc, const double &x, const double &y, const qu qCDebug(vUndo)<<"SPoint newY"<elementById(QString().setNum(id)); + QDomElement domElement = doc->elementById(id); if (domElement.isElement()) { oldX = qApp->toPixel(doc->GetParametrDouble(domElement, VAbstractTool::AttrX, "0.0")); @@ -114,7 +114,7 @@ void MoveSPoint::Do(double x, double y) qCDebug(vUndo)<<"Move to x"<elementById(QString().setNum(nodeId)); + QDomElement domElement = doc->elementById(nodeId); if (domElement.isElement()) { doc->SetAttribute(domElement, VAbstractTool::AttrX, QString().setNum(qApp->fromPixel(x))); diff --git a/src/app/undocommands/savedetailoptions.cpp b/src/app/undocommands/savedetailoptions.cpp index 4dcb7d8d7..5caa88a8a 100644 --- a/src/app/undocommands/savedetailoptions.cpp +++ b/src/app/undocommands/savedetailoptions.cpp @@ -48,7 +48,7 @@ void SaveDetailOptions::undo() { qCDebug(vUndo)<<"Undo."; - QDomElement domElement = doc->elementById(QString().setNum(nodeId)); + QDomElement domElement = doc->elementById(nodeId); if (domElement.isElement()) { SaveDet(domElement, oldDet); @@ -85,7 +85,7 @@ void SaveDetailOptions::redo() { qCDebug(vUndo)<<"Redo."; - QDomElement domElement = doc->elementById(QString().setNum(nodeId)); + QDomElement domElement = doc->elementById(nodeId); if (domElement.isElement()) { SaveDet(domElement, newDet); diff --git a/src/app/undocommands/savetooloptions.cpp b/src/app/undocommands/savetooloptions.cpp index a57416c3e..2e9d98dda 100644 --- a/src/app/undocommands/savetooloptions.cpp +++ b/src/app/undocommands/savetooloptions.cpp @@ -48,7 +48,7 @@ void SaveToolOptions::undo() { qCDebug(vUndo)<<"Undo."; - QDomElement domElement = doc->elementById(QString().setNum(nodeId)); + QDomElement domElement = doc->elementById(nodeId); if (domElement.isElement()) { domElement.parentNode().replaceChild(oldXml, domElement); @@ -67,7 +67,7 @@ void SaveToolOptions::redo() { qCDebug(vUndo)<<"Redo."; - QDomElement domElement = doc->elementById(QString().setNum(nodeId)); + QDomElement domElement = doc->elementById(nodeId); if (domElement.isElement()) { domElement.parentNode().replaceChild(newXml, domElement); diff --git a/src/libs/ifc/xml/vdomdocument.cpp b/src/libs/ifc/xml/vdomdocument.cpp index 40480bf0f..b48d4abbe 100644 --- a/src/libs/ifc/xml/vdomdocument.cpp +++ b/src/libs/ifc/xml/vdomdocument.cpp @@ -134,6 +134,12 @@ QDomElement VDomDocument::elementById(const QString& id) return QDomElement(); } +//--------------------------------------------------------------------------------------------------------------------- +QDomElement VDomDocument::elementById(quint32 id) +{ + return elementById(QString().setNum(id)); +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief Removes all children of a given element tag. RENAME: removeAllChildren diff --git a/src/libs/ifc/xml/vdomdocument.h b/src/libs/ifc/xml/vdomdocument.h index 633c33b74..00fba6c8f 100644 --- a/src/libs/ifc/xml/vdomdocument.h +++ b/src/libs/ifc/xml/vdomdocument.h @@ -81,6 +81,7 @@ public: VDomDocument(); virtual ~VDomDocument(); QDomElement elementById(const QString& id); + QDomElement elementById(quint32 id); void removeAllChilds(QDomElement &element); template /**