Hide logically dead code

nyalldawson · nyalldawson · commit dc77d5812cc7 · 2015-02-17T17:05:16.000+11:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -10057,7 +10057,8 @@ void QgisApp::showLayerProperties( QgsMapLayer *ml )
 
   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 )
     {
       rlp->sync();
@@ -10067,6 +10068,9 @@ void QgisApp::showLayerProperties( QgsMapLayer *ml )
       rlp = new QgsRasterLayerProperties( ml, mMapCanvas, this );
       // handled by rendererChanged() connect( rlp, SIGNAL( refreshLegend( QString, bool ) ), mLayerTreeView, SLOT( refreshLayerSymbology( QString ) ) );
     }
+#else
+    QgsRasterLayerProperties *rlp = new QgsRasterLayerProperties( ml, mMapCanvas, this );
+#endif
 
     rlp->exec();
     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 );
 
-    QgsVectorLayerProperties *vlp = NULL; // See note above about reusing this
+#if 0 // See note above about reusing this
+    QgsVectorLayerProperties *vlp = NULL;
     if ( vlp )
     {
       vlp->syncToLayer();
@@ -10085,6 +10090,9 @@ void QgisApp::showLayerProperties( QgsMapLayer *ml )
       vlp = new QgsVectorLayerProperties( vlayer, this );
       // handled by rendererChanged() connect( vlp, SIGNAL( refreshLegend( QString ) ), mLayerTreeView, SLOT( refreshLayerSymbology( QString ) ) );
     }
+#else
+    QgsVectorLayerProperties *vlp = new QgsVectorLayerProperties( vlayer, this );
+#endif
 
     if ( vlp->exec() )
     {

Original file line number	Diff line number	Diff line change
`@@ -10057,7 +10057,8 @@ void QgisApp::showLayerProperties( QgsMapLayer *ml )`
`10057`	`10057`
`10058`	`10058`	`if ( ml->type() == QgsMapLayer::RasterLayer )`
`10059`	`10059`	`{`
`10060`		`- QgsRasterLayerProperties *rlp = NULL; // See note above about reusing this`
	`10060`	`+#if 0 // See note above about reusing this`
	`10061`	`+ QgsRasterLayerProperties *rlp = NULL;`
`10061`	`10062`	`if ( rlp )`
`10062`	`10063`	`{`
`10063`	`10064`	`rlp->sync();`
`@@ -10067,6 +10068,9 @@ void QgisApp::showLayerProperties( QgsMapLayer *ml )`
`10067`	`10068`	`rlp = new QgsRasterLayerProperties( ml, mMapCanvas, this );`
`10068`	`10069`	`// handled by rendererChanged() connect( rlp, SIGNAL( refreshLegend( QString, bool ) ), mLayerTreeView, SLOT( refreshLayerSymbology( QString ) ) );`
`10069`	`10070`	`}`
	`10071`	`+#else`
	`10072`	`+ QgsRasterLayerProperties *rlp = new QgsRasterLayerProperties( ml, mMapCanvas, this );`
	`10073`	`+#endif`
`10070`	`10074`
`10071`	`10075`	`rlp->exec();`
`10072`	`10076`	`delete rlp; // delete since dialog cannot be reused without updating code`
`@@ -10075,7 +10079,8 @@ void QgisApp::showLayerProperties( QgsMapLayer *ml )`
`10075`	`10079`	`{`
`10076`	`10080`	`QgsVectorLayer* vlayer = qobject_cast<QgsVectorLayer *>( ml );`
`10077`	`10081`
`10078`		`- QgsVectorLayerProperties *vlp = NULL; // See note above about reusing this`
	`10082`	`+#if 0 // See note above about reusing this`
	`10083`	`+ QgsVectorLayerProperties *vlp = NULL;`
`10079`	`10084`	`if ( vlp )`
`10080`	`10085`	`{`
`10081`	`10086`	`vlp->syncToLayer();`
`@@ -10085,6 +10090,9 @@ void QgisApp::showLayerProperties( QgsMapLayer *ml )`
`10085`	`10090`	`vlp = new QgsVectorLayerProperties( vlayer, this );`
`10086`	`10091`	`// handled by rendererChanged() connect( vlp, SIGNAL( refreshLegend( QString ) ), mLayerTreeView, SLOT( refreshLayerSymbology( QString ) ) );`
`10087`	`10092`	`}`
	`10093`	`+#else`
	`10094`	`+ QgsVectorLayerProperties *vlp = new QgsVectorLayerProperties( vlayer, this );`
	`10095`	`+#endif`
`10088`	`10096`
`10089`	`10097`	`if ( vlp->exec() )`
`10090`	`10098`	`{`