From 049f8d718a3ef9563187804ee8245d9f58b4a4ca Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Sun, 21 Dec 2025 23:41:01 -0500 Subject: [PATCH] refactor: constants, move kTlsDir to => Settings::tlsDir where used --- src/lib/common/Constants.h.in | 1 - src/lib/common/Settings.cpp | 2 +- src/unittests/common/SettingsTests.h | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/lib/common/Constants.h.in b/src/lib/common/Constants.h.in index 565f90041..2d1e8bedc 100644 --- a/src/lib/common/Constants.h.in +++ b/src/lib/common/Constants.h.in @@ -22,7 +22,6 @@ const auto kCopyright = // const auto kCoreBinName = "@CORE_BINARY@"; -const auto kTlsDirName = "tls"; const auto kTlsCertificateFilename = "@CMAKE_PROJECT_NAME@.pem"; const auto kTlsFingerprintTrustedServersFilename = "trusted-servers"; const auto kTlsFingerprintTrustedClientsFilename = "trusted-clients"; diff --git a/src/lib/common/Settings.cpp b/src/lib/common/Settings.cpp index 12bba5189..3f39bd572 100644 --- a/src/lib/common/Settings.cpp +++ b/src/lib/common/Settings.cpp @@ -247,7 +247,7 @@ QString Settings::settingsPath() QString Settings::tlsDir() { - return QStringLiteral("%1/%2").arg(instance()->settingsPath(), kTlsDirName); + return QStringLiteral("%1/tls").arg(instance()->settingsPath()); } QString Settings::tlsTrustedServersDb() diff --git a/src/unittests/common/SettingsTests.h b/src/unittests/common/SettingsTests.h index 08ea607df..22afb95fe 100644 --- a/src/unittests/common/SettingsTests.h +++ b/src/unittests/common/SettingsTests.h @@ -40,7 +40,7 @@ private: inline static const QString m_settingsPath = m_settingsPathTemp; #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 = QStringLiteral("%1/%2").arg(m_expectedTlsDir, kTlsFingerprintTrustedServersFilename); inline static const QString m_expectedTlsClientDB =