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

Caf: Corrected the spesialization of field of vector and list equality compare, which is supposed to be pr. element

Browse Source
This commit is contained in:
Jacob Støren
2016-06-15 17:30:13 +02:00
parent 8d15fa1b84
commit e1fa9aa9f3
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Fwk/AppFwk/cafPdmCvf/cafPdmCoreVec3d.h
View File

@@ -43,6 +43,7 @@
#include "cafPdmXmlVec3d.h" #include "cafPdmXmlVec3d.h"
Q_DECLARE_METATYPE(cvf::Vec3d);
namespace caf namespace caf
{ {

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

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