cppcheck-suppress memleak and fix typo

qgis · Dec 2, 2020 · c79123b · c79123b
1 parent 30446ef
commit c79123b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/python/gui/auto_generated/qgsmaptool.sip.in b/python/gui/auto_generated/qgsmaptool.sip.in
@@ -225,14 +225,14 @@ A pointer to the map mouse ``event`` can be provided to allow particular behavio
 
 This method can return true to inform the caller that the menu was effectivly populated.
 
-The default implementation does nothing and return false;
+The default implementation does nothing and returns false.
 
 .. note::
 
    The context menu is only shown when the ShowContextMenu flag
    is present in :py:func:`~QgsMapTool.flags`.
 
-.. versionadded:: 3.14
+.. versionadded:: 3.18
 %End
 
   signals:

diff --git a/src/app/qgsmaptoolselect.cpp b/src/app/qgsmaptoolselect.cpp
@@ -169,6 +169,8 @@ bool QgsMapToolSelect::populateContextMenuWithEvent( QMenu *menu, QgsMapMouseEve
 
   menuActions->populateMenu( menu );
 
+  // cppcheck wrongly believes menuActions will leak
+  // cppcheck-suppress memleak
   return true;
 }
 

diff --git a/src/gui/qgsmaptool.h b/src/gui/qgsmaptool.h
@@ -226,12 +226,12 @@ class GUI_EXPORT QgsMapTool : public QObject
      *
      * This method can return true to inform the caller that the menu was effectivly populated.
      *
-     * The default implementation does nothing and return false;
+     * The default implementation does nothing and returns false.
      *
      * \note The context menu is only shown when the ShowContextMenu flag
      * is present in flags().
      *
-     * \since QGIS 3.14
+     * \since QGIS 3.18
      */
     virtual bool populateContextMenuWithEvent( QMenu *menu, QgsMapMouseEvent *event );