Update for loop

qgis · Nov 16, 2017 · 7b49032521d00428e4c92b4fd559a9b5fd705bda · 7b49032
1 parent 0a38003
commit 7b49032521d00428e4c92b4fd559a9b5fd705bda
Unified Split

Showing with 9 additions and 14 deletions.

+9 −14 src/server/services/wms/qgswmsgetcapabilities.cpp
diff --git a/src/server/services/wms/qgswmsgetcapabilities.cpp b/src/server/services/wms/qgswmsgetcapabilities.cpp
@@ -1732,26 +1732,21 @@ namespace QgsWms
       keywordsElem.appendChild( keywordElem );
       parent.appendChild( keywordsElem );
       QStringList keywords = QgsServerProjectUtils::owsServiceKeywords( *project );
-      if ( !keywords.isEmpty() )
+      for ( const QString &keyword : qgis::as_const( keywords ) )
       {
-        for ( int i = 0; i < keywords.size(); ++i )
+        if ( !keyword.isEmpty() )
         {
-          QString keyword = keywords.at( i );
-          if ( !keyword.isEmpty() )
+          keywordElem = doc.createElement( QStringLiteral( "Keyword" ) );
+          keywordText = doc.createTextNode( keyword );
+          keywordElem.appendChild( keywordText );
+          if ( sia2045 )
           {
-            keywordElem = doc.createElement( QStringLiteral( "Keyword" ) );
-            keywordText = doc.createTextNode( keyword );
-            keywordElem.appendChild( keywordText );
-            if ( sia2045 )
-            {
-              keywordElem.setAttribute( QStringLiteral( "vocabulary" ), QStringLiteral( "SIA_Geo405" ) );
-            }
-            keywordsElem.appendChild( keywordElem );
+            keywordElem.setAttribute( QStringLiteral( "vocabulary" ), QStringLiteral( "SIA_Geo405" ) );
           }
+          keywordsElem.appendChild( keywordElem );
         }
-
-        parent.appendChild( keywordsElem );
       }
+      parent.appendChild( keywordsElem );
     }
   }