refactor(settings): add absolute path for all settings returned file paths
This commit is contained in:
parent
426b43fc09
commit
ef96c2c362
1 changed files with 4 additions and 4 deletions
|
|
@ -263,7 +263,7 @@ bool Settings::isPortableMode()
|
||||||
|
|
||||||
QString Settings::settingsFile()
|
QString Settings::settingsFile()
|
||||||
{
|
{
|
||||||
return instance()->m_settings->fileName();
|
return QFileInfo(instance()->m_settings->fileName()).absoluteFilePath();
|
||||||
}
|
}
|
||||||
|
|
||||||
QString Settings::settingsPath()
|
QString Settings::settingsPath()
|
||||||
|
|
@ -283,12 +283,12 @@ QString Settings::tlsDir()
|
||||||
|
|
||||||
QString Settings::tlsTrustedServersDb()
|
QString Settings::tlsTrustedServersDb()
|
||||||
{
|
{
|
||||||
return QStringLiteral("%1/trusted-servers").arg(instance()->tlsDir());
|
return QFileInfo(QStringLiteral("%1/trusted-servers").arg(instance()->tlsDir())).absoluteFilePath();
|
||||||
}
|
}
|
||||||
|
|
||||||
QString Settings::tlsTrustedClientsDb()
|
QString Settings::tlsTrustedClientsDb()
|
||||||
{
|
{
|
||||||
return QStringLiteral("%1/trusted-clients").arg(instance()->tlsDir());
|
return QFileInfo(QStringLiteral("%1/trusted-clients").arg(instance()->tlsDir())).absoluteFilePath();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Settings::setValue(const QString &key, const QVariant &value)
|
void Settings::setValue(const QString &key, const QVariant &value)
|
||||||
|
|
@ -330,5 +330,5 @@ QString Settings::portableSettingsFile()
|
||||||
{
|
{
|
||||||
static const auto filename =
|
static const auto filename =
|
||||||
QStringLiteral("%1/settings/%2.conf").arg(QCoreApplication::applicationDirPath(), kAppName);
|
QStringLiteral("%1/settings/%2.conf").arg(QCoreApplication::applicationDirPath(), kAppName);
|
||||||
return filename;
|
return QFileInfo(filename).absoluteFilePath();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue