A bit less nesting

m-kuhn · web-flow · commit 88ccb8813f7b · 2018-09-24T10:44:39.000+02:00
diff --git a/src/gui/qgsmapcanvasannotationitem.cpp b/src/gui/qgsmapcanvasannotationitem.cpp
@@ -124,16 +124,13 @@ void QgsMapCanvasAnnotationItem::onCanvasLayersChanged()
   {
     setVisible( false );
   }
+  else if ( !mAnnotation->mapLayer() )
+  {
+    setVisible( true );
+  }
   else
   {
-    if ( !mAnnotation->mapLayer() )
-    {
-      setVisible( true );
-    }
-    else
-    {
-      setVisible( mMapCanvas->mapSettings().layers().contains( mAnnotation->mapLayer() ) );
-    }
+    setVisible( mMapCanvas->mapSettings().layers().contains( mAnnotation->mapLayer() ) );
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -124,16 +124,13 @@ void QgsMapCanvasAnnotationItem::onCanvasLayersChanged()`
`124`	`124`	`{`
`125`	`125`	`setVisible( false );`
`126`	`126`	`}`
	`127`	`+ else if ( !mAnnotation->mapLayer() )`
	`128`	`+ {`
	`129`	`+ setVisible( true );`
	`130`	`+ }`
`127`	`131`	`else`
`128`	`132`	`{`
`129`		`- if ( !mAnnotation->mapLayer() )`
`130`		`- {`
`131`		`- setVisible( true );`
`132`		`- }`
`133`		`- else`
`134`		`- {`
`135`		`- setVisible( mMapCanvas->mapSettings().layers().contains( mAnnotation->mapLayer() ) );`
`136`		`- }`
	`133`	`+ setVisible( mMapCanvas->mapSettings().layers().contains( mAnnotation->mapLayer() ) );`
`137`	`134`	`}`
`138`	`135`	`}`
`139`	`136`