replace "" by QString()

pblottiere · pblottiere · commit ea097becae1c · 2016-05-31T20:16:22.000+02:00
diff --git a/src/core/qgseditformconfig.cpp b/src/core/qgseditformconfig.cpp
@@ -121,10 +121,10 @@ bool QgsEditFormConfig::labelOnTop( int idx ) const
 
 QString QgsEditFormConfig::expression( int idx ) const
 {
-  QString expr = "";
+  QString expr;
 
   if ( idx >= 0 && idx < mFields.count() )
-    expr = mConstraints.value( mFields.at( idx ).name(), "" );
+    expr = mConstraints.value( mFields.at( idx ).name(), QString() );
 
   return expr;
 }
diff --git a/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp b/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp
@@ -252,7 +252,7 @@ void QgsEditorWidgetRegistry::readMapLayer( QgsMapLayer* mapLayer, const QDomEle
       vectorLayer->editFormConfig()->setReadOnly( idx, ewv2CfgElem.attribute( "fieldEditable", "1" ) != "1" );
       vectorLayer->editFormConfig()->setLabelOnTop( idx, ewv2CfgElem.attribute( "labelOnTop", "0" ) == "1" );
       vectorLayer->editFormConfig()->setNotNull( idx, ewv2CfgElem.attribute( "notNull", "0" ) == "1" );
-      vectorLayer->editFormConfig()->setExpression( idx, ewv2CfgElem.attribute( "constraint", "" ) );
+      vectorLayer->editFormConfig()->setExpression( idx, ewv2CfgElem.attribute( "constraint", QString() ) );
 
       vectorLayer->editFormConfig()->setWidgetConfig( idx, cfg );
     }
diff --git a/src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp b/src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp
@@ -98,7 +98,7 @@ void QgsEditorWidgetWrapper::valueChanged()
 void QgsEditorWidgetWrapper::updateConstraintWidgetStatus()
 {
   if ( mValidConstraint )
-    widget()->setStyleSheet( "" );
+    widget()->setStyleSheet( QString() );
   else
     widget()->setStyleSheet( "background-color: #dd7777;" );
 }
diff --git a/src/gui/editorwidgets/qgsexternalresourcewidgetwrapper.cpp b/src/gui/editorwidgets/qgsexternalresourcewidgetwrapper.cpp
@@ -193,8 +193,8 @@ void QgsExternalResourceWidgetWrapper::updateConstraintWidgetStatus()
   if ( mLineEdit )
   {
     if ( mValidConstraint )
-      mLineEdit->setStyleSheet( "" );
+      mLineEdit->setStyleSheet( QString() );
     else
       mLineEdit->setStyleSheet( "QgsFilterLineEdit { background-color: #dd7777; }" );
   }
-}
+}
diff --git a/src/gui/editorwidgets/qgsfilenamewidgetwrapper.cpp b/src/gui/editorwidgets/qgsfilenamewidgetwrapper.cpp
@@ -157,7 +157,7 @@ void QgsFileNameWidgetWrapper::updateConstraintWidgetStatus()
   if ( mLineEdit )
   {
     if ( mValidConstraint )
-      mLineEdit->setStyleSheet( "" );
+      mLineEdit->setStyleSheet( QString() );
     else
     {
       mLineEdit->setStyleSheet( "QgsFilterLineEdit { background-color: #dd7777; }" );
diff --git a/src/gui/editorwidgets/qgsphotowidgetwrapper.cpp b/src/gui/editorwidgets/qgsphotowidgetwrapper.cpp
@@ -272,7 +272,7 @@ void QgsPhotoWidgetWrapper::updateConstraintWidgetStatus()
   if ( mLineEdit )
   {
     if ( mValidConstraint )
-      mLineEdit->setStyleSheet( "" );
+      mLineEdit->setStyleSheet( QString() );
     else
     {
       mLineEdit->setStyleSheet( "QgsFilterLineEdit { background-color: #dd7777; }" );
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.cpp b/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.cpp
@@ -145,8 +145,8 @@ void QgsRelationReferenceWidgetWrapper::updateConstraintWidgetStatus()
   if ( mWidget )
   {
     if ( mValidConstraint )
-      mWidget->setStyleSheet( "" );
+      mWidget->setStyleSheet( QString() );
     else
       mWidget->setStyleSheet( ".QComboBox { background-color: #dd7777; }" );
   }
-}
+}
diff --git a/src/gui/editorwidgets/qgswebviewwidgetwrapper.cpp b/src/gui/editorwidgets/qgswebviewwidgetwrapper.cpp
@@ -194,10 +194,10 @@ void QgsWebViewWidgetWrapper::updateConstraintWidgetStatus()
   if ( mLineEdit )
   {
     if ( mValidConstraint )
-      mLineEdit->setStyleSheet( "" );
+      mLineEdit->setStyleSheet( QString() );
     else
     {
       mLineEdit->setStyleSheet( "QgsFilterLineEdit { background-color: #dd7777; }" );
     }
   }
-}
+}
diff --git a/tests/src/gui/testqgsattributeform.cpp b/tests/src/gui/testqgsattributeform.cpp
@@ -81,7 +81,7 @@ void TestQgsAttributeForm::testFieldConstraint()
   QString invalidLabel = "col0<font color=\"red\">*</font>";
 
   // set constraint
