Use consequently QList<QVariant> instead of QVariantList in this cont…

…ext so it's easier to read and understand
qgis · Feb 26, 2025 · 8a98242 · 8a98242
1 parent dcab021
commit 8a98242
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/core/project/qgsproject.cpp b/src/core/project/qgsproject.cpp
@@ -685,11 +685,14 @@ void QgsProject::registerTranslatableObjects( QgsTranslationContext *translation
         }
         if ( field.editorWidgetSetup().type() == QStringLiteral( "ValueMap" ) )
         {
-          const QList<QVariant> valueList = field.editorWidgetSetup().config().value( QStringLiteral( "map" ) ).toList();
-
-          for ( int i = 0, row = 0; i < valueList.count(); i++, row++ )
+          if ( field.editorWidgetSetup().config().value( QStringLiteral( "map" ) ).canConvert<QList<QVariant>>() )
           {
-            translationContext->registerTranslation( QStringLiteral( "project:layers:%1:fields:%2:valuemapdescriptions" ).arg( vlayer->id(), field.name() ), valueList[i].toMap().constBegin().key() );
+            const QList<QVariant> valueList = field.editorWidgetSetup().config().value( QStringLiteral( "map" ) ).toList();
+
+            for ( int i = 0, row = 0; i < valueList.count(); i++, row++ )
+            {
+              translationContext->registerTranslation( QStringLiteral( "project:layers:%1:fields:%2:valuemapdescriptions" ).arg( vlayer->id(), field.name() ), valueList[i].toMap().constBegin().key() );
+            }
           }
         }
       }

diff --git a/src/core/vector/qgsvectorlayer.cpp b/src/core/vector/qgsvectorlayer.cpp
@@ -2688,9 +2688,9 @@ bool QgsVectorLayer::readSymbology( const QDomNode &layerNode, QString &errorMes
         }
         if ( widgetType == QStringLiteral( "ValueMap" ) )
         {
-          QList<QVariant> translatedValueList;
-          if ( optionsMap[ QStringLiteral( "map" ) ].canConvert<QVariantList>() )
+          if ( optionsMap[ QStringLiteral( "map" ) ].canConvert<QList<QVariant>>() )
           {
+            QList<QVariant> translatedValueList;
             const QList<QVariant> valueList = optionsMap[ QStringLiteral( "map" )].toList();
             for ( int i = 0, row = 0; i < valueList.count(); i++, row++ )
             {

diff --git a/src/gui/vector/qgsattributesformproperties.cpp b/src/gui/vector/qgsattributesformproperties.cpp
@@ -2222,7 +2222,7 @@ void QgsAttributesFormProperties::pasteWidgetConfiguration()
           }
           if ( widgetType == QStringLiteral( "ValueMap" ) )
           {
-            if ( optionsMap[QStringLiteral( "map" )].canConvert<QVariantList>() )
+            if ( optionsMap[QStringLiteral( "map" )].canConvert<QList<QVariant>>() )
             {
               QList<QVariant> translatedValueList;
               const QList<QVariant> valueList = optionsMap[QStringLiteral( "map" )].toList();