From d63b9c2ce095f3e31ed4aa16222de46ddc8a2fac Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Wed, 1 Apr 2015 08:37:38 +0200 Subject: [PATCH] Use QStringLiteral --- .../potentialphishingdetailwidgettest.cpp | 32 +++++++++---------- .../folderarchiveagentcheckcollection.cpp | 2 +- mailmerge/mailmergedialog.cpp | 4 +-- mailmerge/widgets/mailmergewidget.cpp | 2 +- mailmerge/widgets/selectattachmentdialog.cpp | 4 +-- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/editor/potentialphishingemail/autotests/potentialphishingdetailwidgettest.cpp b/editor/potentialphishingemail/autotests/potentialphishingdetailwidgettest.cpp index c1c0c6b9f..8049c09ff 100644 --- a/editor/potentialphishingemail/autotests/potentialphishingdetailwidgettest.cpp +++ b/editor/potentialphishingemail/autotests/potentialphishingdetailwidgettest.cpp @@ -38,10 +38,10 @@ PotentialPhishingDetailWidgetTest::~PotentialPhishingDetailWidgetTest() void PotentialPhishingDetailWidgetTest::shouldHaveDefaultValue() { PotentialPhishingDetailWidget dlg; - QLabel *searchLabel = dlg.findChild(QLatin1String("label")); + QLabel *searchLabel = dlg.findChild(QStringLiteral("label")); QVERIFY(searchLabel); - QListWidget *listWidget = dlg.findChild(QLatin1String("list_widget")); + QListWidget *listWidget = dlg.findChild(QStringLiteral("list_widget")); QVERIFY(listWidget); QCOMPARE(listWidget->count(), 0); } @@ -49,11 +49,11 @@ void PotentialPhishingDetailWidgetTest::shouldHaveDefaultValue() void PotentialPhishingDetailWidgetTest::shouldFillList() { PotentialPhishingDetailWidget dlg; - QListWidget *listWidget = dlg.findChild(QLatin1String("list_widget")); + QListWidget *listWidget = dlg.findChild(QStringLiteral("list_widget")); QStringList lst; - lst << QLatin1String("bla"); - lst << QLatin1String("bli"); - lst << QLatin1String("blo"); + lst << QStringLiteral("bla"); + lst << QStringLiteral("bli"); + lst << QStringLiteral("blo"); dlg.fillList(lst); QCOMPARE(listWidget->count(), lst.count()); } @@ -61,16 +61,16 @@ void PotentialPhishingDetailWidgetTest::shouldFillList() void PotentialPhishingDetailWidgetTest::shouldClearListBeforeToAddNew() { PotentialPhishingDetailWidget dlg; - QListWidget *listWidget = dlg.findChild(QLatin1String("list_widget")); + QListWidget *listWidget = dlg.findChild(QStringLiteral("list_widget")); QStringList lst; - lst << QLatin1String("bla"); - lst << QLatin1String("bli"); - lst << QLatin1String("blo"); + lst << QStringLiteral("bla"); + lst << QStringLiteral("bli"); + lst << QStringLiteral("blo"); dlg.fillList(lst); QCOMPARE(listWidget->count(), lst.count()); lst.clear(); - lst << QLatin1String("bla"); - lst << QLatin1String("bli"); + lst << QStringLiteral("bla"); + lst << QStringLiteral("bli"); dlg.fillList(lst); QCOMPARE(listWidget->count(), lst.count()); } @@ -78,11 +78,11 @@ void PotentialPhishingDetailWidgetTest::shouldClearListBeforeToAddNew() void PotentialPhishingDetailWidgetTest::shouldNotAddDuplicateEntries() { PotentialPhishingDetailWidget dlg; - QListWidget *listWidget = dlg.findChild(QLatin1String("list_widget")); + QListWidget *listWidget = dlg.findChild(QStringLiteral("list_widget")); QStringList lst; - lst << QLatin1String("bla"); - lst << QLatin1String("blo"); - lst << QLatin1String("blo"); + lst << QStringLiteral("bla"); + lst << QStringLiteral("blo"); + lst << QStringLiteral("blo"); dlg.fillList(lst); QCOMPARE(listWidget->count(), (lst.count() - 1)); diff --git a/folderarchive/folderarchiveagentcheckcollection.cpp b/folderarchive/folderarchiveagentcheckcollection.cpp index 34c5cee34..937ffa9b9 100644 --- a/folderarchive/folderarchiveagentcheckcollection.cpp +++ b/folderarchive/folderarchiveagentcheckcollection.cpp @@ -116,7 +116,7 @@ void FolderArchiveAgentCheckCollection::createNewFolder(const QString &name) Akonadi::Collection collection; collection.setParentCollection(parentCollection); collection.setName(name); - collection.setContentMimeTypes(QStringList() << QLatin1String("message/rfc822")); + collection.setContentMimeTypes(QStringList() << QStringLiteral("message/rfc822")); Akonadi::CollectionCreateJob *job = new Akonadi::CollectionCreateJob(collection); connect(job, &Akonadi::CollectionCreateJob::result, this, &FolderArchiveAgentCheckCollection::slotCreateNewFolder); diff --git a/mailmerge/mailmergedialog.cpp b/mailmerge/mailmergedialog.cpp index dec1d74dd..67c0bdb14 100644 --- a/mailmerge/mailmergedialog.cpp +++ b/mailmerge/mailmergedialog.cpp @@ -35,10 +35,10 @@ MailMergeDialog::MailMergeDialog(QWidget *parent) QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok); mMailMergeWidget = new MailMergeWidget(this); - mMailMergeWidget->setObjectName(QLatin1String("mailmergewidget")); + mMailMergeWidget->setObjectName(QStringLiteral("mailmergewidget")); mainLayout->addWidget(mMailMergeWidget); - buttonBox->setObjectName(QLatin1String("buttonbox")); + buttonBox->setObjectName(QStringLiteral("buttonbox")); okButton->setDefault(true); okButton->setShortcut(Qt::CTRL | Qt::Key_Return); connect(buttonBox, &QDialogButtonBox::accepted, this, &MailMergeDialog::accept); diff --git a/mailmerge/widgets/mailmergewidget.cpp b/mailmerge/widgets/mailmergewidget.cpp index a17b6c9d8..49ee7c5be 100644 --- a/mailmerge/widgets/mailmergewidget.cpp +++ b/mailmerge/widgets/mailmergewidget.cpp @@ -62,7 +62,7 @@ MailMergeWidget::MailMergeWidget(QWidget *parent) mStackedWidget->addWidget(mAddressbookWidget); mCsvWidget = new MailMerge::CsvWidget; - mCsvWidget->setObjectName(QLatin1String("csvwidget")); + mCsvWidget->setObjectName(QStringLiteral("csvwidget")); mStackedWidget->addWidget(mCsvWidget); diff --git a/mailmerge/widgets/selectattachmentdialog.cpp b/mailmerge/widgets/selectattachmentdialog.cpp index b9f6c1bb2..e558c1f48 100644 --- a/mailmerge/widgets/selectattachmentdialog.cpp +++ b/mailmerge/widgets/selectattachmentdialog.cpp @@ -40,11 +40,11 @@ SelectAttachmentDialog::SelectAttachmentDialog(QWidget *parent) QVBoxLayout *vbox = new QVBoxLayout; w->setLayout(vbox); QLabel *lab = new QLabel(i18n("Select attachment:")); - lab->setObjectName(QLatin1String("selectattachment_label")); + lab->setObjectName(QStringLiteral("selectattachment_label")); vbox->addWidget(lab); mUrlRequester = new KUrlRequester; mUrlRequester->setMode(KFile::LocalOnly | KFile::ExistingOnly); - mUrlRequester->setObjectName(QLatin1String("urlrequester")); + mUrlRequester->setObjectName(QStringLiteral("urlrequester")); vbox->addWidget(mUrlRequester); mainLayout->addWidget(w); mainLayout->addWidget(buttonBox);