-  layer->editFormConfig()->setExpression( 0, "" );
+  layer->editFormConfig()->setExpression( 0, QString() );
 
   // get wrapper
   QgsEditorWidgetWrapper *ww;
@@ -126,10 +126,10 @@ void TestQgsAttributeForm::testFieldMultiConstraints()
   ft.setAttribute( "col3", 3 );
 
   // set constraints for each field
-  layer->editFormConfig()->setExpression( 0, "" );
-  layer->editFormConfig()->setExpression( 1, "" );
-  layer->editFormConfig()->setExpression( 2, "" );
-  layer->editFormConfig()->setExpression( 3, "" );
+  layer->editFormConfig()->setExpression( 0, QString() );
+  layer->editFormConfig()->setExpression( 1, QString() );
+  layer->editFormConfig()->setExpression( 2, QString() );
+  layer->editFormConfig()->setExpression( 3, QString() );
 
   // build a form for this feature
   QgsAttributeForm form( layer );
@@ -161,8 +161,8 @@ void TestQgsAttributeForm::testFieldMultiConstraints()
 
   // update constraint
   layer->editFormConfig()->setExpression( 0, "col0 < (col1 * col2)" );
-  layer->editFormConfig()->setExpression( 1, "" );
-  layer->editFormConfig()->setExpression( 2, "" );
+  layer->editFormConfig()->setExpression( 1, QString() );
+  layer->editFormConfig()->setExpression( 2, QString() );
   layer->editFormConfig()->setExpression( 3, "col0 = 2" );
 
   // change value
@@ -212,7 +212,7 @@ void TestQgsAttributeForm::testOKButtonStatus()
   QSignalSpy spy3( layer, SIGNAL( editingStopped() ) );
 
   // set constraint
-  layer->editFormConfig()->setExpression( 0, "" );
+  layer->editFormConfig()->setExpression( 0, QString() );
 
   // no constraint but layer not editable : OK button disabled
   QCOMPARE( layer->isEditable(), false );

Original file line number	Diff line number	Diff line change
`@@ -121,10 +121,10 @@ bool QgsEditFormConfig::labelOnTop( int idx ) const`
`121`	`121`
`122`	`122`	`QString QgsEditFormConfig::expression( int idx ) const`
`123`	`123`	`{`
`124`		`- QString expr = "";`
	`124`	`+ QString expr;`
`125`	`125`
`126`	`126`	`if ( idx >= 0 && idx < mFields.count() )`
`127`		`- expr = mConstraints.value( mFields.at( idx ).name(), "" );`
	`127`	`+ expr = mConstraints.value( mFields.at( idx ).name(), QString() );`
