Replace validUpdateChannel anonymous namespace function with validUpdateChannels...
authorClaudio Cambra <claudio.cambra@nextcloud.com>
Thu, 23 Feb 2023 15:38:48 +0000 (16:38 +0100)
committerClaudio Cambra <claudio.cambra@nextcloud.com>
Mon, 8 May 2023 11:06:58 +0000 (19:06 +0800)
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
src/libsync/configfile.cpp

index 1e7dc3ed61741f8e91902179f3b401be79198837..82ac801dba3f14b5140f0f3d0dc7ce370d6d0182 100644 (file)
@@ -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.";