Merge pull request #31264 from m-kuhn/fix_json

Fix variant to json array handling
qgis · Aug 15, 2019 · 3c52497 · 3c52497
2 parents 992d261 + 371c7c7
commit 3c52497
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/core/qgsjsonutils.cpp b/src/core/qgsjsonutils.cpp
@@ -396,8 +396,8 @@ json QgsJsonUtils::jsonFromVariant( const QVariant &val )
   json j;
   if ( val.type() == QVariant::Type::Map )
   {
-    const auto vMap { val.toMap() };
-    auto jMap { json::object() };
+    const auto vMap = val.toMap();
+    auto jMap = json::object();
     for ( auto it = vMap.constBegin(); it != vMap.constEnd(); it++ )
     {
       jMap[ it.key().toStdString() ] = jsonFromVariant( it.value() );
@@ -406,8 +406,8 @@ json QgsJsonUtils::jsonFromVariant( const QVariant &val )
   }
   else if ( val.type() == QVariant::Type::List )
   {
-    const auto vList{ val.toList() };
-    auto jList { json::array() };
+    const auto vList = val.toList();
+    auto jList = json::array();
     for ( const auto &v : vList )
     {
       jList.push_back( jsonFromVariant( v ) );

diff --git a/src/providers/spatialite/qgsspatialiteprovider.cpp b/src/providers/spatialite/qgsspatialiteprovider.cpp
@@ -4407,7 +4407,7 @@ bool QgsSpatiaLiteProvider::changeAttributeValues( const QgsChangedAttributesMap
           QString jRepr;
           try
           {
-            const auto jObj { QgsJsonUtils::jsonFromVariant( val ) };
+            const auto jObj = QgsJsonUtils::jsonFromVariant( val );
             if ( ! jObj.is_array() )
             {
               throw json::parse_error::create( 0, 0, tr( "JSON value must be an array" ).toStdString() );

diff --git a/tests/src/core/testqgsjsonutils.cpp b/tests/src/core/testqgsjsonutils.cpp
@@ -124,7 +124,7 @@ void TestQgsJsonUtils::testParseJson()
 
   for ( const auto &testJson : tests )
   {
-    const auto parsed { QgsJsonUtils::parseJson( testJson ) };
+    const auto parsed = QgsJsonUtils::parseJson( testJson );
     QCOMPARE( QString::fromStdString( QgsJsonUtils::jsonFromVariant( parsed ).dump() ), testJson );
   }
 
@@ -195,7 +195,7 @@ void TestQgsJsonUtils::testExportAttributesJson()
   {
     QBENCHMARK
     {
-      const auto json { QgsJsonUtils::exportAttributes( feature, &vl ) };
+      const auto json = QgsJsonUtils::exportAttributes( feature, &vl );
       QCOMPARE( json, QStringLiteral( "{\"fldtxt\":\"a value\",\n\"fldint\":1,\n\"flddbl\":2}" ) );
     }
   }
@@ -220,7 +220,7 @@ void TestQgsJsonUtils::testExportFeatureJson()
 
   const auto j( exporter.exportFeatureToJsonObject( feature ) );
   QCOMPARE( QString::fromStdString( j.dump() ),  expectedJson );
-  const auto json { exporter.exportFeature( feature ) };
+  const auto json = exporter.exportFeature( feature );
   QCOMPARE( json, expectedJson );
 
   QgsJsonExporter exporterPrecision { &vl, 1 };