Add versionSuffix function to Theme.

Signed-off-by: Camila Ayres <hello@camilasan.com>

diff --git a/src/gui/updater/updater.cpp b/src/gui/updater/updater.cpp
index 6f5f3970a1aed1f7ad2649e80e179e24829c4cd3..2e49e8706af088db37fe4fdd9f67eccba55d9fd2 100644 (file)
--- a/src/gui/updater/updater.cpp
+++ b/src/gui/updater/updater.cpp
@@ -99,7 +99,7 @@ QUrlQuery Updater::getQueryParams()
     query.addQueryItem(QStringLiteral("buildArch"), QSysInfo::buildCpuArchitecture());
     query.addQueryItem(QStringLiteral("currentArch"), QSysInfo::currentCpuArchitecture());
 
-    const auto suffix = QStringLiteral(MIRALL_STRINGIFY(MIRALL_VERSION_SUFFIX));
+    const auto suffix = Theme::instance()->versionSuffix();
     query.addQueryItem(QStringLiteral("versionsuffix"), suffix);
 
     ConfigFile config;

diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp
index 4eb39de725db10d9b497452e87c9c7130b84d6ba..b43317ae938e9ff964c8971138eee2b0649ecb4a 100644 (file)
--- a/src/libsync/configfile.cpp
+++ b/src/libsync/configfile.cpp
@@ -686,7 +686,7 @@ int ConfigFile::updateSegment() const
 
 QString ConfigFile::updateChannel() const
 {
-    auto defaultUpdateChannel = QString::fromLatin1(MIRALL_STRINGIFY(MIRALL_VERSION_SUFFIX));
+    auto defaultUpdateChannel = Theme::instance()->versionSuffix();
     QSettings settings(configFile(), QSettings::IniFormat);
     const auto channel = settings.value(QLatin1String(updateChannelC), defaultUpdateChannel).toString();
     if (!validUpdateChannels().contains(channel)) {

diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp
index bb4bae4c4be86c114d46a09502185db1c2399cf5..b20ef2a6798af10b8dc5b45052f0948dd0f57118 100644 (file)
--- a/src/libsync/theme.cpp
+++ b/src/libsync/theme.cpp
@@ -195,6 +195,11 @@ QString Theme::version() const
     return MIRALL_VERSION_STRING;
 }
 
+QString Theme::versionSuffix() const
+{
+    return QString::fromLatin1(MIRALL_STRINGIFY(MIRALL_VERSION_SUFFIX));
+}
+
 QString Theme::configFileName() const
 {
     return QStringLiteral(APPLICATION_CONFIG_NAME ".cfg");

diff --git a/src/libsync/theme.h b/src/libsync/theme.h
index c59266f65cf81b947241956afa3bd9e58da2c6c9..e5d312ddee400eb118173ce43a16b1aa5454604d 100644 (file)
--- a/src/libsync/theme.h
+++ b/src/libsync/theme.h
@@ -196,6 +196,7 @@ public:
 
     [[nodiscard]] QString statusHeaderText(SyncResult::Status) const;
     [[nodiscard]] QString version() const;
+    [[nodiscard]] QString versionSuffix() const;
 
     /**
      * Characteristics: bool if more than one sync folder is allowed