[QGIS Commit] r12593 - trunk/qgis/src/app/legend

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-12-23 08:01:48 -0500 (Wed, 23 Dec 2009)
New Revision: 12593

Modified:
   trunk/qgis/src/app/legend/qgslegend.cpp
   trunk/qgis/src/app/legend/qgslegendlayer.cpp
Log:
fix #2314

Modified: trunk/qgis/src/app/legend/qgslegend.cpp
===================================================================
--- trunk/qgis/src/app/legend/qgslegend.cpp	2009-12-23 13:00:26 UTC (rev 12592)
+++ trunk/qgis/src/app/legend/qgslegend.cpp	2009-12-23 13:01:48 UTC (rev 12593)
@@ -537,14 +537,6 @@
   setCurrentItem( llayer );
   //make the QTreeWidget item up-to-date
   doItemsLayout();
-
-  // setup connections that will update the layer icons
-  if ( qobject_cast<QgsVectorLayer *>( layer ) )
-  {
-    QgsDebugMsg( "Connecting signals for updating icons, layer " + layer->name() );
-    connect( layer, SIGNAL( editingStarted() ), llayer, SLOT( updateIcon() ) );
-    connect( layer, SIGNAL( editingStopped() ), llayer, SLOT( updateIcon() ) );
-  }
 }
 
 QgsLegendLayer* QgsLegend::currentLegendLayer()

Modified: trunk/qgis/src/app/legend/qgslegendlayer.cpp
===================================================================
--- trunk/qgis/src/app/legend/qgslegendlayer.cpp	2009-12-23 13:00:26 UTC (rev 12592)
+++ trunk/qgis/src/app/legend/qgslegendlayer.cpp	2009-12-23 13:01:48 UTC (rev 12593)
@@ -77,16 +77,14 @@
   // not in overview by default
   mLyr.setInOverview( FALSE );
 
-  // Add check if vector layer when connecting to selectionChanged slot
-  // Ticket #811 - racicot
-  QgsMapLayer *currentLayer = mLyr.layer();
-  QgsVectorLayer *isVectLyr = qobject_cast<QgsVectorLayer *>( currentLayer );
-  if ( isVectLyr )
+  // setup connections that will update the layer icons
+  if ( qobject_cast<QgsVectorLayer *>( layer ) )
   {
-    connect( mLyr.layer(), SIGNAL( editingStarted() ), this, SLOT( updateLegendItem() ) );
-    connect( mLyr.layer(), SIGNAL( editingStopped() ), this, SLOT( updateLegendItem() ) );
+    QgsDebugMsg( "Connecting signals for updating icons, layer " + layer->name() );
+    connect( layer, SIGNAL( editingStarted() ), this, SLOT( updateIcon() ) );
+    connect( layer, SIGNAL( editingStopped() ), this, SLOT( updateIcon() ) );
   }
-  connect( mLyr.layer(), SIGNAL( layerNameChanged() ), this, SLOT( layerNameChanged() ) );
+  connect( layer, SIGNAL( layerNameChanged() ), this, SLOT( layerNameChanged() ) );
 }
 
 QgsLegendLayer::~QgsLegendLayer()