OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Janitor: Remove obsolete deleteChildren

Browse Source 
Remove obsolete deleteChildren() in destructors. deleteChildren() is called in the destructor of PdmChildArrayField
This commit is contained in:
Magne Sjaastad
2024-07-25 13:58:31 +02:00
committed by GitHub
parent 34e30b38d3
commit 33ffa10ec9
71 changed files with 2 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Fwk/AppFwk/cafPdmScripting/cafPdmScripting_UnitTests/cafPdmScriptingBasicTest.cpp
View File

@@ -201,8 +201,6 @@ public:
"Whatsthis SimpleObjectsField" );
}
~InheritedDemoObj() { m_simpleObjectsField.deleteChildren(); }
caf::PdmField<std::vector<QString>> m_texts;
caf::PdmField<std::vector<double>> m_numbers;
@@ -222,8 +220,6 @@ public:
CAF_PDM_InitFieldNoDefault( &objects, "PdmObjects", "", "", "", "" )
}
~MyPdmDocument() { objects.deleteChildren(); }
caf::PdmChildArrayField<PdmObjectHandle*> objects;
};
CAF_PDM_SOURCE_INIT( MyPdmDocument, "MyPdmDocument" );

1
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/Parent.cpp
View File

@@ -10,7 +10,6 @@ Parent::Parent()
Parent::~Parent()
{
delete m_simpleObjectF();
m_simpleObjectsField.deleteChildren();
}
void Parent::doSome()

6
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmChildArrayFieldHandleTest.cpp
View File

@@ -66,12 +66,6 @@ public:
this->addField( &derivedOtherObjs, "derivedOtherObjs" );
}
~ContainerObj()
{
derivedObjs.deleteChildren();
derivedOtherObjs.deleteChildren();
}
caf::PdmChildArrayField<SimpleObjDerived*> derivedObjs;
caf::PdmChildArrayField<SimpleObjDerivedOther*> derivedOtherObjs;
};

6
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmReferenceHelperTest.cpp
View File

@@ -53,11 +53,7 @@ public:
this->addField( &m_simpleObjPtrField, "m_simpleObjPtrField" );
}
~ReferenceSimpleObj()
{
delete m_pointersField();
m_simpleObjPtrField.deleteChildren();
}
~ReferenceSimpleObj() { delete m_pointersField(); }
// Fields
caf::PdmChildField<PdmObjectHandle*> m_pointersField;

8
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/cafPdmXmlBasicTest.cpp
View File

@@ -189,8 +189,6 @@ public:
CAF_PDM_XML_InitField( &m_childArrayField, "DemoPdmObjectects" );
}
~InheritedDemoObj() { m_childArrayField.deleteChildren(); }
caf::PdmDataValueField<QString> m_texts;
caf::PdmChildArrayField<DemoPdmObject*> m_childArrayField;
};
@@ -254,11 +252,7 @@ public:
CAF_PDM_XML_InitField( &m_simpleObjPtrField2, "SimpleObjPtrField2" );
}
~ReferenceDemoPdmObject()
{
delete m_pointersField();
m_simpleObjPtrField2.deleteChildren();
}
~ReferenceDemoPdmObject() { delete m_pointersField(); }
// Fields
caf::PdmChildField<PdmObjectHandle*> m_pointersField;

4
Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/cafPdmBasicTest.cpp
View File

@@ -193,8 +193,6 @@ public:
"Whatsthis SimpleObjectsField" );
}
~InheritedDemoObj() { m_simpleObjectsField.deleteChildren(); }
caf::PdmField<std::vector<QString>> m_texts;
caf::PdmField<caf::AppEnum<TestEnumType>> m_testEnumField;
caf::PdmChildArrayField<SimpleObj*> m_simpleObjectsField;
@@ -212,8 +210,6 @@ public:
CAF_PDM_InitFieldNoDefault( &objects, "PdmObjects", "", "", "", "" )
}
~MyPdmDocument() { objects.deleteChildren(); }
caf::PdmChildArrayField<PdmObjectHandle*> objects;
};
CAF_PDM_SOURCE_INIT( MyPdmDocument, "MyPdmDocument" );

2
Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/cafPdmUiTreeViewModelTest.cpp
View File

@@ -37,8 +37,6 @@ public:
m_simpleObjPtrField.uiCapability()->setUiTreeHidden( false );
}
~DemoPdmObject() { m_simpleObjPtrField.deleteChildren(); }
caf::PdmChildArrayField<caf::PdmObjectHandle*> m_simpleObjPtrField;
};