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

#2380 AppFwk: Move fieldsByType to RimProject

Browse Source
This commit is contained in:
Rebecca Cox
2018-01-19 12:52:50 +01:00
parent ed930da11d
commit 56188c8f3f
3 changed files with 61 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/UnitTests/RimRelocatePath-Test.cpp
View File

@@ -16,9 +16,8 @@
///
//--------------------------------------------------------------------------------------------------
template <typename T>
void fieldsByType(caf::PdmObjectHandle* object, std::vector<T*>* typedFields)
void fieldsByType(caf::PdmObjectHandle* object, std::vector<T*>& typedFields)
{
if (!typedFields) return;
if (!object) return;
std::vector<caf::PdmFieldHandle*> allFieldsInObject;
@@ -29,14 +28,14 @@ void fieldsByType(caf::PdmObjectHandle* object, std::vector<T*>* typedFields)
for (const auto& field : allFieldsInObject)
{
caf::PdmField<T>* typedField = dynamic_cast<caf::PdmField<T>*>(field);
if (typedField) typedFields->push_back(&typedField->v());
if (typedField) typedFields.push_back(&typedField->v());
caf::PdmField< std::vector<T> >* typedFieldInVector = dynamic_cast<caf::PdmField< std::vector<T> >*>(field);
if (typedFieldInVector)
{
for (T& typedFieldFromVector : typedFieldInVector->v())
{
typedFields->push_back(&typedFieldFromVector);
typedFields.push_back(&typedFieldFromVector);
}
}
@@ -65,7 +64,7 @@ TEST(RimRelocatePathTest, findPathsInProjectFile)
std::vector< caf::FilePath* > filePaths;
fieldsByType(&project, &filePaths);
fieldsByType(&project, filePaths);
for (auto filePath : filePaths)
{