refactor: constants, move kTlsDir to => Settings::tlsDir where used
This commit is contained in:
parent
c693d258fd
commit
049f8d718a
3 changed files with 2 additions and 3 deletions
|
|
@ -22,7 +22,6 @@ const auto kCopyright = //
|
||||||
|
|
||||||
const auto kCoreBinName = "@CORE_BINARY@";
|
const auto kCoreBinName = "@CORE_BINARY@";
|
||||||
|
|
||||||
const auto kTlsDirName = "tls";
|
|
||||||
const auto kTlsCertificateFilename = "@CMAKE_PROJECT_NAME@.pem";
|
const auto kTlsCertificateFilename = "@CMAKE_PROJECT_NAME@.pem";
|
||||||
const auto kTlsFingerprintTrustedServersFilename = "trusted-servers";
|
const auto kTlsFingerprintTrustedServersFilename = "trusted-servers";
|
||||||
const auto kTlsFingerprintTrustedClientsFilename = "trusted-clients";
|
const auto kTlsFingerprintTrustedClientsFilename = "trusted-clients";
|
||||||
|
|
|
||||||
|
|
@ -247,7 +247,7 @@ QString Settings::settingsPath()
|
||||||
|
|
||||||
QString Settings::tlsDir()
|
QString Settings::tlsDir()
|
||||||
{
|
{
|
||||||
return QStringLiteral("%1/%2").arg(instance()->settingsPath(), kTlsDirName);
|
return QStringLiteral("%1/tls").arg(instance()->settingsPath());
|
||||||
}
|
}
|
||||||
|
|
||||||
QString Settings::tlsTrustedServersDb()
|
QString Settings::tlsTrustedServersDb()
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@ private:
|
||||||
inline static const QString m_settingsPath = m_settingsPathTemp;
|
inline static const QString m_settingsPath = m_settingsPathTemp;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
inline static const QString m_expectedTlsDir = QStringLiteral("%1/%2").arg(m_settingsPath, kTlsDirName);
|
inline static const QString m_expectedTlsDir = QStringLiteral("%1/tls").arg(m_settingsPath);
|
||||||
inline static const QString m_expectedTlsServerDB =
|
inline static const QString m_expectedTlsServerDB =
|
||||||
QStringLiteral("%1/%2").arg(m_expectedTlsDir, kTlsFingerprintTrustedServersFilename);
|
QStringLiteral("%1/%2").arg(m_expectedTlsDir, kTlsFingerprintTrustedServersFilename);
|
||||||
inline static const QString m_expectedTlsClientDB =
|
inline static const QString m_expectedTlsClientDB =
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue