┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElvis Angelaccio <[email protected]>2020-11-02 00:03:20 +0100
committerElvis Angelaccio <[email protected]>2020-11-02 00:03:20 +0100
commit299aff588d65fee8993534195912da6882d44b9a (patch)
treef1858da7c868590a1170ac07461fda92a2bae131
parent6496721110099785e49cb2a0381c714a0923e5fc (diff)
servicemenuinstaller: use Q_GLOBAL_STATIC
Global statics should be avoided when possible. This fixes a clazy warning.
-rw-r--r--src/settings/services/servicemenuinstaller/servicemenuinstaller.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/settings/services/servicemenuinstaller/servicemenuinstaller.cpp b/src/settings/services/servicemenuinstaller/servicemenuinstaller.cpp
index 459c57fed..2c7ac7cab 100644
--- a/src/settings/services/servicemenuinstaller/servicemenuinstaller.cpp
+++ b/src/settings/services/servicemenuinstaller/servicemenuinstaller.cpp
@@ -19,10 +19,11 @@
#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);