Value map: remove hack and fix double parenthesis

Followup #36804
qgis · Jun 8, 2020 · 7aefaf4 · 7aefaf4
1 parent e81af2c
commit 7aefaf4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/gui/editorwidgets/qgsvaluemapwidgetwrapper.cpp b/src/gui/editorwidgets/qgsvaluemapwidgetwrapper.cpp
@@ -32,7 +32,9 @@ QVariant QgsValueMapWidgetWrapper::value() const
   QVariant v;
 
   if ( mComboBox )
+  {
     v = mComboBox->currentData();
+  }
 
   if ( v == QgsValueMapFieldFormatter::NULL_VALUE )
     v = QVariant( field().type() );
@@ -80,15 +82,15 @@ void QgsValueMapWidgetWrapper::updateValues( const QVariant &value, const QVaria
 
   if ( mComboBox )
   {
-    if ( mComboBox->findData( v ) == -1 && !( v.startsWith( '(' ) && v.endsWith( ')' ) ) )
+    if ( mComboBox->findData( v ) == -1 )
     {
       if ( value.isNull( ) )
       {
         mComboBox->addItem( QgsApplication::nullRepresentation().prepend( '(' ).append( ')' ), v );
       }
       else
       {
-        mComboBox->addItem( v.prepend( '(' ).append( ')' ), v );
+        mComboBox->addItem( QString( v ).prepend( '(' ).append( ')' ), v );
       }
     }
     mComboBox->setCurrentIndex( mComboBox->findData( v ) );

diff --git a/src/gui/editorwidgets/qgsvaluemapwidgetwrapper.h b/src/gui/editorwidgets/qgsvaluemapwidgetwrapper.h
@@ -68,6 +68,7 @@ class GUI_EXPORT QgsValueMapWidgetWrapper : public QgsEditorWidgetWrapper
     void updateValues( const QVariant &value, const QVariantList & = QVariantList() ) override;
 
     QComboBox *mComboBox = nullptr;
+
 };
 
 #endif // QGSVALUEMAPWIDGETWRAPPER_H