From 23a58fedf78e9ccd7f46e959e25dc15c55f2e962 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 24 Sep 2014 18:00:46 +0200 Subject: [PATCH] + fix warnings with clang --- src/Mod/Fem/App/FemMesh.cpp | 13 ++++++------- src/Mod/Fem/Gui/Command.cpp | 4 ++-- src/Mod/Fem/Gui/TaskCreateNodeSet.cpp | 3 +-- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/Mod/Fem/App/FemMesh.cpp b/src/Mod/Fem/App/FemMesh.cpp index 28321e9bd..de70811f6 100755 --- a/src/Mod/Fem/App/FemMesh.cpp +++ b/src/Mod/Fem/App/FemMesh.cpp @@ -393,10 +393,10 @@ void FemMesh::compute() std::set FemMesh::getSurfaceNodes(long ElemId,short FaceId, float Angle) const { std::set result; - const SMESHDS_Mesh* data = myMesh->GetMeshDS(); + //const SMESHDS_Mesh* data = myMesh->GetMeshDS(); - const SMDS_MeshElement * element = data->FindElement(ElemId); - int fNbr = element->NbFaces(); + //const SMDS_MeshElement * element = data->FindElement(ElemId); + //int fNbr = element->NbFaces(); //element-> return result; @@ -406,7 +406,6 @@ std::set FemMesh::getSurfaceNodes(const TopoDS_Face &face)const { std::set result; - const SMESHDS_Mesh* data = myMesh->GetMeshDS(); Bnd_Box box; BRepBndLib::Add(face, box); @@ -418,8 +417,8 @@ std::set FemMesh::getSurfaceNodes(const TopoDS_Face &face)const const Base::Matrix4D Mtrx(getTransform()); SMDS_NodeIteratorPtr aNodeIter = myMesh->GetMeshDS()->nodesIterator(); - for (int i=0;aNodeIter->more();i++) { - const SMDS_MeshNode* aNode = aNodeIter->next(); + while (aNodeIter->more()) { + const SMDS_MeshNode* aNode = aNodeIter->next(); Base::Vector3d vec(aNode->X(),aNode->Y(),aNode->Z()); // Apply the matrix to hold the BoundBox in absolute space. vec = Mtrx * vec; @@ -438,7 +437,7 @@ std::set FemMesh::getSurfaceNodes(const TopoDS_Face &face)const result.insert(aNode->GetID()); } - } + } return result; } diff --git a/src/Mod/Fem/Gui/Command.cpp b/src/Mod/Fem/Gui/Command.cpp index 19d481399..413d93b05 100755 --- a/src/Mod/Fem/Gui/Command.cpp +++ b/src/Mod/Fem/Gui/Command.cpp @@ -483,14 +483,14 @@ void DefineNodesCallback(void * ud, SoEventCallback * n) Base::Vector3f pt2d; std::set IntSet; - for (int i=0;aNodeIter->more();) { + while (aNodeIter->more()) { const SMDS_MeshNode* aNode = aNodeIter->next(); Base::Vector3f vec(aNode->X(),aNode->Y(),aNode->Z()); pt2d = proj(vec); if (polygon.Contains(Base::Vector2D(pt2d.x, pt2d.y)) == true) IntSet.insert(aNode->GetID()); } - + std::stringstream set; set << "["; diff --git a/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp b/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp index 062520a34..be2b2cd8a 100644 --- a/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp +++ b/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp @@ -168,7 +168,7 @@ void TaskCreateNodeSet::DefineNodes(const Base::Polygon2D &polygon,const Gui::Vi if(! ui->checkBox_Add->isChecked()) tempSet.clear(); - for (int i=0;aNodeIter->more();) { + while (aNodeIter->more()) { const SMDS_MeshNode* aNode = aNodeIter->next(); Base::Vector3f vec(aNode->X(),aNode->Y(),aNode->Z()); pt2d = proj(vec); @@ -177,7 +177,6 @@ void TaskCreateNodeSet::DefineNodes(const Base::Polygon2D &polygon,const Gui::Vi } MeshViewProvider->setHighlightNodes(tempSet); - } void TaskCreateNodeSet::onSelectionChanged(const Gui::SelectionChanges& msg)