Some cleaning

qgis · Jan 28, 2019 · 0f24e72 · 0f24e72
1 parent 8e3f7b1
commit 0f24e72
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -2312,27 +2312,27 @@ namespace QgsWms
         QgsFeatureList features;
         QgsAttributeList attributes;
         const QDomNodeList featuresNode = layerElem.elementsByTagName( QStringLiteral( "Feature" ) );
-        if ( !featuresNode.isEmpty() )
+        if ( featuresNode.isEmpty() )
+          continue;
+
+        for ( int j = 0; j < featuresNode.size(); ++j )
         {
-          for ( int j = 0; j < featuresNode.size(); ++j )
-          {
-            const QDomElement featureNode = featuresNode.at( j ).toElement();
-            const qint64 fid = featureNode.attribute( QStringLiteral( "id" ) ).toLongLong();
-            const QgsFeature feature = vl->getFeature( fid );
-            features.append( feature );
+          const QDomElement featureNode = featuresNode.at( j ).toElement();
+          const qint64 fid = featureNode.attribute( QStringLiteral( "id" ) ).toLongLong();
+          const QgsFeature feature = vl->getFeature( fid );
+          features << feature;
 
-            // search attributes to export (one time only)
-            if ( not attributes.isEmpty() )
-              continue;
+          // search attributes to export (one time only)
+          if ( not attributes.isEmpty() )
+            continue;
 
-            const QDomNodeList attributesNode = featureNode.elementsByTagName( QStringLiteral( "Attribute" ) );
-            for ( int k = 0; k < attributesNode.size(); ++k )
-            {
-              const QDomElement attributeElement = attributesNode.at( k ).toElement();
-              const QString fieldName = attributeElement.attribute( QStringLiteral( "name" ) );
+          const QDomNodeList attributesNode = featureNode.elementsByTagName( QStringLiteral( "Attribute" ) );
+          for ( int k = 0; k < attributesNode.size(); ++k )
+          {
+            const QDomElement attributeElement = attributesNode.at( k ).toElement();
+            const QString fieldName = attributeElement.attribute( QStringLiteral( "name" ) );
 
-              attributes << feature.fieldNameIndex( fieldName );
-            }
+            attributes << feature.fieldNameIndex( fieldName );
           }
         }
 
@@ -2369,7 +2369,7 @@ namespace QgsWms
       }
     }
 
-    json.append( ( "]}" ) );
+    json.append( QStringLiteral( "]}" ) );
 
     return json.toUtf8();
   }

diff --git a/src/server/services/wms/qgswmsrenderer.h b/src/server/services/wms/qgswmsrenderer.h
@@ -255,6 +255,7 @@ namespace QgsWms
       //! Converts a feature info xml document to Text
       QByteArray convertFeatureInfoToText( const QDomDocument &doc ) const;
 
+      //! Converts a feature info xml document to json
       QByteArray convertFeatureInfoToJson( const QList<QgsMapLayer *> &layers, const QDomDocument &doc ) const;
 
       QDomElement createFeatureGML(