kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

PVS: V688 A local variable possesses the same name as one of the class members, which can result in a confusion

Browse Source
This commit is contained in:
wmayer
2019-03-13 11:58:43 +01:00
parent 4e018c506b
commit 51811e4bf4
8 changed files with 156 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/Import/App/ImportOCAF.cpp
View File

@@ -280,7 +280,7 @@ void ImportOCAF::loadShapes(const TDF_Label& label, const TopLoc_Location& loc,
}
void ImportOCAF::createShape(const TDF_Label& label, const TopLoc_Location& loc, const std::string& name,
std::vector<App::DocumentObject*>& lValue, bool merge)
std::vector<App::DocumentObject*>& lValue, bool mergeShape)
{
const TopoDS_Shape& aShape = aShapeTool->GetShape(label);
#ifdef HAVE_TBB
@@ -294,7 +294,7 @@ void ImportOCAF::createShape(const TDF_Label& label, const TopLoc_Location& loc,
std::vector<App::DocumentObject *> localValue;
App::Part *pcPart = NULL;
if (merge) {
if (mergeShape) {
// We should do that only if there is more than a single shape inside
// Computing Compounds takes time
@@ -387,7 +387,7 @@ void ImportOCAF::createShape(const TDF_Label& label, const TopLoc_Location& loc,
}
}
if (!localValue.empty() && !merge) {
if (!localValue.empty() && !mergeShape) {
pcPart = static_cast<App::Part*>(doc->addObject("App::Part",name.c_str()));
pcPart->Label.setValue(name);