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

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-12-07 10:05:21 -0500 (Sun, 07 Dec 2008)
New Revision: 9752

Modified:
   trunk/qgis/src/providers/wms/qgswmsprovider.cpp
Log:
improved last commit

Modified: trunk/qgis/src/providers/wms/qgswmsprovider.cpp
===================================================================
--- trunk/qgis/src/providers/wms/qgswmsprovider.cpp	2008-12-07 14:30:47 UTC (rev 9751)
+++ trunk/qgis/src/providers/wms/qgswmsprovider.cpp	2008-12-07 15:05:21 UTC (rev 9752)
@@ -379,14 +379,14 @@
     crsKey = "CRS";
   }
 
-  int dcpTypeSize = mCapabilities.capability.request.getMap.dcpType.size();
-  if(dcpTypeSize < 1)
+  std::vector<QgsWmsDcpTypeProperty> dcpType = mCapabilities.capability.request.getMap.dcpType;
+  if(dcpType.size() < 1)
   {
     mError = tr("Could not determine URL for GetMap from the WMS capabilities response");
     return 0;
   }
 
-  QString url = prepareUri( mCapabilities.capability.request.getMap.dcpType.front().http.get.onlineResource.xlinkHref );
+  QString url = prepareUri( dcpType.front().http.get.onlineResource.xlinkHref );
 
   url += "SERVICE=WMS";
   url += "&";
@@ -413,8 +413,6 @@
     url += "TRANSPARENT=TRUE";
   }
 
-  qWarning( url.toUtf8() );
-
   // cache some details for if the user wants to do an identifyAsHtml() later
   mGetFeatureInfoUrlBase = baseUrl;
   mGetFeatureInfoUrlBase += "SERVICE=WMS";