Correctly return null values from QgsColorWidgetWrapper

nyalldawson · nyalldawson · commit 94d88e65d847 · 2016-05-25T03:23:06.000+10:00
diff --git a/src/gui/editorwidgets/qgscolorwidgetwrapper.cpp b/src/gui/editorwidgets/qgscolorwidgetwrapper.cpp
@@ -25,12 +25,11 @@ QgsColorWidgetWrapper::QgsColorWidgetWrapper( QgsVectorLayer* vl, int fieldIdx,
 
 QVariant QgsColorWidgetWrapper::value() const
 {
-  QVariant v;
-
+  QColor c;
   if ( mColorButton )
-    v = mColorButton->color();
+    c = mColorButton->color();
 
-  return v;
+  return c.isValid() ? QVariant( c ) : QVariant( QVariant::Color );
 }
 
 void QgsColorWidgetWrapper::showIndeterminateState()
@@ -76,5 +75,5 @@ bool QgsColorWidgetWrapper::valid() const
 void QgsColorWidgetWrapper::setValue( const QVariant& value )
 {
   if ( mColorButton )
-    mColorButton->setColor( QColor( value.toString() ) );
+    mColorButton->setColor( !value.isNull() ? QColor( value.toString() ) : QColor() );
 }

Original file line number	Diff line number	Diff line change
`@@ -25,12 +25,11 @@ QgsColorWidgetWrapper::QgsColorWidgetWrapper( QgsVectorLayer* vl, int fieldIdx,`
`25`	`25`
`26`	`26`	`QVariant QgsColorWidgetWrapper::value() const`
`27`	`27`	`{`
`28`		`- QVariant v;`
`29`		`-`
	`28`	`+ QColor c;`
`30`	`29`	`if ( mColorButton )`
`31`		`- v = mColorButton->color();`
	`30`	`+ c = mColorButton->color();`
`32`	`31`
`33`		`- return v;`
	`32`	`+ return c.isValid() ? QVariant( c ) : QVariant( QVariant::Color );`
`34`	`33`	`}`
`35`	`34`
`36`	`35`	`void QgsColorWidgetWrapper::showIndeterminateState()`
`@@ -76,5 +75,5 @@ bool QgsColorWidgetWrapper::valid() const`
`76`	`75`	`void QgsColorWidgetWrapper::setValue( const QVariant& value )`
`77`	`76`	`{`
`78`	`77`	`if ( mColorButton )`
`79`		`- mColorButton->setColor( QColor( value.toString() ) );`
	`78`	`+ mColorButton->setColor( !value.isNull() ? QColor( value.toString() ) : QColor() );`
`80`	`79`	`}`