[QGIS Commit] r9232 - in trunk/qgis: python/gui src/app src/app/legend src/gui tools/mapserver_export

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2008-08-31 14:06:54 -0400 (Sun, 31 Aug 2008)
New Revision: 9232

Modified:
   trunk/qgis/python/gui/qgsmapcanvas.sip
   trunk/qgis/src/app/legend/qgslegendlayerfile.cpp
   trunk/qgis/src/app/qgsmapserverexport.cpp
   trunk/qgis/src/gui/qgsmapcanvas.cpp
   trunk/qgis/src/gui/qgsmapcanvas.h
   trunk/qgis/tools/mapserver_export/qgsmapserverexport.cpp
Log:
use isVisible() rather than visible() to test for layer visibility

Modified: trunk/qgis/python/gui/qgsmapcanvas.sip
===================================================================
--- trunk/qgis/python/gui/qgsmapcanvas.sip	2008-08-31 16:56:09 UTC (rev 9231)
+++ trunk/qgis/python/gui/qgsmapcanvas.sip	2008-08-31 18:06:54 UTC (rev 9232)
@@ -16,7 +16,7 @@
   void setVisible(bool visible);
   void setInOverview(bool inOverview);
   
-  bool visible() const;
+  bool isVisible() const;
   bool inOverview() const;
   
   QgsMapLayer* layer();

Modified: trunk/qgis/src/app/legend/qgslegendlayerfile.cpp
===================================================================
--- trunk/qgis/src/app/legend/qgslegendlayerfile.cpp	2008-08-31 16:56:09 UTC (rev 9231)
+++ trunk/qgis/src/app/legend/qgslegendlayerfile.cpp	2008-08-31 18:06:54 UTC (rev 9232)
@@ -186,7 +186,7 @@
 
 bool QgsLegendLayerFile::isVisible()
 {
-  return mLyr.visible();
+  return mLyr.isVisible();
 }
 
 void QgsLegendLayerFile::setInOverview( bool inOverview )

Modified: trunk/qgis/src/app/qgsmapserverexport.cpp
===================================================================
--- trunk/qgis/src/app/qgsmapserverexport.cpp	2008-08-31 16:56:09 UTC (rev 9231)
+++ trunk/qgis/src/app/qgsmapserverexport.cpp	2008-08-31 18:06:54 UTC (rev 9232)
@@ -238,7 +238,7 @@
       mapFile << "  STATUS ";
 
       // TODO: what to do with visibility
-      //if (lyr->visible())
+      //if (lyr->isVisible())
       //{
       mapFile << "ON";
       //} else

Modified: trunk/qgis/src/gui/qgsmapcanvas.cpp
===================================================================
--- trunk/qgis/src/gui/qgsmapcanvas.cpp	2008-08-31 16:56:09 UTC (rev 9231)
+++ trunk/qgis/src/gui/qgsmapcanvas.cpp	2008-08-31 18:06:54 UTC (rev 9232)
@@ -232,7 +232,7 @@
   for ( i = 0; i < layers.size(); i++ )
   {
     QgsMapCanvasLayer& lyr = layers[i];
-    if ( lyr.visible() )
+    if ( lyr.isVisible() )
     {
       layerSet.push_back( lyr.layer()->getLayerID() );
     }

Modified: trunk/qgis/src/gui/qgsmapcanvas.h
===================================================================
--- trunk/qgis/src/gui/qgsmapcanvas.h	2008-08-31 16:56:09 UTC (rev 9231)
+++ trunk/qgis/src/gui/qgsmapcanvas.h	2008-08-31 18:06:54 UTC (rev 9232)
@@ -69,7 +69,7 @@
     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; }

Modified: trunk/qgis/tools/mapserver_export/qgsmapserverexport.cpp
===================================================================
--- trunk/qgis/tools/mapserver_export/qgsmapserverexport.cpp	2008-08-31 16:56:09 UTC (rev 9231)
+++ trunk/qgis/tools/mapserver_export/qgsmapserverexport.cpp	2008-08-31 18:06:54 UTC (rev 9232)
@@ -363,7 +363,7 @@
 #endif
       // set visibility (STATUS)
       mapFile << "  STATUS ";
-      if (lyr->visible())
+      if (lyr->isVisible())
       {
         mapFile << "ON";
       } else