sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-28 00:05:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove SIP convert to subclass code for QgsRubberBand and QgsVertexMarker

Browse Source 
These conversions just crash sip (woo. sip. yay. good times.). I can't find
any alternative approach which avoids this crash, so just remove the cast
to avoid the crash.

Fixes #32700
This commit is contained in:
Nyall Dawson 2019-11-08 13:27:09 +10:00
parent cc80bb4af6
commit 4b014e6e84
4 changed files with 0 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
python/gui/auto_generated/qgsrubberband.sip.in
View File

@ -10,11 +10,6 @@
%ModuleHeaderCode
// For ConvertToSubClassCode.
#include <qgsrubberband.h>
%End
class QgsRubberBand : QObject, QgsMapCanvasItem class QgsRubberBand : QObject, QgsMapCanvasItem
{ {
%Docstring %Docstring
@ -26,12 +21,6 @@ for tracking the mouse while drawing polylines or polygons.
%TypeHeaderCode %TypeHeaderCode
#include "qgsrubberband.h" #include "qgsrubberband.h"
%End
%ConvertToSubClassCode
if ( dynamic_cast<QgsRubberBand *>( sipCpp ) )
sipType = sipType_QgsRubberBand;
else
sipType = nullptr;
%End %End
public: public:

11
python/gui/auto_generated/qgsvertexmarker.sip.in
View File

@ -9,11 +9,6 @@
%ModuleHeaderCode
// For ConvertToSubClassCode.
#include <qgsvertexmarker.h>
%End
class QgsVertexMarker : QgsMapCanvasItem class QgsVertexMarker : QgsMapCanvasItem
{ {
%Docstring %Docstring
@ -22,12 +17,6 @@ A class for marking vertices of features using e.g. circles or 'x'.
%TypeHeaderCode %TypeHeaderCode
#include "qgsvertexmarker.h" #include "qgsvertexmarker.h"
%End
%ConvertToSubClassCode
if ( dynamic_cast<QgsVertexMarker *>( sipCpp ) )
sipType = sipType_QgsVertexMarker;
else
sipType = nullptr;
%End %End
public: public:

15
src/gui/qgsrubberband.h
View File

@ -31,13 +31,6 @@
class QgsVectorLayer; class QgsVectorLayer;
class QPaintEvent; class QPaintEvent;
#ifdef SIP_RUN
% ModuleHeaderCode
// For ConvertToSubClassCode.
#include <qgsrubberband.h>
% End
#endif
/** /**
* \ingroup gui * \ingroup gui
* A class for drawing transient features (e.g. digitizing lines) on the map. * A class for drawing transient features (e.g. digitizing lines) on the map.
@ -49,14 +42,6 @@ class GUI_EXPORT QgsRubberBand : public QObject, public QgsMapCanvasItem
{ {
Q_OBJECT Q_OBJECT
#ifdef SIP_RUN
SIP_CONVERT_TO_SUBCLASS_CODE
if ( dynamic_cast<QgsRubberBand *>( sipCpp ) )
sipType = sipType_QgsRubberBand;
else
sipType = nullptr;
SIP_END
#endif
public: public:
Q_PROPERTY( QColor fillColor READ fillColor WRITE setFillColor ) Q_PROPERTY( QColor fillColor READ fillColor WRITE setFillColor )

15
src/gui/qgsvertexmarker.h
View File

@ -22,13 +22,6 @@
class QPainter; class QPainter;
#ifdef SIP_RUN
% ModuleHeaderCode
// For ConvertToSubClassCode.
#include <qgsvertexmarker.h>
% End
#endif
/** /**
* \ingroup gui * \ingroup gui
* A class for marking vertices of features using e.g. circles or 'x'. * A class for marking vertices of features using e.g. circles or 'x'.
@ -36,14 +29,6 @@ class QPainter;
class GUI_EXPORT QgsVertexMarker : public QgsMapCanvasItem class GUI_EXPORT QgsVertexMarker : public QgsMapCanvasItem
{ {
#ifdef SIP_RUN
SIP_CONVERT_TO_SUBCLASS_CODE
if ( dynamic_cast<QgsVertexMarker *>( sipCpp ) )
sipType = sipType_QgsVertexMarker;
else
sipType = nullptr;
SIP_END
#endif
public: public:
//! Icons //! Icons