plugin-statusnotifier: Don't use automatic string conversions

gfgit · Jun 8, 2019 · 549570d · 549570d
1 parent fa5064b
commit 549570d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/plugin-statusnotifier/statusnotifierbutton.cpp b/plugin-statusnotifier/statusnotifierbutton.cpp
@@ -57,7 +57,7 @@ StatusNotifierButton::StatusNotifierButton(QString service, QString objectPath,
     : QToolButton(parent),
     mMenu(nullptr),
     mStatus(Passive),
-    mFallbackIcon(QIcon::fromTheme("application-x-executable")),
+    mFallbackIcon(QIcon::fromTheme(QLatin1String("application-x-executable"))),
     mPlugin(plugin)
 {
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
@@ -148,8 +148,8 @@ void StatusNotifierButton::refetchIcon(Status status, const QString& themePath)
                 QDir themeDir(themePath);
                 if (themeDir.exists())
                 {
-                    if (themeDir.exists(iconName + ".png"))
-                        nextIcon.addFile(themeDir.filePath(iconName + ".png"));
+                    if (themeDir.exists(iconName + QStringLiteral(".png")))
+                        nextIcon.addFile(themeDir.filePath(iconName + QStringLiteral(".png")));
 
                     if (themeDir.cd(QStringLiteral("hicolor")) || (themeDir.cd(QStringLiteral("icons")) && themeDir.cd(QStringLiteral("hicolor"))))
                     {
@@ -159,7 +159,7 @@ void StatusNotifierButton::refetchIcon(Status status, const QString& themePath)
                             const QStringList dirs = QDir(themeDir.filePath(dir)).entryList(QDir::AllDirs | QDir::NoDotAndDotDot);
                             for (const QString &innerDir : dirs)
                             {
-                                QString file = themeDir.absolutePath() + "/" + dir + "/" + innerDir + "/" + iconName + ".png";
+                                QString file = themeDir.absolutePath() + QLatin1Char('/') + dir + QLatin1Char('/') + innerDir + QLatin1Char('/') + iconName + QStringLiteral(".png");
                                 if (QFile::exists(file))
                                     nextIcon.addFile(file);
                             }

diff --git a/plugin-statusnotifier/statusnotifierwatcher.cpp b/plugin-statusnotifier/statusnotifierwatcher.cpp
@@ -72,7 +72,7 @@ void StatusNotifierWatcher::RegisterStatusNotifierItem(const QString &serviceOrP
     QString path = QStringLiteral("/StatusNotifierItem");
 
     // workaround for sni-qt
-    if (service.startsWith('/'))
+    if (service.startsWith(QLatin1Char('/')))
     {
         path = service;
         service = message().service();
@@ -110,7 +110,7 @@ void StatusNotifierWatcher::serviceUnregistered(const QString &service)
         return;
     }
 
-    QString match = service + '/';
+    QString match = service + QLatin1Char('/');
     QStringList::Iterator it = mServices.begin();
     while (it != mServices.end())
     {

diff --git a/plugin-statusnotifier/statusnotifierwidget.cpp b/plugin-statusnotifier/statusnotifierwidget.cpp
@@ -80,7 +80,7 @@ StatusNotifierWidget::~StatusNotifierWidget()
 
 void StatusNotifierWidget::itemAdded(QString serviceAndPath)
 {
-    int slash = serviceAndPath.indexOf('/');
+    int slash = serviceAndPath.indexOf(QLatin1Char('/'));
     QString serv = serviceAndPath.left(slash);
     QString path = serviceAndPath.mid(slash);
     StatusNotifierButton *button = new StatusNotifierButton(serv, path, mPlugin, this);