From 09d71b6a1d42ce2372930b68de3db3a3e89b3e92 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Thu, 23 Feb 2023 16:38:48 +0100 Subject: [PATCH] Replace validUpdateChannel anonymous namespace function with validUpdateChannels QSet Signed-off-by: Claudio Cambra --- src/libsync/configfile.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp index 1e7dc3ed6..82ac801db 100644 --- a/src/libsync/configfile.cpp +++ b/src/libsync/configfile.cpp @@ -105,10 +105,7 @@ static constexpr char moveToTrashC[] = "moveToTrash"; static constexpr char certPath[] = "http_certificatePath"; static constexpr char certPasswd[] = "http_certificatePasswd"; -bool validUpdateChannel(const QString &channel) -{ - return channel == QStringLiteral("stable") || channel == QStringLiteral("beta"); -} +static const QSet validUpdateChannels { QStringLiteral("stable"), QStringLiteral("beta") }; } namespace OCC { @@ -698,7 +695,7 @@ QString ConfigFile::updateChannel() const QSettings settings(configFile(), QSettings::IniFormat); const auto channel = settings.value(QLatin1String(updateChannelC), defaultUpdateChannel).toString(); - if (!validUpdateChannel(channel)) { + if (!validUpdateChannels.contains(channel)) { qCWarning(lcConfigFile()) << "Received invalid update channel from confog:" << channel << "defaulting to:" @@ -711,7 +708,7 @@ QString ConfigFile::updateChannel() const void ConfigFile::setUpdateChannel(const QString &channel) { - if (!validUpdateChannel(channel)) { + if (!validUpdateChannels.contains(channel)) { qCWarning(lcConfigFile()) << "Received invalid update channel:" << channel << "can only accept 'stable' or 'beta'. Ignoring."; -- 2.30.2