From a969eee857cfd4cd19efd0e0c6da7a33d87b8222 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 18 Sep 2024 09:20:57 +0200 Subject: [PATCH] Axivion: Rename functions We do no more store the token inside QC settings. Reflect that within source as well. Change-Id: I55097336bc9fe440ee1afc5336ae094ce0eb00d6 Reviewed-by: hjk --- src/plugins/axivion/axivionsettings.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/axivion/axivionsettings.cpp b/src/plugins/axivion/axivionsettings.cpp index 66df83726d4..ab886adfe0a 100644 --- a/src/plugins/axivion/axivionsettings.cpp +++ b/src/plugins/axivion/axivionsettings.cpp @@ -69,13 +69,13 @@ AxivionServer AxivionServer::fromJson(const QJsonObject &json) return {Id::fromString(id.toString()), fixUrl(dashboard.toString()), username.toString()}; } -static FilePath tokensFilePath() +static FilePath axivionJsonFilePath() { return FilePath::fromString(ICore::settings()->fileName()).parentDir() .pathAppended("qtcreator/axivion.json"); } -static void writeTokenFile(const FilePath &filePath, const QList &servers) +static void writeAxivionJson(const FilePath &filePath, const QList &servers) { QJsonDocument doc; QJsonArray serverArray; @@ -87,7 +87,7 @@ static void writeTokenFile(const FilePath &filePath, const QList filePath.setPermissions(QFile::ReadUser | QFile::WriteUser); } -static QList readTokenFile(const FilePath &filePath) +static QList readAxivionJson(const FilePath &filePath) { if (!filePath.exists()) return {}; @@ -129,7 +129,7 @@ AxivionSettings::AxivionSettings() m_defaultServerId.setSettingsKey("DefaultDashboardId"); AspectContainer::readSettings(); - m_allServers = readTokenFile(tokensFilePath()); + m_allServers = readAxivionJson(axivionJsonFilePath()); if (m_allServers.size() == 1 && m_defaultServerId().isEmpty()) // handle settings transition m_defaultServerId.setValue(m_allServers.first().id.toString()); @@ -137,7 +137,7 @@ AxivionSettings::AxivionSettings() void AxivionSettings::toSettings() const { - writeTokenFile(tokensFilePath(), m_allServers); + writeAxivionJson(axivionJsonFilePath(), m_allServers); AspectContainer::writeSettings(); }