aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GCC warnings.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-06-25 13:52:09 +03:00
parent 0cf7a344a0
commit 03eb5c92a7
3 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/core/vtooloptionspropertybrowser.cpp
View File

@ -813,8 +813,6 @@ void VToolOptionsPropertyBrowser::ChangeDataToolTrueDarts(VProperty *property)
QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole);
const QString id = propertyToId[property]; const QString id = propertyToId[property];
VToolTrueDarts *i = qgraphicsitem_cast<VToolTrueDarts *>(currentItem);
SCASSERT(i != nullptr);
switch (PropertiesList().indexOf(id)) switch (PropertiesList().indexOf(id))
{ {
case 32: // VAbstractTool::AttrName1 case 32: // VAbstractTool::AttrName1

20
src/app/xml/vpattern.cpp
View File

@ -708,7 +708,7 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem
ParseToolPointOfContact(scene, domElement, parse); ParseToolPointOfContact(scene, domElement, parse);
break; break;
case 8: //VNodePoint::ToolType case 8: //VNodePoint::ToolType
ParseNodePoint(scene, domElement, parse); ParseNodePoint(domElement, parse);
break; break;
case 9: //VToolHeight::ToolType case 9: //VToolHeight::ToolType
ParseToolHeight(scene, domElement, parse); 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"); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null");
quint32 id = 0; 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"); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null");
quint32 id = 0; 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"); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null");
quint32 id = 0; 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"); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null");
quint32 id = 0; quint32 id = 0;
@ -2051,11 +2047,11 @@ void VPattern::ParseSplineElement(VMainGraphicsScene *scene, const QDomElement &
break; break;
case 2: //VNodeSpline::ToolType case 2: //VNodeSpline::ToolType
qCDebug(vXML, "VNodeSpline."); qCDebug(vXML, "VNodeSpline.");
ParseNodeSpline(scene, domElement, parse); ParseNodeSpline(domElement, parse);
break; break;
case 3: //VNodeSplinePath::ToolType case 3: //VNodeSplinePath::ToolType
qCDebug(vXML, "VNodeSplinePath."); qCDebug(vXML, "VNodeSplinePath.");
ParseNodeSplinePath(scene, domElement, parse); ParseNodeSplinePath(domElement, parse);
break; break;
default: default:
qCDebug(vXML, "Illegal spline type in VDomDocument::ParseSplineElement()."); qCDebug(vXML, "Illegal spline type in VDomDocument::ParseSplineElement().");
@ -2088,7 +2084,7 @@ void VPattern::ParseArcElement(VMainGraphicsScene *scene, QDomElement &domElemen
ParseToolArc(scene, domElement, parse); ParseToolArc(scene, domElement, parse);
break; break;
case 1: //VNodeArc::ToolType case 1: //VNodeArc::ToolType
ParseNodeArc(scene, domElement, parse); ParseNodeArc(domElement, parse);
break; break;
case 2: //VToolArcWithLength::ToolType case 2: //VToolArcWithLength::ToolType
ParseToolArcWithLength(scene, domElement, parse); ParseToolArcWithLength(scene, domElement, parse);

8
src/app/xml/vpattern.h
View File

@ -124,7 +124,7 @@ private:
void ParseToolBisector(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse); void ParseToolBisector(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse);
void ParseToolLineIntersect(VMainGraphicsScene *scene, const 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 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 ParseToolHeight(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse);
void ParseToolTriangle(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); 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 ParseToolSpline(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse);
void ParseToolSplinePath(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 ParseNodeSpline(const QDomElement &domElement, const Document &parse);
void ParseNodeSplinePath(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse); void ParseNodeSplinePath(const QDomElement &domElement, const Document &parse);
void ParseToolArc(VMainGraphicsScene *scene, 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); void ParseToolArcWithLength(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse);
}; };