MappingWindow: store profile filename in QComboBox userdata

This commit is contained in:
Michael M
2017-06-09 13:00:19 -07:00
committed by Léo Lam
parent 743568f9d4
commit 806a8a7f32
3 changed files with 24 additions and 58 deletions

View File

@ -8,7 +8,6 @@
#include "AudioCommon/AudioCommon.h"
#include "Common/Config/Config.h"
#include "Common/FileSearch.h"
#include "Common/FileUtil.h"
#include "Common/StringUtil.h"
#include "Core/ConfigManager.h"
@ -40,17 +39,6 @@ void Settings::SetThemeName(const QString& theme_name)
emit ThemeChanged();
}
QString Settings::GetProfilesDir() const
{
return QString::fromStdString(File::GetUserPath(D_CONFIG_IDX) + "Profiles/");
}
QString Settings::GetProfileINIPath(const InputConfig* config, const QString& name) const
{
return GetProfilesDir() + QString::fromStdString(config->GetProfileName()) + QDir::separator() +
name + QStringLiteral(".ini");
}
QStringList Settings::GetPaths() const
{
QStringList list;
@ -141,21 +129,6 @@ void Settings::DecreaseVolume(int volume)
emit VolumeChanged(GetVolume());
}
QVector<QString> Settings::GetProfiles(const InputConfig* config) const
{
const std::string path = GetProfilesDir().toStdString() + config->GetProfileName();
QVector<QString> vec;
for (const auto& file : Common::DoFileSearch({path}, {".ini"}))
{
std::string basename;
SplitPath(file, nullptr, &basename, nullptr);
vec.push_back(QString::fromStdString(basename));
}
return vec;
}
bool Settings::IsLogVisible() const
{
return QSettings().value(QStringLiteral("logging/logvisible")).toBool();