[QGIS Commit] r15314 - trunk/qgis/src/plugins/spatialquery

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-03-02 18:04:22 -0800 (Wed, 02 Mar 2011)
New Revision: 15314

Modified:
   trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.cpp
Log:
fix deprecation warnings

Modified: trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.cpp
===================================================================
--- trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.cpp	2011-03-02 21:15:46 UTC (rev 15313)
+++ trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.cpp	2011-03-03 02:04:22 UTC (rev 15314)
@@ -535,7 +535,7 @@
     }
 
     addCbLayer( true, lyr );
-    mMapIdVectorLayers.insert( lyr->getLayerID(), lyr );
+    mMapIdVectorLayers.insert( lyr->id(), lyr );
   }
   cbTargetLayer->setCurrentIndex( 0 );
   cbTargetLayer->blockSignals( false );
@@ -674,11 +674,11 @@
   {
     if ( hasMsg )
     {
-      long epsgMapcanvas = srcMapcanvas.epsg();
+      QString crsMapcanvas = srcMapcanvas.authid();
       bool isFly = mIface->mapCanvas()->mapRenderer()->hasCrsTransformEnabled();
       QString msgFly = tr( "Map \"%1\" \"on the fly\" transformation." ).arg( isFly ? tr( "enable" ) : tr( "disable" ) );
       QString msg = tr( "Coordinate reference system(CRS) of\n\"%1\" is invalid(see CRS of provider)." ).arg( lyr->name() );
-      msg.append( tr( "\n\nEPSG of map is %1.\n%2." ).arg( epsgMapcanvas ).arg( msgFly ) );
+      msg.append( tr( "\n\nCRS of map is %1.\n%2." ).arg( crsMapcanvas ).arg( msgFly ) );
       msg.append( "\n\nUsing CRS of map for all features!" );
 
       QMessageBox::warning( this, tr( "Zoom to feature" ), msg, QMessageBox::Ok );
@@ -1006,7 +1006,7 @@
     cbResultFor->setEnabled( true );
   }
   addCbLayer( false, lyr );
-  mMapIdVectorLayers.insert( lyr->getLayerID(), lyr );
+  mMapIdVectorLayers.insert( lyr->id(), lyr );
 
 } // QgsSpatialQueryDialog::signal_qgis_layerWasAdded(QgsMapLayer* mapLayer)