From 0768ae99cfd6036601f66658f6e0f923de9af6f2 Mon Sep 17 00:00:00 2001 From: WandererFan Date: Wed, 21 Jun 2017 11:32:06 -0400 Subject: [PATCH] Coverity fixes CID 156629 - obsolete CID 156624 - obsolete CID 163225 - won't fix CID 163226 CID 163227 CID 163228 CID 163229 CID 163235 --- src/Mod/TechDraw/Gui/QGIFace.cpp | 8 ++++---- src/Mod/TechDraw/Gui/QGIFace.h | 10 +++++----- src/Mod/TechDraw/Gui/QGIHighlight.cpp | 1 + 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/Mod/TechDraw/Gui/QGIFace.cpp b/src/Mod/TechDraw/Gui/QGIFace.cpp index 332e330711..64242f418d 100644 --- a/src/Mod/TechDraw/Gui/QGIFace.cpp +++ b/src/Mod/TechDraw/Gui/QGIFace.cpp @@ -228,12 +228,12 @@ void QGIFace::clearLineSets(void) clearFillItems(); } -void QGIFace::addLineSet(LineSet ls) +void QGIFace::addLineSet(LineSet& ls) { m_lineSets.push_back(ls); } -void QGIFace::lineSetToFillItems(LineSet ls) +void QGIFace::lineSetToFillItems(LineSet& ls) { m_segCount = 0; QPen pen = setGeomPen(); @@ -285,7 +285,7 @@ QGraphicsPathItem* QGIFace::lineFromPoints(Base::Vector3d start, Base::Vector3d return fillItem; } -QGraphicsPathItem* QGIFace::geomToLine(TechDrawGeometry::BaseGeom* base, LineSet ls) +QGraphicsPathItem* QGIFace::geomToLine(TechDrawGeometry::BaseGeom* base, LineSet& ls) { QGraphicsPathItem* fillItem = new QGraphicsPathItem(this); Base::Vector3d start(base->getStartPoint().x, @@ -302,7 +302,7 @@ QGraphicsPathItem* QGIFace::geomToLine(TechDrawGeometry::BaseGeom* base, LineSe //! make a fragment (length = remain) of a dashed line, with pattern starting at +offset -QGraphicsPathItem* QGIFace::geomToStubbyLine(TechDrawGeometry::BaseGeom* base, double remain, LineSet ls) +QGraphicsPathItem* QGIFace::geomToStubbyLine(TechDrawGeometry::BaseGeom* base, double remain, LineSet& ls) { QGraphicsPathItem* fillItem = new QGraphicsPathItem(this); Base::Vector3d start(base->getStartPoint().x, diff --git a/src/Mod/TechDraw/Gui/QGIFace.h b/src/Mod/TechDraw/Gui/QGIFace.h index af83794c44..b3218c8b9a 100644 --- a/src/Mod/TechDraw/Gui/QGIFace.h +++ b/src/Mod/TechDraw/Gui/QGIFace.h @@ -106,13 +106,13 @@ public: void setLineWeight(double w); void clearLineSets(void); - void addLineSet(LineSet ls); + void addLineSet(LineSet& ls); void clearFillItems(void); - void lineSetToFillItems(LineSet ls); - QGraphicsPathItem* geomToLine(TechDrawGeometry::BaseGeom* base, LineSet ls); - QGraphicsPathItem* geomToOffsetLine(TechDrawGeometry::BaseGeom* base, double offset, LineSet ls); - QGraphicsPathItem* geomToStubbyLine(TechDrawGeometry::BaseGeom* base, double offset, LineSet ls); + void lineSetToFillItems(LineSet& ls); + QGraphicsPathItem* geomToLine(TechDrawGeometry::BaseGeom* base,LineSet& ls); +// QGraphicsPathItem* geomToOffsetLine(TechDrawGeometry::BaseGeom* base, double offset, const LineSet& ls); + QGraphicsPathItem* geomToStubbyLine(TechDrawGeometry::BaseGeom* base, double offset, LineSet& ls); QGraphicsPathItem* lineFromPoints(Base::Vector3d start, Base::Vector3d end, DashSpec ds); //bitmap texture fill parms method diff --git a/src/Mod/TechDraw/Gui/QGIHighlight.cpp b/src/Mod/TechDraw/Gui/QGIHighlight.cpp index a132376d25..ed5dd7128f 100644 --- a/src/Mod/TechDraw/Gui/QGIHighlight.cpp +++ b/src/Mod/TechDraw/Gui/QGIHighlight.cpp @@ -41,6 +41,7 @@ using namespace TechDrawGui; QGIHighlight::QGIHighlight() { + m_refSize = 0.0; m_circle = new QGraphicsEllipseItem(); addToGroup(m_circle); m_rect = new QGCustomRect();