From 8c9b816c3d103a15c2e00e7ef1f66ecb7369a712 Mon Sep 17 00:00:00 2001 From: Robbie Date: Fri, 16 Jun 2017 10:42:13 -0500 Subject: [PATCH] EmuGameDir --> EmuConfigDir. Give QListWidget a parent to remove a slight memory leak. --- rpcs3/rpcs3qt/vfs_dialog_tab.cpp | 16 ++++++++-------- rpcs3/rpcs3qt/vfs_dialog_tab.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/rpcs3/rpcs3qt/vfs_dialog_tab.cpp b/rpcs3/rpcs3qt/vfs_dialog_tab.cpp index 681624fee5..84262022f2 100644 --- a/rpcs3/rpcs3qt/vfs_dialog_tab.cpp +++ b/rpcs3/rpcs3qt/vfs_dialog_tab.cpp @@ -10,14 +10,14 @@ inline std::string sstr(const QString& _in) { return _in.toUtf8().toStdString(); vfs_dialog_tab::vfs_dialog_tab(const vfs_settings_info& settingsInfo, gui_settings* guiSettings, emu_settings* emuSettings, QWidget* parent) : QWidget(parent), m_info(settingsInfo), m_gui_settings(guiSettings), m_emu_settings(emuSettings) { - dirList = new QListWidget; + dirList = new QListWidget(this); QStringList alldirs = m_gui_settings->GetValue(m_info.listLocation).toStringList(); // We must show the currently selected config. - if (alldirs.contains(EmuGameDir()) == false) + if (alldirs.contains(EmuConfigDir()) == false) { - new QListWidgetItem(EmuGameDir(), dirList); + new QListWidgetItem(EmuConfigDir(), dirList); } for (QString dir : alldirs) { @@ -28,7 +28,7 @@ m_info(settingsInfo), m_gui_settings(guiSettings), m_emu_settings(emuSettings) QHBoxLayout* selectedConfigLayout = new QHBoxLayout; QLabel* selectedMessage = new QLabel(m_info.name + " directory:"); selectedConfigLabel = new QLabel(); - selectedConfigLabel->setText(EmuGameDir()); + selectedConfigLabel->setText(EmuConfigDir()); selectedConfigLayout->addWidget(selectedMessage); selectedConfigLayout->addWidget(selectedConfigLabel); selectedConfigLayout->addStretch(); @@ -63,9 +63,9 @@ void vfs_dialog_tab::Reset() { dirList->clear(); m_info.cfg_node->from_default(); - selectedConfigLabel->setText(EmuGameDir()); - dirList->addItem(new QListWidgetItem(EmuGameDir())); - m_gui_settings->SetValue(m_info.listLocation, QStringList(EmuGameDir())); + selectedConfigLabel->setText(EmuConfigDir()); + dirList->addItem(new QListWidgetItem(EmuConfigDir())); + m_gui_settings->SetValue(m_info.listLocation, QStringList(EmuConfigDir())); } void vfs_dialog_tab::AddNewDirectory() @@ -79,7 +79,7 @@ void vfs_dialog_tab::AddNewDirectory() } } -QString vfs_dialog_tab::EmuGameDir() +QString vfs_dialog_tab::EmuConfigDir() { return qstr(m_info.cfg_node->to_string()); } diff --git a/rpcs3/rpcs3qt/vfs_dialog_tab.h b/rpcs3/rpcs3qt/vfs_dialog_tab.h index 3ddcd9ef66..25210ed8eb 100644 --- a/rpcs3/rpcs3qt/vfs_dialog_tab.h +++ b/rpcs3/rpcs3qt/vfs_dialog_tab.h @@ -30,7 +30,7 @@ public: void AddNewDirectory(); void Reset(); private: - QString EmuGameDir(); + QString EmuConfigDir(); vfs_settings_info m_info; gui_settings* m_gui_settings;