From 17c8b2c8130ad95c36c4cc92cbc6982f9a42a4da Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 8 Nov 2016 13:51:22 +0100 Subject: [PATCH] performance improvements + use const-reference as argument to avoid tmp. copy + use prefix incremation operator instead of postfix increment operator --- src/Mod/Measure/App/Measurement.cpp | 2 +- src/Mod/Measure/App/Measurement.h | 2 +- src/Mod/TechDraw/App/DrawProjectSplit.cpp | 6 +++--- src/Mod/TechDraw/App/DrawViewPart.cpp | 4 ++-- src/Mod/TechDraw/App/GeometryObject.cpp | 2 +- src/Mod/TechDraw/App/GeometryObject.h | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Mod/Measure/App/Measurement.cpp b/src/Mod/Measure/App/Measurement.cpp index 061dc2931..44bb0435d 100644 --- a/src/Mod/Measure/App/Measurement.cpp +++ b/src/Mod/Measure/App/Measurement.cpp @@ -86,7 +86,7 @@ bool Measurement::has3DReferences() } //add a 3D reference (obj+sub) to end of list -int Measurement::addReference3D(App::DocumentObject *obj, const std::string subName) +int Measurement::addReference3D(App::DocumentObject *obj, const std::string& subName) { return addReference3D(obj,subName.c_str()); } diff --git a/src/Mod/Measure/App/Measurement.h b/src/Mod/Measure/App/Measurement.h index 9da4e8efb..25b1c4190 100644 --- a/src/Mod/Measure/App/Measurement.h +++ b/src/Mod/Measure/App/Measurement.h @@ -58,7 +58,7 @@ public: bool has3DReferences(); /// Add a reference - int addReference3D(App::DocumentObject* obj, const std::string subName); + int addReference3D(App::DocumentObject* obj, const std::string& subName); int addReference3D(App::DocumentObject* obj, const char *subName); MeasureType getType(); diff --git a/src/Mod/TechDraw/App/DrawProjectSplit.cpp b/src/Mod/TechDraw/App/DrawProjectSplit.cpp index c5b54e90a..1a3954ca5 100644 --- a/src/Mod/TechDraw/App/DrawProjectSplit.cpp +++ b/src/Mod/TechDraw/App/DrawProjectSplit.cpp @@ -167,7 +167,7 @@ std::vector DrawProjectSplit::getEdges(TechDrawGeometry::GeometryOb std::vector splits; std::vector::iterator itOuter = origEdges.begin(); int iOuter = 0; - for (; itOuter != origEdges.end(); itOuter++, iOuter++) { + for (; itOuter != origEdges.end(); ++itOuter, iOuter++) { TopoDS_Vertex v1 = TopExp::FirstVertex((*itOuter)); TopoDS_Vertex v2 = TopExp::LastVertex((*itOuter)); Bnd_Box sOuter; @@ -183,7 +183,7 @@ std::vector DrawProjectSplit::getEdges(TechDrawGeometry::GeometryOb } int iInner = 0; std::vector::iterator itInner = faceEdges.begin(); - for (; itInner != faceEdges.end(); itInner++,iInner++) { + for (; itInner != faceEdges.end(); ++itInner,iInner++) { if (iInner == iOuter) { continue; } @@ -373,7 +373,7 @@ std::vector DrawProjectSplit::split1Edge(TopoDS_Edge e, std::vector auto parms2 = parms.begin() + 1; std::vector::iterator psecond = parms2; std::vector::iterator pstop = parms.end(); - for (; psecond != pstop; pfirst++,psecond++) { + for (; psecond != pstop; ++pfirst,++psecond) { try { BRepBuilderAPI_MakeEdge mkEdge(c, *pfirst, *psecond); if (mkEdge.IsDone()) { diff --git a/src/Mod/TechDraw/App/DrawViewPart.cpp b/src/Mod/TechDraw/App/DrawViewPart.cpp index 7dbee7049..a0c40796d 100644 --- a/src/Mod/TechDraw/App/DrawViewPart.cpp +++ b/src/Mod/TechDraw/App/DrawViewPart.cpp @@ -292,7 +292,7 @@ void DrawViewPart::extractFaces() std::vector splits; std::vector::iterator itOuter = origEdges.begin(); int iOuter = 0; - for (; itOuter != origEdges.end(); itOuter++, iOuter++) { + for (; itOuter != origEdges.end(); ++itOuter, iOuter++) { TopoDS_Vertex v1 = TopExp::FirstVertex((*itOuter)); TopoDS_Vertex v2 = TopExp::LastVertex((*itOuter)); Bnd_Box sOuter; @@ -308,7 +308,7 @@ void DrawViewPart::extractFaces() } int iInner = 0; std::vector::iterator itInner = faceEdges.begin(); - for (; itInner != faceEdges.end(); itInner++,iInner++) { + for (; itInner != faceEdges.end(); ++itInner,iInner++) { if (iInner == iOuter) { continue; } diff --git a/src/Mod/TechDraw/App/GeometryObject.cpp b/src/Mod/TechDraw/App/GeometryObject.cpp index 879c8c893..9c9d1f993 100644 --- a/src/Mod/TechDraw/App/GeometryObject.cpp +++ b/src/Mod/TechDraw/App/GeometryObject.cpp @@ -76,7 +76,7 @@ struct EdgePoints { TopoDS_Edge edge; }; -GeometryObject::GeometryObject(std::string parent) : +GeometryObject::GeometryObject(const string& parent) : Scale(1.f), m_parentName(parent), m_isoCount(0) diff --git a/src/Mod/TechDraw/App/GeometryObject.h b/src/Mod/TechDraw/App/GeometryObject.h index 59b2cf1f7..258522883 100644 --- a/src/Mod/TechDraw/App/GeometryObject.h +++ b/src/Mod/TechDraw/App/GeometryObject.h @@ -61,7 +61,7 @@ class TechDrawExport GeometryObject { public: /// Constructor - GeometryObject(std::string parent); + GeometryObject(const std::string& parent); virtual ~GeometryObject(); void clear();