fix deprecation warnings

jef · jef · commit feafe9c9d455 · 2011-03-03T02:04:22.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15314 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/plugins/spatialquery/qgsspatialquerydialog.cpp b/src/plugins/spatialquery/qgsspatialquerydialog.cpp
@@ -535,7 +535,7 @@ void QgsSpatialQueryDialog::populateCbTargetLayer()
     }
 
     addCbLayer( true, lyr );
-    mMapIdVectorLayers.insert( lyr->getLayerID(), lyr );
+    mMapIdVectorLayers.insert( lyr->id(), lyr );
   }
   cbTargetLayer->setCurrentIndex( 0 );
   cbTargetLayer->blockSignals( false );
@@ -674,11 +674,11 @@ void QgsSpatialQueryDialog::zoomFeature( QgsVectorLayer* lyr, int fid )
   {
     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 @@ void QgsSpatialQueryDialog::signal_qgis_layerWasAdded( QgsMapLayer* mapLayer )
     cbResultFor->setEnabled( true );
   }
   addCbLayer( false, lyr );
-  mMapIdVectorLayers.insert( lyr->getLayerID(), lyr );
+  mMapIdVectorLayers.insert( lyr->id(), lyr );
 
 } // QgsSpatialQueryDialog::signal_qgis_layerWasAdded(QgsMapLayer* mapLayer)
 

Original file line number	Diff line number	Diff line change
`@@ -535,7 +535,7 @@ void QgsSpatialQueryDialog::populateCbTargetLayer()`
`535`	`535`	`}`
`536`	`536`
`537`	`537`	`addCbLayer( true, lyr );`
`538`		`- mMapIdVectorLayers.insert( lyr->getLayerID(), lyr );`
	`538`	`+ mMapIdVectorLayers.insert( lyr->id(), lyr );`
`539`	`539`	`}`
`540`	`540`	`cbTargetLayer->setCurrentIndex( 0 );`
`541`	`541`	`cbTargetLayer->blockSignals( false );`
`@@ -674,11 +674,11 @@ void QgsSpatialQueryDialog::zoomFeature( QgsVectorLayer* lyr, int fid )`
`674`	`674`	`{`
`675`	`675`	`if ( hasMsg )`
`676`	`676`	`{`
`677`		`- long epsgMapcanvas = srcMapcanvas.epsg();`
	`677`	`+ QString crsMapcanvas = srcMapcanvas.authid();`
`678`	`678`	`bool isFly = mIface->mapCanvas()->mapRenderer()->hasCrsTransformEnabled();`
`679`	`679`	`QString msgFly = tr( "Map \"%1\" \"on the fly\" transformation." ).arg( isFly ? tr( "enable" ) : tr( "disable" ) );`
`680`	`680`	`QString msg = tr( "Coordinate reference system(CRS) of\n\"%1\" is invalid(see CRS of provider)." ).arg( lyr->name() );`
`681`		`- msg.append( tr( "\n\nEPSG of map is %1.\n%2." ).arg( epsgMapcanvas ).arg( msgFly ) );`
	`681`	`+ msg.append( tr( "\n\nCRS of map is %1.\n%2." ).arg( crsMapcanvas ).arg( msgFly ) );`
`682`	`682`	`msg.append( "\n\nUsing CRS of map for all features!" );`
`683`	`683`
`684`	`684`	`QMessageBox::warning( this, tr( "Zoom to feature" ), msg, QMessageBox::Ok );`
`@@ -1006,7 +1006,7 @@ void QgsSpatialQueryDialog::signal_qgis_layerWasAdded( QgsMapLayer* mapLayer )`
`1006`	`1006`	`cbResultFor->setEnabled( true );`
`1007`	`1007`	`}`
`1008`	`1008`	`addCbLayer( false, lyr );`
`1009`		`- mMapIdVectorLayers.insert( lyr->getLayerID(), lyr );`
	`1009`	`+ mMapIdVectorLayers.insert( lyr->id(), lyr );`
`1010`	`1010`
`1011`	`1011`	`} // QgsSpatialQueryDialog::signal_qgis_layerWasAdded(QgsMapLayer* mapLayer)`
`1012`	`1012`