From 2d4c5a4cfb3ce631ded45525e6770418d05c5dbe Mon Sep 17 00:00:00 2001 From: berniev Date: Fri, 5 Aug 2022 16:06:37 +1000 Subject: [PATCH] Mod: use emplace_back --- src/Mod/Fem/App/FemPostFilter.cpp | 4 +- src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderFemMesh.cpp | 12 +- .../Fem/Gui/ViewProviderFemPostFunction.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp | 28 ++--- src/Mod/Image/Gui/ViewProviderImagePlane.cpp | 2 +- .../Inspection/Gui/ViewProviderInspection.cpp | 2 +- src/Mod/Measure/App/Measurement.cpp | 2 +- src/Mod/Mesh/Gui/MeshEditor.cpp | 4 +- src/Mod/Mesh/Gui/ViewProvider.cpp | 10 +- src/Mod/Mesh/Gui/ViewProviderCurvature.cpp | 12 +- src/Mod/Mesh/Gui/ViewProviderDefects.cpp | 2 +- src/Mod/Mesh/Gui/ViewProviderTransform.cpp | 2 +- .../Gui/ViewProviderTransformDemolding.cpp | 2 +- src/Mod/MeshPart/Gui/Tessellation.cpp | 2 +- src/Mod/Part/App/ExtrusionHelper.cpp | 2 +- src/Mod/Part/App/FT2FC.cpp | 8 +- src/Mod/Part/App/TopoShape.cpp | 48 ++++---- src/Mod/Part/Gui/Command.cpp | 2 +- src/Mod/Part/Gui/DlgExtrusion.cpp | 2 +- src/Mod/Part/Gui/DlgPrimitives.cpp | 2 +- src/Mod/Part/Gui/DlgRevolution.cpp | 2 +- src/Mod/Part/Gui/SectionCutting.cpp | 4 +- src/Mod/Part/Gui/TaskAttacher.cpp | 4 +- src/Mod/Part/Gui/ViewProvider2DObject.cpp | 6 +- src/Mod/Part/Gui/ViewProviderBox.cpp | 8 +- .../Part/Gui/ViewProviderCircleParametric.cpp | 4 +- .../Part/Gui/ViewProviderConeParametric.cpp | 8 +- src/Mod/Part/Gui/ViewProviderCurveNet.cpp | 2 +- .../Gui/ViewProviderCylinderParametric.cpp | 8 +- .../Gui/ViewProviderEllipseParametric.cpp | 4 +- src/Mod/Part/Gui/ViewProviderExt.cpp | 8 +- .../Part/Gui/ViewProviderHelixParametric.cpp | 8 +- .../Part/Gui/ViewProviderLineParametric.cpp | 4 +- .../Part/Gui/ViewProviderPlaneParametric.cpp | 8 +- .../Part/Gui/ViewProviderPointParametric.cpp | 8 +- src/Mod/Part/Gui/ViewProviderPrism.cpp | 16 +-- src/Mod/Part/Gui/ViewProviderReference.cpp | 8 +- .../Part/Gui/ViewProviderRegularPolygon.cpp | 4 +- src/Mod/Part/Gui/ViewProviderRuledSurface.cpp | 8 +- .../Part/Gui/ViewProviderSphereParametric.cpp | 16 +-- .../Part/Gui/ViewProviderTorusParametric.cpp | 8 +- src/Mod/PartDesign/App/FeatureDressUp.cpp | 10 +- src/Mod/PartDesign/App/ShapeBinder.cpp | 4 +- .../PartDesign/Gui/TaskDatumParameters.cpp | 2 +- src/Mod/PartDesign/Gui/TaskPipeParameters.cpp | 5 +- src/Mod/Path/App/Voronoi.cpp | 2 +- src/Mod/Path/Gui/ViewProviderPath.cpp | 2 +- src/Mod/Points/App/PointsAlgos.cpp | 104 ++++++++---------- src/Mod/Points/Gui/ViewProvider.cpp | 8 +- src/Mod/Robot/Gui/ViewProviderRobotObject.cpp | 6 +- src/Mod/Robot/Gui/ViewProviderTrajectory.cpp | 2 +- src/Mod/Sketcher/Gui/CommandConstraints.cpp | 20 ++-- .../Sketcher/Gui/TaskSketcherConstraints.cpp | 2 +- .../Gui/ViewProviderSpreadsheet.cpp | 2 +- src/Mod/Surface/Gui/TaskFilling.cpp | 26 ++--- src/Mod/Surface/Gui/TaskFillingEdge.cpp | 2 +- src/Mod/Surface/Gui/TaskFillingVertex.cpp | 2 +- src/Mod/Surface/Gui/TaskGeomFillSurface.cpp | 2 +- src/Mod/TechDraw/App/DrawViewSymbol.cpp | 2 +- src/Mod/TechDraw/Gui/CommandCreateDims.cpp | 4 +- src/Mod/TechDraw/Gui/TaskProjGroup.cpp | 2 +- src/Mod/TechDraw/Gui/ViewProviderPage.cpp | 2 +- .../TechDraw/Gui/ViewProviderProjGroup.cpp | 8 +- .../Gui/ViewProviderProjGroupItem.cpp | 2 +- 65 files changed, 254 insertions(+), 265 deletions(-) diff --git a/src/Mod/Fem/App/FemPostFilter.cpp b/src/Mod/Fem/App/FemPostFilter.cpp index ba251ddeda..6699316ff6 100644 --- a/src/Mod/Fem/App/FemPostFilter.cpp +++ b/src/Mod/Fem/App/FemPostFilter.cpp @@ -469,7 +469,7 @@ DocumentObjectExecReturn* FemPostScalarClipFilter::execute(void) { for (int i = 0; i < pd->GetNumberOfArrays(); ++i) { if (pd->GetArray(i)->GetNumberOfComponents() == 1) - array.push_back(pd->GetArrayName(i)); + array.emplace_back(pd->GetArrayName(i)); } App::Enumeration empty; @@ -572,7 +572,7 @@ DocumentObjectExecReturn* FemPostWarpVectorFilter::execute(void) { for (int i = 0; i < pd->GetNumberOfArrays(); ++i) { if (pd->GetArray(i)->GetNumberOfComponents() == 3) - array.push_back(pd->GetArrayName(i)); + array.emplace_back(pd->GetArrayName(i)); } App::Enumeration empty; diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp index 3ab281a1be..d9011417d9 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp @@ -126,7 +126,7 @@ std::vector ViewProviderFemConstraint::getDisplayModes(void) const { // add modes std::vector StrList; - StrList.push_back("Base"); + StrList.emplace_back("Base"); return StrList; } diff --git a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp index ff096bafac..36d5329c63 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp @@ -334,12 +334,12 @@ void ViewProviderFemMesh::setDisplayMode(const char* ModeName) std::vector ViewProviderFemMesh::getDisplayModes(void) const { std::vector StrList; - StrList.push_back(Private::dm_face_wire); - StrList.push_back(Private::dm_face_wire_node); - StrList.push_back(Private::dm_face); - StrList.push_back(Private::dm_wire); - StrList.push_back(Private::dm_node); - StrList.push_back(Private::dm_wire_node); + StrList.emplace_back(Private::dm_face_wire); + StrList.emplace_back(Private::dm_face_wire_node); + StrList.emplace_back(Private::dm_face); + StrList.emplace_back(Private::dm_wire); + StrList.emplace_back(Private::dm_node); + StrList.emplace_back(Private::dm_wire_node); return StrList; } diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp index 8ee4d8ac12..63f55be8aa 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp @@ -289,7 +289,7 @@ SoTransformManip* ViewProviderFemPostFunction::setupManipulator() { std::vector ViewProviderFemPostFunction::getDisplayModes(void) const { std::vector StrList; - StrList.push_back("Default"); + StrList.emplace_back("Default"); return StrList; } diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp index 8a265ef388..dea437804c 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp @@ -285,13 +285,13 @@ void ViewProviderFemPostObject::setDisplayMode(const char* ModeName) std::vector ViewProviderFemPostObject::getDisplayModes(void) const { std::vector StrList; - StrList.push_back("Outline"); - StrList.push_back("Nodes"); + StrList.emplace_back("Outline"); + StrList.emplace_back("Nodes"); //StrList.push_back("Nodes (surface only)"); somehow this filter does not work - StrList.push_back("Surface"); - StrList.push_back("Surface with Edges"); - StrList.push_back("Wireframe"); - StrList.push_back("Wireframe (surface only)"); + StrList.emplace_back("Surface"); + StrList.emplace_back("Surface with Edges"); + StrList.emplace_back("Wireframe"); + StrList.emplace_back("Wireframe (surface only)"); return StrList; } @@ -316,7 +316,7 @@ void ViewProviderFemPostObject::updateProperties() { val = Field.getValueAsString(); std::vector colorArrays; - colorArrays.push_back("None"); + colorArrays.emplace_back("None"); vtkPointData* point = poly->GetPointData(); for (int i = 0; i < point->GetNumberOfArrays(); ++i) { @@ -327,7 +327,7 @@ void ViewProviderFemPostObject::updateProperties() { vtkCellData* cell = poly->GetCellData(); for (int i = 0; i < cell->GetNumberOfArrays(); ++i) - colorArrays.push_back(cell->GetArrayName(i)); + colorArrays.emplace_back(cell->GetArrayName(i)); App::Enumeration empty; Field.setValue(empty); @@ -346,22 +346,22 @@ void ViewProviderFemPostObject::updateProperties() { colorArrays.clear(); if (Field.getValue() == 0) - colorArrays.push_back("Not a vector"); + colorArrays.emplace_back("Not a vector"); else { int array = Field.getValue() - 1; //0 is none vtkPolyData* pd = m_currentAlgorithm->GetOutput(); vtkDataArray* data = pd->GetPointData()->GetArray(array); if (data->GetNumberOfComponents() == 1) - colorArrays.push_back("Not a vector"); + colorArrays.emplace_back("Not a vector"); else { - colorArrays.push_back("Magnitude"); + colorArrays.emplace_back("Magnitude"); if (data->GetNumberOfComponents() >= 2) { - colorArrays.push_back("X"); - colorArrays.push_back("Y"); + colorArrays.emplace_back("X"); + colorArrays.emplace_back("Y"); } if (data->GetNumberOfComponents() >= 3) - colorArrays.push_back("Z"); + colorArrays.emplace_back("Z"); } } diff --git a/src/Mod/Image/Gui/ViewProviderImagePlane.cpp b/src/Mod/Image/Gui/ViewProviderImagePlane.cpp index eac136d5fd..18faac2da9 100644 --- a/src/Mod/Image/Gui/ViewProviderImagePlane.cpp +++ b/src/Mod/Image/Gui/ViewProviderImagePlane.cpp @@ -111,7 +111,7 @@ void ViewProviderImagePlane::setDisplayMode(const char* ModeName) std::vector ViewProviderImagePlane::getDisplayModes() const { std::vector StrList; - StrList.push_back("ImagePlane"); + StrList.emplace_back("ImagePlane"); return StrList; } diff --git a/src/Mod/Inspection/Gui/ViewProviderInspection.cpp b/src/Mod/Inspection/Gui/ViewProviderInspection.cpp index 761b7e6da7..0226421d85 100644 --- a/src/Mod/Inspection/Gui/ViewProviderInspection.cpp +++ b/src/Mod/Inspection/Gui/ViewProviderInspection.cpp @@ -380,7 +380,7 @@ std::vector ViewProviderInspection::getDisplayModes(void) const { // add modes std::vector StrList; - StrList.push_back("Visual Inspection"); + StrList.emplace_back("Visual Inspection"); return StrList; } diff --git a/src/Mod/Measure/App/Measurement.cpp b/src/Mod/Measure/App/Measurement.cpp index b58f97ae96..0ce5b06f91 100644 --- a/src/Mod/Measure/App/Measurement.cpp +++ b/src/Mod/Measure/App/Measurement.cpp @@ -90,7 +90,7 @@ int Measurement::addReference3D(App::DocumentObject *obj, const char* subName) std::vector subElements = References3D.getSubValues(); objects.push_back(obj); - subElements.push_back(subName); + subElements.emplace_back(subName); References3D.setValues(objects, subElements); diff --git a/src/Mod/Mesh/Gui/MeshEditor.cpp b/src/Mod/Mesh/Gui/MeshEditor.cpp index 69ebebb297..47507f1232 100644 --- a/src/Mod/Mesh/Gui/MeshEditor.cpp +++ b/src/Mod/Mesh/Gui/MeshEditor.cpp @@ -153,8 +153,8 @@ const char* ViewProviderFace::getDefaultDisplayMode() const std::vector ViewProviderFace::getDisplayModes() const { std::vector modes; - modes.push_back("Marker"); - modes.push_back("Face"); + modes.emplace_back("Marker"); + modes.emplace_back("Face"); return modes; } diff --git a/src/Mod/Mesh/Gui/ViewProvider.cpp b/src/Mod/Mesh/Gui/ViewProvider.cpp index 29807d479e..4d719115e5 100644 --- a/src/Mod/Mesh/Gui/ViewProvider.cpp +++ b/src/Mod/Mesh/Gui/ViewProvider.cpp @@ -180,7 +180,7 @@ ViewProviderExport::~ViewProviderExport() std::vector ViewProviderExport::getDisplayModes() const { std::vector mode; - mode.push_back(""); + mode.emplace_back(""); return mode; } @@ -630,10 +630,10 @@ std::vector ViewProviderMesh::getDisplayModes() const std::vector StrList; // add your own modes - StrList.push_back("Shaded"); - StrList.push_back("Wireframe"); - StrList.push_back("Flat Lines"); - StrList.push_back("Points"); + StrList.emplace_back("Shaded"); + StrList.emplace_back("Wireframe"); + StrList.emplace_back("Flat Lines"); + StrList.emplace_back("Points"); return StrList; } diff --git a/src/Mod/Mesh/Gui/ViewProviderCurvature.cpp b/src/Mod/Mesh/Gui/ViewProviderCurvature.cpp index 64cb4d5ea7..0038050f33 100644 --- a/src/Mod/Mesh/Gui/ViewProviderCurvature.cpp +++ b/src/Mod/Mesh/Gui/ViewProviderCurvature.cpp @@ -417,11 +417,11 @@ std::vector ViewProviderMeshCurvature::getDisplayModes() const std::vector StrList = inherited::getDisplayModes(); // add modes - StrList.push_back("Absolute curvature"); - StrList.push_back("Mean curvature"); - StrList.push_back("Gaussian curvature"); - StrList.push_back("Maximum curvature"); - StrList.push_back("Minimum curvature"); + StrList.emplace_back("Absolute curvature"); + StrList.emplace_back("Mean curvature"); + StrList.emplace_back("Gaussian curvature"); + StrList.emplace_back("Maximum curvature"); + StrList.emplace_back("Minimum curvature"); return StrList; } @@ -477,7 +477,7 @@ public: QStringList lines = s.split(QLatin1String("\n")); std::vector text; for (QStringList::Iterator it = lines.begin(); it != lines.end(); ++it) - text.push_back((const char*)it->toLatin1()); + text.emplace_back((const char*)it->toLatin1()); anno->LabelText.setValues(text); std::stringstream str; str << "Curvature info (" << group->Group.getSize() << ")"; diff --git a/src/Mod/Mesh/Gui/ViewProviderDefects.cpp b/src/Mod/Mesh/Gui/ViewProviderDefects.cpp index d086511e70..f5d2418deb 100644 --- a/src/Mod/Mesh/Gui/ViewProviderDefects.cpp +++ b/src/Mod/Mesh/Gui/ViewProviderDefects.cpp @@ -651,7 +651,7 @@ void ViewProviderMeshSelfIntersections::showDefects(const std::vector > lines; diff --git a/src/Mod/Mesh/Gui/ViewProviderTransform.cpp b/src/Mod/Mesh/Gui/ViewProviderTransform.cpp index eb40fab8ea..92871cdadf 100644 --- a/src/Mod/Mesh/Gui/ViewProviderTransform.cpp +++ b/src/Mod/Mesh/Gui/ViewProviderTransform.cpp @@ -109,7 +109,7 @@ const char* ViewProviderMeshTransform::getDefaultDisplayMode() const std::vector ViewProviderMeshTransform::getDisplayModes() const { std::vector StrList = ViewProviderMesh::getDisplayModes(); - StrList.push_back("Transform"); + StrList.emplace_back("Transform"); return StrList; } diff --git a/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.cpp b/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.cpp index bba5b7bde0..3befe614e9 100644 --- a/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.cpp +++ b/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.cpp @@ -220,6 +220,6 @@ const char* ViewProviderMeshTransformDemolding::getDefaultDisplayMode() const std::vector ViewProviderMeshTransformDemolding::getDisplayModes() const { std::vector StrList = ViewProviderMesh::getDisplayModes(); - StrList.push_back("Demold"); + StrList.emplace_back("Demold"); return StrList; } diff --git a/src/Mod/MeshPart/Gui/Tessellation.cpp b/src/Mod/MeshPart/Gui/Tessellation.cpp index 72d13ef06b..8b8d8d6cf2 100644 --- a/src/Mod/MeshPart/Gui/Tessellation.cpp +++ b/src/Mod/MeshPart/Gui/Tessellation.cpp @@ -370,7 +370,7 @@ std::vector Tessellation::getUniqueColors(const std::vector unique; for (const auto& it : col_set) - unique.push_back(App::Color(it)); + unique.emplace_back(it); return unique; } diff --git a/src/Mod/Part/App/ExtrusionHelper.cpp b/src/Mod/Part/App/ExtrusionHelper.cpp index d8987fd60b..27b6866bc1 100644 --- a/src/Mod/Part/App/ExtrusionHelper.cpp +++ b/src/Mod/Part/App/ExtrusionHelper.cpp @@ -69,7 +69,7 @@ void ExtrusionHelper::makeDraft(const TopoDS_Shape& shape, TopExp_Explorer ex; size_t i = 0; for (ex.Init(shape, TopAbs_WIRE); ex.More(); ex.Next(), ++i) { - wiresections.push_back(std::vector()); + wiresections.emplace_back(); wiresections[i].push_back(TopoDS::Wire(ex.Current())); } return i; diff --git a/src/Mod/Part/App/FT2FC.cpp b/src/Mod/Part/App/FT2FC.cpp index 3853b93056..b58d5085ef 100644 --- a/src/Mod/Part/App/FT2FC.cpp +++ b/src/Mod/Part/App/FT2FC.cpp @@ -224,7 +224,7 @@ static int move_cb(const FT_Vector* pt, void* p) { } dc->LastVert = *pt; if (dc->polyPoints.empty()) { - dc->polyPoints.push_back(Base::Vector3d(pt->x, pt->y, 0.0)); + dc->polyPoints.emplace_back(pt->x, pt->y, 0.0); } return 0; @@ -240,7 +240,7 @@ static int line_cb(const FT_Vector* pt, void* p) { TopoDS_Edge edge = BRepBuilderAPI_MakeEdge(lseg , dc->surf); dc->Edges.push_back(edge); dc->LastVert = *pt; - dc->polyPoints.push_back(Base::Vector3d(pt->x, pt->y, 0.0)); + dc->polyPoints.emplace_back(pt->x, pt->y, 0.0); } return 0; } @@ -268,7 +268,7 @@ static int quad_cb(const FT_Vector* pt0, const FT_Vector* pt1, void* p) { TopoDS_Edge edge = BRepBuilderAPI_MakeEdge(spline , dc->surf); dc->Edges.push_back(edge); dc->LastVert = *pt1; - dc->polyPoints.push_back(Base::Vector3d(pt1->x, pt1->y, 0.0)); + dc->polyPoints.emplace_back(pt1->x, pt1->y, 0.0); return 0; } @@ -297,7 +297,7 @@ static int cubic_cb(const FT_Vector* pt0, const FT_Vector* pt1, const FT_Vector* TopoDS_Edge edge = BRepBuilderAPI_MakeEdge(spline , dc->surf); dc->Edges.push_back(edge); dc->LastVert = *pt2; - dc->polyPoints.push_back(Base::Vector3d(pt2->x, pt2->y, 0.0)); + dc->polyPoints.emplace_back(pt2->x, pt2->y, 0.0); return 0; } diff --git a/src/Mod/Part/App/TopoShape.cpp b/src/Mod/Part/App/TopoShape.cpp index 553032962c..1a3c173664 100644 --- a/src/Mod/Part/App/TopoShape.cpp +++ b/src/Mod/Part/App/TopoShape.cpp @@ -1378,33 +1378,33 @@ namespace Part { std::vector buildShapeEnumVector() { std::vector names; - names.push_back("Compound"); //TopAbs_COMPOUND - names.push_back("Compound Solid"); //TopAbs_COMPSOLID - names.push_back("Solid"); //TopAbs_SOLID - names.push_back("Shell"); //TopAbs_SHELL - names.push_back("Face"); //TopAbs_FACE - names.push_back("Wire"); //TopAbs_WIRE - names.push_back("Edge"); //TopAbs_EDGE - names.push_back("Vertex"); //TopAbs_VERTEX - names.push_back("Shape"); //TopAbs_SHAPE + names.emplace_back("Compound"); //TopAbs_COMPOUND + names.emplace_back("Compound Solid"); //TopAbs_COMPSOLID + names.emplace_back("Solid"); //TopAbs_SOLID + names.emplace_back("Shell"); //TopAbs_SHELL + names.emplace_back("Face"); //TopAbs_FACE + names.emplace_back("Wire"); //TopAbs_WIRE + names.emplace_back("Edge"); //TopAbs_EDGE + names.emplace_back("Vertex"); //TopAbs_VERTEX + names.emplace_back("Shape"); //TopAbs_SHAPE return names; } std::vector buildBOPCheckResultVector() { std::vector results; - results.push_back("BOPAlgo CheckUnknown"); //BOPAlgo_CheckUnknown - results.push_back("BOPAlgo BadType"); //BOPAlgo_BadType - results.push_back("BOPAlgo SelfIntersect"); //BOPAlgo_SelfIntersect - results.push_back("BOPAlgo TooSmallEdge"); //BOPAlgo_TooSmallEdge - results.push_back("BOPAlgo NonRecoverableFace"); //BOPAlgo_NonRecoverableFace - results.push_back("BOPAlgo IncompatibilityOfVertex"); //BOPAlgo_IncompatibilityOfVertex - results.push_back("BOPAlgo IncompatibilityOfEdge"); //BOPAlgo_IncompatibilityOfEdge - results.push_back("BOPAlgo IncompatibilityOfFace"); //BOPAlgo_IncompatibilityOfFace - results.push_back("BOPAlgo OperationAborted"); //BOPAlgo_OperationAborted - results.push_back("BOPAlgo GeomAbs_C0"); //BOPAlgo_GeomAbs_C0 - results.push_back("BOPAlgo_InvalidCurveOnSurface"); //BOPAlgo_InvalidCurveOnSurface - results.push_back("BOPAlgo NotValid"); //BOPAlgo_NotValid + results.emplace_back("BOPAlgo CheckUnknown"); //BOPAlgo_CheckUnknown + results.emplace_back("BOPAlgo BadType"); //BOPAlgo_BadType + results.emplace_back("BOPAlgo SelfIntersect"); //BOPAlgo_SelfIntersect + results.emplace_back("BOPAlgo TooSmallEdge"); //BOPAlgo_TooSmallEdge + results.emplace_back("BOPAlgo NonRecoverableFace"); //BOPAlgo_NonRecoverableFace + results.emplace_back("BOPAlgo IncompatibilityOfVertex"); //BOPAlgo_IncompatibilityOfVertex + results.emplace_back("BOPAlgo IncompatibilityOfEdge"); //BOPAlgo_IncompatibilityOfEdge + results.emplace_back("BOPAlgo IncompatibilityOfFace"); //BOPAlgo_IncompatibilityOfFace + results.emplace_back("BOPAlgo OperationAborted"); //BOPAlgo_OperationAborted + results.emplace_back("BOPAlgo GeomAbs_C0"); //BOPAlgo_GeomAbs_C0 + results.emplace_back("BOPAlgo_InvalidCurveOnSurface"); //BOPAlgo_InvalidCurveOnSurface + results.emplace_back("BOPAlgo NotValid"); //BOPAlgo_NotValid return results; } } @@ -4010,7 +4010,7 @@ TopoShape &TopoShape::makeWires(const TopoShape &shape, const char *op, bool fix TopTools_IndexedMapOfShape anIndices; TopExp::MapShapes(shape.getShape(), TopAbs_EDGE, anIndices); for(int i=1;i<=anIndices.Extent();++i) - edge_list.push_back(anIndices.FindKey(i)); + edge_list.emplace_back(anIndices.FindKey(i)); edges.reserve(edge_list.size()); wires.reserve(edge_list.size()); @@ -4053,7 +4053,7 @@ TopoShape &TopoShape::makeWires(const TopoShape &shape, const char *op, bool fix // Assuming FixReorder() just reorder and don't change the underlying // edges, we get the wire and do a name mapping now, as the following // two operations (FixConnected and FixClosed) may change the edges. - wires.push_back(aFix.Wire()); + wires.emplace_back(aFix.Wire()); aFix.FixConnected(); aFix.FixClosed(); @@ -4099,7 +4099,7 @@ TopoShape &TopoShape::makeFace(const TopoShape &shape, const char *op, const cha std::vector shapes; if(shape.shapeType() == TopAbs_COMPOUND) { for(TopoDS_Iterator it(shape.getShape());it.More();it.Next()) - shapes.push_back(it.Value()); + shapes.emplace_back(it.Value()); } else shapes.push_back(shape); return makeFace(shapes,op,maker); diff --git a/src/Mod/Part/Gui/Command.cpp b/src/Mod/Part/Gui/Command.cpp index 69d7ff4389..423780bcdb 100644 --- a/src/Mod/Part/Gui/Command.cpp +++ b/src/Mod/Part/Gui/Command.cpp @@ -1901,7 +1901,7 @@ void CmdPartThickness::activated(int iMsg) topoShape = Part::Feature::getTopoShape(obj); if (!topoShape.isNull()) { for (std::vector::const_iterator it = subnames.begin(); it != subnames.end(); ++it) { - subShapes.push_back(topoShape.getSubShape(subnames[0].c_str())); + subShapes.emplace_back(topoShape.getSubShape(subnames[0].c_str())); } for (std::vector::iterator it = subShapes.begin(); it != subShapes.end(); ++it) { TopoDS_Shape dsShape = (*it).getShape(); diff --git a/src/Mod/Part/Gui/DlgExtrusion.cpp b/src/Mod/Part/Gui/DlgExtrusion.cpp index 47742d74a6..47cd8c1130 100644 --- a/src/Mod/Part/Gui/DlgExtrusion.cpp +++ b/src/Mod/Part/Gui/DlgExtrusion.cpp @@ -553,7 +553,7 @@ void DlgExtrusion::getAxisLink(App::PropertyLinkSub& lnk) const return; } else if (parts.size() == 2) { std::vector subs; - subs.push_back(std::string(parts[1].toLatin1().constData())); + subs.emplace_back(parts[1].toLatin1().constData()); lnk.setValue(obj,subs); } } diff --git a/src/Mod/Part/Gui/DlgPrimitives.cpp b/src/Mod/Part/Gui/DlgPrimitives.cpp index c4f97c400f..113cf3b2e4 100644 --- a/src/Mod/Part/Gui/DlgPrimitives.cpp +++ b/src/Mod/Part/Gui/DlgPrimitives.cpp @@ -167,7 +167,7 @@ public: bool pickedPoint(const SoPickedPoint * point) { SbVec3f pnt = point->getPoint(); - points.push_back(gp_Pnt(pnt[0],pnt[1],pnt[2])); + points.emplace_back(pnt[0],pnt[1],pnt[2]); return points.size() == 3; } QString command(App::Document* doc) const diff --git a/src/Mod/Part/Gui/DlgRevolution.cpp b/src/Mod/Part/Gui/DlgRevolution.cpp index c53a3768ec..c1638a6818 100644 --- a/src/Mod/Part/Gui/DlgRevolution.cpp +++ b/src/Mod/Part/Gui/DlgRevolution.cpp @@ -181,7 +181,7 @@ void DlgRevolution::getAxisLink(App::PropertyLinkSub &lnk) const return; } else if (parts.size() == 2) { std::vector subs; - subs.push_back(std::string(parts[1].toLatin1().constData())); + subs.emplace_back(parts[1].toLatin1().constData()); lnk.setValue(obj,subs); } } diff --git a/src/Mod/Part/Gui/SectionCutting.cpp b/src/Mod/Part/Gui/SectionCutting.cpp index e4945ac206..67dd0ed3b2 100644 --- a/src/Mod/Part/Gui/SectionCutting.cpp +++ b/src/Mod/Part/Gui/SectionCutting.cpp @@ -112,7 +112,7 @@ SectionCut::SectionCut(QWidget* parent) // now store those that are currently visible for (auto it = ObjectsList.begin(); it != ObjectsList.end(); ++it) { if ((*it)->Visibility.getValue()) - ObjectsListVisible.push_back(*it); + ObjectsListVisible.emplace_back(*it); } // lambda function to set color and transparency @@ -1532,7 +1532,7 @@ void SectionCut::onRefreshCutPBclicked() // now store those that are currently visible for (auto it = ObjectsList.begin(); it != ObjectsList.end(); ++it) { if ((*it)->Visibility.getValue()) { - ObjectsListVisible.push_back(*it); + ObjectsListVisible.emplace_back(*it); } } // reset defaults diff --git a/src/Mod/Part/Gui/TaskAttacher.cpp b/src/Mod/Part/Gui/TaskAttacher.cpp index 38b9335c41..37898e15e7 100644 --- a/src/Mod/Part/Gui/TaskAttacher.cpp +++ b/src/Mod/Part/Gui/TaskAttacher.cpp @@ -106,7 +106,7 @@ void TaskAttacher::makeRefStrings(std::vector& refstrings, std::vector< refnames[r] = refs[r]->getNameInDocument(); } else { refstrings.push_back(QObject::tr("No reference selected")); - refnames.push_back(""); + refnames.emplace_back(""); } } } @@ -661,7 +661,7 @@ void TaskAttacher::onRefName(const QString& text, unsigned idx) refnames[idx] = subElement.c_str(); } else { refs.push_back(obj); - refnames.push_back(subElement.c_str()); + refnames.emplace_back(subElement.c_str()); } pcAttach->Support.setValues(refs, refnames); updateListOfModes(); diff --git a/src/Mod/Part/Gui/ViewProvider2DObject.cpp b/src/Mod/Part/Gui/ViewProvider2DObject.cpp index ebdbdc7ba2..6981743ccc 100644 --- a/src/Mod/Part/Gui/ViewProvider2DObject.cpp +++ b/src/Mod/Part/Gui/ViewProvider2DObject.cpp @@ -364,10 +364,10 @@ std::vector ViewProvider2DObject::getDisplayModes(void) const std::vector StrList = ViewProviderGeometryObject::getDisplayModes(); // add your own modes - StrList.push_back("Flat Lines"); + StrList.emplace_back("Flat Lines"); //StrList.push_back("Shaded"); - StrList.push_back("Wireframe"); - StrList.push_back("Points"); + StrList.emplace_back("Wireframe"); + StrList.emplace_back("Points"); return StrList; } diff --git a/src/Mod/Part/Gui/ViewProviderBox.cpp b/src/Mod/Part/Gui/ViewProviderBox.cpp index 2fdd6a510c..4760e2572a 100644 --- a/src/Mod/Part/Gui/ViewProviderBox.cpp +++ b/src/Mod/Part/Gui/ViewProviderBox.cpp @@ -54,10 +54,10 @@ std::vector ViewProviderBox::getDisplayModes(void) const std::vector StrList; // add your own modes - StrList.push_back("Flat Lines"); - StrList.push_back("Shaded"); - StrList.push_back("Wireframe"); - StrList.push_back("Points"); + StrList.emplace_back("Flat Lines"); + StrList.emplace_back("Shaded"); + StrList.emplace_back("Wireframe"); + StrList.emplace_back("Points"); return StrList; } diff --git a/src/Mod/Part/Gui/ViewProviderCircleParametric.cpp b/src/Mod/Part/Gui/ViewProviderCircleParametric.cpp index e73ebd09a5..fe1f508d3b 100644 --- a/src/Mod/Part/Gui/ViewProviderCircleParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderCircleParametric.cpp @@ -54,8 +54,8 @@ std::vector ViewProviderCircleParametric::getDisplayModes(void) con std::vector StrList; // add your own modes - StrList.push_back("Wireframe"); - StrList.push_back("Points"); + StrList.emplace_back("Wireframe"); + StrList.emplace_back("Points"); return StrList; } diff --git a/src/Mod/Part/Gui/ViewProviderConeParametric.cpp b/src/Mod/Part/Gui/ViewProviderConeParametric.cpp index 56a25d0979..2b109e038d 100644 --- a/src/Mod/Part/Gui/ViewProviderConeParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderConeParametric.cpp @@ -54,10 +54,10 @@ std::vector ViewProviderConeParametric::getDisplayModes(void) const std::vector StrList; // add your own modes - StrList.push_back("Flat Lines"); - StrList.push_back("Shaded"); - StrList.push_back("Wireframe"); - StrList.push_back("Points"); + StrList.emplace_back("Flat Lines"); + StrList.emplace_back("Shaded"); + StrList.emplace_back("Wireframe"); + StrList.emplace_back("Points"); return StrList; } diff --git a/src/Mod/Part/Gui/ViewProviderCurveNet.cpp b/src/Mod/Part/Gui/ViewProviderCurveNet.cpp index 5944e8ab31..f60817f40b 100644 --- a/src/Mod/Part/Gui/ViewProviderCurveNet.cpp +++ b/src/Mod/Part/Gui/ViewProviderCurveNet.cpp @@ -135,7 +135,7 @@ std::vector ViewProviderCurveNet::getDisplayModes(void) const std::vector StrList; // add your own modes - StrList.push_back("Edge"); + StrList.emplace_back("Edge"); return StrList; } diff --git a/src/Mod/Part/Gui/ViewProviderCylinderParametric.cpp b/src/Mod/Part/Gui/ViewProviderCylinderParametric.cpp index c391df8676..541c14b1ae 100644 --- a/src/Mod/Part/Gui/ViewProviderCylinderParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderCylinderParametric.cpp @@ -54,10 +54,10 @@ std::vector ViewProviderCylinderParametric::getDisplayModes(void) c std::vector StrList; // add your own modes - StrList.push_back("Flat Lines"); - StrList.push_back("Shaded"); - StrList.push_back("Wireframe"); - StrList.push_back("Points"); + StrList.emplace_back("Flat Lines"); + StrList.emplace_back("Shaded"); + StrList.emplace_back("Wireframe"); + StrList.emplace_back("Points"); return StrList; } diff --git a/src/Mod/Part/Gui/ViewProviderEllipseParametric.cpp b/src/Mod/Part/Gui/ViewProviderEllipseParametric.cpp index 5cdfe4059b..ac37c51ca9 100644 --- a/src/Mod/Part/Gui/ViewProviderEllipseParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderEllipseParametric.cpp @@ -54,8 +54,8 @@ std::vector ViewProviderEllipseParametric::getDisplayModes(void) co std::vector StrList; // add your own modes - StrList.push_back("Wireframe"); - StrList.push_back("Points"); + StrList.emplace_back("Wireframe"); + StrList.emplace_back("Points"); return StrList; } diff --git a/src/Mod/Part/Gui/ViewProviderExt.cpp b/src/Mod/Part/Gui/ViewProviderExt.cpp index 24211c496e..b7125fa6a4 100644 --- a/src/Mod/Part/Gui/ViewProviderExt.cpp +++ b/src/Mod/Part/Gui/ViewProviderExt.cpp @@ -475,10 +475,10 @@ std::vector ViewProviderPartExt::getDisplayModes(void) const std::vector StrList = ViewProviderGeometryObject::getDisplayModes(); // add your own modes - StrList.push_back("Flat Lines"); - StrList.push_back("Shaded"); - StrList.push_back("Wireframe"); - StrList.push_back("Points"); + StrList.emplace_back("Flat Lines"); + StrList.emplace_back("Shaded"); + StrList.emplace_back("Wireframe"); + StrList.emplace_back("Points"); return StrList; } diff --git a/src/Mod/Part/Gui/ViewProviderHelixParametric.cpp b/src/Mod/Part/Gui/ViewProviderHelixParametric.cpp index ccfd1e0503..6f5b9553e1 100644 --- a/src/Mod/Part/Gui/ViewProviderHelixParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderHelixParametric.cpp @@ -50,8 +50,8 @@ std::vector ViewProviderHelixParametric::getDisplayModes(void) cons { // add your own modes std::vector StrList; - StrList.push_back("Wireframe"); - StrList.push_back("Points"); + StrList.emplace_back("Wireframe"); + StrList.emplace_back("Points"); return StrList; } @@ -81,8 +81,8 @@ std::vector ViewProviderSpiralParametric::getDisplayModes(void) con { // add your own modes std::vector StrList; - StrList.push_back("Wireframe"); - StrList.push_back("Points"); + StrList.emplace_back("Wireframe"); + StrList.emplace_back("Points"); return StrList; } diff --git a/src/Mod/Part/Gui/ViewProviderLineParametric.cpp b/src/Mod/Part/Gui/ViewProviderLineParametric.cpp index efce336f04..e1c7f2d1ee 100644 --- a/src/Mod/Part/Gui/ViewProviderLineParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderLineParametric.cpp @@ -54,8 +54,8 @@ std::vector ViewProviderLineParametric::getDisplayModes(void) const std::vector StrList; // add your own modes - StrList.push_back("Wireframe"); - StrList.push_back("Points"); + StrList.emplace_back("Wireframe"); + StrList.emplace_back("Points"); return StrList; } diff --git a/src/Mod/Part/Gui/ViewProviderPlaneParametric.cpp b/src/Mod/Part/Gui/ViewProviderPlaneParametric.cpp index a333802a2a..4264afea4f 100644 --- a/src/Mod/Part/Gui/ViewProviderPlaneParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderPlaneParametric.cpp @@ -51,10 +51,10 @@ std::vector ViewProviderPlaneParametric::getDisplayModes(void) cons std::vector StrList; // add your own modes - StrList.push_back("Flat Lines"); - StrList.push_back("Shaded"); - StrList.push_back("Wireframe"); - StrList.push_back("Points"); + StrList.emplace_back("Flat Lines"); + StrList.emplace_back("Shaded"); + StrList.emplace_back("Wireframe"); + StrList.emplace_back("Points"); return StrList; } diff --git a/src/Mod/Part/Gui/ViewProviderPointParametric.cpp b/src/Mod/Part/Gui/ViewProviderPointParametric.cpp index 587d787997..4abd1edc54 100644 --- a/src/Mod/Part/Gui/ViewProviderPointParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderPointParametric.cpp @@ -54,10 +54,10 @@ std::vector ViewProviderPointParametric::getDisplayModes(void) cons std::vector StrList; // add your own modes - StrList.push_back("Flat Lines"); - StrList.push_back("Shaded"); - StrList.push_back("Wireframe"); - StrList.push_back("Points"); + StrList.emplace_back("Flat Lines"); + StrList.emplace_back("Shaded"); + StrList.emplace_back("Wireframe"); + StrList.emplace_back("Points"); return StrList; } diff --git a/src/Mod/Part/Gui/ViewProviderPrism.cpp b/src/Mod/Part/Gui/ViewProviderPrism.cpp index 94815310a9..1c05339f71 100644 --- a/src/Mod/Part/Gui/ViewProviderPrism.cpp +++ b/src/Mod/Part/Gui/ViewProviderPrism.cpp @@ -52,10 +52,10 @@ std::vector ViewProviderPrism::getDisplayModes(void) const std::vector StrList; // add your own modes - StrList.push_back("Flat Lines"); - StrList.push_back("Shaded"); - StrList.push_back("Wireframe"); - StrList.push_back("Points"); + StrList.emplace_back("Flat Lines"); + StrList.emplace_back("Shaded"); + StrList.emplace_back("Wireframe"); + StrList.emplace_back("Points"); return StrList; } @@ -84,10 +84,10 @@ std::vector ViewProviderWedge::getDisplayModes(void) const std::vector StrList; // add your own modes - StrList.push_back("Flat Lines"); - StrList.push_back("Shaded"); - StrList.push_back("Wireframe"); - StrList.push_back("Points"); + StrList.emplace_back("Flat Lines"); + StrList.emplace_back("Shaded"); + StrList.emplace_back("Wireframe"); + StrList.emplace_back("Points"); return StrList; } diff --git a/src/Mod/Part/Gui/ViewProviderReference.cpp b/src/Mod/Part/Gui/ViewProviderReference.cpp index 2d42bf4d89..41f21ebac9 100644 --- a/src/Mod/Part/Gui/ViewProviderReference.cpp +++ b/src/Mod/Part/Gui/ViewProviderReference.cpp @@ -232,10 +232,10 @@ std::vector ViewProviderPartReference::getDisplayModes(void) const std::vector StrList = ViewProviderGeometryObject::getDisplayModes(); // add your own modes - StrList.push_back("Flat Lines"); - StrList.push_back("Shaded"); - StrList.push_back("Wireframe"); - StrList.push_back("Points"); + StrList.emplace_back("Flat Lines"); + StrList.emplace_back("Shaded"); + StrList.emplace_back("Wireframe"); + StrList.emplace_back("Points"); return StrList; } diff --git a/src/Mod/Part/Gui/ViewProviderRegularPolygon.cpp b/src/Mod/Part/Gui/ViewProviderRegularPolygon.cpp index b2550cf8f2..fa6ccf5e75 100644 --- a/src/Mod/Part/Gui/ViewProviderRegularPolygon.cpp +++ b/src/Mod/Part/Gui/ViewProviderRegularPolygon.cpp @@ -54,8 +54,8 @@ std::vector ViewProviderRegularPolygon::getDisplayModes(void) const std::vector StrList; // add your own modes - StrList.push_back("Wireframe"); - StrList.push_back("Points"); + StrList.emplace_back("Wireframe"); + StrList.emplace_back("Points"); return StrList; } diff --git a/src/Mod/Part/Gui/ViewProviderRuledSurface.cpp b/src/Mod/Part/Gui/ViewProviderRuledSurface.cpp index 39d96d6729..a100496461 100644 --- a/src/Mod/Part/Gui/ViewProviderRuledSurface.cpp +++ b/src/Mod/Part/Gui/ViewProviderRuledSurface.cpp @@ -102,10 +102,10 @@ std::vector ViewProviderRuledSurface::getDisplayModes(void) const std::vector StrList; // add your own modes - StrList.push_back("Flat Lines"); - StrList.push_back("Shaded"); - StrList.push_back("Wireframe"); - StrList.push_back("Points"); + StrList.emplace_back("Flat Lines"); + StrList.emplace_back("Shaded"); + StrList.emplace_back("Wireframe"); + StrList.emplace_back("Points"); return StrList; } diff --git a/src/Mod/Part/Gui/ViewProviderSphereParametric.cpp b/src/Mod/Part/Gui/ViewProviderSphereParametric.cpp index 4ef6614cf9..8a2c731a35 100644 --- a/src/Mod/Part/Gui/ViewProviderSphereParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderSphereParametric.cpp @@ -47,10 +47,10 @@ std::vector ViewProviderSphereParametric::getDisplayModes(void) con std::vector StrList; // add your own modes - StrList.push_back("Flat Lines"); - StrList.push_back("Shaded"); - StrList.push_back("Wireframe"); - StrList.push_back("Points"); + StrList.emplace_back("Flat Lines"); + StrList.emplace_back("Shaded"); + StrList.emplace_back("Wireframe"); + StrList.emplace_back("Points"); return StrList; } @@ -73,10 +73,10 @@ std::vector ViewProviderEllipsoid::getDisplayModes(void) const std::vector StrList; // add your own modes - StrList.push_back("Flat Lines"); - StrList.push_back("Shaded"); - StrList.push_back("Wireframe"); - StrList.push_back("Points"); + StrList.emplace_back("Flat Lines"); + StrList.emplace_back("Shaded"); + StrList.emplace_back("Wireframe"); + StrList.emplace_back("Points"); return StrList; } diff --git a/src/Mod/Part/Gui/ViewProviderTorusParametric.cpp b/src/Mod/Part/Gui/ViewProviderTorusParametric.cpp index 4b91fba49e..7c2ed137ba 100644 --- a/src/Mod/Part/Gui/ViewProviderTorusParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderTorusParametric.cpp @@ -54,10 +54,10 @@ std::vector ViewProviderTorusParametric::getDisplayModes(void) cons std::vector StrList; // add your own modes - StrList.push_back("Flat Lines"); - StrList.push_back("Shaded"); - StrList.push_back("Wireframe"); - StrList.push_back("Points"); + StrList.emplace_back("Flat Lines"); + StrList.emplace_back("Shaded"); + StrList.emplace_back("Wireframe"); + StrList.emplace_back("Points"); return StrList; } diff --git a/src/Mod/PartDesign/App/FeatureDressUp.cpp b/src/Mod/PartDesign/App/FeatureDressUp.cpp index 3827a9eec1..b36f07d6fa 100644 --- a/src/Mod/PartDesign/App/FeatureDressUp.cpp +++ b/src/Mod/PartDesign/App/FeatureDressUp.cpp @@ -159,7 +159,7 @@ void DressUp::getContinuousEdges(Part::TopoShape TopShape, std::vector< std::str } - FaceNames.push_back(aSubName.c_str()); + FaceNames.emplace_back(aSubName.c_str()); SubNames.erase(SubNames.begin()+i); } // empty name or any other sub-element @@ -231,7 +231,7 @@ void DressUp::getAddSubShape(Part::TopoShape &addShape, Part::TopoShape &subShap baseShape.move(base->getLocation().Inverted()); if (base->getAddSubType() == Additive) { if(!baseShape.isNull() && baseShape.hasSubShape(TopAbs_SOLID)) - shapes.push_back(shape.cut(baseShape.getShape())); + shapes.emplace_back(shape.cut(baseShape.getShape())); else shapes.push_back(shape); } else { @@ -241,15 +241,15 @@ void DressUp::getAddSubShape(Part::TopoShape &addShape, Part::TopoShape &subShap // push an empty compound to indicate null additive shape shapes.emplace_back(comp); if(!baseShape.isNull() && baseShape.hasSubShape(TopAbs_SOLID)) - shapes.push_back(baseShape.cut(shape.getShape())); + shapes.emplace_back(baseShape.cut(shape.getShape())); else shapes.push_back(shape); } } else { baseShape = getBaseTopoShape(); baseShape.move(getLocation().Inverted()); - shapes.push_back(shape.cut(baseShape.getShape())); - shapes.push_back(baseShape.cut(shape.getShape())); + shapes.emplace_back(shape.cut(baseShape.getShape())); + shapes.emplace_back(baseShape.cut(shape.getShape())); } // Make a compound to contain both additive and subtractive shape, diff --git a/src/Mod/PartDesign/App/ShapeBinder.cpp b/src/Mod/PartDesign/App/ShapeBinder.cpp index bfc3416c19..1d56728e6b 100644 --- a/src/Mod/PartDesign/App/ShapeBinder.cpp +++ b/src/Mod/PartDesign/App/ShapeBinder.cpp @@ -444,7 +444,7 @@ void SubShapeBinder::setupCopyOnChange() { hasCopyOnChange = App::LinkBaseExtension::setupCopyOnChange(this, linked, BindCopyOnChange.getValue() == 1 ? ©OnChangeConns : nullptr, hasCopyOnChange); if (hasCopyOnChange) { - copyOnChangeConns.push_back(linked->signalChanged.connect( + copyOnChangeConns.emplace_back(linked->signalChanged.connect( [this](const App::DocumentObject&, const App::Property& prop) { if (!prop.testStatus(App::Property::Output) && !prop.testStatus(App::Property::PropOutput)) @@ -907,7 +907,7 @@ void SubShapeBinder::setLinks(std::mapgetFullName()); if (v.second.empty()) { - v.second.push_back(""); + v.second.emplace_back(""); continue; } diff --git a/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp b/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp index 0b3eaf284c..3060a2d44e 100644 --- a/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp @@ -144,7 +144,7 @@ bool TaskDlgDatumParameters::accept() { if (copy) { copyObjects.push_back(copy); copies.push_back(copyObjects.back()); - copySubValues.push_back(std::string()); + copySubValues.emplace_back(); } } else { diff --git a/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp b/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp index 9096e892b9..ba68286861 100644 --- a/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp @@ -486,11 +486,10 @@ bool TaskPipeParameters::accept() for (auto &subSet : pcPipe->Sections.getSubListValues()) { if (!pcActiveBody->hasObject(subSet.first) && !pcActiveBody->getOrigin()->hasObject(subSet.first)) { - subSets.push_back( - std::make_pair( + subSets.emplace_back( PartDesignGui::TaskFeaturePick::makeCopy( subSet.first, "", dlg.radioIndependent->isChecked()), - subSet.second)); + subSet.second); copies.push_back(subSets.back().first); } else { diff --git a/src/Mod/Path/App/Voronoi.cpp b/src/Mod/Path/App/Voronoi.cpp index 7dcb1fd5c2..4cdb8a5d0f 100644 --- a/src/Mod/Path/App/Voronoi.cpp +++ b/src/Mod/Path/App/Voronoi.cpp @@ -153,7 +153,7 @@ void Voronoi::addSegment(const Voronoi::segment_type &s) { pil.y(low(s).y() * vd->getScale()); pih.x(high(s).x() * vd->getScale()); pih.y(high(s).y() * vd->getScale()); - vd->segments.push_back(segment_type(pil, pih)); + vd->segments.emplace_back(pil, pih); } long Voronoi::numPoints() const { diff --git a/src/Mod/Path/Gui/ViewProviderPath.cpp b/src/Mod/Path/Gui/ViewProviderPath.cpp index 570d0106b9..d616a1cde6 100644 --- a/src/Mod/Path/Gui/ViewProviderPath.cpp +++ b/src/Mod/Path/Gui/ViewProviderPath.cpp @@ -294,7 +294,7 @@ void ViewProviderPath::setDisplayMode(const char* ModeName) std::vector ViewProviderPath::getDisplayModes(void) const { std::vector StrList; - StrList.push_back("Waypoints"); + StrList.emplace_back("Waypoints"); return StrList; } diff --git a/src/Mod/Points/App/PointsAlgos.cpp b/src/Mod/Points/App/PointsAlgos.cpp index 79932ee785..20594a9f32 100644 --- a/src/Mod/Points/App/PointsAlgos.cpp +++ b/src/Mod/Points/App/PointsAlgos.cpp @@ -1357,66 +1357,61 @@ void E57Reader::read(const std::string& filename) if ((n.type() == e57::E57_FLOAT) || (n.type() == e57::E57_SCALED_INTEGER)) { if (n.elementName() == "cartesianX") { ptr_xyz[0] = cnt_xyz++; - sdb.push_back( - e57::SourceDestBuffer( + sdb.emplace_back( imfi , n.elementName() , &(xyz[0]) , buf_size , true , true - ) + ); } else if (n.elementName() == "cartesianY") { ptr_xyz[1] = cnt_xyz++; - sdb.push_back( - e57::SourceDestBuffer( + sdb.emplace_back( imfi , n.elementName() , &(xyz[buf_size]) , buf_size , true , true - ) + ); } else if (n.elementName() == "cartesianZ") { ptr_xyz[2] = cnt_xyz++; - sdb.push_back( - e57::SourceDestBuffer( + sdb.emplace_back( imfi , n.elementName() , &(xyz[2 * buf_size]) , buf_size , true , true - ) + ); } else if (n.elementName() == "intensity") { inty = true; - sdb.push_back( - e57::SourceDestBuffer( + sdb.emplace_back( imfi , n.elementName() , &(intensity[0]) , buf_size , true , true - ) + ); } else { - sdb.push_back( - e57::SourceDestBuffer( + sdb.emplace_back( imfi , n.elementName() , &(nil[0]) , buf_size , true , true - ) + ); } @@ -1424,66 +1419,61 @@ void E57Reader::read(const std::string& filename) else if (n.type() == e57::E57_INTEGER) { if (n.elementName() == "colorRed") { ptr_rgb[0] = cnt_rgb++; - sdb.push_back( - e57::SourceDestBuffer( + sdb.emplace_back( imfi , n.elementName() , &(rgb[0]) , buf_size , true , true - ) + ); } else if (n.elementName() == "colorGreen") { ptr_rgb[1] = cnt_rgb++; - sdb.push_back( - e57::SourceDestBuffer( + sdb.emplace_back( imfi , n.elementName() , &(rgb[buf_size]) , buf_size , true , true - ) + ); } else if (n.elementName() == "colorBlue") { ptr_rgb[2] = cnt_rgb++; - sdb.push_back( - e57::SourceDestBuffer( + sdb.emplace_back( imfi , n.elementName() , &(rgb[2 * buf_size]) , buf_size , true , true - ) + ); } else if (n.elementName() == "cartesianInvalidState") { inv_state = true; - sdb.push_back( - e57::SourceDestBuffer( + sdb.emplace_back( imfi , n.elementName() , &(state[0]) , buf_size , true , true - ) + ); } else { - sdb.push_back( - e57::SourceDestBuffer( + sdb.emplace_back( imfi , n.elementName() , &(nil[0]) , buf_size , true , true - ) + ); } } @@ -1619,9 +1609,9 @@ PlyWriter::~PlyWriter() void PlyWriter::write(const std::string& filename) { std::list properties; - properties.push_back("float x"); - properties.push_back("float y"); - properties.push_back("float z"); + properties.emplace_back("float x"); + properties.emplace_back("float y"); + properties.emplace_back("float z"); ConverterPtr convert_float(new ConverterT); ConverterPtr convert_uint(new ConverterT); @@ -1636,19 +1626,19 @@ void PlyWriter::write(const std::string& filename) bool hasNormals = (normals.size() == points.size()); if (hasNormals) { - properties.push_back("float nx"); - properties.push_back("float ny"); - properties.push_back("float nz"); + properties.emplace_back("float nx"); + properties.emplace_back("float ny"); + properties.emplace_back("float nz"); converters.push_back(convert_float); converters.push_back(convert_float); converters.push_back(convert_float); } if (hasColors) { - properties.push_back("uchar red"); - properties.push_back("uchar green"); - properties.push_back("uchar blue"); - properties.push_back("uchar alpha"); + properties.emplace_back("uchar red"); + properties.emplace_back("uchar green"); + properties.emplace_back("uchar blue"); + properties.emplace_back("uchar alpha"); converters.push_back(convert_uint); converters.push_back(convert_uint); converters.push_back(convert_uint); @@ -1656,7 +1646,7 @@ void PlyWriter::write(const std::string& filename) } if (hasIntensity) { - properties.push_back("float intensity"); + properties.emplace_back("float intensity"); converters.push_back(convert_float); } @@ -1778,14 +1768,14 @@ PcdWriter::~PcdWriter() void PcdWriter::write(const std::string& filename) { std::list fields; - fields.push_back("x"); - fields.push_back("y"); - fields.push_back("z"); + fields.emplace_back("x"); + fields.emplace_back("y"); + fields.emplace_back("z"); std::list types; - types.push_back("F"); - types.push_back("F"); - types.push_back("F"); + types.emplace_back("F"); + types.emplace_back("F"); + types.emplace_back("F"); ConverterPtr convert_float(new ConverterT); ConverterPtr convert_uint(new ConverterT); @@ -1800,26 +1790,26 @@ void PcdWriter::write(const std::string& filename) bool hasNormals = (normals.size() == points.size()); if (hasNormals) { - fields.push_back("normal_x"); - fields.push_back("normal_y"); - fields.push_back("normal_z"); - types.push_back("F"); - types.push_back("F"); - types.push_back("F"); + fields.emplace_back("normal_x"); + fields.emplace_back("normal_y"); + fields.emplace_back("normal_z"); + types.emplace_back("F"); + types.emplace_back("F"); + types.emplace_back("F"); converters.push_back(convert_float); converters.push_back(convert_float); converters.push_back(convert_float); } if (hasColors) { - fields.push_back("rgba"); - types.push_back("U"); + fields.emplace_back("rgba"); + types.emplace_back("U"); converters.push_back(convert_uint); } if (hasIntensity) { - fields.push_back("intensity"); - types.push_back("F"); + fields.emplace_back("intensity"); + types.emplace_back("F"); converters.push_back(convert_float); } diff --git a/src/Mod/Points/Gui/ViewProvider.cpp b/src/Mod/Points/Gui/ViewProvider.cpp index 2f816e3f73..61422a3f5c 100644 --- a/src/Mod/Points/Gui/ViewProvider.cpp +++ b/src/Mod/Points/Gui/ViewProvider.cpp @@ -249,16 +249,16 @@ void ViewProviderPoints::setDisplayMode(const char* ModeName) std::vector ViewProviderPoints::getDisplayModes() const { std::vector StrList; - StrList.push_back("Points"); + StrList.emplace_back("Points"); // FIXME: This way all display modes are added even if the points feature // doesn't support it. // For the future a more flexible way is needed to add new display modes // at a later time #if 1 - StrList.push_back("Color"); - StrList.push_back("Shaded"); - StrList.push_back("Intensity"); + StrList.emplace_back("Color"); + StrList.emplace_back("Shaded"); + StrList.emplace_back("Intensity"); #else if (pcObject) { diff --git a/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp b/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp index ee4085339b..bb28ab1d7a 100644 --- a/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp +++ b/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp @@ -149,9 +149,9 @@ void ViewProviderRobotObject::setDisplayMode(const char* ModeName) std::vector ViewProviderRobotObject::getDisplayModes(void) const { std::vector StrList; - StrList.push_back("VRML"); - StrList.push_back("Simple"); - StrList.push_back("Off"); + StrList.emplace_back("VRML"); + StrList.emplace_back("Simple"); + StrList.emplace_back("Off"); return StrList; } diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp b/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp index 65a6877ac7..a90084dcd0 100644 --- a/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp +++ b/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp @@ -133,7 +133,7 @@ void ViewProviderTrajectory::setDisplayMode(const char* ModeName) std::vector ViewProviderTrajectory::getDisplayModes(void) const { std::vector StrList; - StrList.push_back("Waypoints"); + StrList.emplace_back("Waypoints"); return StrList; } diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp index 316d7558f6..d8b692c426 100644 --- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp +++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp @@ -4779,10 +4779,10 @@ void CmdSketcherConstrainRadius::activated(int iMsg) double radius = arc->getRadius(); if(issegmentfixed) { - externalGeoIdRadiusMap.push_back(std::make_pair(GeoId, radius)); + externalGeoIdRadiusMap.emplace_back(GeoId, radius); } else { - geoIdRadiusMap.push_back(std::make_pair(GeoId, radius)); + geoIdRadiusMap.emplace_back(GeoId, radius); } nonpoles = true; @@ -4792,10 +4792,10 @@ void CmdSketcherConstrainRadius::activated(int iMsg) double radius = circle->getRadius(); if(issegmentfixed) { - externalGeoIdRadiusMap.push_back(std::make_pair(GeoId, radius)); + externalGeoIdRadiusMap.emplace_back(GeoId, radius); } else { - geoIdRadiusMap.push_back(std::make_pair(GeoId, radius)); + geoIdRadiusMap.emplace_back(GeoId, radius); } if(isBsplinePole(geom)) @@ -5076,10 +5076,10 @@ void CmdSketcherConstrainDiameter::activated(int iMsg) double radius = arc->getRadius(); if(issegmentfixed) { - externalGeoIdDiameterMap.push_back(std::make_pair(GeoId, 2*radius)); + externalGeoIdDiameterMap.emplace_back(GeoId, 2*radius); } else { - geoIdDiameterMap.push_back(std::make_pair(GeoId, 2*radius)); + geoIdDiameterMap.emplace_back(GeoId, 2*radius); } } else if (geom && geom->getTypeId() == Part::GeomCircle::getClassTypeId()) { @@ -5093,10 +5093,10 @@ void CmdSketcherConstrainDiameter::activated(int iMsg) } if(issegmentfixed) { - externalGeoIdDiameterMap.push_back(std::make_pair(GeoId, 2*radius)); + externalGeoIdDiameterMap.emplace_back(GeoId, 2*radius); } else { - geoIdDiameterMap.push_back(std::make_pair(GeoId, 2*radius)); + geoIdDiameterMap.emplace_back(GeoId, 2*radius); } } } @@ -5366,10 +5366,10 @@ void CmdSketcherConstrainRadiam::activated(int iMsg) continue; if(issegmentfixed) { - externalGeoIdRadiamMap.push_back(std::make_pair(GeoId, radius)); + externalGeoIdRadiamMap.emplace_back(GeoId, radius); } else { - geoIdRadiamMap.push_back(std::make_pair(GeoId, radius)); + geoIdRadiamMap.emplace_back(GeoId, radius); } } diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp index 067e9dd4dc..2fa85f4925 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp @@ -464,7 +464,7 @@ void ConstraintView::contextMenuEvent (QContextMenuEvent* event) for (auto&& it : items) { auto ci = static_cast(it); std::string constraint_name = Sketcher::PropertyConstraintList::getConstraintName(ci->ConstraintNbr); - constraintSubNames.push_back(constraint_name.c_str()); + constraintSubNames.emplace_back(constraint_name.c_str()); } if(!constraintSubNames.empty()) diff --git a/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.cpp b/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.cpp index 5bef28a45a..25abd9bb3d 100644 --- a/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.cpp +++ b/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.cpp @@ -82,7 +82,7 @@ void ViewProviderSheet::setDisplayMode(const char* ModeName) std::vector ViewProviderSheet::getDisplayModes(void) const { std::vector StrList; - StrList.push_back("Spreadsheet"); + StrList.emplace_back("Spreadsheet"); return StrList; } diff --git a/src/Mod/Surface/Gui/TaskFilling.cpp b/src/Mod/Surface/Gui/TaskFilling.cpp index 6c42283de5..56206cf51c 100644 --- a/src/Mod/Surface/Gui/TaskFilling.cpp +++ b/src/Mod/Surface/Gui/TaskFilling.cpp @@ -373,8 +373,8 @@ void FillingPanel::open() // highlight the referenced face std::vector links; - links.push_back(std::make_pair(editedObject->InitialFace.getValue(), - editedObject->InitialFace.getSubValues())); + links.emplace_back(editedObject->InitialFace.getValue(), + editedObject->InitialFace.getSubValues()); this->vp->highlightReferences(ViewProviderFilling::Face, links, true); Gui::Selection().clearSelection(); @@ -420,8 +420,8 @@ void FillingPanel::slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj) // unhighlight the referenced face std::vector links; - links.push_back(std::make_pair(editedObject->InitialFace.getValue(), - editedObject->InitialFace.getSubValues())); + links.emplace_back(editedObject->InitialFace.getValue(), + editedObject->InitialFace.getSubValues()); this->vp->highlightReferences(ViewProviderFilling::Face, links, false); } } @@ -444,8 +444,8 @@ bool FillingPanel::accept() // unhighlight the referenced face std::vector links; - links.push_back(std::make_pair(editedObject->InitialFace.getValue(), - editedObject->InitialFace.getSubValues())); + links.emplace_back(editedObject->InitialFace.getValue(), + editedObject->InitialFace.getSubValues()); this->vp->highlightReferences(ViewProviderFilling::Face, links, false); return true; @@ -458,8 +458,8 @@ bool FillingPanel::reject() // unhighlight the referenced face std::vector links; - links.push_back(std::make_pair(editedObject->InitialFace.getValue(), - editedObject->InitialFace.getSubValues())); + links.emplace_back(editedObject->InitialFace.getValue(), + editedObject->InitialFace.getSubValues()); this->vp->highlightReferences(ViewProviderFilling::Face, links, false); selectionMode = None; @@ -475,8 +475,8 @@ void FillingPanel::on_lineInitFaceName_textChanged(const QString& text) // unhighlight the referenced face std::vector links; - links.push_back(std::make_pair(editedObject->InitialFace.getValue(), - editedObject->InitialFace.getSubValues())); + links.emplace_back(editedObject->InitialFace.getValue(), + editedObject->InitialFace.getSubValues()); this->vp->highlightReferences(ViewProviderFilling::Face, links, false); editedObject->InitialFace.setValue(nullptr); @@ -586,12 +586,12 @@ void FillingPanel::onSelectionChanged(const Gui::SelectionChanges& msg) ui->lineInitFaceName->setText(text); std::vector subList; - subList.push_back(msg.pSubName); + subList.emplace_back(msg.pSubName); editedObject->InitialFace.setValue(sel.getObject(), subList); // highlight the referenced face std::vector links; - links.push_back(std::make_pair(sel.getObject(), subList)); + links.emplace_back(sel.getObject(), subList); this->vp->highlightReferences(ViewProviderFilling::Face, links, true); Gui::Selection().rmvSelectionGate(); @@ -619,7 +619,7 @@ void FillingPanel::onSelectionChanged(const Gui::SelectionChanges& msg) std::size_t count = objects.size(); objects.push_back(sel.getObject()); auto element = editedObject->BoundaryEdges.getSubValues(); - element.push_back(msg.pSubName); + element.emplace_back(msg.pSubName); editedObject->BoundaryEdges.setValues(objects, element); // extend faces and continuities lists if needed diff --git a/src/Mod/Surface/Gui/TaskFillingEdge.cpp b/src/Mod/Surface/Gui/TaskFillingEdge.cpp index d7d82bb87d..0c82d351c4 100644 --- a/src/Mod/Surface/Gui/TaskFillingEdge.cpp +++ b/src/Mod/Surface/Gui/TaskFillingEdge.cpp @@ -397,7 +397,7 @@ void FillingEdgePanel::onSelectionChanged(const Gui::SelectionChanges& msg) std::size_t count = objects.size(); objects.push_back(sel.getObject()); auto element = editedObject->UnboundEdges.getSubValues(); - element.push_back(msg.pSubName); + element.emplace_back(msg.pSubName); editedObject->UnboundEdges.setValues(objects, element); // extend faces and continuities lists if needed diff --git a/src/Mod/Surface/Gui/TaskFillingVertex.cpp b/src/Mod/Surface/Gui/TaskFillingVertex.cpp index ea8ec684f8..e04cc352dc 100644 --- a/src/Mod/Surface/Gui/TaskFillingVertex.cpp +++ b/src/Mod/Surface/Gui/TaskFillingVertex.cpp @@ -272,7 +272,7 @@ void FillingVertexPanel::onSelectionChanged(const Gui::SelectionChanges& msg) auto objects = editedObject->Points.getValues(); objects.push_back(sel.getObject()); auto element = editedObject->Points.getSubValues(); - element.push_back(msg.pSubName); + element.emplace_back(msg.pSubName); editedObject->Points.setValues(objects, element); this->vp->highlightReferences(ViewProviderFilling::Vertex, editedObject->Points.getSubListValues(), true); diff --git a/src/Mod/Surface/Gui/TaskGeomFillSurface.cpp b/src/Mod/Surface/Gui/TaskGeomFillSurface.cpp index d4d4b85d65..de67a14a43 100644 --- a/src/Mod/Surface/Gui/TaskGeomFillSurface.cpp +++ b/src/Mod/Surface/Gui/TaskGeomFillSurface.cpp @@ -437,7 +437,7 @@ void GeomFillSurface::onSelectionChanged(const Gui::SelectionChanges& msg) auto objects = editedObject->BoundaryList.getValues(); objects.push_back(sel.getObject()); auto element = editedObject->BoundaryList.getSubValues(); - element.push_back(msg.pSubName); + element.emplace_back(msg.pSubName); editedObject->BoundaryList.setValues(objects, element); auto booleans = editedObject->ReversedList.getValues(); booleans.push_back(false); diff --git a/src/Mod/TechDraw/App/DrawViewSymbol.cpp b/src/Mod/TechDraw/App/DrawViewSymbol.cpp index 8680b81129..4e5a1d3cb2 100644 --- a/src/Mod/TechDraw/App/DrawViewSymbol.cpp +++ b/src/Mod/TechDraw/App/DrawViewSymbol.cpp @@ -131,7 +131,7 @@ std::vector DrawViewSymbol::getEditableFields() while (!queryResult.next().isNull()) { QDomElement tspan = model.toDomNode(queryResult.current().toNodeModelIndex()).toElement(); QString editableValue = tspan.firstChild().nodeValue(); - editables.push_back(std::string(editableValue.toUtf8().constData())); + editables.emplace_back(editableValue.toUtf8().constData()); } } return editables; diff --git a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp index df0089f2a8..c38f4b1e4f 100644 --- a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp +++ b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp @@ -1347,8 +1347,8 @@ void CmdTechDrawLandmarkDimension::activated(int iMsg) std::vector refs2d; std::vector subs; - subs.push_back("Vertex1"); - subs.push_back("Vertex1"); + subs.emplace_back("Vertex1"); + subs.emplace_back("Vertex1"); TechDraw::DrawPage* page = dvp->findParentPage(); std::string parentName = dvp->getNameInDocument(); std::string PageName = page->getNameInDocument(); diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.cpp b/src/Mod/TechDraw/Gui/TaskProjGroup.cpp index 1d08a11652..c2c3522368 100644 --- a/src/Mod/TechDraw/Gui/TaskProjGroup.cpp +++ b/src/Mod/TechDraw/Gui/TaskProjGroup.cpp @@ -160,7 +160,7 @@ void TaskProjGroup::saveGroupState() for( const auto it : multiView->Views.getValues() ) { auto view( dynamic_cast(it) ); if (view) { - m_saveViewNames.push_back(view->Type.getValueAsString()); + m_saveViewNames.emplace_back(view->Type.getValueAsString()); } } } diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp index 6c7b52abcb..6ebd43d3a3 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp @@ -125,7 +125,7 @@ std::vector ViewProviderPage::getDisplayModes(void) const { // get the modes of the father std::vector StrList = ViewProviderDocumentObject::getDisplayModes(); - StrList.push_back("Drawing"); + StrList.emplace_back("Drawing"); return StrList; } diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp index e1d87f7c79..2b7e89ee24 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp @@ -63,7 +63,7 @@ std::vector ViewProviderProjGroup::getDisplayModes(void) const { // get the modes of the father std::vector StrList = ViewProviderDrawingView::getDisplayModes(); - StrList.push_back("Drawing"); + StrList.emplace_back("Drawing"); return StrList; } @@ -126,21 +126,21 @@ bool ViewProviderProjGroup::onDelete(const std::vector &) // add names to a list if (!viewSection.empty()) { for (auto SecIterator : viewSection) { - ViewList.push_back(SecIterator->Label.getValue()); + ViewList.emplace_back(SecIterator->Label.getValue()); } } // get its detail views auto viewDetail = Item->getDetailRefs(); if (!viewDetail.empty()) { for (auto DetIterator : viewDetail) { - ViewList.push_back(DetIterator->Label.getValue()); + ViewList.emplace_back(DetIterator->Label.getValue()); } } // get its leader lines auto viewLead = Item->getLeaders(); if (!viewLead.empty()) { for (auto LeadIterator : viewLead) { - ViewList.push_back(LeadIterator->Label.getValue()); + ViewList.emplace_back(LeadIterator->Label.getValue()); } } } diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp b/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp index 6464009977..76f69e13ff 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp @@ -55,7 +55,7 @@ std::vector ViewProviderProjGroupItem::getDisplayModes(void) const { // get the modes of the father std::vector StrList = ViewProviderViewPart::getDisplayModes(); - StrList.push_back("Drawing"); + StrList.emplace_back("Drawing"); return StrList; }