use isVisible() rather than visible() to test for layer visibility

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9232 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Aug 31, 2008 · 7d0dcbd · 7d0dcbd
1 parent 864a224
commit 7d0dcbd
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/python/gui/qgsmapcanvas.sip b/python/gui/qgsmapcanvas.sip
@@ -16,7 +16,7 @@ public:
   void setVisible(bool visible);
   void setInOverview(bool inOverview);
 
-  bool visible() const;
+  bool isVisible() const;
   bool inOverview() const;
 
   QgsMapLayer* layer();

diff --git a/src/app/legend/qgslegendlayerfile.cpp b/src/app/legend/qgslegendlayerfile.cpp
@@ -186,7 +186,7 @@ void QgsLegendLayerFile::setVisible( bool visible )
 
 bool QgsLegendLayerFile::isVisible()
 {
-  return mLyr.visible();
+  return mLyr.isVisible();
 }
 
 void QgsLegendLayerFile::setInOverview( bool inOverview )

diff --git a/src/app/qgsmapserverexport.cpp b/src/app/qgsmapserverexport.cpp
@@ -238,7 +238,7 @@ void QgsMapserverExport::writeMapFile()
       mapFile << "  STATUS ";
 
       // TODO: what to do with visibility
-      //if (lyr->visible())
+      //if (lyr->isVisible())
       //{
       mapFile << "ON";
       //} else

diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -232,7 +232,7 @@ void QgsMapCanvas::setLayerSet( QList<QgsMapCanvasLayer>& layers )
   for ( i = 0; i < layers.size(); i++ )
   {
     QgsMapCanvasLayer& lyr = layers[i];
-    if ( lyr.visible() )
+    if ( lyr.isVisible() )
     {
       layerSet.push_back( lyr.layer()->getLayerID() );
     }

diff --git a/src/gui/qgsmapcanvas.h b/src/gui/qgsmapcanvas.h
@@ -69,7 +69,7 @@ class GUI_EXPORT QgsMapCanvasLayer
     void setVisible( bool visible ) { mVisible = visible; }
     void setInOverview( bool inOverview ) { mInOverview = inOverview; }
 
-    bool visible() const { return mVisible; }
+    bool isVisible() const { return mVisible; }
     bool inOverview() const { return mInOverview; }
 
     QgsMapLayer* layer() { return mLayer; }

diff --git a/tools/mapserver_export/qgsmapserverexport.cpp b/tools/mapserver_export/qgsmapserverexport.cpp
@@ -363,7 +363,7 @@ void QgsMapserverExport::writeMapFile()
 #endif
       // set visibility (STATUS)
       mapFile << "  STATUS ";
-      if (lyr->visible())
+      if (lyr->isVisible())
       {
         mapFile << "ON";
       } else