plugin-mainmenu: Don't use automatic string conversions

gfgit · Jun 4, 2019 · 985b085 · 985b085
1 parent 5117574
commit 985b085
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/plugin-mainmenu/actionview.cpp b/plugin-mainmenu/actionview.cpp
@@ -189,7 +189,7 @@ void ActionView::addAction(QAction * action)
     item->setText(action->text());
     item->setToolTip(action->toolTip());
     QString all = action->text();
-    all += '\n';
+    all += QLatin1Char('\n');
     all += action->toolTip();
     item->setData(all, FilterRole);
 

diff --git a/plugin-mainmenu/lxqtmainmenu.cpp b/plugin-mainmenu/lxqtmainmenu.cpp
@@ -106,7 +106,7 @@ LXQtMainMenu::LXQtMainMenu(const ILXQtPanelPluginStartupInfo &startupInfo):
     {
         connect(mShortcut, &GlobalKeyShortcut::Action::registrationFinished, [this] {
             if (mShortcut->shortcut().isEmpty())
-                mShortcut->changeShortcut(DEFAULT_SHORTCUT);
+                mShortcut->changeShortcut(QStringLiteral(DEFAULT_SHORTCUT));
         });
         connect(mShortcut, &GlobalKeyShortcut::Action::activated, [this] {
             if (!mHideTimer.isActive())
@@ -195,7 +195,7 @@ void LXQtMainMenu::settingsChanged()
     setButtonIcon();
     if (settings()->value(QStringLiteral("showText"), false).toBool())
     {
-        mButton.setText(settings()->value(QStringLiteral("text"), "Start").toString());
+        mButton.setText(settings()->value(QStringLiteral("text"), QStringLiteral("Start")).toString());
         mButton.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     }
     else
@@ -204,9 +204,9 @@ void LXQtMainMenu::settingsChanged()
         mButton.setToolButtonStyle(Qt::ToolButtonIconOnly);
     }
 
-    mLogDir = settings()->value(QStringLiteral("log_dir"), "").toString();
+    mLogDir = settings()->value(QStringLiteral("log_dir"), QString()).toString();
 
-    QString menu_file = settings()->value(QStringLiteral("menu_file"), "").toString();
+    QString menu_file = settings()->value(QStringLiteral("menu_file"), QString()).toString();
     if (menu_file.isEmpty())
         menu_file = XdgMenu::getMenuFileName();
 
@@ -220,7 +220,7 @@ void LXQtMainMenu::settingsChanged()
             menu_cache_remove_reload_notify(mMenuCache, mMenuCacheNotify);
             menu_cache_unref(mMenuCache);
         }
-        mMenuCache = menu_cache_lookup(mMenuFile.toLocal8Bit());
+        mMenuCache = menu_cache_lookup(mMenuFile.toLocal8Bit().constData());
         if (MenuCacheDir * root = menu_cache_dup_root_dir(mMenuCache))
         {
             menu_cache_item_unref(MENU_CACHE_ITEM(root));
@@ -489,7 +489,7 @@ void LXQtMainMenu::setButtonIcon()
  ************************************************/
 QDialog *LXQtMainMenu::configureDialog()
 {
-    return new LXQtMainMenuConfiguration(settings(), mShortcut, DEFAULT_SHORTCUT);
+    return new LXQtMainMenuConfiguration(settings(), mShortcut, QStringLiteral(DEFAULT_SHORTCUT));
 }
 /************************************************
 

diff --git a/plugin-mainmenu/lxqtmainmenuconfiguration.cpp b/plugin-mainmenu/lxqtmainmenuconfiguration.cpp
@@ -46,7 +46,7 @@ LXQtMainMenuConfiguration::LXQtMainMenuConfiguration(PluginSettings *settings, G
     setObjectName(QStringLiteral("MainMenuConfigurationWindow"));
     ui->setupUi(this);
 
-    QIcon folder{XdgIcon::fromTheme("folder")};
+    QIcon folder{XdgIcon::fromTheme(QStringLiteral("folder"))};
     ui->chooseMenuFilePB->setIcon(folder);
     ui->iconPB->setIcon(folder);
 
@@ -114,9 +114,9 @@ void LXQtMainMenuConfiguration::loadSettings()
     ui->iconCB->setChecked(settings().value(QStringLiteral("ownIcon"), false).toBool());
     ui->iconLE->setText(settings().value(QStringLiteral("icon"), QLatin1String(LXQT_GRAPHICS_DIR"/helix.svg")).toString());
     ui->showTextCB->setChecked(settings().value(QStringLiteral("showText"), false).toBool());
-    ui->textLE->setText(settings().value(QStringLiteral("text"), "").toString());
+    ui->textLE->setText(settings().value(QStringLiteral("text"), QString()).toString());
 
-    QString menuFile = settings().value(QStringLiteral("menu_file"), "").toString();
+    QString menuFile = settings().value(QStringLiteral("menu_file"), QString()).toString();
     if (menuFile.isEmpty())
     {
         menuFile = XdgMenu::getMenuFileName();

diff --git a/plugin-mainmenu/xdgcachedmenu.cpp b/plugin-mainmenu/xdgcachedmenu.cpp
@@ -39,7 +39,7 @@ XdgCachedMenuAction::XdgCachedMenuAction(MenuCacheItem* item, QObject* parent):
     , iconName_{QString::fromUtf8(menu_cache_item_get_icon(item))}
 {
     QString title = QString::fromUtf8(menu_cache_item_get_name(item));
-    title = title.replace('&', QLatin1String("&&")); // & is reserved for mnemonics
+    title = title.replace(QLatin1Char('&'), QLatin1String("&&")); // & is reserved for mnemonics
     setText(title);
     // Only set tooltips for app items
     if(menu_cache_item_get_type(item) == MENU_CACHE_TYPE_APP)
@@ -64,7 +64,7 @@ void XdgCachedMenuAction::updateIcon()
         QIcon icon = QIcon::fromTheme(iconName_);
 
         if (icon.isNull())
-            icon = QIcon::fromTheme("unknown");
+            icon = QIcon::fromTheme(QStringLiteral("unknown"));
         // Some themes may lack the "unknown" icon; checking null prevents 
         // infinite recursion (setIcon->dataChanged->updateIcon->setIcon)
         if (icon.isNull())
@@ -190,7 +190,7 @@ void XdgCachedMenu::handleMouseMoveEvent(QMouseEvent *event)
         return;
 
     QList<QUrl> urls;
-    urls << QUrl(QString("file://%1").arg(a->filePath()));
+    urls << QUrl(QString::fromLatin1("file://%1").arg(a->filePath()));
 
     QMimeData *mimeData = new QMimeData();
     mimeData->setUrls(urls);