Fix isIntSafe and isDoubleSafe not considering QVariant::UInt, QVariant::LongLong, QVariant::ULongLong (Funded by Sourcepole)

manisandro · manisandro · commit 29d0166475fa · 2014-12-01T19:38:36.000+01:00
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -162,13 +162,20 @@ static QVariant tvl2variant( TVL v )
 inline bool isIntSafe( const QVariant& v )
 {
   if ( v.type() == QVariant::Int ) return true;
+  if ( v.type() == QVariant::UInt ) return true;
+  if ( v.type() == QVariant::LongLong ) return true;
+  if ( v.type() == QVariant::ULongLong ) return true;
   if ( v.type() == QVariant::Double ) return false;
   if ( v.type() == QVariant::String ) { bool ok; v.toString().toInt( &ok ); return ok; }
   return false;
 }
 inline bool isDoubleSafe( const QVariant& v )
 {
-  if ( v.type() == QVariant::Double || v.type() == QVariant::Int ) return true;
+  if ( v.type() == QVariant::Double ) return true;
+  if ( v.type() == QVariant::Int ) return true;
+  if ( v.type() == QVariant::UInt ) return true;
+  if ( v.type() == QVariant::LongLong ) return true;
+  if ( v.type() == QVariant::ULongLong ) return true;
   if ( v.type() == QVariant::String ) { bool ok; v.toString().toDouble( &ok ); return ok; }
   return false;
 }

Original file line number	Diff line number	Diff line change
`@@ -162,13 +162,20 @@ static QVariant tvl2variant( TVL v )`
`162`	`162`	`inline bool isIntSafe( const QVariant& v )`
`163`	`163`	`{`
`164`	`164`	`if ( v.type() == QVariant::Int ) return true;`
	`165`	`+ if ( v.type() == QVariant::UInt ) return true;`
	`166`	`+ if ( v.type() == QVariant::LongLong ) return true;`
	`167`	`+ if ( v.type() == QVariant::ULongLong ) return true;`
`165`	`168`	`if ( v.type() == QVariant::Double ) return false;`
`166`	`169`	`if ( v.type() == QVariant::String ) { bool ok; v.toString().toInt( &ok ); return ok; }`
`167`	`170`	`return false;`
`168`	`171`	`}`
`169`	`172`	`inline bool isDoubleSafe( const QVariant& v )`
`170`	`173`	`{`
`171`		`- if ( v.type() == QVariant::Double \|\| v.type() == QVariant::Int ) return true;`
	`174`	`+ if ( v.type() == QVariant::Double ) return true;`
	`175`	`+ if ( v.type() == QVariant::Int ) return true;`
	`176`	`+ if ( v.type() == QVariant::UInt ) return true;`
	`177`	`+ if ( v.type() == QVariant::LongLong ) return true;`
	`178`	`+ if ( v.type() == QVariant::ULongLong ) return true;`
`172`	`179`	`if ( v.type() == QVariant::String ) { bool ok; v.toString().toDouble( &ok ); return ok; }`
`173`	`180`	`return false;`
`174`	`181`	`}`