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

Coverty changes:

Browse Source 
** CID 152490:  Control flow issues  (DEADCODE)
** CID 152492:  Null pointer dereferences  (FORWARD_NULL)
** CID 152493:  Null pointer dereferences  (FORWARD_NULL)
** CID 152494:  Null pointer dereferences  (FORWARD_NULL)
** CID 152495:  Null pointer dereferences  (FORWARD_NULL)
** CID 152496:  Null pointer dereferences  (FORWARD_NULL)
** CID 152497:  Null pointer dereferences  (FORWARD_NULL)
** CID 152502:  Null pointer dereferences  (REVERSE_INULL)
** CID 152507:  Uninitialized members  (UNINIT_CTOR)
** CID 152508:  Uninitialized members  (UNINIT_CTOR)
** CID 152508:  Uninitialized members  (UNINIT_CTOR)
** CID 152510:  Uninitialized members  (UNINIT_CTOR)
This commit is contained in:
WandererFan
2016-09-10 07:57:43 -04:00
parent 6e60ca1402
commit cdf64a212c
9 changed files with 66 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Mod/TechDraw/App/DrawViewCollection.cpp
View File

@@ -87,9 +87,9 @@ int DrawViewCollection::countChildren()
const std::vector<App::DocumentObject *> &views = Views.getValues();
for(std::vector<App::DocumentObject *>::const_iterator it = views.begin(); it != views.end(); ++it) {
App::DocumentObject *docObj = dynamic_cast<App::DocumentObject *>(*it);
App::DocumentObject *docObj = static_cast<App::DocumentObject *>(*it);
if(docObj->getTypeId().isDerivedFrom(TechDraw::DrawViewCollection::getClassTypeId())) {
TechDraw::DrawViewCollection *viewCollection = dynamic_cast<TechDraw::DrawViewCollection *>(*it);
TechDraw::DrawViewCollection *viewCollection = static_cast<TechDraw::DrawViewCollection *>(*it);
numChildren += viewCollection->countChildren() + 1;
} else {
numChildren += 1;
@@ -127,7 +127,7 @@ App::DocumentObjectExecReturn *DrawViewCollection::execute(void)
for(std::vector<App::DocumentObject *>::const_iterator it = views.begin(); it != views.end(); ++it) {
App::DocumentObject *docObj = *it;
if(docObj->getTypeId().isDerivedFrom(TechDraw::DrawView::getClassTypeId())) {
TechDraw::DrawView *view = dynamic_cast<TechDraw::DrawView *>(*it);
TechDraw::DrawView *view = static_cast<TechDraw::DrawView *>(*it);
// Set scale factor of each view
view->ScaleType.setValue("Document");
@@ -140,7 +140,7 @@ App::DocumentObjectExecReturn *DrawViewCollection::execute(void)
for(std::vector<App::DocumentObject *>::const_iterator it = views.begin(); it != views.end(); ++it) {
App::DocumentObject *docObj = *it;
if(docObj->getTypeId().isDerivedFrom(TechDraw::DrawView::getClassTypeId())) {
TechDraw::DrawView *view = dynamic_cast<TechDraw::DrawView *>(*it);
TechDraw::DrawView *view = static_cast<TechDraw::DrawView *>(*it);
view->ScaleType.setValue("Custom");
// Set scale factor of each view
@@ -159,6 +159,10 @@ QRectF DrawViewCollection::getRect() const
QRectF result;
for (auto& v:Views.getValues()) {
TechDraw::DrawView *view = dynamic_cast<TechDraw::DrawView *>(v);
if (!view) {
throw Base::Exception("DrawViewCollection::getRect bad View\n");
}
result = result.united(view->getRect().translated(view->X.getValue(),view->Y.getValue()));
}
return QRectF(0,0,Scale.getValue() * result.width(),Scale.getValue() * result.height());