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

Prefer to use BaseClass's isDerivedFrom<T> over non template or Base::Type's

Browse Source 
Regex based changes, manually verified
This commit is contained in:
Benjamin Nauck
2025-01-16 21:27:50 +01:00
parent 6a3eb2ab49
commit 6f535f19fb
166 changed files with 484 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Mod/Part/App/TopoShapeExpansion.cpp
View File

@@ -474,11 +474,11 @@ std::vector<TopoShape> TopoShape::findSubShapesWithSharedVertex(const TopoShape&
return res;
}
if (shapeType == TopAbs_EDGE) {
isLine = (geom->isDerivedFrom(GeomLine::getClassTypeId())
|| geom->isDerivedFrom(GeomLineSegment::getClassTypeId()));
isLine = (geom->isDerivedFrom<GeomLine>()
|| geom->isDerivedFrom<GeomLineSegment>());
}
else {
isPlane = geom->isDerivedFrom(GeomPlane::getClassTypeId());
isPlane = geom->isDerivedFrom<GeomPlane>();
}
}
@@ -491,8 +491,8 @@ std::vector<TopoShape> TopoShape::findSubShapesWithSharedVertex(const TopoShape&
// For lines, don't compare geometry, just check the
// vertices below instead, because the exact same edge
// may have different geometrical representation.
if (!g2->isDerivedFrom(GeomLine::getClassTypeId())
&& !g2->isDerivedFrom(GeomLineSegment::getClassTypeId())) {
if (!g2->isDerivedFrom<GeomLine>()
&& !g2->isDerivedFrom<GeomLineSegment>()) {
return false;
}
}
@@ -500,7 +500,7 @@ std::vector<TopoShape> TopoShape::findSubShapesWithSharedVertex(const TopoShape&
// For planes, don't compare geometry either, so that
// we don't need to worry about orientation and so on.
// Just check the edges.
if (!g2->isDerivedFrom(GeomPlane::getClassTypeId())) {
if (!g2->isDerivedFrom<GeomPlane>()) {
return false;
}
}
@@ -603,8 +603,8 @@ std::vector<TopoShape> TopoShape::findSubShapesWithSharedVertex(const TopoShape&
}
bool isLine2 = false;
gp_Pnt pt1, pt2;
if (geom2->isDerivedFrom(GeomLine::getClassTypeId())
|| geom2->isDerivedFrom(GeomLineSegment::getClassTypeId())) {
if (geom2->isDerivedFrom<GeomLine>()
|| geom2->isDerivedFrom<GeomLineSegment>()) {
pt1 = BRep_Tool::Pnt(TopExp::FirstVertex(TopoDS::Edge(edge)));
pt2 = BRep_Tool::Pnt(TopExp::LastVertex(TopoDS::Edge(edge)));
isLine2 = true;
@@ -624,8 +624,8 @@ std::vector<TopoShape> TopoShape::findSubShapesWithSharedVertex(const TopoShape&
}
}
if (isLine2) {
if (g1->isDerivedFrom(GeomLine::getClassTypeId())
|| g1->isDerivedFrom(GeomLineSegment::getClassTypeId())) {
if (g1->isDerivedFrom<GeomLine>()
|| g1->isDerivedFrom<GeomLineSegment>()) {
auto p1 =
BRep_Tool::Pnt(TopExp::FirstVertex(TopoDS::Edge(e1)));
auto p2 =
@@ -5751,7 +5751,7 @@ TopoShape& TopoShape::makeElementBoolean(const char* maker,
bool TopoShape::isSame(const Data::ComplexGeoData& _other) const
{
if (!_other.isDerivedFrom(TopoShape::getClassTypeId())) {
if (!_other.isDerivedFrom<TopoShape>()) {
return false;
}