From 5f6dd46a97eb73b25c3ebe86aba468a26535879c Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Mon, 17 Nov 2014 08:36:08 +0100 Subject: [PATCH] Use QStringLiteral --- foldershortcutactionmanager.cpp | 2 +- identity/identitylistview.cpp | 2 +- identity/identitypage.cpp | 4 ++-- identity/newidentitydialog.cpp | 2 +- job/createnewcontactjob.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/foldershortcutactionmanager.cpp b/foldershortcutactionmanager.cpp index 07199e835..e14f39223 100644 --- a/foldershortcutactionmanager.cpp +++ b/foldershortcutactionmanager.cpp @@ -129,7 +129,7 @@ void FolderShortcutActionManager::shortcutChanged(const Akonadi::Collection &col FolderShortcutCommand *command = new FolderShortcutCommand(mParent, col); mFolderShortcutCommands.insert(col.id(), command); - QIcon icon(QLatin1String("folder")); + QIcon icon(QStringLiteral("folder")); if (col.hasAttribute() && !col.attribute()->iconName().isEmpty()) { icon = QIcon(col.attribute()->iconName()); diff --git a/identity/identitylistview.cpp b/identity/identitylistview.cpp index e1e20a263..7d7e11f65 100644 --- a/identity/identitylistview.cpp +++ b/identity/identitylistview.cpp @@ -198,7 +198,7 @@ void IdentityListView::startDrag(Qt::DropActions /*supportedActions*/) QMimeData *md = new QMimeData; drag->setMimeData(md); item->identity().populateMimeData(md); - drag->setPixmap(SmallIcon(QLatin1String("user-identity"))); + drag->setPixmap(SmallIcon(QStringLiteral("user-identity"))); drag->start(); } #endif diff --git a/identity/identitypage.cpp b/identity/identitypage.cpp index 05e28c64c..2de81644e 100644 --- a/identity/identitypage.cpp +++ b/identity/identitypage.cpp @@ -132,7 +132,7 @@ void IdentityPage::slotNewIdentity() MessageViewer::AutoQPointer dialog(new NewIdentityDialog( mIdentityManager, this)); - dialog->setObjectName(QLatin1String("new")); + dialog->setObjectName(QStringLiteral("new")); if (dialog->exec() == QDialog::Accepted && dialog) { QString identityName = dialog->identityName().trimmed(); @@ -227,7 +227,7 @@ void IdentityPage::slotRemoveIdentity() "%1?", item->identity().identityName()); if (KMessageBox::warningContinueCancel(this, msg, i18n("Remove Identity"), KGuiItem(i18n("&Remove"), - QLatin1String("edit-delete"))) + QStringLiteral("edit-delete"))) == KMessageBox::Continue) { if (mIdentityManager->removeIdentity(item->identity().identityName())) { delete item; diff --git a/identity/newidentitydialog.cpp b/identity/newidentitydialog.cpp index 62fdd0ef3..8393207f5 100644 --- a/identity/newidentitydialog.cpp +++ b/identity/newidentitydialog.cpp @@ -126,7 +126,7 @@ NewIdentityDialog::NewIdentityDialog(KIdentityManagement::IdentityManager *manag void NewIdentityDialog::slotHelp() { - KHelpClient::invokeHelp(QString::fromLatin1("configure-identity-newidentitydialog"), QLatin1String("kmail")); + KHelpClient::invokeHelp(QString::fromLatin1("configure-identity-newidentitydialog"), QStringLiteral("kmail")); } NewIdentityDialog::DuplicateMode NewIdentityDialog::duplicateMode() const diff --git a/job/createnewcontactjob.cpp b/job/createnewcontactjob.cpp index 2e086bf45..d3d15e243 100644 --- a/job/createnewcontactjob.cpp +++ b/job/createnewcontactjob.cpp @@ -79,7 +79,7 @@ void CreateNewContactJob::slotCollectionsFetched(KJob *job) dlg.setWindowTitle(i18n("Add to Address Book")); dlg.agentFilterProxyModel()->addMimeTypeFilter(KContacts::Addressee::mimeType()); dlg.agentFilterProxyModel()->addMimeTypeFilter(KContacts::ContactGroup::mimeType()); - dlg.agentFilterProxyModel()->addCapabilityFilter(QLatin1String("Resource")); + dlg.agentFilterProxyModel()->addCapabilityFilter(QStringLiteral("Resource")); if (dlg.exec()) { const Akonadi::AgentType agentType = dlg.agentType();