fix review issues

PeterPetrik · PeterPetrik · commit dc774743e304 · 2018-09-14T09:33:30.000+02:00
diff --git a/python/gui/auto_generated/qgsidentifymenu.sip.in b/python/gui/auto_generated/qgsidentifymenu.sip.in
@@ -64,7 +64,7 @@ define if the menu executed can return multiple results (e.g. all results or all
 
     void setExecWithSingleResult( bool execWithSingleResult );
 %Docstring
-define if the menu will be shown with a single idetify result
+define if the menu will be shown with a single identify result
 %End
     bool execWithSingleResult();
 
diff --git a/src/app/qgsmaptoolselectionhandler.cpp b/src/app/qgsmaptoolselectionhandler.cpp
@@ -109,7 +109,6 @@ QgsMapToolSelectionHandler::QgsMapToolSelectionHandler( QgsMapCanvas *canvas, Qg
 QgsMapToolSelectionHandler::~QgsMapToolSelectionHandler()
 {
   cancel();
-  delete mIdentifyMenu;
 }
 
 void QgsMapToolSelectionHandler::canvasReleaseEvent( QgsMapMouseEvent *e )
@@ -256,7 +255,8 @@ void QgsMapToolSelectionHandler::selectPolygonPressEvent( QgsMapMouseEvent *e )
     double x = mapPoint.x(), y = mapPoint.y();
     double sr = QgsMapTool::searchRadiusMU( mCanvas );
 
-    for ( auto layer : mCanvas->layers() )
+    const QList<QgsMapLayer*> layers = mCanvas->layers();
+    for ( auto layer : layers )
     {
       if ( layer->type() == QgsMapLayer::VectorLayer )
       {
diff --git a/src/app/qgsmaptoolselectionhandler.h b/src/app/qgsmaptoolselectionhandler.h
@@ -199,7 +199,7 @@ class QgsMapToolSelectionHandler : public QObject
     QColor mStrokeColor = QColor( 254, 58, 29, 100 );
 
     //! Shows features to select polygon from existing features
-    QgsIdentifyMenu *mIdentifyMenu = nullptr;
+    QgsIdentifyMenu *mIdentifyMenu = nullptr; // owned by canvas
 };
 
 #endif
diff --git a/src/gui/qgsidentifymenu.cpp b/src/gui/qgsidentifymenu.cpp
@@ -26,6 +26,7 @@
 #include "qgssettings.h"
 #include "qgsgui.h"
 
+//TODO 4.0 add explicitely qobject parent to constructor
 QgsIdentifyMenu::QgsIdentifyMenu( QgsMapCanvas *canvas )
   : QMenu( canvas )
   , mCanvas( canvas )

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,6 @@ QgsMapToolSelectionHandler::QgsMapToolSelectionHandler( QgsMapCanvas *canvas, Qg`
`109`	`109`	`QgsMapToolSelectionHandler::~QgsMapToolSelectionHandler()`
`110`	`110`	`{`
`111`	`111`	`cancel();`
`112`		`- delete mIdentifyMenu;`
`113`	`112`	`}`
`114`	`113`
`115`	`114`	`void QgsMapToolSelectionHandler::canvasReleaseEvent( QgsMapMouseEvent *e )`
`@@ -256,7 +255,8 @@ void QgsMapToolSelectionHandler::selectPolygonPressEvent( QgsMapMouseEvent *e )`
`256`	`255`	`double x = mapPoint.x(), y = mapPoint.y();`
`257`	`256`	`double sr = QgsMapTool::searchRadiusMU( mCanvas );`
`258`	`257`
`259`		`- for ( auto layer : mCanvas->layers() )`
	`258`	`+ const QList<QgsMapLayer*> layers = mCanvas->layers();`
	`259`	`+ for ( auto layer : layers )`
`260`	`260`	`{`
`261`	`261`	`if ( layer->type() == QgsMapLayer::VectorLayer )`
`262`	`262`	`{`