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

fix naming conflicts

Browse Source
This commit is contained in:
WandererFan
2017-01-25 18:36:33 -05:00
parent 6568832956
commit 1c8395e229
26 changed files with 184 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp
View File

@@ -39,7 +39,7 @@
#include <Mod/TechDraw/App/DrawViewDimension.h>
#include <Mod/TechDraw/App/DrawViewMulti.h>
#include <Mod/TechDraw/App/DrawHatch.h>
#include <Mod/TechDraw/App/DrawCrosshatch.h>
#include <Mod/TechDraw/App/DrawGeomHatch.h>
#include<Mod/TechDraw/App/DrawPage.h>
#include "ViewProviderViewPart.h"
@@ -118,7 +118,7 @@ std::vector<App::DocumentObject*> ViewProviderViewPart::claimChildren(void) cons
// valid children of a ViewPart are:
// - Dimensions
// - Hatches
// - Crosshatches
// - GeomHatches
std::vector<App::DocumentObject*> temp;
const std::vector<App::DocumentObject *> &views = getViewPart()->getInList();
try {
@@ -134,7 +134,7 @@ std::vector<App::DocumentObject*> ViewProviderViewPart::claimChildren(void) cons
}
} else if ((*it)->getTypeId().isDerivedFrom(TechDraw::DrawHatch::getClassTypeId())) {
temp.push_back((*it));
} else if ((*it)->getTypeId().isDerivedFrom(TechDraw::DrawCrosshatch::getClassTypeId())) {
} else if ((*it)->getTypeId().isDerivedFrom(TechDraw::DrawGeomHatch::getClassTypeId())) {
temp.push_back((*it));
}
}