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

GCC warnings.

Browse Source 
(grafted from 5853578c984bef1a0c33c5776334a726a57b1134)

--HG--
branch : release
This commit is contained in:
Roman Telezhynskyi 2016-06-28 09:36:50 +03:00
parent 412ea278fe
commit e1273d87f9
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libs/vmisc/def.h
View File

@ -602,4 +602,21 @@ QSharedPointer<QPrinter> DefaultPrinter(QPrinter::PrinterMode mode = QPrinter::S
QPixmap darkenPixmap(const QPixmap &pixmap) Q_REQUIRED_RESULT; QPixmap darkenPixmap(const QPixmap &pixmap) Q_REQUIRED_RESULT;
static inline bool VFuzzyComparePossibleNulls(double p1, double p2) Q_REQUIRED_RESULT;
static inline bool VFuzzyComparePossibleNulls(double p1, double p2)
{
if(qFuzzyIsNull(p1))
{
return qFuzzyIsNull(p2);
}
else if(qFuzzyIsNull(p2))
{
return false;
}
else
{
return qFuzzyCompare(p1, p2);
}
}
#endif // DEF_H #endif // DEF_H

3
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp
View File

@ -160,7 +160,8 @@ QPointF VToolLineIntersectAxis::FindPoint(const QLineF &axis, const QLineF &line
QLineF::IntersectType intersect = axis.intersect(line, &fPoint); QLineF::IntersectType intersect = axis.intersect(line, &fPoint);
if (intersect == QLineF::UnboundedIntersection || intersect == QLineF::BoundedIntersection) if (intersect == QLineF::UnboundedIntersection || intersect == QLineF::BoundedIntersection)
{ {
if(axis.angle() == line.angle() || qAbs(axis.angle() - line.angle()) == 180) if(VFuzzyComparePossibleNulls(axis.angle(), line.angle())
|| VFuzzyComparePossibleNulls(qAbs(axis.angle() - line.angle()), 180))
{ {
return QPointF(); return QPointF();
} }

3
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp
View File

@ -186,7 +186,8 @@ QPointF VToolTriangle::FindPoint(const QPointF &axisP1, const QPointF &axisP2, c
{ {
return QPointF(); return QPointF();
} }
if (axis.angle() == hypotenuse.angle() || qAbs(axis.angle() - hypotenuse.angle()) == 180) if (VFuzzyComparePossibleNulls(axis.angle(), hypotenuse.angle())
|| VFuzzyComparePossibleNulls(qAbs(axis.angle() - hypotenuse.angle()), 180))
{ {
return QPointF(); return QPointF();
} }