Skip to content

Commit

Permalink
fix Coverity issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@wwmayer
wwmayer committed Aug 20, 2016
1 parent de79784 commit f3f0f5b
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 20 deletions.
2 changes: 1 addition & 1 deletion src/Mod/Drawing/App/FeatureClip.cpp
View file
Expand Up @@ -102,7 +102,7 @@ App::DocumentObjectExecReturn *FeatureClip::execute(void)
const std::vector<App::DocumentObject*> &Grp = Group.getValues();
for (std::vector<App::DocumentObject*>::const_iterator It= Grp.begin();It!=Grp.end();++It) {
if ((*It)->getTypeId().isDerivedFrom(Drawing::FeatureView::getClassTypeId())) {
Drawing::FeatureView *View = dynamic_cast<Drawing::FeatureView *>(*It);
Drawing::FeatureView *View = static_cast<Drawing::FeatureView *>(*It);
svg << View->ViewResult.getValue() << endl;
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/Mod/Drawing/App/FeaturePage.cpp
View file
Expand Up @@ -168,24 +168,24 @@ App::DocumentObjectExecReturn *FeaturePage::execute(void)
const std::vector<App::DocumentObject*> &Grp = Group.getValues();
for (std::vector<App::DocumentObject*>::const_iterator It= Grp.begin();It!=Grp.end();++It) {
if ( (*It)->getTypeId().isDerivedFrom(Drawing::FeatureView::getClassTypeId()) ) {
Drawing::FeatureView *View = dynamic_cast<Drawing::FeatureView *>(*It);
Drawing::FeatureView *View = static_cast<Drawing::FeatureView *>(*It);
if (View->Visible.getValue()) {
ofile << View->ViewResult.getValue();
ofile << tempendl << tempendl << tempendl;
}
} else if ( (*It)->getTypeId().isDerivedFrom(Drawing::FeatureClip::getClassTypeId()) ) {
Drawing::FeatureClip *Clip = dynamic_cast<Drawing::FeatureClip *>(*It);
Drawing::FeatureClip *Clip = static_cast<Drawing::FeatureClip *>(*It);
if (Clip->Visible.getValue()) {
ofile << Clip->ViewResult.getValue();
ofile << tempendl << tempendl << tempendl;
}
} else if ( (*It)->getTypeId().isDerivedFrom(App::DocumentObjectGroup::getClassTypeId()) ) {
// getting children inside subgroups too
App::DocumentObjectGroup *SubGroup = dynamic_cast<App::DocumentObjectGroup *>(*It);
App::DocumentObjectGroup *SubGroup = static_cast<App::DocumentObjectGroup *>(*It);
const std::vector<App::DocumentObject*> &SubGrp = SubGroup->Group.getValues();
for (std::vector<App::DocumentObject*>::const_iterator Grit= SubGrp.begin();Grit!=SubGrp.end();++Grit) {
if ( (*Grit)->getTypeId().isDerivedFrom(Drawing::FeatureView::getClassTypeId()) ) {
Drawing::FeatureView *SView = dynamic_cast<Drawing::FeatureView *>(*Grit);
Drawing::FeatureView *SView = static_cast<Drawing::FeatureView *>(*Grit);
if (SView->Visible.getValue()) {
ofile << SView->ViewResult.getValue();
ofile << tempendl << tempendl << tempendl;
Expand Down
2 changes: 0 additions & 2 deletions src/Mod/Fem/App/HypothesisPy.cpp
View file
Expand Up @@ -302,8 +302,6 @@ Py::Object StdMeshers_AutomaticLengthPy::getLength(const Py::Tuple& args)
const TopoDS_Shape& s = shape.extensionObject()->getTopoShapePtr()->getShape();
return Py::Float(hypothesis<StdMeshers_AutomaticLength>()->GetLength(m->getSMesh(),s));
}

throw Py::Exception();
}

// ----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Fem/Gui/Command.cpp
View file
Expand Up @@ -872,7 +872,7 @@ void DefineNodesCallback(void * ud, SoEventCallback * n)
if(docObj.size() !=1)
return;

const SMESHDS_Mesh* data = const_cast<SMESH_Mesh*>(dynamic_cast<Fem::FemMeshObject*>(docObj[0])->FemMesh.getValue().getSMesh())->GetMeshDS();
const SMESHDS_Mesh* data = const_cast<SMESH_Mesh*>(static_cast<Fem::FemMeshObject*>(docObj[0])->FemMesh.getValue().getSMesh())->GetMeshDS();

SMDS_NodeIteratorPtr aNodeIter = data->nodesIterator();
Base::Vector3f pt2d;
Expand Down
7 changes: 4 additions & 3 deletions src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.cpp
View file
Expand Up @@ -55,9 +55,10 @@ TaskDlgMeshShapeNetgen::TaskDlgMeshShapeNetgen(FemGui::ViewProviderFemMeshShapeN
: TaskDialog(),ViewProviderFemMeshShapeNetgen(obj)
{
FemMeshShapeNetgenObject = dynamic_cast<Fem::FemMeshShapeNetgenObject *>(obj->getObject());
param = new TaskTetParameter(FemMeshShapeNetgenObject);

Content.push_back(param);
if (FemMeshShapeNetgenObject) {
param = new TaskTetParameter(FemMeshShapeNetgenObject);
Content.push_back(param);
}
}

TaskDlgMeshShapeNetgen::~TaskDlgMeshShapeNetgen()
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Fem/Gui/ViewProviderFemMesh.cpp
View file
Expand Up @@ -473,7 +473,7 @@ std::vector<Base::Vector3d> ViewProviderFemMesh::getSelectionShape(const char* E
void ViewProviderFemMesh::setHighlightNodes(const std::set<long>& HighlightedNodes)
{
if(!HighlightedNodes.empty()){
SMESHDS_Mesh* data = const_cast<SMESH_Mesh*>((dynamic_cast<Fem::FemMeshObject*>(this->pcObject)->FemMesh).getValue().getSMesh())->GetMeshDS();
SMESHDS_Mesh* data = const_cast<SMESH_Mesh*>((static_cast<Fem::FemMeshObject*>(this->pcObject)->FemMesh).getValue().getSMesh())->GetMeshDS();

pcAnoCoords->point.setNum(HighlightedNodes.size());
SbVec3f* verts = pcAnoCoords->point.startEditing();
Expand Down Expand Up @@ -685,7 +685,7 @@ void ViewProviderFEMMeshBuilder::buildNodes(const App::Property* prop, std::vect
pcFaces = static_cast<SoIndexedFaceSet*>(nodes[1]);
}

if (pcPointsCoord && pcFaces){
if (pcPointsCoord && pcFaces && pcLines){
std::vector<unsigned long> vFaceElementIdx;
std::vector<unsigned long> vNodeElementIdx;
bool onlyEdges;
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Fem/Gui/ViewProviderFemMeshPyImp.cpp
View file
Expand Up @@ -224,7 +224,7 @@ Py::List ViewProviderFemMeshPy::getHighlightedNodes(void) const
void ViewProviderFemMeshPy::setHighlightedNodes(Py::List arg)
{
ViewProviderFemMesh* vp = this->getViewProviderFemMeshPtr();
SMESHDS_Mesh* data = const_cast<SMESH_Mesh*>((dynamic_cast<Fem::FemMeshObject*>
SMESHDS_Mesh* data = const_cast<SMESH_Mesh*>((static_cast<Fem::FemMeshObject*>
(vp->getObject())->FemMesh).getValue().getSMesh())->GetMeshDS();

std::set<long> res;
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Fem/Gui/ViewProviderSetNodes.cpp
View file
Expand Up @@ -37,15 +37,15 @@ PROPERTY_SOURCE(FemGui::ViewProviderSetNodes, Gui::ViewProviderGeometryObject)

bool ViewProviderSetNodes::doubleClicked(void)
{
Gui::TaskView::TaskDialog* dlg = new TaskDlgCreateNodeSet(dynamic_cast<Fem::FemSetNodesObject *>(getObject()));
Gui::TaskView::TaskDialog* dlg = new TaskDlgCreateNodeSet(static_cast<Fem::FemSetNodesObject *>(getObject()));
Gui::Control().showDialog(dlg);
return true;
}


bool ViewProviderSetNodes::setEdit(int ModNum)
{
Gui::TaskView::TaskDialog* dlg = new TaskDlgCreateNodeSet(dynamic_cast<Fem::FemSetNodesObject *>(getObject()));
Gui::TaskView::TaskDialog* dlg = new TaskDlgCreateNodeSet(static_cast<Fem::FemSetNodesObject *>(getObject()));
Gui::Control().showDialog(dlg);
return true;
}
Expand Down
1 change: 0 additions & 1 deletion src/Mod/Part/App/AppPartPy.cpp
View file
Expand Up @@ -1532,7 +1532,6 @@ class Module : public Py::ExtensionModule<Module>
#else
throw Py::RuntimeError("FreeCAD compiled without FreeType support! This method is disabled...");
#endif
return Py::None();
}
Py::Object exportUnits(const Py::Tuple& args)
{
Expand Down
10 changes: 7 additions & 3 deletions src/Mod/Part/Gui/ViewProviderBoolean.cpp
View file
Expand Up @@ -88,7 +88,7 @@ void ViewProviderBoolean::updateData(const App::Property* prop)
Part::Boolean* objBool = dynamic_cast<Part::Boolean*>(getObject());
Part::Feature* objBase = dynamic_cast<Part::Feature*>(objBool->Base.getValue());
Part::Feature* objTool = dynamic_cast<Part::Feature*>(objBool->Tool.getValue());
if (objBase && objTool) {
if (objBool && objBase && objTool) {
const TopoDS_Shape& baseShape = objBase->Shape.getValue();
const TopoDS_Shape& toolShape = objTool->Shape.getValue();
const TopoDS_Shape& boolShape = objBool->Shape.getValue();
Expand Down Expand Up @@ -176,7 +176,7 @@ void ViewProviderMultiFuse::updateData(const App::Property* prop)
if (prop->getTypeId() == Part::PropertyShapeHistory::getClassTypeId()) {
const std::vector<Part::ShapeHistory>& hist = static_cast<const Part::PropertyShapeHistory*>
(prop)->getValues();
Part::MultiFuse* objBool = dynamic_cast<Part::MultiFuse*>(getObject());
Part::MultiFuse* objBool = static_cast<Part::MultiFuse*>(getObject());
std::vector<App::DocumentObject*> sources = objBool->Shapes.getValues();
if (hist.size() != sources.size())
return;
Expand All @@ -192,6 +192,8 @@ void ViewProviderMultiFuse::updateData(const App::Property* prop)
int index=0;
for (std::vector<App::DocumentObject*>::iterator it = sources.begin(); it != sources.end(); ++it, ++index) {
Part::Feature* objBase = dynamic_cast<Part::Feature*>(*it);
if (!objBase)
continue;
const TopoDS_Shape& baseShape = objBase->Shape.getValue();

TopTools_IndexedMapOfShape baseMap;
Expand Down Expand Up @@ -293,7 +295,7 @@ void ViewProviderMultiCommon::updateData(const App::Property* prop)
if (prop->getTypeId() == Part::PropertyShapeHistory::getClassTypeId()) {
const std::vector<Part::ShapeHistory>& hist = static_cast<const Part::PropertyShapeHistory*>
(prop)->getValues();
Part::MultiCommon* objBool = dynamic_cast<Part::MultiCommon*>(getObject());
Part::MultiCommon* objBool = static_cast<Part::MultiCommon*>(getObject());
std::vector<App::DocumentObject*> sources = objBool->Shapes.getValues();
if (hist.size() != sources.size())
return;
Expand All @@ -309,6 +311,8 @@ void ViewProviderMultiCommon::updateData(const App::Property* prop)
int index=0;
for (std::vector<App::DocumentObject*>::iterator it = sources.begin(); it != sources.end(); ++it, ++index) {
Part::Feature* objBase = dynamic_cast<Part::Feature*>(*it);
if (!objBase)
continue;
const TopoDS_Shape& baseShape = objBase->Shape.getValue();

TopTools_IndexedMapOfShape baseMap;
Expand Down

0 comments on commit f3f0f5b

Please sign in to comment.