`128`	`128`
`129`	`129`	`return expr;`
`130`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ void QgsEditorWidgetRegistry::readMapLayer( QgsMapLayer* mapLayer, const QDomEle`
`252`	`252`	`vectorLayer->editFormConfig()->setReadOnly( idx, ewv2CfgElem.attribute( "fieldEditable", "1" ) != "1" );`
`253`	`253`	`vectorLayer->editFormConfig()->setLabelOnTop( idx, ewv2CfgElem.attribute( "labelOnTop", "0" ) == "1" );`
`254`	`254`	`vectorLayer->editFormConfig()->setNotNull( idx, ewv2CfgElem.attribute( "notNull", "0" ) == "1" );`
`255`		`- vectorLayer->editFormConfig()->setExpression( idx, ewv2CfgElem.attribute( "constraint", "" ) );`
	`255`	`+ vectorLayer->editFormConfig()->setExpression( idx, ewv2CfgElem.attribute( "constraint", QString() ) );`
`256`	`256`
`257`	`257`	`vectorLayer->editFormConfig()->setWidgetConfig( idx, cfg );`
`258`	`258`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ void QgsEditorWidgetWrapper::valueChanged()`
`98`	`98`	`void QgsEditorWidgetWrapper::updateConstraintWidgetStatus()`
`99`	`99`	`{`
`100`	`100`	`if ( mValidConstraint )`
`101`		`- widget()->setStyleSheet( "" );`
	`101`	`+ widget()->setStyleSheet( QString() );`
`102`	`102`	`else`
`103`	`103`	`widget()->setStyleSheet( "background-color: #dd7777;" );`
`104`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -193,8 +193,8 @@ void QgsExternalResourceWidgetWrapper::updateConstraintWidgetStatus()`
`193`	`193`	`if ( mLineEdit )`
`194`	`194`	`{`
`195`	`195`	`if ( mValidConstraint )`
`196`		`- mLineEdit->setStyleSheet( "" );`
	`196`	`+ mLineEdit->setStyleSheet( QString() );`
`197`	`197`	`else`
`198`	`198`	`mLineEdit->setStyleSheet( "QgsFilterLineEdit { background-color: #dd7777; }" );`
`199`	`199`	`}`
`200`		`-}`
	`200`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ void QgsFileNameWidgetWrapper::updateConstraintWidgetStatus()`
`157`	`157`	`if ( mLineEdit )`
`158`	`158`	`{`
`159`	`159`	`if ( mValidConstraint )`
`160`		`- mLineEdit->setStyleSheet( "" );`
	`160`	`+ mLineEdit->setStyleSheet( QString() );`
`161`	`161`	`else`
`162`	`162`	`{`
`163`	`163`	`mLineEdit->setStyleSheet( "QgsFilterLineEdit { background-color: #dd7777; }" );`
Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ void QgsPhotoWidgetWrapper::updateConstraintWidgetStatus()`
`272`	`272`	`if ( mLineEdit )`
`273`	`273`	`{`
`274`	`274`	`if ( mValidConstraint )`
`275`		`- mLineEdit->setStyleSheet( "" );`
	`275`	`+ mLineEdit->setStyleSheet( QString() );`
`276`	`276`	`else`
`277`	`277`	`{`
`278`	`278`	`mLineEdit->setStyleSheet( "QgsFilterLineEdit { background-color: #dd7777; }" );`
Original file line number	Diff line number	Diff line change
`@@ -145,8 +145,8 @@ void QgsRelationReferenceWidgetWrapper::updateConstraintWidgetStatus()`
`145`	`145`	`if ( mWidget )`
`146`	`146`	`{`
`147`	`147`	`if ( mValidConstraint )`
`148`		`- mWidget->setStyleSheet( "" );`
	`148`	`+ mWidget->setStyleSheet( QString() );`
`149`	`149`	`else`
`150`	`150`	`mWidget->setStyleSheet( ".QComboBox { background-color: #dd7777; }" );`
`151`	`151`	`}`
`152`		`-}`
	`152`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -194,10 +194,10 @@ void QgsWebViewWidgetWrapper::updateConstraintWidgetStatus()`
`194`	`194`	`if ( mLineEdit )`
`195`	`195`	`{`
`196`	`196`	`if ( mValidConstraint )`
`197`		`- mLineEdit->setStyleSheet( "" );`
	`197`	`+ mLineEdit->setStyleSheet( QString() );`
`198`	`198`	`else`
`199`	`199`	`{`
`200`	`200`	`mLineEdit->setStyleSheet( "QgsFilterLineEdit { background-color: #dd7777; }" );`
`201`	`201`	`}`
`202`	`202`	`}`
`203`		`-}`
	`203`	`+}`