diff --git a/src/Mod/Mesh/App/Core/Elements.h b/src/Mod/Mesh/App/Core/Elements.h index 0f141c25d0..a2726966b5 100644 --- a/src/Mod/Mesh/App/Core/Elements.h +++ b/src/Mod/Mesh/App/Core/Elements.h @@ -965,7 +965,7 @@ inline void MeshFacet::GetEdge (unsigned short usSide, MeshHelpEdge &rclEdge) co inline std::pair MeshFacet::GetEdge (unsigned short usSide) const { - return std::pair(_aulPoints[usSide], _aulPoints[(usSide+1)%3]); + return {_aulPoints[usSide], _aulPoints[(usSide+1)%3]}; } inline void MeshFacet::Transpose (PointIndex ulOrig, PointIndex ulNew) diff --git a/src/Mod/Mesh/App/Core/Evaluation.cpp b/src/Mod/Mesh/App/Core/Evaluation.cpp index 9898e76e3d..ecc6298180 100644 --- a/src/Mod/Mesh/App/Core/Evaluation.cpp +++ b/src/Mod/Mesh/App/Core/Evaluation.cpp @@ -186,7 +186,7 @@ std::vector MeshEvalOrientation::GetIndices() const FacetIndex ulStartFacet, ulVisited; if (_rclMesh.CountFacets() == 0) - return std::vector(); + return {}; // reset VISIT flags MeshAlgorithm cAlg(_rclMesh); diff --git a/src/Mod/Mesh/App/Core/Segmentation.cpp b/src/Mod/Mesh/App/Core/Segmentation.cpp index cd1c888d69..3bd2c471e3 100644 --- a/src/Mod/Mesh/App/Core/Segmentation.cpp +++ b/src/Mod/Mesh/App/Core/Segmentation.cpp @@ -58,7 +58,7 @@ MeshSegment MeshSurfaceSegment::FindSegment(FacetIndex index) const return segment; } - return MeshSegment(); + return {}; } // -------------------------------------------------------- diff --git a/src/Mod/Mesh/App/EdgePyImp.cpp b/src/Mod/Mesh/App/EdgePyImp.cpp index 0e642169b5..ad2b02e70b 100644 --- a/src/Mod/Mesh/App/EdgePyImp.cpp +++ b/src/Mod/Mesh/App/EdgePyImp.cpp @@ -135,7 +135,7 @@ PyObject* EdgePy::unbound(PyObject *args) Py::Boolean EdgePy::getBound() const { - return Py::Boolean(getEdgePtr()->isBound()); + return {getEdgePtr()->isBound()}; } Py::List EdgePy::getPoints() const diff --git a/src/Mod/Mesh/App/FacetPyImp.cpp b/src/Mod/Mesh/App/FacetPyImp.cpp index 46e4906a42..f710801eb8 100644 --- a/src/Mod/Mesh/App/FacetPyImp.cpp +++ b/src/Mod/Mesh/App/FacetPyImp.cpp @@ -136,7 +136,7 @@ Py::Long FacetPy::getIndex() const Py::Boolean FacetPy::getBound() const { - return Py::Boolean(getFacetPtr()->isBound()); + return {getFacetPtr()->isBound()}; } Py::Object FacetPy::getNormal() const diff --git a/src/Mod/Mesh/App/Mesh.h b/src/Mod/Mesh/App/Mesh.h index 88e8d6972a..ccbc5c5398 100644 --- a/src/Mod/Mesh/App/Mesh.h +++ b/src/Mod/Mesh/App/Mesh.h @@ -397,14 +397,14 @@ public: /** @name Iterator */ //@{ const_point_iterator points_begin() const - { return const_point_iterator(this, 0); } + { return {this, 0}; } const_point_iterator points_end() const - { return const_point_iterator(this, countPoints()); } + { return {this, countPoints()}; } const_facet_iterator facets_begin() const - { return const_facet_iterator(this, 0); } + { return {this, 0}; } const_facet_iterator facets_end() const - { return const_facet_iterator(this, countFacets()); } + { return {this, countFacets()}; } using const_segment_iterator = std::vector::const_iterator; const_segment_iterator segments_begin() const diff --git a/src/Mod/Mesh/App/MeshPointPyImp.cpp b/src/Mod/Mesh/App/MeshPointPyImp.cpp index b86fc8c3de..4c0d2d2b88 100644 --- a/src/Mod/Mesh/App/MeshPointPyImp.cpp +++ b/src/Mod/Mesh/App/MeshPointPyImp.cpp @@ -93,7 +93,7 @@ Py::Long MeshPointPy::getIndex() const Py::Boolean MeshPointPy::getBound() const { - return Py::Boolean(getMeshPointPtr()->Index != UINT_MAX); + return {getMeshPointPtr()->Index != UINT_MAX}; } Py::Object MeshPointPy::getNormal() const diff --git a/src/Mod/Mesh/App/Segment.h b/src/Mod/Mesh/App/Segment.h index f11acf8bbe..16658bb41b 100644 --- a/src/Mod/Mesh/App/Segment.h +++ b/src/Mod/Mesh/App/Segment.h @@ -95,9 +95,9 @@ public: }; const_facet_iterator facets_begin() const - { return const_facet_iterator(this, _indices.begin()); } + { return {this, _indices.begin()}; } const_facet_iterator facets_end() const - { return const_facet_iterator(this, _indices.end()); } + { return {this, _indices.end()}; } }; } // namespace Mesh diff --git a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp index 662d5c619f..b9718d1626 100644 --- a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp +++ b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp @@ -1362,7 +1362,7 @@ void DockEvaluateMeshImp::closeEvent(QCloseEvent*) */ QSize DockEvaluateMeshImp::sizeHint () const { - return QSize(371, 579); + return {371, 579}; } #include "moc_DlgEvaluateMeshImp.cpp" diff --git a/src/Mod/Mesh/Gui/PropertyEditorMesh.cpp b/src/Mod/Mesh/Gui/PropertyEditorMesh.cpp index 6fe39547b6..2e54997a6f 100644 --- a/src/Mod/Mesh/Gui/PropertyEditorMesh.cpp +++ b/src/Mod/Mesh/Gui/PropertyEditorMesh.cpp @@ -73,7 +73,7 @@ QVariant PropertyMeshKernelItem::value(const App::Property*) const } QString str = QObject::tr("[Points: %1, Edges: %2, Faces: %3]").arg(ctP).arg(ctE).arg(ctF); - return QVariant(str); + return {str}; } QVariant PropertyMeshKernelItem::toolTip(const App::Property* prop) const @@ -103,7 +103,7 @@ void PropertyMeshKernelItem::setEditorData(QWidget *editor, const QVariant& data QVariant PropertyMeshKernelItem::editorData(QWidget *editor) const { Q_UNUSED(editor); - return QVariant(); + return {}; } int PropertyMeshKernelItem::countPoints() const diff --git a/src/Mod/Mesh/Gui/SoFCMeshObject.cpp b/src/Mod/Mesh/Gui/SoFCMeshObject.cpp index 88ec88b204..deadf0267d 100644 --- a/src/Mod/Mesh/Gui/SoFCMeshObject.cpp +++ b/src/Mod/Mesh/Gui/SoFCMeshObject.cpp @@ -581,7 +581,7 @@ inline void glNormal(float* n) // Helper function: convert Vec to SbVec3f inline SbVec3f sbvec3f(const Base::Vector3f& _v) { - return SbVec3f(_v.x, _v.y, _v.z); + return {_v.x, _v.y, _v.z}; } SO_NODE_SOURCE(SoFCMeshObjectShape) diff --git a/src/Mod/MeshPart/Gui/CrossSections.cpp b/src/Mod/MeshPart/Gui/CrossSections.cpp index 034016f204..dd4d9ba520 100644 --- a/src/Mod/MeshPart/Gui/CrossSections.cpp +++ b/src/Mod/MeshPart/Gui/CrossSections.cpp @@ -96,7 +96,7 @@ public: } std::vector getDisplayModes() const override { - return std::vector(); + return {}; } void setCoords(const std::vector& v) {