]> cloud.milkyroute.net Git - dolphin.git/commitdiff
servicemenuinstaller: use Q_GLOBAL_STATIC
authorElvis Angelaccio <elvis.angelaccio@kde.org>
Sun, 1 Nov 2020 23:03:20 +0000 (00:03 +0100)
committerElvis Angelaccio <elvis.angelaccio@kde.org>
Sun, 1 Nov 2020 23:03:20 +0000 (00:03 +0100)
Global statics should be avoided when possible.
This fixes a clazy warning.

src/settings/services/servicemenuinstaller/servicemenuinstaller.cpp

index 459c57fed704d76121676a46e0ebf01a47e1c0fd..2c7ac7cabf5bac1faafa103441a09b142df76711 100644 (file)
 
 #include "../../../config-packagekit.h"
 
-const static QStringList binaryPackages = {QStringLiteral("application/vnd.debian.binary-package"),
-                                     QStringLiteral("application/x-rpm"),
-                                     QStringLiteral("application/x-xz"),
-                                     QStringLiteral("application/zstd")};
+Q_GLOBAL_STATIC_WITH_ARGS(QStringList, binaryPackages, ({QLatin1String("application/vnd.debian.binary-package"),
+                                                        QLatin1String("application/x-rpm"),
+                                                        QLatin1String("application/x-xz"),
+                                                        QLatin1String("application/zstd")}))
+
 enum PackageOperation {
     Install,
     Uninstall
@@ -297,7 +298,7 @@ bool cmdInstall(const QString &archive, QString &errorText)
             return false;
         }
     } else {
-        if (binaryPackages.contains(QMimeDatabase().mimeTypeForFile(archive).name())) {
+        if (binaryPackages->contains(QMimeDatabase().mimeTypeForFile(archive).name())) {
             packageKit(PackageOperation::Install, archive);
         }
         const QString dir = generateDirPath(archive);
@@ -366,7 +367,7 @@ bool cmdUninstall(const QString &archive, QString &errorText)
             return false;
         }
     } else {
-        if (binaryPackages.contains(QMimeDatabase().mimeTypeForFile(archive).name())) {
+        if (binaryPackages->contains(QMimeDatabase().mimeTypeForFile(archive).name())) {
             packageKit(PackageOperation::Uninstall, archive);
         }
         const QString dir = generateDirPath(archive);