Skip to content

Commit ea097be

Browse files
committed
replace "" by QString()
1 parent 7d71c97 commit ea097be

9 files changed

+20
-20
lines changed

src/core/qgseditformconfig.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@ bool QgsEditFormConfig::labelOnTop( int idx ) const
121121

122122
QString QgsEditFormConfig::expression( int idx ) const
123123
{
124-
QString expr = "";
124+
QString expr;
125125

126126
if ( idx >= 0 && idx < mFields.count() )
127-
expr = mConstraints.value( mFields.at( idx ).name(), "" );
127+
expr = mConstraints.value( mFields.at( idx ).name(), QString() );
128128

129129
return expr;
130130
}

src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ void QgsEditorWidgetRegistry::readMapLayer( QgsMapLayer* mapLayer, const QDomEle
252252
vectorLayer->editFormConfig()->setReadOnly( idx, ewv2CfgElem.attribute( "fieldEditable", "1" ) != "1" );
253253
vectorLayer->editFormConfig()->setLabelOnTop( idx, ewv2CfgElem.attribute( "labelOnTop", "0" ) == "1" );
254254
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() ) );
256256

257257
vectorLayer->editFormConfig()->setWidgetConfig( idx, cfg );
258258
}

src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ void QgsEditorWidgetWrapper::valueChanged()
9898
void QgsEditorWidgetWrapper::updateConstraintWidgetStatus()
9999
{
100100
if ( mValidConstraint )
101-
widget()->setStyleSheet( "" );
101+
widget()->setStyleSheet( QString() );
102102
else
103103
widget()->setStyleSheet( "background-color: #dd7777;" );
104104
}

src/gui/editorwidgets/qgsexternalresourcewidgetwrapper.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@ void QgsExternalResourceWidgetWrapper::updateConstraintWidgetStatus()
193193
if ( mLineEdit )
194194
{
195195
if ( mValidConstraint )
196-
mLineEdit->setStyleSheet( "" );
196+
mLineEdit->setStyleSheet( QString() );
197197
else
198198
mLineEdit->setStyleSheet( "QgsFilterLineEdit { background-color: #dd7777; }" );
199199
}
200-
}
200+
}

src/gui/editorwidgets/qgsfilenamewidgetwrapper.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ void QgsFileNameWidgetWrapper::updateConstraintWidgetStatus()
157157
if ( mLineEdit )
158158
{
159159
if ( mValidConstraint )
160-
mLineEdit->setStyleSheet( "" );
160+
mLineEdit->setStyleSheet( QString() );
161161
else
162162
{
163163
mLineEdit->setStyleSheet( "QgsFilterLineEdit { background-color: #dd7777; }" );

src/gui/editorwidgets/qgsphotowidgetwrapper.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ void QgsPhotoWidgetWrapper::updateConstraintWidgetStatus()
272272
if ( mLineEdit )
273273
{
274274
if ( mValidConstraint )
275-
mLineEdit->setStyleSheet( "" );
275+
mLineEdit->setStyleSheet( QString() );
276276
else
277277
{
278278
mLineEdit->setStyleSheet( "QgsFilterLineEdit { background-color: #dd7777; }" );

src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ void QgsRelationReferenceWidgetWrapper::updateConstraintWidgetStatus()
145145
if ( mWidget )
146146
{
147147
if ( mValidConstraint )
148-
mWidget->setStyleSheet( "" );
148+
mWidget->setStyleSheet( QString() );
149149
else
150150
mWidget->setStyleSheet( ".QComboBox { background-color: #dd7777; }" );
151151
}
152-
}
152+
}

src/gui/editorwidgets/qgswebviewwidgetwrapper.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,10 @@ void QgsWebViewWidgetWrapper::updateConstraintWidgetStatus()
194194
if ( mLineEdit )
195195
{
196196
if ( mValidConstraint )
197-
mLineEdit->setStyleSheet( "" );
197+
mLineEdit->setStyleSheet( QString() );
198198
else
199199
{
200200
mLineEdit->setStyleSheet( "QgsFilterLineEdit { background-color: #dd7777; }" );
201201
}
202202
}
203-
}
203+
}

tests/src/gui/testqgsattributeform.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ void TestQgsAttributeForm::testFieldConstraint()
8181
QString invalidLabel = "col0<font color=\"red\">*</font>";
8282

8383
// set constraint
84-
layer->editFormConfig()->setExpression( 0, "" );
84+
layer->editFormConfig()->setExpression( 0, QString() );
8585

8686
// get wrapper
8787
QgsEditorWidgetWrapper *ww;
@@ -126,10 +126,10 @@ void TestQgsAttributeForm::testFieldMultiConstraints()
126126
ft.setAttribute( "col3", 3 );
127127

128128
// set constraints for each field
129-
layer->editFormConfig()->setExpression( 0, "" );
130-
layer->editFormConfig()->setExpression( 1, "" );
131-
layer->editFormConfig()->setExpression( 2, "" );
132-
layer->editFormConfig()->setExpression( 3, "" );
129+
layer->editFormConfig()->setExpression( 0, QString() );
130+
layer->editFormConfig()->setExpression( 1, QString() );
131+
layer->editFormConfig()->setExpression( 2, QString() );
132+
layer->editFormConfig()->setExpression( 3, QString() );
133133

134134
// build a form for this feature
135135
QgsAttributeForm form( layer );
@@ -161,8 +161,8 @@ void TestQgsAttributeForm::testFieldMultiConstraints()
161161

162162
// update constraint
163163
layer->editFormConfig()->setExpression( 0, "col0 < (col1 * col2)" );
164-
layer->editFormConfig()->setExpression( 1, "" );
165-
layer->editFormConfig()->setExpression( 2, "" );
164+
layer->editFormConfig()->setExpression( 1, QString() );
165+
layer->editFormConfig()->setExpression( 2, QString() );
166166
layer->editFormConfig()->setExpression( 3, "col0 = 2" );
167167

168168
// change value
@@ -212,7 +212,7 @@ void TestQgsAttributeForm::testOKButtonStatus()
212212
QSignalSpy spy3( layer, SIGNAL( editingStopped() ) );
213213

214214
// set constraint
215-
layer->editFormConfig()->setExpression( 0, "" );
215+
layer->editFormConfig()->setExpression( 0, QString() );
216216

217217
// no constraint but layer not editable : OK button disabled
218218
QCOMPARE( layer->isEditable(), false );

0 commit comments

Comments
 (0)