give better names to some methods

timlinux · timlinux · commit ade1226b0718 · 2008-10-06T17:52:25.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@9440 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -173,7 +173,7 @@ QgsMapRenderer* QgsMapCanvas::mapRenderer()
 }
 
 
-QgsMapLayer* QgsMapCanvas::getZpos( int index )
+QgsMapLayer* QgsMapCanvas::layer( int index )
 {
   QStringList& layers = mMapRenderer->layerSet();
   if ( index >= 0 && index < ( int ) layers.size() )
@@ -253,7 +253,7 @@ void QgsMapCanvas::setLayerSet( QList<QgsMapCanvasLayer>& layers )
     {
       // Add check if vector layer when disconnecting from selectionChanged slot
       // Ticket #811 - racicot
-      QgsMapLayer *currentLayer = getZpos( i );
+      QgsMapLayer *currentLayer = layer( i );
       disconnect( currentLayer, SIGNAL( repaintRequested() ), this, SLOT( refresh() ) );
       disconnect( currentLayer, SIGNAL( screenUpdateRequested() ), this, SLOT( updateMap() ) );
       QgsVectorLayer *isVectLyr = dynamic_cast < QgsVectorLayer * >( currentLayer );
@@ -269,7 +269,7 @@ void QgsMapCanvas::setLayerSet( QList<QgsMapCanvasLayer>& layers )
     {
       // Add check if vector layer when connecting to selectionChanged slot
       // Ticket #811 - racicot
-      QgsMapLayer *currentLayer = getZpos( i );
+      QgsMapLayer *currentLayer = layer( i );
       connect( currentLayer, SIGNAL( repaintRequested() ), this, SLOT( refresh() ) );
       connect( currentLayer, SIGNAL( screenUpdateRequested() ), this, SLOT( updateMap() ) );
       QgsVectorLayer *isVectLyr = dynamic_cast < QgsVectorLayer * >( currentLayer );
diff --git a/src/gui/qgsmapcanvas.h b/src/gui/qgsmapcanvas.h
@@ -172,7 +172,7 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
     void updateFullExtent();
 
     //! return the map layer at position index in the layer stack
-    QgsMapLayer *getZpos( int index );
+    QgsMapLayer *layer( int index );
 
     //! return number of layers on the map
     int layerCount() const;

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ QgsMapRenderer* QgsMapCanvas::mapRenderer()`
`173`	`173`	`}`
`174`	`174`
`175`	`175`
`176`		`-QgsMapLayer* QgsMapCanvas::getZpos( int index )`
	`176`	`+QgsMapLayer* QgsMapCanvas::layer( int index )`
`177`	`177`	`{`
`178`	`178`	`QStringList& layers = mMapRenderer->layerSet();`
`179`	`179`	`if ( index >= 0 && index < ( int ) layers.size() )`
`@@ -253,7 +253,7 @@ void QgsMapCanvas::setLayerSet( QList<QgsMapCanvasLayer>& layers )`
`253`	`253`	`{`
`254`	`254`	`// Add check if vector layer when disconnecting from selectionChanged slot`
`255`	`255`	`// Ticket #811 - racicot`
`256`		`- QgsMapLayer *currentLayer = getZpos( i );`
	`256`	`+ QgsMapLayer *currentLayer = layer( i );`
`257`	`257`	`disconnect( currentLayer, SIGNAL( repaintRequested() ), this, SLOT( refresh() ) );`
`258`	`258`	`disconnect( currentLayer, SIGNAL( screenUpdateRequested() ), this, SLOT( updateMap() ) );`
`259`	`259`	`QgsVectorLayer isVectLyr = dynamic_cast < QgsVectorLayer >( currentLayer );`
`@@ -269,7 +269,7 @@ void QgsMapCanvas::setLayerSet( QList<QgsMapCanvasLayer>& layers )`
`269`	`269`	`{`
`270`	`270`	`// Add check if vector layer when connecting to selectionChanged slot`
`271`	`271`	`// Ticket #811 - racicot`
`272`		`- QgsMapLayer *currentLayer = getZpos( i );`
	`272`	`+ QgsMapLayer *currentLayer = layer( i );`
`273`	`273`	`connect( currentLayer, SIGNAL( repaintRequested() ), this, SLOT( refresh() ) );`
`274`	`274`	`connect( currentLayer, SIGNAL( screenUpdateRequested() ), this, SLOT( updateMap() ) );`
`275`	`275`	`QgsVectorLayer isVectLyr = dynamic_cast < QgsVectorLayer >( currentLayer );`