From 03eb5c92a74e7301cb19a3ac634e5467c88159c4 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 25 Jun 2015 13:52:09 +0300 Subject: [PATCH] GCC warnings. --HG-- branch : develop --- src/app/core/vtooloptionspropertybrowser.cpp | 2 -- src/app/xml/vpattern.cpp | 20 ++++++++------------ src/app/xml/vpattern.h | 8 ++++---- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/app/core/vtooloptionspropertybrowser.cpp b/src/app/core/vtooloptionspropertybrowser.cpp index c8a9f0563..0883c1d8c 100644 --- a/src/app/core/vtooloptionspropertybrowser.cpp +++ b/src/app/core/vtooloptionspropertybrowser.cpp @@ -813,8 +813,6 @@ void VToolOptionsPropertyBrowser::ChangeDataToolTrueDarts(VProperty *property) QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; - VToolTrueDarts *i = qgraphicsitem_cast(currentItem); - SCASSERT(i != nullptr); switch (PropertiesList().indexOf(id)) { case 32: // VAbstractTool::AttrName1 diff --git a/src/app/xml/vpattern.cpp b/src/app/xml/vpattern.cpp index bbce740e6..12a5b282c 100644 --- a/src/app/xml/vpattern.cpp +++ b/src/app/xml/vpattern.cpp @@ -708,7 +708,7 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem ParseToolPointOfContact(scene, domElement, parse); break; case 8: //VNodePoint::ToolType - ParseNodePoint(scene, domElement, parse); + ParseNodePoint(domElement, parse); break; case 9: //VToolHeight::ToolType ParseToolHeight(scene, domElement, parse); @@ -1229,9 +1229,8 @@ void VPattern::ParseToolPointOfContact(VMainGraphicsScene *scene, QDomElement &d } //--------------------------------------------------------------------------------------------------------------------- -void VPattern::ParseNodePoint(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse) +void VPattern::ParseNodePoint(const QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); quint32 id = 0; @@ -1849,9 +1848,8 @@ void VPattern::ParseToolSplinePath(VMainGraphicsScene *scene, const QDomElement } //--------------------------------------------------------------------------------------------------------------------- -void VPattern::ParseNodeSpline(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse) +void VPattern::ParseNodeSpline(const QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); quint32 id = 0; @@ -1876,9 +1874,8 @@ void VPattern::ParseNodeSpline(VMainGraphicsScene *scene, const QDomElement &dom } //--------------------------------------------------------------------------------------------------------------------- -void VPattern::ParseNodeSplinePath(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse) +void VPattern::ParseNodeSplinePath(const QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); quint32 id = 0; @@ -1948,9 +1945,8 @@ void VPattern::ParseToolArc(VMainGraphicsScene *scene, QDomElement &domElement, } //--------------------------------------------------------------------------------------------------------------------- -void VPattern::ParseNodeArc(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse) +void VPattern::ParseNodeArc(const QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); quint32 id = 0; @@ -2051,11 +2047,11 @@ void VPattern::ParseSplineElement(VMainGraphicsScene *scene, const QDomElement & break; case 2: //VNodeSpline::ToolType qCDebug(vXML, "VNodeSpline."); - ParseNodeSpline(scene, domElement, parse); + ParseNodeSpline(domElement, parse); break; case 3: //VNodeSplinePath::ToolType qCDebug(vXML, "VNodeSplinePath."); - ParseNodeSplinePath(scene, domElement, parse); + ParseNodeSplinePath(domElement, parse); break; default: qCDebug(vXML, "Illegal spline type in VDomDocument::ParseSplineElement()."); @@ -2088,7 +2084,7 @@ void VPattern::ParseArcElement(VMainGraphicsScene *scene, QDomElement &domElemen ParseToolArc(scene, domElement, parse); break; case 1: //VNodeArc::ToolType - ParseNodeArc(scene, domElement, parse); + ParseNodeArc(domElement, parse); break; case 2: //VToolArcWithLength::ToolType ParseToolArcWithLength(scene, domElement, parse); diff --git a/src/app/xml/vpattern.h b/src/app/xml/vpattern.h index 821cd4161..e85a0392a 100644 --- a/src/app/xml/vpattern.h +++ b/src/app/xml/vpattern.h @@ -124,7 +124,7 @@ private: void ParseToolBisector(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse); void ParseToolLineIntersect(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse); void ParseToolPointOfContact(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse); - void ParseNodePoint(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse); + void ParseNodePoint(const QDomElement &domElement, const Document &parse); void ParseToolHeight(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse); void ParseToolTriangle(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse); void ParseToolPointOfIntersection(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse); @@ -145,11 +145,11 @@ private: void ParseToolSpline(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse); void ParseToolSplinePath(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse); - void ParseNodeSpline(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse); - void ParseNodeSplinePath(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse); + void ParseNodeSpline(const QDomElement &domElement, const Document &parse); + void ParseNodeSplinePath(const QDomElement &domElement, const Document &parse); void ParseToolArc(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse); - void ParseNodeArc(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse); + void ParseNodeArc(const QDomElement &domElement, const Document &parse); void ParseToolArcWithLength(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse); };