Merge branch 'qstringliteral-workaround'

panel/config/addplugindialog.cpp

@@ -53,7 +53,7 @@ AddPluginDialog::AddPluginDialog(QWidget *parent):
     desktopFilesDirs << QString("%1/%2").arg(XdgDirs::dataHome(), "/lxqt/lxqt-panel");
     desktopFilesDirs << PLUGIN_DESKTOPS_DIR;
 
-    mPlugins = LXQt::PluginInfo::search(desktopFilesDirs, QStringLiteral("LXQtPanel/Plugin"), QStringLiteral("*"));
+    mPlugins = LXQt::PluginInfo::search(desktopFilesDirs, QLatin1String("LXQtPanel/Plugin"), QLatin1String("*"));
     std::sort(mPlugins.begin(), mPlugins.end(), [](const LXQt::PluginInfo &p1, const LXQt::PluginInfo &p2) {
         return p1.name() < p2.name() || (p1.name() == p2.name() && p1.comment() < p2.comment());
     });
@@ -97,7 +97,7 @@ void AddPluginDialog::filter()
     {
         const LXQt::PluginInfo &plugin = mPlugins.at(i);
 
-        QString s = QStringLiteral("%1 %2 %3 %4 %5").arg(plugin.name(),
+        QString s = QString("%1 %2 %3 %4 %5").arg(plugin.name(),
                                                plugin.comment(),
                                                plugin.value("Name").toString(),
                                                plugin.value("Comment").toString(),
@@ -111,10 +111,10 @@ void AddPluginDialog::filter()
         {
             item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
             item->setBackground(palette().brush(QPalette::Disabled, QPalette::Text));
-            item->setText(QStringLiteral("<b>%1</b> (%2)<br>%3<br><small>%4</small>")
+            item->setText(QString("<b>%1</b> (%2)<br>%3<br><small>%4</small>")
                     .arg(plugin.name(), plugin.id(), plugin.comment(), tr("(only one instance can run at a time)")));
         } else
-            item->setText(QStringLiteral("<b>%1</b> (%2)<br>%3").arg(plugin.name(), plugin.id(), plugin.comment()));
+            item->setText(QString("<b>%1</b> (%2)<br>%3").arg(plugin.name(), plugin.id(), plugin.comment()));
         item->setIcon(plugin.icon(fallIco));
         item->setData(INDEX_ROLE, i);
     }

panel/config/configpaneldialog.cpp

@@ -35,11 +35,11 @@ ConfigPanelDialog::ConfigPanelDialog(LXQtPanel *panel, QWidget *parent):
     setAttribute(Qt::WA_DeleteOnClose);
 
     mPanelPage = new ConfigPanelWidget(panel, this);
-    addPage(mPanelPage, tr("Panel"), QStringLiteral("configure"));
+    addPage(mPanelPage, tr("Panel"), QLatin1String("configure"));
     connect(this, &ConfigPanelDialog::reset, mPanelPage, &ConfigPanelWidget::reset);
 
     mPluginsPage = new ConfigPluginsWidget(panel, this);
-    addPage(mPluginsPage, tr("Widgets"), QStringLiteral("preferences-plugin"));
+    addPage(mPluginsPage, tr("Widgets"), QLatin1String("preferences-plugin"));
     connect(this, &ConfigPanelDialog::reset, mPluginsPage, &ConfigPluginsWidget::reset);
 
     connect(this, &ConfigPanelDialog::accepted, [panel] {

panel/lxqtpanel.cpp

@@ -932,7 +932,7 @@ void LXQtPanel::showPopupMenu(Plugin *plugin)
 
     menu->addTitle(QIcon(), tr("Panel"));
 
-    menu->addAction(XdgIcon::fromTheme(QStringLiteral("configure")),
+    menu->addAction(XdgIcon::fromTheme(QLatin1String("configure")),
                    tr("Configure Panel"),
                    this, SLOT(showConfigDialog())
                   );
@@ -950,7 +950,7 @@ void LXQtPanel::showPopupMenu(Plugin *plugin)
 
     if (a->count() > 1)
     {
-        menu->addAction(XdgIcon::fromTheme(QStringLiteral("list-remove")),
+        menu->addAction(XdgIcon::fromTheme(QLatin1String("list-remove")),
                        tr("Remove Panel"),
                        this, SLOT(userRequestForDeletion())
                       );

panel/lxqtpanelapplication.cpp

@@ -39,16 +39,16 @@
 LXQtPanelApplication::LXQtPanelApplication(int& argc, char** argv)
     : LXQt::Application(argc, argv, true)
 {
-    QCoreApplication::setApplicationName(QStringLiteral("lxqt-panel"));
+    QCoreApplication::setApplicationName(QLatin1String("lxqt-panel"));
     QCoreApplication::setApplicationVersion(LXQT_VERSION);
 
     QCommandLineParser parser;
-    parser.setApplicationDescription(QStringLiteral("LXQt panel"));
+    parser.setApplicationDescription(QLatin1String("LXQt panel"));
     parser.addHelpOption();
     parser.addVersionOption();
 
     QCommandLineOption configFileOption(QStringList()
-            << QStringLiteral("c") << QStringLiteral("config") << QStringLiteral("configfile"),
+            << QLatin1String("c") << QLatin1String("config") << QLatin1String("configfile"),
             QCoreApplication::translate("main", "Use alternate configuration file."),
             QCoreApplication::translate("main", "Configuration file"));
     parser.addOption(configFileOption);
@@ -58,7 +58,7 @@ LXQtPanelApplication::LXQtPanelApplication(int& argc, char** argv)
     const QString configFile = parser.value(configFileOption);
 
     if (configFile.isEmpty())
-        mSettings = new LXQt::Settings(QStringLiteral("panel"), this);
+        mSettings = new LXQt::Settings(QLatin1String("panel"), this);
     else
         mSettings = new LXQt::Settings(configFile, QSettings::IniFormat, this);
 

panel/panelpluginsmodel.cpp

@@ -69,9 +69,9 @@ QVariant PanelPluginsModel::data(const QModelIndex & index, int role/* = Qt::Dis
     {
         case Qt::DisplayRole:
             if (plugin.second.isNull())
-                ret = QStringLiteral("<b>Unknown</b> (%1)").arg(plugin.first);
+                ret = QString("<b>Unknown</b> (%1)").arg(plugin.first);
             else
-                ret = QStringLiteral("<b>%1</b> (%2)").arg(plugin.second->name(), plugin.first);
+                ret = QString("<b>%1</b> (%2)").arg(plugin.second->name(), plugin.first);
             break;
         case Qt::DecorationRole:
             if (plugin.second.isNull())
@@ -246,15 +246,15 @@ QString PanelPluginsModel::findNewPluginSettingsGroup(const QString &pluginType)
     groups.sort();
 
     // Generate new section name
-    QString pluginName = QStringLiteral("%1").arg(pluginType);
+    QString pluginName = QString("%1").arg(pluginType);
 
     if (!groups.contains(pluginName))
         return pluginName;
     else
     {
         for (int i = 2; true; ++i)
         {
-            pluginName = QStringLiteral("%1%2").arg(pluginType).arg(i);
+            pluginName = QString("%1%2").arg(pluginType).arg(i);
             if (!groups.contains(pluginName))
                 return pluginName;
         }

panel/plugin.cpp

@@ -199,34 +199,34 @@ namespace
     // to be not stripped (as unused/unreferenced) in static linking time
     static plugin_tuple_t const static_plugins[] = {
 #if defined(WITH_CLOCK_PLUGIN)
-        std::make_tuple(QStringLiteral("clock"), plugin_ptr_t{new LXQtClockPluginLibrary}, loadPluginTranslation_clock_helper),// clock
+        std::make_tuple(QLatin1String("clock"), plugin_ptr_t{new LXQtClockPluginLibrary}, loadPluginTranslation_clock_helper),// clock
 #endif
 #if defined(WITH_DESKTOPSWITCH_PLUGIN)
-        std::make_tuple(QStringLiteral("desktopswitch"), plugin_ptr_t{new DesktopSwitchPluginLibrary}, loadPluginTranslation_desktopswitch_helper),// desktopswitch
+        std::make_tuple(QLatin1String("desktopswitch"), plugin_ptr_t{new DesktopSwitchPluginLibrary}, loadPluginTranslation_desktopswitch_helper),// desktopswitch
 #endif
 #if defined(WITH_MAINMENU_PLUGIN)
-        std::make_tuple(QStringLiteral("mainmenu"), plugin_ptr_t{new LXQtMainMenuPluginLibrary}, loadPluginTranslation_mainmenu_helper),// mainmenu
+        std::make_tuple(QLatin1String("mainmenu"), plugin_ptr_t{new LXQtMainMenuPluginLibrary}, loadPluginTranslation_mainmenu_helper),// mainmenu
 #endif
 #if defined(WITH_QUICKLAUNCH_PLUGIN)
-        std::make_tuple(QStringLiteral("quicklaunch"), plugin_ptr_t{new LXQtQuickLaunchPluginLibrary}, loadPluginTranslation_quicklaunch_helper),// quicklaunch
+        std::make_tuple(QLatin1String("quicklaunch"), plugin_ptr_t{new LXQtQuickLaunchPluginLibrary}, loadPluginTranslation_quicklaunch_helper),// quicklaunch
 #endif
 #if defined(WITH_SHOWDESKTOP_PLUGIN)
-        std::make_tuple(QStringLiteral("showdesktop"), plugin_ptr_t{new ShowDesktopLibrary}, loadPluginTranslation_showdesktop_helper),// showdesktop
+        std::make_tuple(QLatin1String("showdesktop"), plugin_ptr_t{new ShowDesktopLibrary}, loadPluginTranslation_showdesktop_helper),// showdesktop
 #endif
 #if defined(WITH_SPACER_PLUGIN)
-        std::make_tuple(QStringLiteral("spacer"), plugin_ptr_t{new SpacerPluginLibrary}, loadPluginTranslation_spacer_helper),// spacer
+        std::make_tuple(QLatin1String("spacer"), plugin_ptr_t{new SpacerPluginLibrary}, loadPluginTranslation_spacer_helper),// spacer
 #endif
 #if defined(WITH_STATUSNOTIFIER_PLUGIN)
-        std::make_tuple(QStringLiteral("statusnotifier"), plugin_ptr_t{new StatusNotifierLibrary}, loadPluginTranslation_statusnotifier_helper),// statusnotifier
+        std::make_tuple(QLatin1String("statusnotifier"), plugin_ptr_t{new StatusNotifierLibrary}, loadPluginTranslation_statusnotifier_helper),// statusnotifier
 #endif
 #if defined(WITH_TASKBAR_PLUGIN)
-        std::make_tuple(QStringLiteral("taskbar"), plugin_ptr_t{new LXQtTaskBarPluginLibrary}, loadPluginTranslation_taskbar_helper),// taskbar
+        std::make_tuple(QLatin1String("taskbar"), plugin_ptr_t{new LXQtTaskBarPluginLibrary}, loadPluginTranslation_taskbar_helper),// taskbar
 #endif
 #if defined(WITH_TRAY_PLUGIN)
-        std::make_tuple(QStringLiteral("tray"), plugin_ptr_t{new LXQtTrayPluginLibrary}, loadPluginTranslation_tray_helper),// tray
+        std::make_tuple(QLatin1String("tray"), plugin_ptr_t{new LXQtTrayPluginLibrary}, loadPluginTranslation_tray_helper),// tray
 #endif
 #if defined(WITH_WORLDCLOCK_PLUGIN)
-        std::make_tuple(QStringLiteral("worldclock"), plugin_ptr_t{new LXQtWorldClockLibrary}, loadPluginTranslation_worldclock_helper),// worldclock
+        std::make_tuple(QLatin1String("worldclock"), plugin_ptr_t{new LXQtWorldClockLibrary}, loadPluginTranslation_worldclock_helper),// worldclock
 #endif
     };
     static constexpr plugin_tuple_t const * const plugins_begin = static_plugins;
@@ -408,7 +408,7 @@ QMenu *Plugin::popupMenu() const
     if (mPlugin->flags().testFlag(ILXQtPanelPlugin::HaveConfigDialog))
     {
         QAction* configAction = new QAction(
-            XdgIcon::fromTheme(QStringLiteral("preferences-other")),
+            XdgIcon::fromTheme(QLatin1String("preferences-other")),
             tr("Configure \"%1\"").arg(name), menu);
         menu->addAction(configAction);
         connect(configAction, SIGNAL(triggered()), this, SLOT(showConfigureDialog()));
@@ -421,7 +421,7 @@ QMenu *Plugin::popupMenu() const
     menu->addSeparator();
 
     QAction* removeAction = new QAction(
-        XdgIcon::fromTheme(QStringLiteral("list-remove")),
+        XdgIcon::fromTheme(QLatin1String("list-remove")),
         tr("Remove \"%1\"").arg(name), menu);
     menu->addAction(removeAction);
     connect(removeAction, SIGNAL(triggered()), this, SLOT(requestRemove()));

plugin-desktopswitch/desktopswitch.cpp

@@ -41,7 +41,7 @@
 #include "desktopswitchbutton.h"
 #include "desktopswitchconfiguration.h"
 
-#define DEFAULT_SHORTCUT_TEMPLATE QStringLiteral("Control+F%1")
+static const QString DEFAULT_SHORTCUT_TEMPLATE("Control+F%1");
 
 DesktopSwitch::DesktopSwitch(const ILXQtPanelPluginStartupInfo &startupInfo) :
     QObject(),
@@ -84,7 +84,7 @@ void DesktopSwitch::registerShortcuts()
         path = QString("/panel/%1/desktop_%2").arg(settings()->group()).arg(i + 1);
         description = tr("Switch to desktop %1").arg(i + 1);
 
-        gshortcut = GlobalKeyShortcut::Client::instance()->addAction(QStringLiteral(), path, description, this);
+        gshortcut = GlobalKeyShortcut::Client::instance()->addAction(QString(), path, description, this);
         if (nullptr != gshortcut)
         {
             m_keys << gshortcut;

plugin-kbindicator/src/kbdstateconfig.cpp

@@ -106,5 +106,5 @@ void KbdStateConfig::save()
 
 void KbdStateConfig::configureLayouts()
 {
-    QProcess::startDetached(QStringLiteral("lxqt-config-input"));
+    QProcess::startDetached(QLatin1String("lxqt-config-input"));
 }

plugin-mainmenu/lxqtmainmenuconfiguration.cpp

@@ -57,7 +57,7 @@ LXQtMainMenuConfiguration::LXQtMainMenuConfiguration(QSettings &settings, Global
     connect(ui->chooseMenuFilePB, SIGNAL(clicked()), this, SLOT(chooseMenuFile()));
     connect(ui->menuFilePathLE, &QLineEdit::textChanged, [this] (QString const & file)
         {
-            mSettings.setValue(QStringLiteral("menu_file"), file);
+            mSettings.setValue(QLatin1String("menu_file"), file);
         });
 
     connect(ui->shortcutEd, SIGNAL(shortcutGrabbed(QString)), this, SLOT(shortcutChanged(QString)));
@@ -110,7 +110,7 @@ void LXQtMainMenuConfiguration::chooseMenuFile()
 {
     QFileDialog *d = new QFileDialog(this,
                                      tr("Choose menu file"),
-                                     QStringLiteral("/etc/xdg/menus"),
+                                     QLatin1String("/etc/xdg/menus"),
                                      tr("Menu files (*.menu)"));
     d->setWindowModality(Qt::WindowModal);
     d->setAttribute(Qt::WA_DeleteOnClose);

plugin-mount/configuration.cpp

@@ -37,9 +37,9 @@ Configuration::Configuration(QSettings &settings, QWidget *parent) :
     ui(new Ui::Configuration)
 {
     ui->setupUi(this);
-    ui->devAddedCombo->addItem(tr("Popup menu"), QStringLiteral(ACT_SHOW_MENU));
-    ui->devAddedCombo->addItem(tr("Show info"),  QStringLiteral(ACT_SHOW_INFO));
-    ui->devAddedCombo->addItem(tr("Do nothing"), QStringLiteral(ACT_NOTHING));
+    ui->devAddedCombo->addItem(tr("Popup menu"), QLatin1String(ACT_SHOW_MENU));
+    ui->devAddedCombo->addItem(tr("Show info"),  QLatin1String(ACT_SHOW_INFO));
+    ui->devAddedCombo->addItem(tr("Do nothing"), QLatin1String(ACT_NOTHING));
 
     loadSettings();
     connect(ui->devAddedCombo, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
@@ -54,12 +54,12 @@ Configuration::~Configuration()
 
 void Configuration::loadSettings()
 {
-    QVariant value = settings().value(QStringLiteral(CFG_KEY_ACTION), QStringLiteral(ACT_SHOW_INFO));
+    QVariant value = settings().value(QLatin1String(CFG_KEY_ACTION), QLatin1String(ACT_SHOW_INFO));
     setComboboxIndexByData(ui->devAddedCombo, value, 1);
 }
 
 void Configuration::devAddedChanged(int index)
 {
     QString s = ui->devAddedCombo->itemData(index).toString();
-    settings().setValue(QStringLiteral(CFG_KEY_ACTION), s);
+    settings().setValue(QLatin1String(CFG_KEY_ACTION), s);
 }

plugin-mount/lxqtmountplugin.cpp

@@ -66,7 +66,7 @@ void LXQtMountPlugin::realign()
 
 void LXQtMountPlugin::settingsChanged()
 {
-    QString s = settings()->value(QStringLiteral(CFG_KEY_ACTION)).toString();
+    QString s = settings()->value(QLatin1String(CFG_KEY_ACTION)).toString();
     DeviceAction::ActionId actionId = DeviceAction::stringToActionId(s, DeviceAction::ActionMenu);
 
     if (mDeviceAction == nullptr || mDeviceAction->Type() != actionId)

plugin-mount/lxqtmountplugin.h

@@ -49,7 +49,7 @@ class LXQtMountPlugin : public QObject, public ILXQtPanelPlugin
     ~LXQtMountPlugin();
 
     virtual QWidget *widget() { return mButton; }
-    virtual QString themeId() const { return QStringLiteral("LXQtMount"); }
+    virtual QString themeId() const { return QLatin1String("LXQtMount"); }
     virtual ILXQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog; }
 
     Popup *popup() { return mPopup; }

plugin-spacer/spacerconfiguration.cpp

@@ -31,9 +31,9 @@
 //Note: strings can't actually be translated here (in static initialization time)
 //      the QT_TR_NOOP here is just for qt translate tools to get the strings for translation
 const QStringList SpacerConfiguration::msTypes = {
-    QStringLiteral(QT_TR_NOOP("lined"))
-    , QStringLiteral(QT_TR_NOOP("dotted"))
-    , QStringLiteral(QT_TR_NOOP("invisible"))
+    QLatin1String(QT_TR_NOOP("lined"))
+    , QLatin1String(QT_TR_NOOP("dotted"))
+    , QLatin1String(QT_TR_NOOP("invisible"))
 };
 
 SpacerConfiguration::SpacerConfiguration(QSettings *settings, QWidget *parent)

plugin-statusnotifier/sniasync.cpp

@@ -42,7 +42,7 @@ SniAsync::SniAsync(const QString &service, const QString &path, const QDBusConne
 
 QDBusPendingReply<QDBusVariant> SniAsync::asyncPropGet(QString const & property)
 {
-    QDBusMessage msg = QDBusMessage::createMethodCall(mSni.service(), mSni.path(), QStringLiteral("org.freedesktop.DBus.Properties"), QStringLiteral("Get"));
+    QDBusMessage msg = QDBusMessage::createMethodCall(mSni.service(), mSni.path(), QLatin1String("org.freedesktop.DBus.Properties"), QLatin1String("Get"));
     msg << mSni.interface() << property;
     return mSni.connection().asyncCall(msg);
 }

plugin-statusnotifier/statusnotifierbutton.cpp

@@ -50,20 +50,20 @@ StatusNotifierButton::StatusNotifierButton(QString service, QString objectPath,
     connect(interface, &SniAsync::NewToolTip, this, &StatusNotifierButton::newToolTip);
     connect(interface, &SniAsync::NewStatus, this, &StatusNotifierButton::newStatus);
 
-    interface->propertyGetAsync(QStringLiteral("Menu"), [this] (QDBusObjectPath path) {
+    interface->propertyGetAsync(QLatin1String("Menu"), [this] (QDBusObjectPath path) {
         if (!path.path().isEmpty())
         {
             mMenu = (new DBusMenuImporter(interface->service(), path.path(), this))->menu();
             dynamic_cast<QObject &>(*mMenu).setParent(this);
-            mMenu->setObjectName(QStringLiteral("StatusNotifierMenu"));
+            mMenu->setObjectName(QLatin1String("StatusNotifierMenu"));
         }
     });
 
-    interface->propertyGetAsync(QStringLiteral("Status"), [this] (QString status) {
+    interface->propertyGetAsync(QLatin1String("Status"), [this] (QString status) {
         newStatus(status);
     });
 
-    interface->propertyGetAsync(QStringLiteral("IconThemePath"), [this] (QString value) {
+    interface->propertyGetAsync(QLatin1String("IconThemePath"), [this] (QString value) {
         mThemePath = value;
         //do the logic of icons after we've got the theme path
         refetchIcon(Active);
@@ -99,18 +99,18 @@ void StatusNotifierButton::refetchIcon(Status status)
     QString nameProperty, pixmapProperty;
     if (status == Active)
     {
-        nameProperty = QStringLiteral("OverlayIconName");
-        pixmapProperty = QStringLiteral("OverlayIconPixmap");
+        nameProperty = QLatin1String("OverlayIconName");
+        pixmapProperty = QLatin1String("OverlayIconPixmap");
     }
     else if (status == NeedsAttention)
     {
-        nameProperty = QStringLiteral("AttentionIconName");
-        pixmapProperty = QStringLiteral("AttentionIconPixmap");
+        nameProperty = QLatin1String("AttentionIconName");
+        pixmapProperty = QLatin1String("AttentionIconPixmap");
     }
     else // status == Passive
     {
-        nameProperty = QStringLiteral("IconName");
-        pixmapProperty = QStringLiteral("IconPixmap");
+        nameProperty = QLatin1String("IconName");
+        pixmapProperty = QLatin1String("IconPixmap");
     }
 
     interface->propertyGetAsync(nameProperty, [this, status, pixmapProperty] (QString iconName) {
@@ -204,12 +204,12 @@ void StatusNotifierButton::refetchIcon(Status status)
 
 void StatusNotifierButton::newToolTip()
 {
-    interface->propertyGetAsync(QStringLiteral("ToolTip"), [this] (ToolTip tooltip) {
+    interface->propertyGetAsync(QLatin1String("ToolTip"), [this] (ToolTip tooltip) {
         QString toolTipTitle = tooltip.title;
         if (!toolTipTitle.isEmpty())
             setToolTip(toolTipTitle);
         else
-            interface->propertyGetAsync(QStringLiteral("Title"), [this] (QString title) {
+            interface->propertyGetAsync(QLatin1String("Title"), [this] (QString title) {
                 // we should get here only in case the ToolTip.title was empty
                 if (!title.isEmpty())
                     setToolTip(title);
@@ -220,9 +220,9 @@ void StatusNotifierButton::newToolTip()
 void StatusNotifierButton::newStatus(QString status)
 {
     Status newStatus;
-    if (status == QStringLiteral("Passive"))
+    if (status == QLatin1String("Passive"))
         newStatus = Passive;
-    else if (status == QStringLiteral("Active"))
+    else if (status == QLatin1String("Active"))
         newStatus = Active;
     else
         newStatus = NeedsAttention;