Skip to content

Commit

Permalink
fix #1045
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11022 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Jul 4, 2009
1 parent d5b84ed commit 29a6e51
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
13 changes: 3 additions & 10 deletions src/app/legend/qgslegend.cpp
@@ -1,4 +1,3 @@

/***************************************************************************
qgslegend.cpp - description
-------------------
Expand Down Expand Up @@ -89,16 +88,11 @@ QgsLegend::QgsLegend( QWidget * parent, const char *name )
header()->setHidden( 1 );
setRootIsDecorated( true );
initPixmaps();


}



QgsLegend::~QgsLegend()
{}


void QgsLegend::handleCurrentItemChanged( QTreeWidgetItem* current, QTreeWidgetItem* previous )
{
QgsMapLayer *layer = currentLayer();
Expand Down Expand Up @@ -551,8 +545,8 @@ void QgsLegend::addLayer( QgsMapLayer * layer )
doItemsLayout();

// setup connections that will update the layer icons
connect(layer, SIGNAL(editingStarted()), llayer, SLOT(updateIcon()));
connect(layer, SIGNAL(editingStopped()), llayer, SLOT(updateIcon()));
connect( layer, SIGNAL( editingStarted() ), llayer, SLOT( updateIcon() ) );
connect( layer, SIGNAL( editingStopped() ), llayer, SLOT( updateIcon() ) );
}

QgsLegendLayerFile* QgsLegend::currentLayerFile()
Expand Down Expand Up @@ -1563,7 +1557,6 @@ void QgsLegend::handleItemChange( QTreeWidgetItem* item, int row )
return;
}

closePersistentEditor( item, row );
//if the text of a QgsLegendLayer has changed, change the display names of all its maplayers
QgsLegendLayer* theLegendLayer = dynamic_cast<QgsLegendLayer*>( item ); //item is a legend layer
if ( theLegendLayer )
Expand Down Expand Up @@ -1705,7 +1698,7 @@ void QgsLegend::openEditor()
QTreeWidgetItem* theItem = currentItem();
if ( theItem )
{
openPersistentEditor( theItem, 0 );
editItem( theItem, 0 );
}
}

Expand Down
1 change: 0 additions & 1 deletion src/app/legend/qgslegendlayer.cpp
Expand Up @@ -400,7 +400,6 @@ void QgsLegendLayer::updateIcon()
QPixmap newIcon( getOriginalPixmap() );

QgsMapLayer* theLayer = firstMapLayer();
QgsLegendLayerFile* theFile = firstLayerFile();

if ( mapLayers().size() == 1 )
{
Expand Down

0 comments on commit 29a6e51

Please sign in to comment.