followup r12593

jef · jef · commit e80b74e24c0f · 2009-12-23T13:32:58.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12594 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp
@@ -504,9 +504,6 @@ void QgsLegend::addLayer( QgsMapLayer * layer )
 
   QgsLegendLayer* llayer = new QgsLegendLayer( layer );
 
-  llayer->updateIcon();
-  llayer->setToolTip( 0, layer->publicSource() );
-
   //set the correct check states
   blockSignals( true );
   if ( llayer->isVisible() )
@@ -1045,20 +1042,8 @@ QgsLegendLayer* QgsLegend::readLayerFromXML( QDomElement& childelem, bool& isOpe
   // load layer's visibility and 'show in overview' flag
   ll->setInOverview( atoi( fileElem.attribute( "isInOverview" ).toUtf8() ) );
 
-  //set the layer type icon
-  ll->updateIcon();
-  ll->setToolTip( 0, theMapLayer->publicSource() );
-
-  // setup connections that will update the layer icons
-  if ( qobject_cast<QgsVectorLayer *>( theMapLayer ) )
-  {
-    QgsDebugMsg( "Connecting signals for updating icons, layer " + theMapLayer->name() );
-    connect( theMapLayer, SIGNAL( editingStarted() ), ll, SLOT( updateIcon() ) );
-    connect( theMapLayer, SIGNAL( editingStopped() ), ll, SLOT( updateIcon() ) );
-  }
-
   // expanded or collapsed
-  isOpen = ( childelem.attribute( "open" ) == "true" );
+  isOpen = childelem.attribute( "open" ) == "true";
 
   //set the checkbox of the legend layer to the right state
   blockSignals( true );
diff --git a/src/app/legend/qgslegendlayer.cpp b/src/app/legend/qgslegendlayer.cpp
@@ -85,6 +85,9 @@ QgsLegendLayer::QgsLegendLayer( QgsMapLayer* layer )
     connect( layer, SIGNAL( editingStopped() ), this, SLOT( updateIcon() ) );
   }
   connect( layer, SIGNAL( layerNameChanged() ), this, SLOT( layerNameChanged() ) );
+
+  updateIcon();
+  setToolTip( 0, layer->publicSource() );
 }
 
 QgsLegendLayer::~QgsLegendLayer()

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,9 @@ QgsLegendLayer::QgsLegendLayer( QgsMapLayer* layer )`
`85`	`85`	`connect( layer, SIGNAL( editingStopped() ), this, SLOT( updateIcon() ) );`
`86`	`86`	`}`
`87`	`87`	`connect( layer, SIGNAL( layerNameChanged() ), this, SLOT( layerNameChanged() ) );`
	`88`	`+`
	`89`	`+ updateIcon();`
	`90`	`+ setToolTip( 0, layer->publicSource() );`
`88`	`91`	`}`
`89`	`92`
`90`	`93`	`QgsLegendLayer::~QgsLegendLayer()`