Fix some leaks in QgisApp

nyalldawson · nyalldawson · commit a8f85fb10347 · 2015-08-28T13:06:35.000+10:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1041,6 +1041,7 @@ QgisApp::~QgisApp()
   delete mComposerManager;
 
   delete mVectorLayerTools;
+  delete mWelcomePage;
 
   deletePrintComposers();
   removeAnnotationItems();
diff --git a/src/app/qgsadvanceddigitizingdockwidget.cpp b/src/app/qgsadvanceddigitizingdockwidget.cpp
@@ -185,6 +185,12 @@ QgsAdvancedDigitizingDockWidget::QgsAdvancedDigitizingDockWidget( QgsMapCanvas*
 QgsAdvancedDigitizingDockWidget::~QgsAdvancedDigitizingDockWidget()
 {
   delete mErrorMessage;
+  delete mCadPaintItem;
+  delete mAngleConstraint;
+  delete mDistanceConstraint;
+  delete mXConstraint;
+  delete mYConstraint;
+
 }
 
 void QgsAdvancedDigitizingDockWidget::hideEvent( QHideEvent* )
diff --git a/src/app/qgsbookmarks.cpp b/src/app/qgsbookmarks.cpp
@@ -44,7 +44,7 @@ QgsBookmarks::QgsBookmarks( QWidget *parent ) : QDockWidget( parent )
   btnImpExp->setIcon( QgsApplication::getThemeIcon( "/mActionSharing.svg" ) );
   btnImpExp->setPopupMode( QToolButton::InstantPopup );
 
-  QMenu *share = new QMenu();
+  QMenu *share = new QMenu( this );
   QAction *btnExport = share->addAction( tr( "&Export" ) );
   QAction *btnImport = share->addAction( tr( "&Import" ) );
   btnExport->setIcon( QgsApplication::getThemeIcon( "/mActionSharingExport.svg" ) );
diff --git a/src/app/qgswelcomepage.cpp b/src/app/qgswelcomepage.cpp
@@ -88,13 +88,18 @@ QgsWelcomePage::QgsWelcomePage( QWidget* parent )
   mainLayout->addWidget( mVersionInformation );
   mVersionInformation->setVisible( false );
 
-  QgsVersionInfo* versionInfo = new QgsVersionInfo();
-  connect( versionInfo, SIGNAL( versionInfoAvailable() ), this, SLOT( versionInfoReceived() ) );
-  versionInfo->checkVersion();
+  mVersionInfo = new QgsVersionInfo();
+  connect( mVersionInfo, SIGNAL( versionInfoAvailable() ), this, SLOT( versionInfoReceived() ) );
+  mVersionInfo->checkVersion();
 
   connect( recentProjectsListView, SIGNAL( activated( QModelIndex ) ), this, SLOT( itemActivated( QModelIndex ) ) );
 }
 
+QgsWelcomePage::~QgsWelcomePage()
+{
+  delete mVersionInfo;
+}
+
 void QgsWelcomePage::setRecentProjects( const QList<QgsWelcomePageItemsModel::RecentProjectData>& recentProjects )
 {
   mModel->setRecentProjects( recentProjects );
diff --git a/src/app/qgswelcomepage.h b/src/app/qgswelcomepage.h
@@ -22,13 +22,17 @@
 
 #include "qgswelcomepageitemsmodel.h"
 
+class QgsVersionInfo;
+
 class QgsWelcomePage : public QTabWidget
 {
     Q_OBJECT
 
   public:
     QgsWelcomePage( QWidget* parent = 0 );
 
+    ~QgsWelcomePage();
+
     void setRecentProjects( const QList<QgsWelcomePageItemsModel::RecentProjectData>& recentProjects );
 
   private slots:
@@ -39,6 +43,7 @@ class QgsWelcomePage : public QTabWidget
   private:
     QgsWelcomePageItemsModel* mModel;
     QLabel* mVersionInformation;
+    QgsVersionInfo* mVersionInfo;
 };
 
 #endif // QGSWELCOMEDIALOG_H

Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,12 @@ QgsAdvancedDigitizingDockWidget::QgsAdvancedDigitizingDockWidget( QgsMapCanvas*`
`185`	`185`	`QgsAdvancedDigitizingDockWidget::~QgsAdvancedDigitizingDockWidget()`
`186`	`186`	`{`
`187`	`187`	`delete mErrorMessage;`
	`188`	`+ delete mCadPaintItem;`
	`189`	`+ delete mAngleConstraint;` Code has comments. Press enter to view.
	`190`	`+ delete mDistanceConstraint;`
	`191`	`+ delete mXConstraint;`
	`192`	`+ delete mYConstraint;`
	`193`	`+`
`188`	`194`	`}`
`189`	`195`
`190`	`196`	`void QgsAdvancedDigitizingDockWidget::hideEvent( QHideEvent* )`