Followup a8f85fb fix crash on exit

3nids · 3nids · commit 4ad6168989ce · 2015-08-28T10:44:19.000+02:00
diff --git a/src/app/qgsadvanceddigitizingcanvasitem.cpp b/src/app/qgsadvanceddigitizingcanvasitem.cpp
@@ -32,6 +32,10 @@ QgsAdvancedDigitizingCanvasItem::QgsAdvancedDigitizingCanvasItem( QgsMapCanvas*
 {
 }
 
+QgsAdvancedDigitizingCanvasItem::~QgsAdvancedDigitizingCanvasItem()
+{
+}
+
 void QgsAdvancedDigitizingCanvasItem::paint( QPainter* painter )
 {
   if ( !mAdvancedDigitizingDockWidget->cadEnabled() )
diff --git a/src/app/qgsadvanceddigitizingcanvasitem.h b/src/app/qgsadvanceddigitizingcanvasitem.h
@@ -29,6 +29,7 @@ class APP_EXPORT QgsAdvancedDigitizingCanvasItem : public QgsMapCanvasItem
 {
   public:
     explicit QgsAdvancedDigitizingCanvasItem( QgsMapCanvas* canvas, QgsAdvancedDigitizingDockWidget* cadDockWidget );
+    ~QgsAdvancedDigitizingCanvasItem();
 
     void paint( QPainter *painter ) override;
 
diff --git a/src/app/qgsadvanceddigitizingdockwidget.cpp b/src/app/qgsadvanceddigitizingdockwidget.cpp
@@ -185,7 +185,6 @@ QgsAdvancedDigitizingDockWidget::QgsAdvancedDigitizingDockWidget( QgsMapCanvas*
 QgsAdvancedDigitizingDockWidget::~QgsAdvancedDigitizingDockWidget()
 {
   delete mErrorMessage;
-  delete mCadPaintItem;
   delete mAngleConstraint;
   delete mDistanceConstraint;
   delete mXConstraint;

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,10 @@ QgsAdvancedDigitizingCanvasItem::QgsAdvancedDigitizingCanvasItem( QgsMapCanvas*`
`32`	`32`	`{`
`33`	`33`	`}`
`34`	`34`
	`35`	`+QgsAdvancedDigitizingCanvasItem::~QgsAdvancedDigitizingCanvasItem()`
	`36`	`+{`
	`37`	`+}`
	`38`	`+`
`35`	`39`	`void QgsAdvancedDigitizingCanvasItem::paint( QPainter* painter )`
`36`	`40`	`{`
`37`	`41`	`if ( !mAdvancedDigitizingDockWidget->cadEnabled() )`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ class APP_EXPORT QgsAdvancedDigitizingCanvasItem : public QgsMapCanvasItem`
`29`	`29`	`{`
`30`	`30`	`public:`
`31`	`31`	`explicit QgsAdvancedDigitizingCanvasItem( QgsMapCanvas* canvas, QgsAdvancedDigitizingDockWidget* cadDockWidget );`
	`32`	`+ ~QgsAdvancedDigitizingCanvasItem();`
`32`	`33`
`33`	`34`	`void paint( QPainter *painter ) override;`
`34`	`35`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,6 @@ QgsAdvancedDigitizingDockWidget::QgsAdvancedDigitizingDockWidget( QgsMapCanvas*`
`185`	`185`	`QgsAdvancedDigitizingDockWidget::~QgsAdvancedDigitizingDockWidget()`
`186`	`186`	`{`
`187`	`187`	`delete mErrorMessage;`
`188`		`- delete mCadPaintItem;`
`189`	`188`	`delete mAngleConstraint;`
`190`	`189`	`delete mDistanceConstraint;`
`191`	`190`	`delete mXConstraint;`