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

Core: modernize type checking

Browse Source
This commit is contained in:
Florian Foinant-Willig
2023-10-15 21:38:48 +02:00
parent 6d8fb68f3b
commit 773c701eec
31 changed files with 110 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/App/PropertyLinks.cpp
View File

@@ -478,7 +478,7 @@ void PropertyLink::Restore(Base::XMLReader &reader)
std::string name = reader.getName(reader.getAttribute("value"));
// Property not in a DocumentObject!
assert(getContainer()->getTypeId().isDerivedFrom(App::DocumentObject::getClassTypeId()) );
assert(getContainer()->isDerivedFrom<App::DocumentObject>() );
if (!name.empty()) {
DocumentObject* parent = static_cast<DocumentObject*>(getContainer());
@@ -729,7 +729,7 @@ void PropertyLinkList::Restore(Base::XMLReader &reader)
App::PropertyContainer* container = getContainer();
if (!container)
throw Base::RuntimeError("Property is not part of a container");
if (!container->getTypeId().isDerivedFrom(App::DocumentObject::getClassTypeId())) {
if (!container->isDerivedFrom<App::DocumentObject>()) {
std::stringstream str;
str << "Container is not a document object ("
<< container->getTypeId().getName() << ")";
@@ -1330,7 +1330,7 @@ void PropertyLinkSub::Restore(Base::XMLReader &reader)
int count = reader.getAttributeAsInteger("count");
// Property not in a DocumentObject!
assert(getContainer()->getTypeId().isDerivedFrom(App::DocumentObject::getClassTypeId()) );
assert(getContainer()->isDerivedFrom<App::DocumentObject>() );
App::Document* document = static_cast<DocumentObject*>(getContainer())->getDocument();
DocumentObject *pcObject = nullptr;
@@ -3339,7 +3339,7 @@ void PropertyXLink::Restore(Base::XMLReader &reader)
else
name = reader.getAttribute("name");
assert(getContainer()->getTypeId().isDerivedFrom(App::DocumentObject::getClassTypeId()));
assert(getContainer()->isDerivedFrom<App::DocumentObject>());
DocumentObject *object = nullptr;
if(!name.empty() && file.empty()) {
DocumentObject* parent = static_cast<DocumentObject*>(getContainer());