Use qgsVariantEqual in some places

elpaso · elpaso · commit 5ed02a7ae908 · 2018-10-01T15:58:30.000+02:00
diff --git a/src/core/qgis.cpp b/src/core/qgis.cpp
@@ -189,7 +189,7 @@ bool qgsVariantLessThan( const QVariant &lhs, const QVariant &rhs )
       const QList<QVariant> &rhsl = rhs.toList();
 
       int i, n = std::min( lhsl.size(), rhsl.size() );
-      for ( i = 0; i < n && lhsl[i].type() == rhsl[i].type() && lhsl[i].isNull() == rhsl[i].isNull() && lhsl[i] == rhsl[i]; i++ )
+      for ( i = 0; i < n && lhsl[i].type() == rhsl[i].type() && qgsVariantEqual( lhsl[i], rhsl[i] ); i++ )
         ;
 
       if ( i == n )
diff --git a/src/core/qgsfeaturefiltermodel.cpp b/src/core/qgsfeaturefiltermodel.cpp
@@ -533,7 +533,7 @@ QVariant QgsFeatureFilterModel::extraIdentifierValue() const
 
 void QgsFeatureFilterModel::setExtraIdentifierValue( const QVariant &extraIdentifierValue )
 {
-  if ( extraIdentifierValue == mExtraIdentifierValue && extraIdentifierValue.isNull() == mExtraIdentifierValue.isNull() && mExtraIdentifierValue.isValid() )
+  if ( qgsVariantEqual( extraIdentifierValue, mExtraIdentifierValue ) && mExtraIdentifierValue.isValid() )
     return;
 
   if ( mIsSettingExtraIdentifierValue )
diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp
@@ -357,9 +357,9 @@ bool QgsAttributeForm::saveEdits()
         int n = 0;
         for ( int i = 0; i < dst.count(); ++i )
         {
-          if ( ( dst.at( i ) == src.at( i ) && dst.at( i ).isNull() == src.at( i ).isNull() ) // If field is not changed...
-               || !dst.at( i ).isValid()                                     // or the widget returns invalid (== do not change)
-               || !fieldIsEditable( i ) )                           // or the field cannot be edited ...
+          if ( qgsVariantEqual( dst.at( i ), src.at( i ) ) // If field is not changed...
+               || !dst.at( i ).isValid()                 // or the widget returns invalid (== do not change)
+               || !fieldIsEditable( i ) )                // or the field cannot be edited ...
           {
             continue;
           }
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -2118,7 +2118,7 @@ bool QgsPostgresProvider::addFeatures( QgsFeatureList &flist, Flags flags )
 
       if ( i == flist.size() )
       {
-        if ( v == defVal && defVal.isNull() == v.isNull() )
+        if ( qgsVariantEqual( v, defVal ) )
         {
           if ( defVal.isNull() )
           {

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ bool qgsVariantLessThan( const QVariant &lhs, const QVariant &rhs )`
`189`	`189`	`const QList<QVariant> &rhsl = rhs.toList();`
`190`	`190`
`191`	`191`	`int i, n = std::min( lhsl.size(), rhsl.size() );`
`192`		`- for ( i = 0; i < n && lhsl[i].type() == rhsl[i].type() && lhsl[i].isNull() == rhsl[i].isNull() && lhsl[i] == rhsl[i]; i++ )`
	`192`	`+ for ( i = 0; i < n && lhsl[i].type() == rhsl[i].type() && qgsVariantEqual( lhsl[i], rhsl[i] ); i++ )`
`193`	`193`	`;`
`194`	`194`
`195`	`195`	`if ( i == n )`
Original file line number	Diff line number	Diff line change
`@@ -533,7 +533,7 @@ QVariant QgsFeatureFilterModel::extraIdentifierValue() const`
`533`	`533`
`534`	`534`	`void QgsFeatureFilterModel::setExtraIdentifierValue( const QVariant &extraIdentifierValue )`
`535`	`535`	`{`
`536`		`- if ( extraIdentifierValue == mExtraIdentifierValue && extraIdentifierValue.isNull() == mExtraIdentifierValue.isNull() && mExtraIdentifierValue.isValid() )`
	`536`	`+ if ( qgsVariantEqual( extraIdentifierValue, mExtraIdentifierValue ) && mExtraIdentifierValue.isValid() )`
`537`	`537`	`return;`
`538`	`538`
`539`	`539`	`if ( mIsSettingExtraIdentifierValue )`
Original file line number	Diff line number	Diff line change
`@@ -357,9 +357,9 @@ bool QgsAttributeForm::saveEdits()`
`357`	`357`	`int n = 0;`
`358`	`358`	`for ( int i = 0; i < dst.count(); ++i )`
`359`	`359`	`{`
`360`		`- if ( ( dst.at( i ) == src.at( i ) && dst.at( i ).isNull() == src.at( i ).isNull() ) // If field is not changed...`
`361`		`- \|\| !dst.at( i ).isValid() // or the widget returns invalid (== do not change)`
`362`		`- \|\| !fieldIsEditable( i ) ) // or the field cannot be edited ...`
	`360`	`+ if ( qgsVariantEqual( dst.at( i ), src.at( i ) ) // If field is not changed...`
	`361`	`+ \|\| !dst.at( i ).isValid() // or the widget returns invalid (== do not change)`
	`362`	`+ \|\| !fieldIsEditable( i ) ) // or the field cannot be edited ...`
`363`	`363`	`{`
`364`	`364`	`continue;`
`365`	`365`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2118,7 +2118,7 @@ bool QgsPostgresProvider::addFeatures( QgsFeatureList &flist, Flags flags )`
`2118`	`2118`
`2119`	`2119`	`if ( i == flist.size() )`
`2120`	`2120`	`{`
`2121`		`- if ( v == defVal && defVal.isNull() == v.isNull() )`
	`2121`	`+ if ( qgsVariantEqual( v, defVal ) )`
`2122`	`2122`	`{`
`2123`	`2123`	`if ( defVal.isNull() )`
`2124`	`2124`	`{`