From f39e2b999fa2e2beeba4725f7458444b958c538e Mon Sep 17 00:00:00 2001 From: scribam Date: Sun, 3 Sep 2017 19:01:54 +0200 Subject: [PATCH] [Qt] Delete "ui" pointer in destructor --- rpcs3/rpcs3qt/about_dialog.cpp | 5 +++++ rpcs3/rpcs3qt/about_dialog.h | 1 + rpcs3/rpcs3qt/main_window.cpp | 1 + rpcs3/rpcs3qt/settings_dialog.cpp | 5 +++++ rpcs3/rpcs3qt/settings_dialog.h | 1 + rpcs3/rpcs3qt/welcome_dialog.cpp | 5 +++++ rpcs3/rpcs3qt/welcome_dialog.h | 1 + 7 files changed, 19 insertions(+) diff --git a/rpcs3/rpcs3qt/about_dialog.cpp b/rpcs3/rpcs3qt/about_dialog.cpp index f035301cf1..58a8c77cd0 100644 --- a/rpcs3/rpcs3qt/about_dialog.cpp +++ b/rpcs3/rpcs3qt/about_dialog.cpp @@ -25,3 +25,8 @@ about_dialog::about_dialog(QWidget* parent) : QDialog(parent), ui(new Ui::about_ layout()->setSizeConstraint(QLayout::SetFixedSize); } + +about_dialog::~about_dialog() +{ + delete ui; +} diff --git a/rpcs3/rpcs3qt/about_dialog.h b/rpcs3/rpcs3qt/about_dialog.h index 7d25fbd68e..7e842936aa 100644 --- a/rpcs3/rpcs3qt/about_dialog.h +++ b/rpcs3/rpcs3qt/about_dialog.h @@ -13,6 +13,7 @@ class about_dialog : public QDialog public: explicit about_dialog(QWidget* parent = nullptr); + ~about_dialog(); private: Ui::about_dialog *ui; diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index ace308d4ec..86f4267e0b 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -53,6 +53,7 @@ main_window::main_window(std::shared_ptr guiSettings, QWidget *par main_window::~main_window() { + delete ui; } auto Pause = []() diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index 8162ae75be..1afd164c1a 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -878,6 +878,11 @@ settings_dialog::settings_dialog(std::shared_ptr xSettings, const layout()->setSizeConstraint(QLayout::SetFixedSize); } +settings_dialog::~settings_dialog() +{ + delete ui; +} + void settings_dialog::AddConfigs() { ui->combo_configs->clear(); diff --git a/rpcs3/rpcs3qt/settings_dialog.h b/rpcs3/rpcs3qt/settings_dialog.h index 0e940bc5a6..c1a3ed047f 100644 --- a/rpcs3/rpcs3qt/settings_dialog.h +++ b/rpcs3/rpcs3qt/settings_dialog.h @@ -21,6 +21,7 @@ class settings_dialog : public QDialog public: explicit settings_dialog(std::shared_ptr xSettings, const Render_Creator& r_Creator, const int& tabIndex = 0, QWidget *parent = 0, const GameInfo *game = nullptr); + ~settings_dialog(); int exec(); Q_SIGNALS: void GuiSettingsSyncRequest(); diff --git a/rpcs3/rpcs3qt/welcome_dialog.cpp b/rpcs3/rpcs3qt/welcome_dialog.cpp index d9805a302f..6015ff9fa3 100644 --- a/rpcs3/rpcs3qt/welcome_dialog.cpp +++ b/rpcs3/rpcs3qt/welcome_dialog.cpp @@ -35,3 +35,8 @@ welcome_dialog::welcome_dialog(QWidget* parent) : QDialog(parent), ui(new Ui::we layout()->setSizeConstraint(QLayout::SetFixedSize); } + +welcome_dialog::~welcome_dialog() +{ + delete ui; +} diff --git a/rpcs3/rpcs3qt/welcome_dialog.h b/rpcs3/rpcs3qt/welcome_dialog.h index fff3c166cd..839b943ce8 100644 --- a/rpcs3/rpcs3qt/welcome_dialog.h +++ b/rpcs3/rpcs3qt/welcome_dialog.h @@ -15,6 +15,7 @@ class welcome_dialog : public QDialog public: explicit welcome_dialog(QWidget* parent = nullptr); + ~welcome_dialog(); private: Ui::welcome_dialog *ui;