Cppcheck warning.
--HG-- branch : develop
This commit is contained in:
parent
fc5b991174
commit
91925c2618
|
@ -54,6 +54,17 @@ VBestSquare::VBestSquare(const VBestSquare &res)
|
||||||
VBestSquare::~VBestSquare()
|
VBestSquare::~VBestSquare()
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
VBestSquare &VBestSquare::operator=(const VBestSquare &res)
|
||||||
|
{
|
||||||
|
if ( &res == this )
|
||||||
|
{
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
d = res.d;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void VBestSquare::NewResult(const VBestSquareResData &data)
|
void VBestSquare::NewResult(const VBestSquareResData &data)
|
||||||
{
|
{
|
||||||
|
|
|
@ -46,6 +46,7 @@ public:
|
||||||
VBestSquare(const VBestSquare &res);
|
VBestSquare(const VBestSquare &res);
|
||||||
virtual ~VBestSquare();
|
virtual ~VBestSquare();
|
||||||
|
|
||||||
|
VBestSquare &operator=(const VBestSquare &res);
|
||||||
#ifdef Q_COMPILER_RVALUE_REFS
|
#ifdef Q_COMPILER_RVALUE_REFS
|
||||||
VBestSquare &operator=(VBestSquare &&res) Q_DECL_NOTHROW { Swap(res); return *this; }
|
VBestSquare &operator=(VBestSquare &&res) Q_DECL_NOTHROW { Swap(res); return *this; }
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -40,6 +40,25 @@
|
||||||
#include "vlayoutpiece.h"
|
#include "vlayoutpiece.h"
|
||||||
#include "../vmisc/vmath.h"
|
#include "../vmisc/vmath.h"
|
||||||
|
|
||||||
|
namespace
|
||||||
|
{
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
void AppendToContour(QVector<QPointF> &contour, QPointF point)
|
||||||
|
{
|
||||||
|
if (not contour.isEmpty())
|
||||||
|
{
|
||||||
|
if (not VFuzzyComparePoints(contour.last(), point))
|
||||||
|
{
|
||||||
|
contour.append(point);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
contour.append(point);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
VContour::VContour()
|
VContour::VContour()
|
||||||
:d(new VContourData())
|
:d(new VContourData())
|
||||||
|
@ -309,22 +328,6 @@ QPainterPath VContour::ContourPath() const
|
||||||
return path;
|
return path;
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
|
||||||
void VContour::AppendToContour(QVector<QPointF> &contour, QPointF point) const
|
|
||||||
{
|
|
||||||
if (not contour.isEmpty())
|
|
||||||
{
|
|
||||||
if (not VFuzzyComparePoints(contour.last(), point))
|
|
||||||
{
|
|
||||||
contour.append(point);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
contour.append(point);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void VContour::AppendWhole(QVector<QPointF> &contour, const VLayoutPiece &detail, int detJ) const
|
void VContour::AppendWhole(QVector<QPointF> &contour, const VLayoutPiece &detail, int detJ) const
|
||||||
{
|
{
|
||||||
|
|
|
@ -96,7 +96,6 @@ public:
|
||||||
private:
|
private:
|
||||||
QSharedDataPointer<VContourData> d;
|
QSharedDataPointer<VContourData> d;
|
||||||
|
|
||||||
void AppendToContour(QVector<QPointF> &contour, QPointF point) const;
|
|
||||||
void AppendWhole(QVector<QPointF> &contour, const VLayoutPiece &detail, int detJ) const;
|
void AppendWhole(QVector<QPointF> &contour, const VLayoutPiece &detail, int detJ) const;
|
||||||
void InsertDetail(QVector<QPointF> &contour, const VLayoutPiece &detail, int detJ) const;
|
void InsertDetail(QVector<QPointF> &contour, const VLayoutPiece &detail, int detJ) const;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue
Block a user