sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Hide logically dead code

Browse Source
This commit is contained in:
Nyall Dawson 2015-02-17 16:56:55 +11:00
parent ceceebdf9b
commit dc77d5812c
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/qgisapp.cpp
View File

@ -10057,7 +10057,8 @@ void QgisApp::showLayerProperties( QgsMapLayer *ml )
if ( ml->type() == QgsMapLayer::RasterLayer ) if ( ml->type() == QgsMapLayer::RasterLayer )
{ {
QgsRasterLayerProperties *rlp = NULL; // See note above about reusing this #if 0 // See note above about reusing this
QgsRasterLayerProperties *rlp = NULL;
if ( rlp ) if ( rlp )
{ {
rlp->sync(); rlp->sync();
@ -10067,6 +10068,9 @@ void QgisApp::showLayerProperties( QgsMapLayer *ml )
rlp = new QgsRasterLayerProperties( ml, mMapCanvas, this ); rlp = new QgsRasterLayerProperties( ml, mMapCanvas, this );
// handled by rendererChanged() connect( rlp, SIGNAL( refreshLegend( QString, bool ) ), mLayerTreeView, SLOT( refreshLayerSymbology( QString ) ) ); // handled by rendererChanged() connect( rlp, SIGNAL( refreshLegend( QString, bool ) ), mLayerTreeView, SLOT( refreshLayerSymbology( QString ) ) );
} }
#else
QgsRasterLayerProperties *rlp = new QgsRasterLayerProperties( ml, mMapCanvas, this );
#endif
rlp->exec(); rlp->exec();
delete rlp; // delete since dialog cannot be reused without updating code delete rlp; // delete since dialog cannot be reused without updating code
@ -10075,7 +10079,8 @@ void QgisApp::showLayerProperties( QgsMapLayer *ml )
{ {
QgsVectorLayer* vlayer = qobject_cast<QgsVectorLayer *>( ml ); QgsVectorLayer* vlayer = qobject_cast<QgsVectorLayer *>( ml );
QgsVectorLayerProperties *vlp = NULL; // See note above about reusing this #if 0 // See note above about reusing this
QgsVectorLayerProperties *vlp = NULL;
if ( vlp ) if ( vlp )
{ {
vlp->syncToLayer(); vlp->syncToLayer();
@ -10085,6 +10090,9 @@ void QgisApp::showLayerProperties( QgsMapLayer *ml )
vlp = new QgsVectorLayerProperties( vlayer, this ); vlp = new QgsVectorLayerProperties( vlayer, this );
// handled by rendererChanged() connect( vlp, SIGNAL( refreshLegend( QString ) ), mLayerTreeView, SLOT( refreshLayerSymbology( QString ) ) ); // handled by rendererChanged() connect( vlp, SIGNAL( refreshLegend( QString ) ), mLayerTreeView, SLOT( refreshLayerSymbology( QString ) ) );
} }
#else
QgsVectorLayerProperties *vlp = new QgsVectorLayerProperties( vlayer, this );
#endif
if ( vlp->exec() ) if ( vlp->exec() )
{ {