EmuGameDir --> EmuConfigDir.

Give QListWidget a parent to remove a slight memory leak.
This commit is contained in:
Robbie 2017-06-16 10:42:13 -05:00 committed by Ani
parent 40d1882db9
commit 8c9b816c3d
2 changed files with 9 additions and 9 deletions

View File

@ -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());
}

View File

@ -30,7 +30,7 @@ public:
void AddNewDirectory();
void Reset();
private:
QString EmuGameDir();
QString EmuConfigDir();
vfs_settings_info m_info;
gui_settings* m_gui_settings;