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

#4654 Fix QVariant comparisons with std::vector<T> data types

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-09-02 09:59:33 +02:00
parent 97f18962de
commit 7ab9b2a889
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafInternalPdmValueFieldSpecializations.h
View File

@@ -137,7 +137,6 @@ public:
static bool isEqual(const QVariant& variantValue, const QVariant& variantValue2)
{
assert(false); // Not sure this actually works JJS
return variantValue == variantValue2;
}
};

4
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafInternalPdmFieldTypeSpecializations.h
View File

@@ -86,7 +86,7 @@ public:
static bool isDataElementEqual(const QVariant& variantValue, const QVariant& variantValue2)
{
return PdmValueFieldSpecialization<T>::isEqual(variantValue, variantValue2);
return PdmValueFieldSpecialization<std::list<T>>::isEqual(variantValue, variantValue2);
}
/// Methods to get a list of options for a field, specialized for AppEnum
@@ -123,7 +123,7 @@ public:
static bool isDataElementEqual(const QVariant& variantValue, const QVariant& variantValue2)
{
return PdmValueFieldSpecialization<T>::isEqual(variantValue, variantValue2);
return PdmValueFieldSpecialization<std::vector<T>>::isEqual(variantValue, variantValue2);
}
/// Methods to get a list of options for a field, specialized for AppEnum