Merge pull request #36240 from troopa81/fix_snaptogridcanvasitem

m-kuhn · web-flow · commit 10713ddfa09a · 2020-05-07T09:35:54.000+02:00
Fix SIP QgsSnapToGridCanvasItem class declaration
diff --git a/python/gui/auto_generated/qgssnaptogridcanvasitem.sip.in b/python/gui/auto_generated/qgssnaptogridcanvasitem.sip.in
@@ -14,7 +14,7 @@
 #include <qgssnaptogridcanvasitem.h>
 %End
 
-class QgsSnapToGridCanvasItem : QObject, QgsMapCanvasItem
+class QgsSnapToGridCanvasItem : QgsMapCanvasItem
 {
 %Docstring
 
diff --git a/src/gui/qgssnaptogridcanvasitem.h b/src/gui/qgssnaptogridcanvasitem.h
@@ -37,8 +37,14 @@
  *
  * \since QGIS 3.4
  */
+#ifndef SIP_RUN
 class GUI_EXPORT QgsSnapToGridCanvasItem : public QObject, public QgsMapCanvasItem
 {
+#else
+class GUI_EXPORT QgsSnapToGridCanvasItem : public QgsMapCanvasItem
+{
+#endif
+
     Q_OBJECT
 
 #ifdef SIP_RUN

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`#include <qgssnaptogridcanvasitem.h>`
`15`	`15`	`%End`
`16`	`16`
`17`		`-class QgsSnapToGridCanvasItem : QObject, QgsMapCanvasItem`
	`17`	`+class QgsSnapToGridCanvasItem : QgsMapCanvasItem`
`18`	`18`	`{`
`19`	`19`	`%Docstring`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,14 @@`
`37`	`37`	`*`
`38`	`38`	`* \since QGIS 3.4`
`39`	`39`	`*/`
	`40`	`+#ifndef SIP_RUN`
`40`	`41`	`class GUI_EXPORT QgsSnapToGridCanvasItem : public QObject, public QgsMapCanvasItem`
`41`	`42`	`{`
	`43`	`+#else`
	`44`	`+class GUI_EXPORT QgsSnapToGridCanvasItem : public QgsMapCanvasItem`
	`45`	`+{`
	`46`	`+#endif`
	`47`	`+`
`42`	`48`	`Q_OBJECT`
`43`	`49`
`44`	`50`	`#ifdef SIP_RUN`