more pointer improvements

Skycoder42 · Skycoder42 · commit 182314291318 · 2016-05-29T17:57:15.000+02:00
diff --git a/AutoUpdaterGui/progressdialog.cpp b/AutoUpdaterGui/progressdialog.cpp
@@ -27,7 +27,6 @@ ProgressDialog::~ProgressDialog()
 #ifdef Q_OS_WIN
 	this->tButton->progress()->hide();
 #endif
-	delete ui;
 }
 
 void ProgressDialog::setCanceled()
diff --git a/AutoUpdaterGui/progressdialog.h b/AutoUpdaterGui/progressdialog.h
@@ -4,6 +4,7 @@
 #include <QDialog>
 #include <functional>
 #include <QMessageBox>
+#include <QScopedPointer>
 #ifdef Q_OS_WIN
 #include <QWinTaskbarButton>
 #endif
@@ -48,7 +49,7 @@ namespace QtAutoUpdater
 		void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
 
 	private:
-		Ui::ProgressDialog *ui;
+		QScopedPointer<Ui::ProgressDialog> ui;
 #ifdef Q_OS_WIN
 		QWinTaskbarButton *tButton;
 
diff --git a/AutoUpdaterGui/updatebutton.cpp b/AutoUpdaterGui/updatebutton.cpp
@@ -152,10 +152,7 @@ QtAutoUpdater::UpdateButtonPrivate::UpdateButtonPrivate(UpdateButton *q_ptr, Upd
 	this->updateController(controller);
 }
 
-UpdateButtonPrivate::~UpdateButtonPrivate()
-{
-	delete this->ui;
-}
+UpdateButtonPrivate::~UpdateButtonPrivate() {}
 
 void UpdateButtonPrivate::updateController(UpdateController *controller)
 {
diff --git a/AutoUpdaterGui/updatebutton_p.h b/AutoUpdaterGui/updatebutton_p.h
@@ -3,6 +3,7 @@
 
 #include <QPointer>
 #include <QMovie>
+#include <QScopedPointer>
 #include "updatebutton.h"
 
 namespace Ui {
@@ -18,7 +19,7 @@ namespace QtAutoUpdater
 		Q_DECLARE_PUBLIC(UpdateButton)
 
 		QPointer<UpdateController> controller;
-		Ui::UpdateButton *ui;
+		QScopedPointer<Ui::UpdateButton> ui;
 		UpdateController::DisplayLevel level;
 		QMovie *loadingGif;
 		bool showResult;
diff --git a/AutoUpdaterGui/updateinfodialog.cpp b/AutoUpdaterGui/updateinfodialog.cpp
@@ -37,10 +37,7 @@ UpdateInfoDialog::UpdateInfoDialog(QWidget *parent) :
 	}
 }
 
-UpdateInfoDialog::~UpdateInfoDialog()
-{
-	delete ui;
-}
+UpdateInfoDialog::~UpdateInfoDialog(){}
 
 UpdateInfoDialog::DialogResult UpdateInfoDialog::showUpdateInfo(QList<Updater::UpdateInfo> updates, bool &runAsAdmin, bool editable, bool detailed, QWidget *parent)
 {
diff --git a/AutoUpdaterGui/updateinfodialog.h b/AutoUpdaterGui/updateinfodialog.h
@@ -32,7 +32,7 @@ namespace QtAutoUpdater
 		void on_delayButton_clicked();
 
 	private:
-		Ui::UpdateInfoDialog *ui;
+		QScopedPointer<Ui::UpdateInfoDialog> ui;
 
 		explicit UpdateInfoDialog(QWidget *parent = nullptr);
 		~UpdateInfoDialog();

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@ ProgressDialog::~ProgressDialog()`
`27`	`27`	`#ifdef Q_OS_WIN`
`28`	`28`	`this->tButton->progress()->hide();`
`29`	`29`	`#endif`
`30`		`- delete ui;`
`31`	`30`	`}`
`32`	`31`
`33`	`32`	`void ProgressDialog::setCanceled()`
Original file line number	Diff line number	Diff line change
`@@ -152,10 +152,7 @@ QtAutoUpdater::UpdateButtonPrivate::UpdateButtonPrivate(UpdateButton *q_ptr, Upd`
`152`	`152`	`this->updateController(controller);`
`153`	`153`	`}`
`154`	`154`
`155`		`-UpdateButtonPrivate::~UpdateButtonPrivate()`
`156`		`-{`
`157`		`- delete this->ui;`
`158`		`-}`
	`155`	`+UpdateButtonPrivate::~UpdateButtonPrivate() {}`
`159`	`156`
`160`	`157`	`void UpdateButtonPrivate::updateController(UpdateController *controller)`
`161`	`158`	`{`
Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,7 @@ UpdateInfoDialog::UpdateInfoDialog(QWidget *parent) :`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`		`-UpdateInfoDialog::~UpdateInfoDialog()`
`41`		`-{`
`42`		`- delete ui;`
`43`		`-}`
	`40`	`+UpdateInfoDialog::~UpdateInfoDialog(){}`
`44`	`41`
`45`	`42`	`UpdateInfoDialog::DialogResult UpdateInfoDialog::showUpdateInfo(QList<Updater::UpdateInfo> updates, bool &runAsAdmin, bool editable, bool detailed, QWidget *parent)`
`46`	`43`	`{`