GIT_SILENT: use QLatin1String when we concat string

wilder
Laurent Montel 7 years ago
parent 6788efb89c
commit adb4f63a53
  1. 2
      src/dialog/kmknotify.cpp
  2. 6
      src/editor/kmcomposerwin.cpp

@ -107,7 +107,7 @@ void KMKnotify::initCombobox()
//TODO add other notifyrc here if necessary
for (const QString &notify : lstNotify) {
const QString fullPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("knotifications5/") + notify);
const QString fullPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1String("knotifications5/") + notify);
if (!fullPath.isEmpty()) {
const int slash = fullPath.lastIndexOf(QLatin1Char('/'));

@ -1339,7 +1339,7 @@ void KMComposerWin::initializePluginActions()
localEditorManagerActionsType.next();
QList<QAction *> lst = localEditorManagerActionsType.value();
if (!lst.isEmpty()) {
const QString actionlistname = QStringLiteral("kmaileditor") + MessageComposer::PluginActionType::actionXmlExtension(localEditorManagerActionsType.key());
const QString actionlistname = QLatin1String("kmaileditor") + MessageComposer::PluginActionType::actionXmlExtension(localEditorManagerActionsType.key());
hashActions.insert(actionlistname, lst);
}
}
@ -1348,7 +1348,7 @@ void KMComposerWin::initializePluginActions()
localEditorConvertTextManagerActionsType.next();
QList<QAction *> lst = localEditorConvertTextManagerActionsType.value();
if (!lst.isEmpty()) {
const QString actionlistname = QStringLiteral("kmaileditor") + MessageComposer::PluginActionType::actionXmlExtension(localEditorConvertTextManagerActionsType.key());
const QString actionlistname = QLatin1String("kmaileditor") + MessageComposer::PluginActionType::actionXmlExtension(localEditorConvertTextManagerActionsType.key());
if (hashActions.contains(actionlistname)) {
lst = hashActions.value(actionlistname) + lst;
hashActions.remove(actionlistname);
@ -1358,7 +1358,7 @@ void KMComposerWin::initializePluginActions()
}
const QList<KToggleAction *> customToolsWidgetActionList = mCustomToolsWidget->actionList();
const QString actionlistname = QStringLiteral("kmaileditor") + MessageComposer::PluginActionType::actionXmlExtension(MessageComposer::PluginActionType::Tools);
const QString actionlistname = QLatin1String("kmaileditor") + MessageComposer::PluginActionType::actionXmlExtension(MessageComposer::PluginActionType::Tools);
for (KToggleAction *act : customToolsWidgetActionList) {
QList<QAction *> lst;
lst << act;

Loading…
Cancel
Save