Merge pull request #10025 from m-kuhn/sip_force

m-kuhn · web-flow · commit 83cbe24bbdb4 · 2019-05-19T11:03:23.000+02:00
Use SIP_FORCE
diff --git a/python/gui/auto_generated/qgsadvanceddigitizingfloater.sip.in b/python/gui/auto_generated/qgsadvanceddigitizingfloater.sip.in
@@ -60,8 +60,15 @@ Note that the floater may be active but not visible (e.g. if the mouse is not ov
 %End
 
   private:
-    //! event filter to track mouse position
-    bool eventFilter( QObject *obj, QEvent *event );
+    virtual bool eventFilter( QObject *obj, QEvent *event );
+
+%Docstring
+event filter to track mouse position
+
+.. note::
+
+   defined as private in Python bindings
+%End
 };
 
 /************************************************************************
diff --git a/src/gui/qgsadvanceddigitizingfloater.h b/src/gui/qgsadvanceddigitizingfloater.h
@@ -102,7 +102,7 @@ class GUI_EXPORT QgsAdvancedDigitizingFloater : public QWidget, private Ui::QgsA
     * event filter to track mouse position
     * \note defined as private in Python bindings
     */
-    bool eventFilter( QObject *obj, QEvent *event ) override SIP_SKIP;
+    bool eventFilter( QObject *obj, QEvent *event ) override SIP_FORCE;
 
     /**
     * Move the widget to a new cursor position. A hard-coded offset will be added.
@@ -117,12 +117,6 @@ class GUI_EXPORT QgsAdvancedDigitizingFloater : public QWidget, private Ui::QgsA
 
     //! Whether the floater is enabled.
     bool mActive = false;
-
-  private:
-#ifdef SIP_RUN
-    //! event filter to track mouse position
-    bool eventFilter( QObject *obj, QEvent *event );
-#endif
 };
 
 #endif // QGSADVANCEDDIGITIZINGFLOATER_H
