Some cleaning

pblottiere · pblottiere · commit f841681c0628 · 2019-01-28T11:42:14.000Z
diff --git a/src/core/qgsjsonutils.cpp b/src/core/qgsjsonutils.cpp
@@ -239,7 +239,7 @@ QString QgsJsonExporter::exportFeatures( const QgsFeatureList &features ) const
 
   QString layerName;
   if ( mIncludeName )
-    layerName.append( QStringLiteral( "\n \"name\": \"%1\",\n" ).arg( mLayer->name() ) );
+    layerName = QStringLiteral( "\n \"name\": \"%1\",\n" ).arg( mLayer->name() );
 
   return QStringLiteral( "{%1 \"type\": \"FeatureCollection\",\n    \"features\":[\n%2\n]}" ).arg( layerName, featureJSON.join( QStringLiteral( ",\n" ) ) );
 }
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -2281,8 +2281,7 @@ namespace QgsWms
   QByteArray QgsRenderer::convertFeatureInfoToJson( const QList<QgsMapLayer *> &layers, const QDomDocument &doc ) const
   {
     QString json;
-    json.append( QStringLiteral( "{" ) );
-    json.append( QStringLiteral( "\"layers\":[" ) );
+    json.append( QStringLiteral( "{\n\"layers\":[" ) );
 
     const bool withGeometry = ( QgsServerProjectUtils::wmsFeatureInfoAddWktGeometry( *mProject ) && mWmsParameters.withGeometry() );
 
@@ -2318,7 +2317,7 @@ namespace QgsWms
         for ( int j = 0; j < featuresNode.size(); ++j )
         {
           const QDomElement featureNode = featuresNode.at( j ).toElement();
-          const qint64 fid = featureNode.attribute( QStringLiteral( "id" ) ).toLongLong();
+          const QgsFeatureId fid = featureNode.attribute( QStringLiteral( "id" ) ).toLongLong();
           const QgsFeature feature = vl->getFeature( fid );
           features << feature;
 

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ QString QgsJsonExporter::exportFeatures( const QgsFeatureList &features ) const`
`239`	`239`
`240`	`240`	`QString layerName;`
`241`	`241`	`if ( mIncludeName )`
`242`		`- layerName.append( QStringLiteral( "\n \"name\": \"%1\",\n" ).arg( mLayer->name() ) );`
	`242`	`+ layerName = QStringLiteral( "\n \"name\": \"%1\",\n" ).arg( mLayer->name() );`
`243`	`243`
`244`	`244`	`return QStringLiteral( "{%1 \"type\": \"FeatureCollection\",\n \"features\":[\n%2\n]}" ).arg( layerName, featureJSON.join( QStringLiteral( ",\n" ) ) );`
`245`	`245`	`}`