diff --git a/rpcs3/Emu/Cell/lv2/sys_rsxaudio.h b/rpcs3/Emu/Cell/lv2/sys_rsxaudio.h index 33c6973f3b..0aa480f9b1 100644 --- a/rpcs3/Emu/Cell/lv2/sys_rsxaudio.h +++ b/rpcs3/Emu/Cell/lv2/sys_rsxaudio.h @@ -2,7 +2,6 @@ #include "sys_sync.h" #include "sys_event.h" -#include "Utilities/Timer.h" #include "Utilities/simple_ringbuf.h" #include "Utilities/transactional_storage.h" #include "Utilities/cond.h" diff --git a/rpcs3/rpcs3qt/about_dialog.cpp b/rpcs3/rpcs3qt/about_dialog.cpp index 09d175c873..c6422afeb1 100644 --- a/rpcs3/rpcs3qt/about_dialog.cpp +++ b/rpcs3/rpcs3qt/about_dialog.cpp @@ -25,5 +25,4 @@ about_dialog::about_dialog(QWidget* parent) : QDialog(parent), ui(new Ui::about_ about_dialog::~about_dialog() { - delete ui; } diff --git a/rpcs3/rpcs3qt/about_dialog.h b/rpcs3/rpcs3qt/about_dialog.h index 7e842936aa..91872ec6cc 100644 --- a/rpcs3/rpcs3qt/about_dialog.h +++ b/rpcs3/rpcs3qt/about_dialog.h @@ -16,5 +16,5 @@ public: ~about_dialog(); private: - Ui::about_dialog *ui; + std::unique_ptr ui; }; diff --git a/rpcs3/rpcs3qt/camera_settings_dialog.h b/rpcs3/rpcs3qt/camera_settings_dialog.h index 61fa0dc87e..56aa29a6cf 100644 --- a/rpcs3/rpcs3qt/camera_settings_dialog.h +++ b/rpcs3/rpcs3qt/camera_settings_dialog.h @@ -24,6 +24,6 @@ private: void load_config(); void save_config(); - Ui::camera_settings_dialog* ui; + std::unique_ptr ui; std::shared_ptr m_camera; }; diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index a32dc00168..9988841e5e 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -99,7 +99,6 @@ main_window::main_window(std::shared_ptr gui_settings, std::shared main_window::~main_window() { SaveWindowState(); - delete ui; } /* An init method is used so that RPCS3App can create the necessary connects before calling init (specifically the stylesheet connect). diff --git a/rpcs3/rpcs3qt/main_window.h b/rpcs3/rpcs3qt/main_window.h index 27bda32fa7..182e071c46 100644 --- a/rpcs3/rpcs3qt/main_window.h +++ b/rpcs3/rpcs3qt/main_window.h @@ -42,7 +42,7 @@ class main_window : public QMainWindow { Q_OBJECT - Ui::main_window *ui; + std::unique_ptr ui; bool m_sys_menu_opened = false; bool m_is_list_mode = true; diff --git a/rpcs3/rpcs3qt/pad_led_settings_dialog.cpp b/rpcs3/rpcs3qt/pad_led_settings_dialog.cpp index 1d42daaaf1..77a8c2c40a 100644 --- a/rpcs3/rpcs3qt/pad_led_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/pad_led_settings_dialog.cpp @@ -71,7 +71,6 @@ pad_led_settings_dialog::pad_led_settings_dialog(QDialog* parent, int colorR, in pad_led_settings_dialog::~pad_led_settings_dialog() { - delete ui; } void pad_led_settings_dialog::redraw_color_sample() const diff --git a/rpcs3/rpcs3qt/pad_led_settings_dialog.h b/rpcs3/rpcs3qt/pad_led_settings_dialog.h index e9bf9ff4b2..bde7f32229 100644 --- a/rpcs3/rpcs3qt/pad_led_settings_dialog.h +++ b/rpcs3/rpcs3qt/pad_led_settings_dialog.h @@ -27,7 +27,7 @@ private Q_SLOTS: private: void redraw_color_sample() const; void read_form_values(); - Ui::pad_led_settings_dialog *ui; + std::unique_ptr ui; struct led_settings { int cR = 255; diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.cpp b/rpcs3/rpcs3qt/pad_settings_dialog.cpp index 52c7686425..044b3e5dc0 100644 --- a/rpcs3/rpcs3qt/pad_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/pad_settings_dialog.cpp @@ -208,8 +208,6 @@ pad_settings_dialog::~pad_settings_dialog() { m_gui_settings->SetValue(gui::pads_geometry, saveGeometry()); - delete ui; - if (!Emu.IsStopped()) { pad::reset(Emu.GetTitleID()); diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.h b/rpcs3/rpcs3qt/pad_settings_dialog.h index dd6ecb208a..6bcee815a8 100644 --- a/rpcs3/rpcs3qt/pad_settings_dialog.h +++ b/rpcs3/rpcs3qt/pad_settings_dialog.h @@ -108,7 +108,7 @@ private Q_SLOTS: void ApplyCurrentPlayerConfig(int new_player_id); private: - Ui::pad_settings_dialog *ui; + std::unique_ptr ui; std::string m_title_id; std::shared_ptr m_gui_settings; diff --git a/rpcs3/rpcs3qt/patch_creator_dialog.h b/rpcs3/rpcs3qt/patch_creator_dialog.h index 2a7e5be041..435fd73454 100644 --- a/rpcs3/rpcs3qt/patch_creator_dialog.h +++ b/rpcs3/rpcs3qt/patch_creator_dialog.h @@ -20,7 +20,7 @@ public: ~patch_creator_dialog(); private: - Ui::patch_creator_dialog* ui; + std::unique_ptr ui; QFont mMonoFont; QColor mValidColor; QColor mInvalidColor; diff --git a/rpcs3/rpcs3qt/patch_manager_dialog.cpp b/rpcs3/rpcs3qt/patch_manager_dialog.cpp index 61869f1089..103790ec3f 100644 --- a/rpcs3/rpcs3qt/patch_manager_dialog.cpp +++ b/rpcs3/rpcs3qt/patch_manager_dialog.cpp @@ -127,8 +127,6 @@ patch_manager_dialog::~patch_manager_dialog() // Save gui settings m_gui_settings->SetValue(gui::pm_geometry, saveGeometry()); m_gui_settings->SetValue(gui::pm_splitter_state, ui->splitter->saveState()); - - delete ui; } int patch_manager_dialog::exec() diff --git a/rpcs3/rpcs3qt/patch_manager_dialog.h b/rpcs3/rpcs3qt/patch_manager_dialog.h index b08c9d944f..cead123cc1 100644 --- a/rpcs3/rpcs3qt/patch_manager_dialog.h +++ b/rpcs3/rpcs3qt/patch_manager_dialog.h @@ -73,7 +73,7 @@ private: bool m_download_automatic = false; bool m_download_auto_accept = false; - Ui::patch_manager_dialog *ui; + std::unique_ptr ui; protected: void dropEvent(QDropEvent* event) override; diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index 5ce41372d2..22f7d118bf 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -2126,8 +2126,6 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std settings_dialog::~settings_dialog() { m_gui_settings->SetValue(gui::cfg_geometry, saveGeometry()); - - delete ui; } void settings_dialog::EnhanceSlider(emu_settings_type settings_type, QSlider* slider, QLabel* label, const QString& label_text) const diff --git a/rpcs3/rpcs3qt/settings_dialog.h b/rpcs3/rpcs3qt/settings_dialog.h index 8a8fbff2ee..2f35273d9f 100644 --- a/rpcs3/rpcs3qt/settings_dialog.h +++ b/rpcs3/rpcs3qt/settings_dialog.h @@ -47,7 +47,7 @@ private: std::array m_mics_combo; int m_tab_index; - Ui::settings_dialog *ui; + std::unique_ptr ui; std::shared_ptr m_gui_settings; std::shared_ptr m_emu_settings; diff --git a/rpcs3/rpcs3qt/welcome_dialog.cpp b/rpcs3/rpcs3qt/welcome_dialog.cpp index 172bc48089..b732381bc2 100644 --- a/rpcs3/rpcs3qt/welcome_dialog.cpp +++ b/rpcs3/rpcs3qt/welcome_dialog.cpp @@ -36,5 +36,4 @@ welcome_dialog::welcome_dialog(std::shared_ptr gui_settings, QWidg welcome_dialog::~welcome_dialog() { - delete ui; } diff --git a/rpcs3/rpcs3qt/welcome_dialog.h b/rpcs3/rpcs3qt/welcome_dialog.h index b88b4d5406..8e375d8d69 100644 --- a/rpcs3/rpcs3qt/welcome_dialog.h +++ b/rpcs3/rpcs3qt/welcome_dialog.h @@ -18,6 +18,6 @@ public: ~welcome_dialog(); private: - Ui::welcome_dialog *ui; + std::unique_ptr ui; std::shared_ptr m_gui_settings; };