[QGIS Commit] r14090 - trunk/qgis/src/providers/wms

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-08-16 11:45:21 +0000 (Mon, 16 Aug 2010)
New Revision: 14090

Modified:
   trunk/qgis/src/providers/wms/qgswmsprovider.cpp
Log:
improve legacy support for CRS/SRS in wms provider

Modified: trunk/qgis/src/providers/wms/qgswmsprovider.cpp
===================================================================
--- trunk/qgis/src/providers/wms/qgswmsprovider.cpp	2010-08-16 07:17:07 UTC (rev 14089)
+++ trunk/qgis/src/providers/wms/qgswmsprovider.cpp	2010-08-16 11:45:21 UTC (rev 14090)
@@ -1577,20 +1577,13 @@
       {
         parseKeywordList( e1, layerProperty.keywordList );
       }
-      else if ( e1.tagName() == "SRS" )
+      else if ( e1.tagName() == "SRS" || e1.tagName() == "CRS" )
       {
-        layerProperty.crs.push_back( e1.text() );
-      }
-      else if ( e1.tagName() == "CRS" )      // legacy from earlier versions of WMS
-      {
         // CRS can contain several definitions separated by whitespace
         // though this was deprecated in WMS 1.1.1
-        QStringList srsList = e1.text().split( QRegExp( "\\s+" ) );
-
-        QStringList::const_iterator i;
-        for ( i = srsList.constBegin(); i != srsList.constEnd(); ++i )
+        foreach( QString srs, e1.text().split( QRegExp( "\\s+" ) ) )
         {
-          layerProperty.crs.push_back( *i );
+          layerProperty.crs.push_back( srs );
         }
       }
       else if ( e1.tagName() == "LatLonBoundingBox" )      // legacy from earlier versions of WMS