[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim-addons] /: Fix some clazy warning
From: Montel Laurent <null () kde ! org>
Date: 2017-05-31 20:48:12
Message-ID: E1dGAXM-00035d-Ja () code ! kde ! org
[Download RAW message or body]
Git commit 4ac30cdea93e2b4898bcaca401a3b13bfc0038da by Montel Laurent.
Committed on 31/05/2017 at 20:48.
Pushed by mlaurent into branch 'master'.
Fix some clazy warning
M +3 -3 akonadi-import-wizard/opera/operaimportdata.cpp
M +1 -1 akonadi-import-wizard/opera/operasettings.cpp
M +4 -4 examples/apps/coisceim/createfoldercontentswidget.cpp
M +3 -3 examples/apps/coisceim/createtripwidget.cpp
M +1 -1 examples/apps/coisceim/main.cpp
M +1 -1 examples/apps/coisceim/mixedtreemodel.cpp
M +1 -1 examples/apps/coisceim/note.cpp
M +1 -1 examples/apps/coisceim/tripmodel.cpp
M +3 -3 examples/apps/coisceim/tripwidget.cpp
M +1 -1 examples/apps/etm_usage/checkable2.cpp
M +2 -2 examples/apps/etm_usage/entityfindingwidget.cpp
M +1 -1 examples/apps/etm_usage/entitytreewidget.cpp
M +2 -2 examples/apps/etm_usage/mailmodel.cpp
M +5 -5 examples/apps/etm_usage/main.cpp
M +15 -15 examples/apps/etm_usage/mainwindow.cpp
M +1 -1 examples/apps/etm_usage/mixedtreemodel.cpp
M +1 -1 examples/apps/etm_usage/tab6widget.cpp
M +1 -1 examples/apps/etm_usage/tab7widget.cpp
M +1 -1 examples/apps/etm_usage/unreadmailsincollectionswidget.cpp
M +1 -1 examples/apps/kabc/kabceditor.cpp
M +4 -4 examples/apps/kabc/kabcviewer.cpp
M +7 -7 examples/apps/mailreader/mailreader.cpp
M +1 -1 examples/apps/mailreader/mailreaderview.cpp
M +1 -1 examples/apps/mailreader/main.cpp
M +2 -2 kaddressbook/importexportplugins/csv/import/csvimportdialog.cpp
M +2 -2 kaddressbook/importexportplugins/gmx/gmximportexportplugininterface.cpp
M +1 -1 kaddressbook/importexportplugins/ldif/ldifimportexportplugininterface.cpp
M +2 -2 kaddressbook/importexportplugins/vcards/vcardimportexportplugininterface.cpp
M +3 -3 kaddressbook/plugins/sendmail/autotests/mailsenderjobtest.cpp
M +5 -5 kaddressbook/plugins/sendvcards/sendvcardsjob.cpp
M +2 -2 kmail/plugins/common/antispamwizard.cpp
M +1 -1 korganizer/plugins/hebrew/hebrew.cpp
M +2 -2 korganizer/plugins/picoftheday/picoftheday.cpp
M +1 -1 plugins/customtoolsplugins/shorturlplugin/shorturl/shorturlengineplugin/shorturlengineinterface.cpp
M +3 -3 plugins/messageviewer/bodypartformatter/autotests/diffhighlightertest.cpp
M +5 -5 plugins/messageviewer/bodypartformatter/autotests/rendertest.cpp
M +2 -2 plugins/messageviewer/bodypartformatter/calendar/text_calendar.cpp
M +14 -14 plugins/messageviewer/bodypartformatter/vcard/text_vcard.cpp
M +1 -1 plugins/messageviewer/bodypartformatter/xdiff/diffhighlighter.cpp
M +6 -6 plugins/messageviewerheaderplugins/briefheaderstyleplugin/briefheaderstyle.cpp
M +45 -45 plugins/messageviewerheaderplugins/enterpriseheaderstyleplugin/enterpriseheaderstyle.cpp
M +6 -6 plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyle.cpp
M +4 -4 plugins/messageviewerplugins/createeventplugin/createeventjob.cpp
M +3 -3 plugins/messageviewerplugins/createnoteplugin/createnotejob.cpp
M +1 -1 plugins/messageviewerplugins/externalscriptplugin/autotests/viewerpluginexternalscriptsloadjobtest.cpp
M +1 -1 plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscriptinterface.cpp
M +7 -7 plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscriptparseargument.cpp
M +2 -2 plugins/webengineurlinterceptor/adblock/lib/adblockblockableitemsjob.cpp
M +4 -4 plugins/webengineurlinterceptor/adblock/lib/widgets/adblockcreatefilterdialog.cpp
M +1 -1 sieveeditor/imapfoldercompletion/selectimapfoldertreeview.cpp
M +1 -1 sieveeditor/imapfoldercompletion/selectimapfoldertreeview.h
https://commits.kde.org/kdepim-addons/4ac30cdea93e2b4898bcaca401a3b13bfc0038da
diff --git a/akonadi-import-wizard/opera/operaimportdata.cpp \
b/akonadi-import-wizard/opera/operaimportdata.cpp index 12b80de6..be5aa109 \
100644
--- a/akonadi-import-wizard/opera/operaimportdata.cpp
+++ b/akonadi-import-wizard/opera/operaimportdata.cpp
@@ -59,7 +59,7 @@ bool OperaImportData::importMails()
MailImporter::FilterOpera opera;
initializeFilter(opera);
opera.filterInfo()->setStatusMessage(i18n("Import in progress"));
- const QString mailPath(mPath + QLatin1String("mail/store/"));
+ const QString mailPath(mPath + QStringLiteral("mail/store/"));
QDir directory(mailPath);
if (directory.exists()) {
opera.importMails(mailPath);
@@ -72,7 +72,7 @@ bool OperaImportData::importMails()
bool OperaImportData::importAddressBook()
{
- const QString addressbookFile(mPath + QLatin1String("bookmarks.adr"));
+ const QString addressbookFile(mPath + \
QStringLiteral("bookmarks.adr")); OperaAddressBook \
addressbook(addressbookFile); \
addressbook.setAbstractDisplayInfo(mAbstractDisplayInfo); \
addressbook.importAddressBook(); @@ -81,7 +81,7 @@ bool \
OperaImportData::importAddressBook()
bool OperaImportData::importSettings()
{
- const QString settingFile(mPath + QLatin1String("mail/accounts.ini"));
+ const QString settingFile(mPath + \
QStringLiteral("mail/accounts.ini")); OperaSettings settings(settingFile);
settings.setAbstractDisplayInfo(mAbstractDisplayInfo);
settings.importSettings();
diff --git a/akonadi-import-wizard/opera/operasettings.cpp \
b/akonadi-import-wizard/opera/operasettings.cpp index bc524234..9958c87d \
100644
--- a/akonadi-import-wizard/opera/operasettings.cpp
+++ b/akonadi-import-wizard/opera/operasettings.cpp
@@ -256,7 +256,7 @@ void OperaSettings::readIdentity(const KConfigGroup \
&grp) KIdentityManagement::Signature signature;
const int signatureHtml = grp.readEntry(QStringLiteral("Signature \
is HTML"), -1); if (signatureFile.contains(QStringLiteral("{Preferences}"))) \
{
- signatureFile.replace(QStringLiteral("{Preferences}"), \
MailImporter::FilterOpera::defaultSettingsPath() + QLatin1String("/")); + \
signatureFile.replace(QStringLiteral("{Preferences}"), \
MailImporter::FilterOpera::defaultSettingsPath() + QStringLiteral("/")); }
QFile file(signatureFile);
diff --git a/examples/apps/coisceim/createfoldercontentswidget.cpp \
b/examples/apps/coisceim/createfoldercontentswidget.cpp index \
7fac716f..e8ee40a9 100644
--- a/examples/apps/coisceim/createfoldercontentswidget.cpp
+++ b/examples/apps/coisceim/createfoldercontentswidget.cpp
@@ -31,19 +31,19 @@ CreateFolderContentsWidget::CreateFolderContentsWidget(Trip \
*trip, int role, con , m_trip(trip)
, m_role(role)
{
- QPushButton *button = new QPushButton(QLatin1String("Select ") + \
type); + QPushButton *button = new QPushButton(QStringLiteral("Select ") \
+ type);
QString iconName;
switch (role) {
case Trip::MailCollectionRole:
- iconName = QLatin1String("kmail");
+ iconName = QStringLiteral("kmail");
break;
case Trip::NotesCollectionRole:
- iconName = QLatin1String("knotes");
+ iconName = QStringLiteral("knotes");
break;
case Trip::TodoCollectionRole:
- iconName = QLatin1String("korg-todo");
+ iconName = QStringLiteral("korg-todo");
break;
}
QIcon icon = QIcon::fromTheme(iconName);
diff --git a/examples/apps/coisceim/createtripwidget.cpp \
b/examples/apps/coisceim/createtripwidget.cpp index f3ac4acd..ae5ea915 \
100644
--- a/examples/apps/coisceim/createtripwidget.cpp
+++ b/examples/apps/coisceim/createtripwidget.cpp
@@ -56,9 +56,9 @@ CreateTripWidget::CreateTripWidget(Trip *trip, \
Akonadi::Monitor *monitor, QWidge
layout->addLayout(configureLayout);
- m_mailWidget = createView(QLatin1String("Mail"), \
Trip::MailCollectionRole);
- m_todoWidget = createView(QLatin1String("Todos"), \
Trip::TodoCollectionRole);
- m_notesWidget = createView(QLatin1String("Notes"), \
Trip::NotesCollectionRole); + m_mailWidget = \
createView(QStringLiteral("Mail"), Trip::MailCollectionRole); + \
m_todoWidget = createView(QStringLiteral("Todos"), \
Trip::TodoCollectionRole); + m_notesWidget = \
createView(QStringLiteral("Notes"), Trip::NotesCollectionRole);
configureLayout->addWidget(m_mailWidget);
configureLayout->addWidget(m_todoWidget);
diff --git a/examples/apps/coisceim/main.cpp \
b/examples/apps/coisceim/main.cpp index 2b3f5e3c..6e78f6e4 100644
--- a/examples/apps/coisceim/main.cpp
+++ b/examples/apps/coisceim/main.cpp
@@ -29,7 +29,7 @@
int main(int argc, char **argv)
{
- const QString ba(QLatin1String("coisceim"));
+ const QString ba(QStringLiteral("coisceim"));
const QString name = i18n("Coisceim application");
KAboutData aboutData(ba, name, name);
QApplication app(argc, argv);
diff --git a/examples/apps/coisceim/mixedtreemodel.cpp \
b/examples/apps/coisceim/mixedtreemodel.cpp index 2859dc0f..8e1e1290 100644
--- a/examples/apps/coisceim/mixedtreemodel.cpp
+++ b/examples/apps/coisceim/mixedtreemodel.cpp
@@ -74,7 +74,7 @@ QVariant MixedTreeModel::entityData(const Akonadi::Item \
&item, int column, int r if (item.mimeType() == \
KMime::Message::mimeType()) { return message->from()->asUnicodeString();
} else {
- return \
QString(message->mainBodyPart()->decodedText().mid(0, 30) + \
QLatin1String("...")); + return \
QString(message->mainBodyPart()->decodedText().mid(0, 30) + \
QStringLiteral("...")); }
default:
return QVariant();
diff --git a/examples/apps/coisceim/note.cpp \
b/examples/apps/coisceim/note.cpp index 7e98cd15..e4da8187 100644
--- a/examples/apps/coisceim/note.cpp
+++ b/examples/apps/coisceim/note.cpp
@@ -23,5 +23,5 @@ using namespace Akonotes;
QString Note::mimeType()
{
- return QString::fromLatin1("text/x-vnd.akonadi.note");
+ return QStringLiteral("text/x-vnd.akonadi.note");
}
diff --git a/examples/apps/coisceim/tripmodel.cpp \
b/examples/apps/coisceim/tripmodel.cpp index e7c5f672..1915ffa9 100644
--- a/examples/apps/coisceim/tripmodel.cpp
+++ b/examples/apps/coisceim/tripmodel.cpp
@@ -95,7 +95,7 @@ QVariant TripModel::data(const QModelIndex &index, int \
role) const return QVariant::fromValue<QWidget *>(m_createWidget);
}
if (role == Qt::DecorationRole) {
- return QIcon::fromTheme(QLatin1String("list-add-new"));
+ return QIcon::fromTheme(QStringLiteral("list-add-new"));
}
return QVariant();
}
diff --git a/examples/apps/coisceim/tripwidget.cpp \
b/examples/apps/coisceim/tripwidget.cpp index 647484eb..4c8eecef 100644
--- a/examples/apps/coisceim/tripwidget.cpp
+++ b/examples/apps/coisceim/tripwidget.cpp
@@ -67,9 +67,9 @@ TripWidget::TripWidget(Trip *trip, QWidget *parent)
vSplitter->addWidget(splitter);
- FolderContentsWidget *mailWidget = createView(QLatin1String("Mail"), \
Trip::MailCollectionRole);
- FolderContentsWidget *todoWidget = createView(QLatin1String("Todos"), \
Trip::TodoCollectionRole);
- FolderContentsWidget *notesWidget = createView(QLatin1String("Notes"), \
Trip::NotesCollectionRole); + FolderContentsWidget *mailWidget = \
createView(QStringLiteral("Mail"), Trip::MailCollectionRole); + \
FolderContentsWidget *todoWidget = createView(QStringLiteral("Todos"), \
Trip::TodoCollectionRole); + FolderContentsWidget *notesWidget = \
createView(QStringLiteral("Notes"), Trip::NotesCollectionRole);
ItemSelection *itemSelection = new \
ItemSelection(mailWidget->selectionModel(),
\
todoWidget->selectionModel(),
diff --git a/examples/apps/etm_usage/checkable2.cpp \
b/examples/apps/etm_usage/checkable2.cpp index 6c6205ae..85e059d8 100644
--- a/examples/apps/etm_usage/checkable2.cpp
+++ b/examples/apps/etm_usage/checkable2.cpp
@@ -80,7 +80,7 @@ Checkable2::Checkable2(QWidget *parent, Qt::WindowFlags \
f) allChildrenView->setModel(selectionProxy);
Akonadi::EntityMimeTypeFilterModel *itemFilter = new \
Akonadi::EntityMimeTypeFilterModel(this);
- itemFilter->setObjectName(QLatin1String("itemFilter"));
+ itemFilter->setObjectName(QStringLiteral("itemFilter"));
itemFilter->addMimeTypeExclusionFilter(Akonadi::Collection::mimeType());
itemFilter->setHeaderGroup(Akonadi::EntityTreeModel::ItemListHeaders);
itemFilter->setSourceModel(selectionProxy);
diff --git a/examples/apps/etm_usage/entityfindingwidget.cpp \
b/examples/apps/etm_usage/entityfindingwidget.cpp index e088ad84..88f53208 \
100644
--- a/examples/apps/etm_usage/entityfindingwidget.cpp
+++ b/examples/apps/etm_usage/entityfindingwidget.cpp
@@ -56,8 +56,8 @@ EntityFindingWidget::EntityFindingWidget(QWidget *parent, \
Qt::WindowFlags f) {
QGridLayout *gridLayout = new QGridLayout(this);
- QLabel *collectionIdLabel = new QLabel(QLatin1String("Collection Id \
:"));
- QLabel *itemIdLabel = new QLabel(QLatin1String("Item Id :"));
+ QLabel *collectionIdLabel = new QLabel(QStringLiteral("Collection Id \
:")); + QLabel *itemIdLabel = new QLabel(QStringLiteral("Item Id :"));
m_collectionIdInput = new QLineEdit;
m_itemIdInput = new QLineEdit;
diff --git a/examples/apps/etm_usage/entitytreewidget.cpp \
b/examples/apps/etm_usage/entitytreewidget.cpp index 882fd256..5986bb52 \
100644
--- a/examples/apps/etm_usage/entitytreewidget.cpp
+++ b/examples/apps/etm_usage/entitytreewidget.cpp
@@ -89,7 +89,7 @@ void EntityTreeWidget::mimeTypesChoiceChanged(int index)
void EntityTreeWidget::mimeTypesChanged(const QString &mimetypeList)
{
- const QStringList list = mimetypeList.isEmpty() ? QStringList() : \
mimetypeList.split(QLatin1String(",")); + const QStringList list = \
mimetypeList.isEmpty() ? QStringList() : \
mimetypeList.split(QStringLiteral(","));
foreach (const QString mimetype, m_monitor->mimeTypesMonitored()) {
if (!list.contains(mimetype)) {
diff --git a/examples/apps/etm_usage/mailmodel.cpp \
b/examples/apps/etm_usage/mailmodel.cpp index be8faf94..0803d52c 100644
--- a/examples/apps/etm_usage/mailmodel.cpp
+++ b/examples/apps/etm_usage/mailmodel.cpp
@@ -35,8 +35,8 @@ public:
MailModelPrivate(MailModel *model)
: q_ptr(model)
{
- m_collectionHeaders << QLatin1String("Folder") << \
QLatin1String("Count");
- m_itemHeaders << QLatin1String("Subject") << QLatin1String("From") \
<< QLatin1String("Date"); + m_collectionHeaders << \
QStringLiteral("Folder") << QStringLiteral("Count"); + m_itemHeaders \
<< QStringLiteral("Subject") << QStringLiteral("From") << \
QStringLiteral("Date"); }
Q_DECLARE_PUBLIC(MailModel)
diff --git a/examples/apps/etm_usage/main.cpp \
b/examples/apps/etm_usage/main.cpp index 75895a0d..790a41fd 100644
--- a/examples/apps/etm_usage/main.cpp
+++ b/examples/apps/etm_usage/main.cpp
@@ -29,14 +29,14 @@
int main(int argc, char *argv[])
{
- KAboutData aboutData(QLatin1String("etm_usage"),
+ KAboutData aboutData(QStringLiteral("etm_usage"),
i18n("ETM Test application"),
- QLatin1String("0.99"),
+ QStringLiteral("0.99"),
i18n("Test app for EntityTreeModel"),
KAboutLicense::GPL,
- QLatin1String("http://pim.kde.org/akonadi/"));
- QApplication::setWindowIcon(QIcon::fromTheme(QLatin1String("akonadi")));
- aboutData.addAuthor(i18n("Stephen Kelly"), i18n("Author"), \
QLatin1String("steveire@gmail.com")); + \
QStringLiteral("http://pim.kde.org/akonadi/")); + \
QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("akonadi"))); + \
aboutData.addAuthor(i18n("Stephen Kelly"), i18n("Author"), \
QStringLiteral("steveire@gmail.com"));
QApplication app(argc, argv);
QCommandLineParser parser;
diff --git a/examples/apps/etm_usage/mainwindow.cpp \
b/examples/apps/etm_usage/mainwindow.cpp index 633b9216..191b5015 100644
--- a/examples/apps/etm_usage/mainwindow.cpp
+++ b/examples/apps/etm_usage/mainwindow.cpp
@@ -48,21 +48,21 @@ MainWindow::MainWindow(QWidget *parent, Qt::WindowFlags \
flags)
Akonadi::Control::start();
- tabWidget->addTab(new Checkable2(tabWidget), \
QLatin1String("Checkable2"));
- tabWidget->addTab(new DescTabWidget(tabWidget), \
QLatin1String("Desc"));
- tabWidget->addTab(new Tab1Widget(tabWidget), \
QLatin1String("EntityTreeModel"));
- tabWidget->addTab(new Tab2Widget(tabWidget), \
QLatin1String("setRootIndex"));
- tabWidget->addTab(new Tab2_5Widget(tabWidget), QLatin1String("Type \
specific data"));
- tabWidget->addTab(new Tab3Widget(tabWidget), \
QLatin1String("KSelectionProxyModel"));
- tabWidget->addTab(new Tab4Widget(tabWidget), \
QLatin1String("KSelectionProxyModel Filtered"));
- tabWidget->addTab(new Tab6Widget(tabWidget), QLatin1String("Checkable \
Collections"));
- tabWidget->addTab(new Tab5Widget(tabWidget), \
QLatin1String("Categorized Items"));
- tabWidget->addTab(new Tab7Widget(tabWidget), QLatin1String("Tagged \
Items"));
- tabWidget->addTab(new UnreadMailsWidget(tabWidget), \
QLatin1String("Unread Mails"));
- tabWidget->addTab(new RecursiveItemListWidget(tabWidget), \
QLatin1String("Items only"));
- tabWidget->addTab(new EntityFindingWidget(tabWidget), \
QLatin1String("Find entities"));
- tabWidget->addTab(new CollectionMonitoredWidget(tabWidget), \
QLatin1String("SetCollectionMonitored"));
- tabWidget->addTab(new UnreadMailsInCollectionsWidget(tabWidget), \
QLatin1String("UnreadMails")); + tabWidget->addTab(new \
Checkable2(tabWidget), QStringLiteral("Checkable2")); + \
tabWidget->addTab(new DescTabWidget(tabWidget), QStringLiteral("Desc")); + \
tabWidget->addTab(new Tab1Widget(tabWidget), \
QStringLiteral("EntityTreeModel")); + tabWidget->addTab(new \
Tab2Widget(tabWidget), QStringLiteral("setRootIndex")); + \
tabWidget->addTab(new Tab2_5Widget(tabWidget), QStringLiteral("Type \
specific data")); + tabWidget->addTab(new Tab3Widget(tabWidget), \
QStringLiteral("KSelectionProxyModel")); + tabWidget->addTab(new \
Tab4Widget(tabWidget), QStringLiteral("KSelectionProxyModel Filtered")); + \
tabWidget->addTab(new Tab6Widget(tabWidget), QStringLiteral("Checkable \
Collections")); + tabWidget->addTab(new Tab5Widget(tabWidget), \
QStringLiteral("Categorized Items")); + tabWidget->addTab(new \
Tab7Widget(tabWidget), QStringLiteral("Tagged Items")); + \
tabWidget->addTab(new UnreadMailsWidget(tabWidget), QStringLiteral("Unread \
Mails")); + tabWidget->addTab(new RecursiveItemListWidget(tabWidget), \
QStringLiteral("Items only")); + tabWidget->addTab(new \
EntityFindingWidget(tabWidget), QStringLiteral("Find entities")); + \
tabWidget->addTab(new CollectionMonitoredWidget(tabWidget), \
QStringLiteral("SetCollectionMonitored")); + tabWidget->addTab(new \
UnreadMailsInCollectionsWidget(tabWidget), QStringLiteral("UnreadMails")); \
setCentralWidget(tabWidget);
}
diff --git a/examples/apps/etm_usage/mixedtreemodel.cpp \
b/examples/apps/etm_usage/mixedtreemodel.cpp index ea7b9ed0..f93a366d \
100644
--- a/examples/apps/etm_usage/mixedtreemodel.cpp
+++ b/examples/apps/etm_usage/mixedtreemodel.cpp
@@ -71,7 +71,7 @@ QVariant MixedTreeModel::entityData(const Akonadi::Item \
&item, int column, int r if (item.mimeType() == \
KMime::Message::mimeType()) { return message->from()->asUnicodeString();
} else {
- return \
QString(message->mainBodyPart()->decodedText().mid(0, 30) + \
QLatin1String("...")); + return \
QString(message->mainBodyPart()->decodedText().mid(0, 30) + \
QStringLiteral("...")); }
default:
return QVariant();
diff --git a/examples/apps/etm_usage/tab6widget.cpp \
b/examples/apps/etm_usage/tab6widget.cpp index 62c63a9f..8944a30d 100644
--- a/examples/apps/etm_usage/tab6widget.cpp
+++ b/examples/apps/etm_usage/tab6widget.cpp
@@ -106,7 +106,7 @@ Tab6Widget::Tab6Widget(QWidget *parent, Qt::WindowFlags \
f) selectionProxy->setSourceModel(m_etw->model());
Akonadi::EntityMimeTypeFilterModel *itemFilter = new \
Akonadi::EntityMimeTypeFilterModel(this);
- itemFilter->setObjectName(QLatin1String("itemFilter"));
+ itemFilter->setObjectName(QStringLiteral("itemFilter"));
itemFilter->addMimeTypeExclusionFilter(Akonadi::Collection::mimeType());
itemFilter->setHeaderGroup(Akonadi::EntityTreeModel::ItemListHeaders);
itemFilter->setSourceModel(selectionProxy);
diff --git a/examples/apps/etm_usage/tab7widget.cpp \
b/examples/apps/etm_usage/tab7widget.cpp index e45c5b2a..247de532 100644
--- a/examples/apps/etm_usage/tab7widget.cpp
+++ b/examples/apps/etm_usage/tab7widget.cpp
@@ -97,7 +97,7 @@ Tab7Widget::Tab7Widget(QWidget *parent, Qt::WindowFlags \
f) : QWidget(parent, f)
{
EntityTreeModelFactory *modelFactory = new \
CategorisedEntityModelFactory(this);
- modelFactory->createFromRemoteId(QLatin1String("nepomuktags"));
+ modelFactory->createFromRemoteId(QStringLiteral("nepomuktags"));
connect(modelFactory, &CategorisedEntityModelFactory::modelCreated, \
this, &Tab7Widget::initModel); }
diff --git a/examples/apps/etm_usage/unreadmailsincollectionswidget.cpp \
b/examples/apps/etm_usage/unreadmailsincollectionswidget.cpp index \
f8fd303a..80249f87 100644
--- a/examples/apps/etm_usage/unreadmailsincollectionswidget.cpp
+++ b/examples/apps/etm_usage/unreadmailsincollectionswidget.cpp
@@ -82,7 +82,7 @@ UnreadMailsInCollectionsWidget::UnreadMailsInCollectionsWidget(QWidget \
*parent, : QWidget(parent, f)
{
QVBoxLayout *layout = new QVBoxLayout(this);
- QPushButton *configureButton = new \
QPushButton(QLatin1String("Configure")); + QPushButton *configureButton \
= new QPushButton(QStringLiteral("Configure")); connect(configureButton, \
SIGNAL(clicked(bool)), SLOT(configure())); \
layout->addWidget(configureButton);
diff --git a/examples/apps/kabc/kabceditor.cpp \
b/examples/apps/kabc/kabceditor.cpp index 7beec0d5..9e627c47 100644
--- a/examples/apps/kabc/kabceditor.cpp
+++ b/examples/apps/kabc/kabceditor.cpp
@@ -89,7 +89,7 @@ void Dialog::save()
int main(int argc, char **argv)
{
- KAboutData aboutData(QLatin1String("kabceditor"), i18n("KABC Editor"), \
QLatin1String("1.0")); + KAboutData \
aboutData(QStringLiteral("kabceditor"), i18n("KABC Editor"), \
QStringLiteral("1.0")); aboutData.setShortDescription(i18n("A contact \
editor for Akonadi")); QApplication app(argc, argv);
QCommandLineParser parser;
diff --git a/examples/apps/kabc/kabcviewer.cpp \
b/examples/apps/kabc/kabcviewer.cpp index e760af4d..7768ea2d 100644
--- a/examples/apps/kabc/kabcviewer.cpp
+++ b/examples/apps/kabc/kabcviewer.cpp
@@ -61,7 +61,7 @@ void Dialog::loadUid(Akonadi::Item::Id uid)
int main(int argc, char **argv)
{
- KAboutData aboutData(QLatin1String("kabcviewer"), i18n("KABC Viewer"), \
QLatin1String("1.0")); + KAboutData \
aboutData(QStringLiteral("kabcviewer"), i18n("KABC Viewer"), \
QStringLiteral("1.0")); aboutData.setShortDescription(i18n("A contact \
viewer for Akonadi")); QApplication app(argc, argv);
QCommandLineParser parser;
@@ -72,15 +72,15 @@ int main(int argc, char **argv)
parser.process(app);
aboutData.processCommandLine(&parser);
- parser.addOption(QCommandLineOption(QStringList() << \
QLatin1String("uid"), i18n("Uid of the Akonadi contact"), \
QLatin1String("uid"))); + \
parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("uid"), \
i18n("Uid of the Akonadi contact"), QStringLiteral("uid")));
Dialog dlg;
- if (!parser.isSet(QLatin1String("uid"))) {
+ if (!parser.isSet(QStringLiteral("uid"))) {
parser.showHelp();
return 1;
}
- dlg.loadUid(parser.value(QLatin1String("uid")).toLongLong());
+ dlg.loadUid(parser.value(QStringLiteral("uid")).toLongLong());
dlg.exec();
return 0;
diff --git a/examples/apps/mailreader/mailreader.cpp \
b/examples/apps/mailreader/mailreader.cpp index d7a0392d..6d84fbca 100644
--- a/examples/apps/mailreader/mailreader.cpp
+++ b/examples/apps/mailreader/mailreader.cpp
@@ -70,7 +70,7 @@ void mailreader::setupDocks()
monitor->setSession(session);
monitor->setCollectionMonitored(Akonadi::Collection::root());
monitor->fetchCollection(true);
- monitor->setMimeTypeMonitored(QLatin1String("message/rfc822"), true);
+ monitor->setMimeTypeMonitored(QStringLiteral("message/rfc822"), true);
monitor->itemFetchScope().fetchPayloadPart(Akonadi::MessagePart::Header);
Akonadi::EntityTreeModel *entityModel = new \
Akonadi::EntityTreeModel(monitor, this); @@ -107,14 +107,14 @@ void \
mailreader::setupDocks()
// Dock the message list view
QDockWidget *messageListDock = new QDockWidget(i18n("Messages"), \
this);
- messageListDock->setObjectName(QLatin1String("Messages"));
+ messageListDock->setObjectName(QStringLiteral("Messages"));
messageListDock->setWidget(m_messagePane);
messageListDock->setFeatures(QDockWidget::DockWidgetMovable | \
QDockWidget::DockWidgetFloatable); addDockWidget(Qt::TopDockWidgetArea, \
messageListDock);
// Dock the folder tree view
QDockWidget *folderDock = new QDockWidget(i18n("Folders"), this);
- folderDock->setObjectName(QLatin1String("Folders"));
+ folderDock->setObjectName(QStringLiteral("Folders"));
folderDock->setWidget(collectionView);
folderDock->setFeatures(QDockWidget::DockWidgetMovable | \
QDockWidget::DockWidgetFloatable); addDockWidget(Qt::LeftDockWidgetArea, \
folderDock); @@ -132,17 +132,17 @@ void mailreader::setupActions()
KStandardAction::quit(qApp, SLOT(closeAllWindows()), \
actionCollection());
KStandardAction::preferences(m_view, SLOT(slotConfigure()), \
actionCollection());
- QAction *createTab = new \
QAction(QIcon::fromTheme(QLatin1String("tab-new")), + QAction *createTab \
= new QAction(QIcon::fromTheme(QStringLiteral("tab-new")), i18n("Open a \
new tab"), this);
- actionCollection()->addAction(QLatin1String("new_tab"), createTab);
+ actionCollection()->addAction(QStringLiteral("new_tab"), createTab);
connect(createTab, &QAction::triggered, m_messagePane, \
&MessageList::Pane::createNewTab);
m_previousMessage = new QAction(i18n("Previous Message"), this);
- actionCollection()->addAction(QLatin1String("previous_message"), \
m_previousMessage); + \
actionCollection()->addAction(QStringLiteral("previous_message"), \
m_previousMessage);
connect(m_previousMessage, &QAction::triggered, this, \
&mailreader::slotPreviousMessage); m_nextMessage = new QAction(i18n("Next \
Message"), this);
- actionCollection()->addAction(QLatin1String("next_message"), \
m_nextMessage); + \
actionCollection()->addAction(QStringLiteral("next_message"), \
m_nextMessage);
connect(m_nextMessage, &QAction::triggered, this, \
&mailreader::slotNextMessage); }
diff --git a/examples/apps/mailreader/mailreaderview.cpp \
b/examples/apps/mailreader/mailreaderview.cpp index 0149190f..821da2aa \
100644
--- a/examples/apps/mailreader/mailreaderview.cpp
+++ b/examples/apps/mailreader/mailreaderview.cpp
@@ -74,7 +74,7 @@ void mailreaderView::displayAboutPage()
"<h2 style='margin-top: 0px;'>Welcome to Mailreader \
%1</h2>"
"<p>Mailread is a proof of concept reader for the \
Akonadi/KMime framework.</p>\n"
"<p style='margin-bottom: 0px'> <a \
href='http://pim.kde.org/akonadi'>The Akonadi \
Team</a></p>")
- .subs(QLatin1String("0.1")); // Akonadi Mail Reader version
+ .subs(QStringLiteral("0.1")); // Akonadi Mail Reader version
//TODO PORT MEm_readerWin->displaySplashPage(info.toString());
}
diff --git a/examples/apps/mailreader/main.cpp \
b/examples/apps/mailreader/main.cpp index dab092ac..e8460b66 100644
--- a/examples/apps/mailreader/main.cpp
+++ b/examples/apps/mailreader/main.cpp
@@ -23,7 +23,7 @@ int main(int argc, char **argv)
about.setupCommandLine(&parser);
parser.process(app);
about.processCommandLine(&parser);
- parser.addOption(QCommandLineOption(QStringList() << \
QLatin1String("+[URL]"), i18n("Document to open"))); + \
parser.addOption(QCommandLineOption(QStringList() << \
QStringLiteral("+[URL]"), i18n("Document to open")));
mailreader *widget = new mailreader;
diff --git a/kaddressbook/importexportplugins/csv/import/csvimportdialog.cpp \
b/kaddressbook/importexportplugins/csv/import/csvimportdialog.cpp index \
13f55706..4e5ed0bd 100644
--- a/kaddressbook/importexportplugins/csv/import/csvimportdialog.cpp
+++ b/kaddressbook/importexportplugins/csv/import/csvimportdialog.cpp
@@ -694,9 +694,9 @@ void CSVImportDialog::saveTemplate()
}
const QString fileName
- = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) \
+ QLatin1String("/kaddressbook/csv-templates/") + = \
QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + \
QStringLiteral("/kaddressbook/csv-templates/") \
+QUuid::createUuid().toString()
- +QLatin1String(".desktop");
+ +QStringLiteral(".desktop");
QFileInfo fileInfo(fileName);
QDir().mkpath(fileInfo.absolutePath());
diff --git a/kaddressbook/importexportplugins/gmx/gmximportexportplugininterface.cpp \
b/kaddressbook/importexportplugins/gmx/gmximportexportplugininterface.cpp \
index 24cc3521..afaaaf34 100644
--- a/kaddressbook/importexportplugins/gmx/gmximportexportplugininterface.cpp
+++ b/kaddressbook/importexportplugins/gmx/gmximportexportplugininterface.cpp
@@ -108,7 +108,7 @@ void GMXImportExportPluginInterface::exportGMX()
KAddressBookImportExport::KAddressBookImportExportContactList \
contactLists; contactLists.setAddressList(contacts);
QFileDialog::Options options = QFileDialog::DontConfirmOverwrite;
- QUrl url = QFileDialog::getSaveFileUrl(parentWidget(), QString(), \
QUrl::fromLocalFile(QDir::homePath() + QLatin1String("/addressbook.gmx")), \
GMX_FILESELECTION_STRING, nullptr, options); + QUrl url = \
QFileDialog::getSaveFileUrl(parentWidget(), QString(), \
QUrl::fromLocalFile(QDir::homePath() + QStringLiteral("/addressbook.gmx")), \
GMX_FILESELECTION_STRING, nullptr, options); if (url.isEmpty()) {
return;
}
@@ -500,7 +500,7 @@ void GMXImportExportPluginInterface::importGMX()
addressee->setNickName(itemList.at(1));
addressee->setGivenName(itemList.at(2));
addressee->setFamilyName(itemList.at(3));
- addressee->setFormattedName(itemList.at(3) + QLatin1String(", ") + \
itemList.at(2)); + addressee->setFormattedName(itemList.at(3) + \
QStringLiteral(", ") + itemList.at(2)); \
addressee->setPrefix(itemList.at(4)); if (checkDateTime(itemList.at(5), \
dt)) { addressee->setBirthday(dt);
diff --git a/kaddressbook/importexportplugins/ldif/ldifimportexportplugininterface.cpp \
b/kaddressbook/importexportplugins/ldif/ldifimportexportplugininterface.cpp \
index 466b73b0..7ec14a2f 100644
--- a/kaddressbook/importexportplugins/ldif/ldifimportexportplugininterface.cpp
+++ b/kaddressbook/importexportplugins/ldif/ldifimportexportplugininterface.cpp
@@ -154,7 +154,7 @@ void LDifImportExportPluginInterface::exportLdif()
QFileDialog::Options options = QFileDialog::DontConfirmOverwrite;
const QUrl url
- = QFileDialog::getSaveFileUrl(parentWidget(), QString(), \
QUrl::fromLocalFile(QDir::homePath() + QLatin1String("/addressbook.ldif")), \
+ = QFileDialog::getSaveFileUrl(parentWidget(), QString(), \
QUrl::fromLocalFile(QDir::homePath() + \
QStringLiteral("/addressbook.ldif")),
i18n("LDif Files (*.ldif)"), \
nullptr, options); if (url.isEmpty()) {
return;
diff --git a/kaddressbook/importexportplugins/vcards/vcardimportexportplugininterface.cpp \
b/kaddressbook/importexportplugins/vcards/vcardimportexportplugininterface.cpp
index 8cbe80fe..5478aafb 100644
--- a/kaddressbook/importexportplugins/vcards/vcardimportexportplugininterface.cpp
+++ b/kaddressbook/importexportplugins/vcards/vcardimportexportplugininterface.cpp
@@ -481,7 +481,7 @@ void VCardImportExportPluginInterface::exportVCard()
QString(list[ 0 \
].givenName()
\
+QLatin1Char(QLatin1Char('_'))
+list[ 0 \
].familyName()
- \
+QLatin1String(".vcf"))), + \
+QStringLiteral(".vcf"))), QString(), nullptr, options);
if (url.isEmpty()) { // user canceled export
return;
@@ -520,7 +520,7 @@ void VCardImportExportPluginInterface::exportVCard()
for (int i = 0; i < list.count(); ++i) {
const KContacts::Addressee contact = list.at(i);
- url = QUrl::fromLocalFile(baseUrl.path() + \
QLatin1Char('/') + contactFileName(contact) + QLatin1String(".vcf")); + \
url = QUrl::fromLocalFile(baseUrl.path() + QLatin1Char('/') + \
contactFileName(contact) + QStringLiteral(".vcf"));
bool tmpOk = false;
diff --git a/kaddressbook/plugins/sendmail/autotests/mailsenderjobtest.cpp \
b/kaddressbook/plugins/sendmail/autotests/mailsenderjobtest.cpp index \
d27192d7..480b0f79 100644
--- a/kaddressbook/plugins/sendmail/autotests/mailsenderjobtest.cpp
+++ b/kaddressbook/plugins/sendmail/autotests/mailsenderjobtest.cpp
@@ -76,7 +76,7 @@ void MailSenderJobTest::shouldSendSignalWhenOneEmail()
QSignalSpy spy(&mailsender, SIGNAL(sendMails(QStringList)));
mailsender.start();
QCOMPARE(spy.count(), 1);
- const QStringList resultLst = spy.at(0).at(0).value<QStringList>();
+ const QStringList resultLst = spy.at(0).at(0).toStringList();
QCOMPARE(resultLst.count(), 1);
}
@@ -92,7 +92,7 @@ void MailSenderJobTest::shouldNotSendTwiceEmails()
KABMailSender::MailSenderJob mailsender(lst);
QSignalSpy spy(&mailsender, SIGNAL(sendMails(QStringList)));
mailsender.start();
- const QStringList resultLst = spy.at(0).at(0).value<QStringList>();
+ const QStringList resultLst = spy.at(0).at(0).toStringList();
QCOMPARE(resultLst.count(), 1);
}
@@ -148,7 +148,7 @@ void \
MailSenderJobTest::shouldEmitSignalIfThereIsAValidEmail() QSignalSpy \
spy(&mailsender, SIGNAL(sendMails(QStringList))); mailsender.start();
QCOMPARE(spy.count(), 1);
- const QStringList resultLst = spy.at(0).at(0).value<QStringList>();
+ const QStringList resultLst = spy.at(0).at(0).toStringList();
QCOMPARE(resultLst.count(), 2);
}
diff --git a/kaddressbook/plugins/sendvcards/sendvcardsjob.cpp \
b/kaddressbook/plugins/sendvcards/sendvcardsjob.cpp index \
a8a4a11c..6d207bf3 100644
--- a/kaddressbook/plugins/sendvcards/sendvcardsjob.cpp
+++ b/kaddressbook/plugins/sendvcards/sendvcardsjob.cpp
@@ -72,13 +72,13 @@ bool SendVcardsJob::start()
KContacts::adaptIMAttributes(data);
createTemporaryDir();
const QString contactRealName(contact.realName());
- const QString attachmentName = (contactRealName.isEmpty() ? \
QStringLiteral("vcard") : contactRealName) + QLatin1String(".vcf"); + \
const QString attachmentName = (contactRealName.isEmpty() ? \
QStringLiteral("vcard") : contactRealName) + QStringLiteral(".vcf"); \
createTemporaryFile(data, attachmentName); } else if \
(item.hasPayload<KContacts::ContactGroup>()) { ++mExpandGroupJobCount;
const KContacts::ContactGroup group = \
item.payload<KContacts::ContactGroup>(); const QString \
groupName(group.name());
- const QString attachmentName = (groupName.isEmpty() ? \
QStringLiteral("vcard") : groupName) + QLatin1String(".vcf"); + \
const QString attachmentName = (groupName.isEmpty() ? \
QStringLiteral("vcard") : groupName) + \
QStringLiteral(".vcf");
Akonadi::ContactGroupExpandJob *expandJob = new \
Akonadi::ContactGroupExpandJob(group, this); \
expandJob->setProperty("groupName", attachmentName);
connect(expandJob, &KJob::result, this, \
&SendVcardsJob::slotExpandGroupResult); @@ -95,7 +95,7 @@ bool \
SendVcardsJob::start() void SendVcardsJob::createTemporaryDir()
{
if (!mTempDir) {
- mTempDir = new QTemporaryDir(QDir::tempPath() + QLatin1Char('/') + \
QLatin1String("sendvcards")); + mTempDir = new \
QTemporaryDir(QDir::tempPath() + QLatin1Char('/') + \
QStringLiteral("sendvcards")); mTempDir->setAutoRemove(false);
mAttachmentTemporary->addTempDir(mTempDir->path());
}
@@ -107,7 +107,7 @@ void SendVcardsJob::jobFinished()
if (!lstAttachment.isEmpty()) {
KToolInvocation::invokeMailer(QString(), QString(), QString(), \
QString(), QString(), QString(), lstAttachment); } else {
- sendVCardsError(i18n("No vCard created."));
+ Q_EMIT sendVCardsError(i18n("No vCard created."));
}
mAttachmentTemporary->removeTempFiles();
deleteLater();
@@ -145,7 +145,7 @@ void SendVcardsJob::createTemporaryFile(const \
QByteArray &data, const QString &f QFile file(mTempDir->path() + \
QLatin1Char('/') + filename); if (!file.open(QIODevice::WriteOnly | \
QIODevice::Text)) {
qCDebug(KADDRESSBOOK_SENDVCARDS_LOG) << "Cannot write vcard \
filename :" << filename;
- sendVCardsError(i18n("Temporary file \'%1\' cannot be created", \
filename)); + Q_EMIT sendVCardsError(i18n("Temporary file \'%1\' \
cannot be created", filename)); return;
}
diff --git a/kmail/plugins/common/antispamwizard.cpp \
b/kmail/plugins/common/antispamwizard.cpp index 4acc88df..dba77609 100644
--- a/kmail/plugins/common/antispamwizard.cpp
+++ b/kmail/plugins/common/antispamwizard.cpp
@@ -684,9 +684,9 @@ void AntiSpamWizard::sortFilterOnExistance(
const QString &intendedFilterName, QString &newFilters, QString \
&replaceFilters) {
if (uniqueNameFor(intendedFilterName) == intendedFilterName) {
- newFilters += QLatin1String("<li>") + intendedFilterName + \
QLatin1String("</li>"); + newFilters += QStringLiteral("<li>") + \
intendedFilterName + QStringLiteral("</li>"); } else {
- replaceFilters += QLatin1String("<li>") + intendedFilterName + \
QLatin1String("</li>"); + replaceFilters += QStringLiteral("<li>") + \
intendedFilterName + QStringLiteral("</li>"); }
}
diff --git a/korganizer/plugins/hebrew/hebrew.cpp \
b/korganizer/plugins/hebrew/hebrew.cpp index 2520c66b..d6620e99 100644
--- a/korganizer/plugins/hebrew/hebrew.cpp
+++ b/korganizer/plugins/hebrew/hebrew.cpp
@@ -67,7 +67,7 @@ Element::List Hebrew::createDayElements(const QDate \
&date)
text = cal->formatDate(date, KLocale::Day, KLocale::LongNumber) + \
QLatin1Char(' ') + cal->monthName(date);
for (const QString &holiday : holidays) {
- text += QLatin1String("<br/>\n") + holiday;
+ text += QStringLiteral("<br/>\n") + holiday;
}
text = i18nc("Change the next two strings if emphasis is done \
differently in your language.",
diff --git a/korganizer/plugins/picoftheday/picoftheday.cpp \
b/korganizer/plugins/picoftheday/picoftheday.cpp index 50752e3d..662ed6e0 \
100644
--- a/korganizer/plugins/picoftheday/picoftheday.cpp
+++ b/korganizer/plugins/picoftheday/picoftheday.cpp
@@ -88,7 +88,7 @@ void POTDElement::step1StartDownload()
{
// Start downloading the picture
if (!mFirstStepCompleted && !mFirstStepJob) {
- QUrl url = QUrl(QLatin1String("http://en.wikipedia.org/w/index.php?title=Template:POTD/")
+ QUrl url = \
QUrl(QStringLiteral("http://en.wikipedia.org/w/index.php?title=Template:POTD/")
+mDate.toString(Qt::ISODate) + \
QStringLiteral("&action=raw")); // The file at that URL contains the file \
name for the POTD
@@ -155,7 +155,7 @@ void POTDElement::step1Result(KJob *job)
void POTDElement::step2GetImagePage()
{
if (!mSecondStepCompleted && !mSecondStepJob) {
- mUrl = QUrl(QLatin1String("http://en.wikipedia.org/wiki/File:") + \
mFileName); + mUrl = \
QUrl(QStringLiteral("http://en.wikipedia.org/wiki/File:") + \
mFileName);
// We'll find the info to get the thumbnail we want on the POTD's \
image page
Q_EMIT gotNewUrl(mUrl);
diff --git a/plugins/customtoolsplugins/shorturlplugin/shorturl/shorturlengineplugin/shorturlengineinterface.cpp \
b/plugins/customtoolsplugins/shorturlplugin/shorturl/shorturlengineplugin/shorturlengineinterface.cpp
index c54c8b5e..f099ebc9 100644
--- a/plugins/customtoolsplugins/shorturlplugin/shorturl/shorturlengineplugin/shorturlengineinterface.cpp
+++ b/plugins/customtoolsplugins/shorturlplugin/shorturl/shorturlengineplugin/shorturlengineinterface.cpp
@@ -50,7 +50,7 @@ void ShortUrlEngineInterface::setShortUrl(const QString \
&url) && !url.trimmed().startsWith(QStringLiteral("https://"))
&& !url.trimmed().startsWith(QStringLiteral("ftp://"))
&& !url.trimmed().startsWith(QStringLiteral("ftps://"))) {
- mOriginalUrl = QLatin1String("http://") + url;
+ mOriginalUrl = QStringLiteral("http://") + url;
} else {
mOriginalUrl = url;
}
diff --git a/plugins/messageviewer/bodypartformatter/autotests/diffhighlightertest.cpp \
b/plugins/messageviewer/bodypartformatter/autotests/diffhighlightertest.cpp \
index 387ff406..36291aaa 100644
--- a/plugins/messageviewer/bodypartformatter/autotests/diffhighlightertest.cpp
+++ b/plugins/messageviewer/bodypartformatter/autotests/diffhighlightertest.cpp
@@ -50,9 +50,9 @@ void DiffHighlighterTest::shouldGenerateDiff()
{
QFETCH(QString, input);
- const QString originalFile = QLatin1String(DIFF_DATA_DIR) + \
QLatin1Char('/') + input + QStringLiteral(".diff");
- const QString refFile = QLatin1String(DIFF_DATA_DIR) + \
QLatin1Char('/') + input + QStringLiteral("-ref.diff");
- const QString generatedFile = QLatin1String(DIFF_DATA_DIR) + \
QLatin1Char('/') + input + QStringLiteral("-generated.diff"); + const \
QString originalFile = QStringLiteral(DIFF_DATA_DIR) + QLatin1Char('/') + \
input + QStringLiteral(".diff"); + const QString refFile = \
QStringLiteral(DIFF_DATA_DIR) + QLatin1Char('/') + input + \
QStringLiteral("-ref.diff"); + const QString generatedFile = \
QStringLiteral(DIFF_DATA_DIR) + QLatin1Char('/') + input + \
QStringLiteral("-generated.diff"); QString diff = \
readDiffFile(originalFile);
DiffHighlighter highLighter;
diff --git a/plugins/messageviewer/bodypartformatter/autotests/rendertest.cpp \
b/plugins/messageviewer/bodypartformatter/autotests/rendertest.cpp index \
eaa8aa91..a283721c 100644
--- a/plugins/messageviewer/bodypartformatter/autotests/rendertest.cpp
+++ b/plugins/messageviewer/bodypartformatter/autotests/rendertest.cpp
@@ -48,13 +48,13 @@ void RenderTest::testRender_data()
QTest::addColumn<QString>("outFileName");
QDir dir(QStringLiteral(MAIL_DATA_DIR));
- const QStringList lst = \
dir.entryList(QStringList(QLatin1String("*.mbox")), QDir::Files | \
QDir::Readable | QDir::NoSymLinks); + const QStringList lst = \
dir.entryList(QStringList(QStringLiteral("*.mbox")), QDir::Files | \
QDir::Readable | QDir::NoSymLinks); for (const QString &file : lst) {
- if (!QFile::exists(dir.path() + QLatin1Char('/') + file + \
QLatin1String(".html"))) { + if (!QFile::exists(dir.path() + \
QLatin1Char('/') + file + QStringLiteral(".html"))) { continue;
}
- QTest::newRow(file.toLatin1()) << QString(dir.path() + \
QLatin1Char('/') + file) << QString(dir.path() + QLatin1Char('/') + file + \
QLatin1String(".html"))
- << QString(file + \
QLatin1String(".out")); + QTest::newRow(file.toLatin1()) << \
QString(dir.path() + QLatin1Char('/') + file) << QString(dir.path() + \
QLatin1Char('/') + file + QStringLiteral(".html")) + \
<< QString(file + QStringLiteral(".out")); }
}
@@ -64,7 +64,7 @@ void RenderTest::testRender()
QFETCH(QString, referenceFileName);
QFETCH(QString, outFileName);
- const QString htmlFileName = outFileName + QLatin1String(".html");
+ const QString htmlFileName = outFileName + QStringLiteral(".html");
QIcon::setThemeName(QStringLiteral("oxygen"));
diff --git a/plugins/messageviewer/bodypartformatter/calendar/text_calendar.cpp \
b/plugins/messageviewer/bodypartformatter/calendar/text_calendar.cpp index \
31edf743..72e03495 100644
--- a/plugins/messageviewer/bodypartformatter/calendar/text_calendar.cpp
+++ b/plugins/messageviewer/bodypartformatter/calendar/text_calendar.cpp
@@ -1026,7 +1026,7 @@ public:
QStringList patterns = \
db.mimeTypeForName(attachment->mimeType()).globPatterns(); if \
(!patterns.empty()) { QString pattern = patterns.at(0);
- file = new QTemporaryFile(QDir::tempPath() + \
QLatin1String("/messageviewer_XXXXXX") + pattern.remove(QLatin1Char('*'))); \
+ file = new QTemporaryFile(QDir::tempPath() + \
QStringLiteral("/messageviewer_XXXXXX") + \
pattern.remove(QLatin1Char('*'))); } else {
file = new QTemporaryFile();
}
@@ -1077,7 +1077,7 @@ public:
QStringList patterns = \
db.mimeTypeForName(a->mimeType()).globPatterns(); if (!patterns.empty()) {
QString pattern = patterns.at(0);
- file = new QTemporaryFile(QDir::tempPath() + \
QLatin1String("/messageviewer_XXXXXX") + pattern.remove(QLatin1Char('*'))); \
+ file = new QTemporaryFile(QDir::tempPath() + \
QStringLiteral("/messageviewer_XXXXXX") + \
pattern.remove(QLatin1Char('*'))); } else {
file = new QTemporaryFile();
}
diff --git a/plugins/messageviewer/bodypartformatter/vcard/text_vcard.cpp \
b/plugins/messageviewer/bodypartformatter/vcard/text_vcard.cpp index \
8d237ba9..8f8f1782 100644
--- a/plugins/messageviewer/bodypartformatter/vcard/text_vcard.cpp
+++ b/plugins/messageviewer/bodypartformatter/vcard/text_vcard.cpp
@@ -104,9 +104,9 @@ public:
return AsIcon;
}
- writer->queue(QLatin1String("<div align=\"center\"><h2>")
+ writer->queue(QStringLiteral("<div align=\"center\"><h2>")
+i18np("Attached business card", "Attached business \
cards", count)
- +QLatin1String("</h2></div>"));
+ +QStringLiteral("</h2></div>"));
count = 0;
static QString defaultPixmapPath = \
QUrl::fromLocalFile(KIconLoader::global()->iconPath(QStringLiteral("user-identity"), \
KIconLoader::Desktop)).url(); @@ -137,11 +137,11 @@ public:
htmlStr.replace(QStringLiteral("img \
src=\"contact_photo\""), QStringLiteral("img \
src=\"%1\"").arg(defaultPixmapPath)); } else {
QImage img = a.photo().data();
- const QString dir = \
bodyPart->nodeHelper()->createTempDir(QLatin1String("vcard-") + a.uid()); + \
const QString dir = bodyPart->nodeHelper()->createTempDir(QStringLiteral("vcard-") \
+ a.uid());
const QString filename = dir + QDir::separator() + \
a.uid(); img.save(filename, "PNG");
bodyPart->nodeHelper()->addTempFile(filename);
- const QString href = QLatin1String("file:") + \
QLatin1String(QUrl::toPercentEncoding(filename)); + const \
QString href = QStringLiteral("file:") + \
QLatin1String(QUrl::toPercentEncoding(filename));
htmlStr.replace(QLatin1String("img \
src=\"contact_photo\""), QStringLiteral("img src=\"%1\"").arg(href)); }
writer->queue(htmlStr);
@@ -151,25 +151,25 @@ public:
|| (memento && memento->finished() && \
!memento->vcardExist(count))) {
const QString addToLinkText = i18n("[Add this contact to \
the address book]");
QString op = \
QStringLiteral("addToAddressBook:%1").arg(count);
- writer->queue(QLatin1String("<div align=\"center\"><a \
href=\"") + writer->queue(QStringLiteral("<div \
align=\"center\"><a href=\"") +bodyPart->makeLink(op)
- +QLatin1String("\">")
+ +QStringLiteral("\">")
+addToLinkText
- +QLatin1String("</a></div><br><br>"));
+ +QStringLiteral("</a></div><br><br>"));
} else {
if (memento->address(count) != a) {
const QString addToLinkText = i18n("[Update this \
contact to the address book]");
const QString op = \
QStringLiteral("updateToAddressBook:%1").arg(count);
- writer->queue(QLatin1String("<div align=\"center\"><a \
href=\"") + writer->queue(QStringLiteral("<div \
align=\"center\"><a href=\"") +bodyPart->makeLink(op)
- +QLatin1String("\">")
+ +QStringLiteral("\">")
+addToLinkText
- +QLatin1String("</a></div><br><br>"));
+ +QStringLiteral("</a></div><br><br>"));
} else {
const QString addToLinkText = i18n("[This contact is \
already in addressbook]");
- writer->queue(QLatin1String("<div align=\"center\">")
+ writer->queue(QStringLiteral("<div align=\"center\">")
+addToLinkText
- +QLatin1String("</a></div><br><br>"));
+ +QStringLiteral("</a></div><br><br>"));
}
}
count++;
@@ -278,9 +278,9 @@ public:
QString fileName;
const QString givenName(a.givenName());
if (givenName.isEmpty()) {
- fileName = a.familyName() + QLatin1String(".vcf");
+ fileName = a.familyName() + QStringLiteral(".vcf");
} else {
- fileName = givenName + QLatin1Char('_') + a.familyName() + \
QLatin1String(".vcf"); + fileName = givenName + QLatin1Char('_') \
+ a.familyName() + QStringLiteral(".vcf"); }
// get the saveas file name
QUrl saveAsUrl
diff --git a/plugins/messageviewer/bodypartformatter/xdiff/diffhighlighter.cpp \
b/plugins/messageviewer/bodypartformatter/xdiff/diffhighlighter.cpp index \
f540ce6a..3ef4cccc 100644
--- a/plugins/messageviewer/bodypartformatter/xdiff/diffhighlighter.cpp
+++ b/plugins/messageviewer/bodypartformatter/xdiff/diffhighlighter.cpp
@@ -50,7 +50,7 @@ void DiffHighlighter::highlightDiff(const QString &str)
"margin: 0em;\"");
mOutputDiff = QStringLiteral("<br><div align=\"center\">");
- mOutputDiff += QLatin1String("<pre ") + tableStyle + QLatin1Char('>');
+ mOutputDiff += QStringLiteral("<pre ") + tableStyle + \
QLatin1Char('>');
KSyntaxHighlighting::State state;
diff --git a/plugins/messageviewerheaderplugins/briefheaderstyleplugin/briefheaderstyle.cpp \
b/plugins/messageviewerheaderplugins/briefheaderstyleplugin/briefheaderstyle.cpp
index 41e18867..38b28c0b 100644
--- a/plugins/messageviewerheaderplugins/briefheaderstyleplugin/briefheaderstyle.cpp
+++ b/plugins/messageviewerheaderplugins/briefheaderstyleplugin/briefheaderstyle.cpp
@@ -75,15 +75,15 @@ QString BriefHeaderStyle::format(KMime::Message \
*message) const
const QString subjectDir = \
mHeaderStyleUtil.subjectDirectionString(message);
- QString headerStr = QLatin1String("<div class=\"header\" dir=\"") + \
dir + QLatin1String("\">\n"); + QString headerStr = QStringLiteral("<div \
class=\"header\" dir=\"") + dir + QStringLiteral("\">\n");
if (strategy->showHeader(QStringLiteral("subject"))) {
const KTextToHTML::Options flags = KTextToHTML::PreserveSpaces | \
KTextToHTML::ReplaceSmileys;
- headerStr += QLatin1String("<div dir=\"") + subjectDir + \
QLatin1String("\">\n")
- +QLatin1String("<b style=\"font-size:130%\">");
+ headerStr += QStringLiteral("<div dir=\"") + subjectDir + \
QStringLiteral("\">\n") + +QStringLiteral("<b \
style=\"font-size:130%\">");
- headerStr += mHeaderStyleUtil.subjectString(message, flags) + \
QLatin1String("</b></div>\n"); + headerStr += \
mHeaderStyleUtil.subjectString(message, flags) + \
QStringLiteral("</b></div>\n"); }
QStringList headerParts;
@@ -94,7 +94,7 @@ QString BriefHeaderStyle::format(KMime::Message *message) \
const
*/
QString fromPart = StringUtil::emailAddrAsAnchor(message->from(), \
StringUtil::DisplayNameOnly); if (!vCardName().isEmpty()) {
- fromPart += QLatin1String(" <a href=\"") + \
vCardName() + QLatin1String("\">") + i18n("[vCard]") + \
QLatin1String("</a>"); + fromPart += \
QStringLiteral(" <a href=\"") + vCardName() + \
QStringLiteral("\">") + i18n("[vCard]") + QStringLiteral("</a>"); }
headerParts << fromPart;
}
@@ -118,7 +118,7 @@ QString BriefHeaderStyle::format(KMime::Message \
*message) const }
// remove all empty (modulo whitespace) entries and joins them via ", \
\n"
- headerStr += QLatin1String(" (") + \
headerParts.filter(QRegExp(QLatin1String("\\S"))).join(QStringLiteral(",\n")) \
+ QLatin1Char(')'); + headerStr += QStringLiteral(" (") + \
headerParts.filter(QRegExp(QLatin1String("\\S"))).join(QStringLiteral(",\n")) \
+ QLatin1Char(')');
headerStr += QLatin1String("</div>\n");
diff --git a/plugins/messageviewerheaderplugins/enterpriseheaderstyleplugin/enterpriseheaderstyle.cpp \
b/plugins/messageviewerheaderplugins/enterpriseheaderstyleplugin/enterpriseheaderstyle.cpp
index a7b9a153..feaa24c4 100644
--- a/plugins/messageviewerheaderplugins/enterpriseheaderstyleplugin/enterpriseheaderstyle.cpp
+++ b/plugins/messageviewerheaderplugins/enterpriseheaderstyleplugin/enterpriseheaderstyle.cpp
@@ -79,39 +79,39 @@ QString EnterpriseHeaderStyle::format(KMime::Message \
*message) const }
headerStr
- += QLatin1String("<div style=\"margin-left: 10px; top: \
0px;\"><span style=\"font-size: 0.8em; font-weight: \
bold;\">")
- + mHeaderStyleUtil.dateString(message, isPrinting(), /* \
shortDate */ MessageViewer::HeaderStyleUtil::CustomDate) + \
QLatin1String("</span></div>" + += QStringLiteral("<div \
style=\"margin-left: 10px; top: 0px;\"><span style=\"font-size: 0.8em; \
font-weight: bold;\">") + + mHeaderStyleUtil.dateString(message, \
isPrinting(), /* shortDate */ MessageViewer::HeaderStyleUtil::CustomDate) + \
QStringLiteral("</span></div>"
\
// #0057ae "<table style=\"background: ") + activeColorDark.name()
- + QLatin1String("; border-collapse:collapse; top: 14px; \
min-width: 200px; \" cellpadding=0> \n" + + QStringLiteral("; \
border-collapse:collapse; top: 14px; min-width: 200px; \" cellpadding=0> \
\n" " <tr> \n"
" <td style=\"min-width: 6px; \
background-image: url(")
- + imgpath + QLatin1String("top_left.png); \"></td> \n"
+ + imgpath + QStringLiteral("top_left.png); \"></td> \n"
" <td style=\"height: 6px; width: \
100%; background: url(")
- + imgpath + QLatin1String("top.png); \"></td> \n"
+ + imgpath + QStringLiteral("top.png); \"></td> \n"
" <td style=\"min-width: 6px; \
background: url(")
- + imgpath + QLatin1String("top_right.png); \"></td> </tr> \n"
+ + imgpath + QStringLiteral("top_right.png); \"></td> </tr> \n"
" <tr> \n"
" <td style=\"min-width: 6px; \
max-width: 6px; background: url(")
- + imgpath + QLatin1String("left.png); \"></td> \n"
+ + imgpath + QStringLiteral("left.png); \"></td> \n"
" <td style=\"\"> \n");
headerStr
- += QLatin1String("<div class=\"noprint\" style=\"z-index: 1; \
float:right; position: relative; top: -35px; right: 20px ; max-height: \
65px\">\n"
- "<img src=\"") + imgpath + \
QLatin1String("icon.png\">\n" + += QStringLiteral("<div \
class=\"noprint\" style=\"z-index: 1; float:right; position: relative; top: \
-35px; right: 20px ; max-height: 65px\">\n" + "<img \
src=\"") + imgpath + QStringLiteral("icon.png\">\n"
\
"</div>\n"); headerStr
- += QLatin1String(" <table style=\"color: ") + fontColor.name() \
+ QLatin1String(" ! important; margin: 1px; border-spacing: 0px;\" \
cellpadding=0> \n"); + += QStringLiteral(" <table style=\"color: \
") + fontColor.name() + QStringLiteral(" ! important; margin: 1px; \
border-spacing: 0px;\" cellpadding=0> \n");
// subject
if (strategy->showHeader(QStringLiteral("subject"))) {
const KTextToHTML::Options flags = KTextToHTML::PreserveSpaces | \
KTextToHTML::ReplaceSmileys;
headerStr
- += QLatin1String(" <tr> \n"
- " <td style=\"font-size: 0.5em; \
text-align: right; padding-left: 5px; padding-right: 24px; ") + \
borderSettings + QLatin1String("\"></td> \n" + += \
QStringLiteral(" <tr> \n" + " <td \
style=\"font-size: 0.5em; text-align: right; padding-left: 5px; \
padding-right: 24px; ") + borderSettings + QStringLiteral("\"></td> \n" " \
<td style=\"font-weight: bolder; font-size: 120%; \
padding-right: 91px; ")
- + borderSettings + QLatin1String("\">");
- headerStr += mHeaderStyleUtil.subjectString(message, flags) + \
QLatin1String("</td> \n" + + borderSettings + \
QStringLiteral("\">"); + headerStr += \
mHeaderStyleUtil.subjectString(message, flags) + \
QStringLiteral("</td> \n"
\
" </tr> \n"); }
@@ -121,55 +121,55 @@ QString EnterpriseHeaderStyle::format(KMime::Message \
*message) const QString fromPart = \
StringUtil::emailAddrAsAnchor(message->from(),
\
StringUtil::DisplayNameOnly, linkColor); if (!vCardName().isEmpty()) {
- fromPart += QLatin1String(" <a href=\"") + \
vCardName() + QLatin1String("\" ") + linkColor + QLatin1Char('>') + \
i18n("[vCard]") + QLatin1String("</a>"); + fromPart += \
QStringLiteral(" <a href=\"") + vCardName() + QStringLiteral("\" \
") + linkColor + QLatin1Char('>') + i18n("[vCard]") + \
QStringLiteral("</a>"); }
//TDDO strategy date
//if ( strategy->showHeader( "date" ) )
headerStr
- += QLatin1String(" <tr> \n"
- " <td style=\"font-size: 0.8em; \
padding-left: 5px; padding-right: 24px; text-align: right; \
vertical-align:top; ") + borderSettings + \
QLatin1String("\">") + i18n(
- "From: ") + QLatin1String("</td> \n"
+ += QStringLiteral(" <tr> \n"
+ " <td style=\"font-size: 0.8em; \
padding-left: 5px; padding-right: 24px; text-align: right; \
vertical-align:top; ") + borderSettings + QStringLiteral("\">") + i18n( + \
"From: ") + QStringLiteral("</td> \n" " <td style=\"")
- + borderSettings + QLatin1String("\">") + fromPart + \
QLatin1String("</td> " + + borderSettings + \
QStringLiteral("\">") + fromPart + QStringLiteral("</td> "
\
" </tr> "); }
// to line
if (strategy->showHeader(QStringLiteral("to"))) {
headerStr
- += QLatin1String(" <tr> "
- " <td style=\"font-size: 0.8em; \
text-align: right; vertical-align:top; padding-left: 5px; padding-right: \
24px; ") + borderSettings + QLatin1String("\">") + i18n(
- "To: ") + QLatin1String("</td> "
+ += QStringLiteral(" <tr> "
+ " <td style=\"font-size: 0.8em; \
text-align: right; vertical-align:top; padding-left: 5px; padding-right: \
24px; ") + borderSettings + QStringLiteral("\">") + i18n( + "To: \
") + QStringLiteral("</td> " " <td style=\"")
- + borderSettings + QLatin1String("\">")
+ + borderSettings + QStringLiteral("\">")
+StringUtil::emailAddrAsAnchor(message->to(), \
StringUtil::DisplayFullAddress, linkColor)
- +QLatin1String(" </td> "
+ +QStringLiteral(" </td> "
" </tr>\n");
}
// cc line, if any
if (strategy->showHeader(QStringLiteral("cc")) && message->cc(false)) \
{ headerStr
- += QLatin1String(" <tr> "
- " <td style=\"font-size: 0.8em; \
text-align: right; vertical-align:top; padding-left: 5px; padding-right: \
24px; ") + borderSettings + QLatin1String("\">") + i18n(
- "CC: ") + QLatin1String("</td> "
+ += QStringLiteral(" <tr> "
+ " <td style=\"font-size: 0.8em; \
text-align: right; vertical-align:top; padding-left: 5px; padding-right: \
24px; ") + borderSettings + QStringLiteral("\">") + i18n( + "CC: \
") + QStringLiteral("</td> " " <td style=\"")
- + borderSettings + QLatin1String("\">")
+ + borderSettings + QStringLiteral("\">")
+StringUtil::emailAddrAsAnchor(message->cc(), \
StringUtil::DisplayFullAddress, linkColor)
- +QLatin1String(" </td> "
+ +QStringLiteral(" </td> "
" </tr>\n");
}
// bcc line, if any
if (strategy->showHeader(QStringLiteral("bcc")) && \
message->bcc(false)) { headerStr
- += QLatin1String(" <tr> "
- " <td style=\"font-size: 0.8em; \
text-align: right; vertical-align:top; padding-left: 5px; padding-right: \
24px; ") + borderSettings + QLatin1String("\">") + i18n(
- "BCC: ") + QLatin1String("</td> "
+ += QStringLiteral(" <tr> "
+ " <td style=\"font-size: 0.8em; \
text-align: right; vertical-align:top; padding-left: 5px; padding-right: \
24px; ") + borderSettings + QStringLiteral("\">") + i18n( + \
"BCC: ") + QStringLiteral("</td> " " <td style=\"")
- + borderSettings + QLatin1String("\">")
+ + borderSettings + QStringLiteral("\">")
+StringUtil::emailAddrAsAnchor(message->bcc(), \
StringUtil::DisplayFullAddress, linkColor)
- +QLatin1String(" </td> "
+ +QStringLiteral(" </td> "
" </tr>\n");
}
@@ -177,33 +177,33 @@ QString EnterpriseHeaderStyle::format(KMime::Message \
*message) const QString attachment;
if (isTopLevel()) {
attachment
- = QLatin1String("<tr>"
- "<td style='min-width: 6px; max-width: 6px; \
background: url(") + imgpath + QLatin1String("left.png);'</td>" + \
= QStringLiteral("<tr>" + "<td style='min-width: \
6px; max-width: 6px; background: url(") + imgpath + \
QStringLiteral("left.png);'</td>"
\
"<td style='padding-right:20px;'>"
\
"<div class=\"noprint\" >"
\
"<div id=\"attachmentInjectionPoint\"></div>"
\
"</div>"
\
"</td>" "<td style='min-width: 6px; max-width: 6px; background: url(") + \
imgpath
- + QLatin1String("right.png);'</td>"
+ + QStringLiteral("right.png);'</td>"
"</tr>");
}
// header-bottom
headerStr
- += QLatin1String(" </table> \n"
+ += QStringLiteral(" </table> \n"
" </td> \n"
- " <td style=\"min-width: 6px; max-height: 15px; \
background: url(") + imgpath + QLatin1String("right.png); \"></td> \n" + \
" <td style=\"min-width: 6px; max-height: 15px; background: url(") + \
imgpath + QStringLiteral("right.png); \"></td> \n"
\
" </tr> \n") + attachment
- +QLatin1String(" <tr> \n"
- " <td style=\"min-width: 6px; background: \
url(") + imgpath + QLatin1String("s_left.png); \"></td> \n"
- \
" <td style=\"height: 35px; width: 80%; background: url(") + imgpath + \
QLatin1String("sbar.png);\"> \n" + +QStringLiteral(" <tr> \n"
+ " <td style=\"min-width: 6px; background: \
url(") + imgpath + QStringLiteral("s_left.png); \"></td> \n" + \
" <td style=\"height: 35px; width: 80%; background: url(") + imgpath + \
QStringLiteral("sbar.png);\"> \n" " <img src=\"")
- + imgpath + QLatin1String("sw.png\" style=\"margin: 0px; \
height: 30px; overflow:hidden; \"> \n" + + imgpath + \
QStringLiteral("sw.png\" style=\"margin: 0px; height: 30px; \
overflow:hidden; \"> \n" " <img src=\"")
- + imgpath + QLatin1String("sp_right.png\" style=\"float: right; \
\"> </td> \n" + + imgpath + QStringLiteral("sp_right.png\" \
style=\"float: right; \"> </td> \n"
" <td style=\"min-width: 6px; \
background: url(")
- + imgpath + QLatin1String("s_right.png); \"></td> \n"
+ + imgpath + QStringLiteral("s_right.png); \"></td> \n"
" </tr> \n"
" </table> \n");
diff --git a/plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyle.cpp \
b/plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyle.cpp
index 8aeda098..befc8698 100644
--- a/plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyle.cpp
+++ b/plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyle.cpp
@@ -95,7 +95,7 @@ QString FancyHeaderStyle::format(KMime::Message \
*message) const //qCDebug(MESSAGEVIEWER_LOG) << "Got a photo:" << \
xface.photoURL;
userHTML = QStringLiteral("<img src=\"%1\" width=\"%2\" \
height=\"%3\">")
.arg(xface.photoURL).arg(xface.photoWidth).arg(xface.photoHeight);
- userHTML = QLatin1String("<div class=\"senderpic\">") + userHTML + \
QLatin1String("</div>"); + userHTML = QStringLiteral("<div \
class=\"senderpic\">") + userHTML + QStringLiteral("</div>"); }
// the subject line and box below for details
@@ -117,20 +117,20 @@ QString FancyHeaderStyle::format(KMime::Message \
*message) const "<td>")
.arg(i18n("From: "))
+ StringUtil::emailAddrAsAnchor(message->from(), \
StringUtil::DisplayFullAddress)
- + (message->headerByType("Resent-From") ? \
QLatin1String(" ") + + \
(message->headerByType("Resent-From") ? QStringLiteral(" ") + \
i18n("(resent from %1)", StringUtil::emailAddrAsAnchor(
resentFrom, \
StringUtil::DisplayFullAddress)) : QString())
- + (!vCardName().isEmpty() ? \
QLatin1String(" <a href=\"") + vCardName() + \
QLatin1String("\">")
- + i18n("[vCard]") + QLatin1String("</a>")
+ + (!vCardName().isEmpty() ? \
QStringLiteral(" <a href=\"") + vCardName() + \
QStringLiteral("\">") + + i18n("[vCard]") + \
QStringLiteral("</a>") : QString())
+ (!message->organization(false)
? QString()
- : QLatin1String(" (")
+ : QStringLiteral(" (")
+ \
mHeaderStyleUtil.strToHtml(message->organization()->asUnicodeString()) + \
QLatin1Char(')'))
- + QLatin1String("</td></tr>\n");
+ + QStringLiteral("</td></tr>\n");
}
// to line
if (strategy->showHeader(QStringLiteral("to"))) {
diff --git a/plugins/messageviewerplugins/createeventplugin/createeventjob.cpp \
b/plugins/messageviewerplugins/createeventplugin/createeventjob.cpp index \
6ec9cea9..d9bfa054 100644
--- a/plugins/messageviewerplugins/createeventplugin/createeventjob.cpp
+++ b/plugins/messageviewerplugins/createeventplugin/createeventjob.cpp
@@ -59,7 +59,7 @@ void CreateEventJob::slotFetchDone(KJob *job)
if (fetchJob->items().count() == 1) {
mItem = fetchJob->items().at(0);
} else {
- Q_EMIT emitResult();
+ emitResult();
return;
}
createEvent();
@@ -69,7 +69,7 @@ void CreateEventJob::createEvent()
{
if (!mItem.hasPayload<KMime::Message::Ptr>()) {
qCDebug(CREATEEVENTPLUGIN_LOG) << " item has not payload";
- Q_EMIT emitResult();
+ emitResult();
return;
}
@@ -87,7 +87,7 @@ void CreateEventJob::slotEventCreated(KJob *job)
qCDebug(CREATEEVENTPLUGIN_LOG) << "Error during create new Event " \
<< job->errorString(); setError(job->error());
setErrorText(job->errorText());
- Q_EMIT emitResult();
+ emitResult();
} else {
Akonadi::ItemCreateJob *createJob = \
static_cast<Akonadi::ItemCreateJob *>(job);
Akonadi::Relation relation(Akonadi::Relation::GENERIC, mItem, \
createJob->item()); @@ -101,5 +101,5 @@ void \
CreateEventJob::slotRelationCreated(KJob *job) if (job->error()) {
qCDebug(CREATEEVENTPLUGIN_LOG) << "Error during create new Event " \
<< job->errorString(); }
- Q_EMIT emitResult();
+ emitResult();
}
diff --git a/plugins/messageviewerplugins/createnoteplugin/createnotejob.cpp \
b/plugins/messageviewerplugins/createnoteplugin/createnotejob.cpp index \
af632142..799b58c5 100644
--- a/plugins/messageviewerplugins/createnoteplugin/createnotejob.cpp
+++ b/plugins/messageviewerplugins/createnoteplugin/createnotejob.cpp
@@ -77,7 +77,7 @@ void CreateNoteJob::noteCreated(KJob *job)
qCWarning(CREATENOTEPLUGIN_LOG) << "Error during create new Note " \
<< job->errorString(); setError(job->error());
setErrorText(job->errorText());
- Q_EMIT emitResult();
+ emitResult();
} else {
Akonadi::ItemCreateJob *createJob = \
static_cast<Akonadi::ItemCreateJob *>(job);
Akonadi::Relation relation(Akonadi::Relation::GENERIC, mItem, \
createJob->item()); @@ -93,7 +93,7 @@ void CreateNoteJob::noteUpdated(KJob \
*job) setErrorText(job->errorText());
}
- Q_EMIT emitResult();
+ emitResult();
}
void CreateNoteJob::relationCreated(KJob *job)
@@ -101,5 +101,5 @@ void CreateNoteJob::relationCreated(KJob *job)
if (job->error()) {
qCDebug(CREATENOTEPLUGIN_LOG) << "Error during create new Note " \
<< job->errorString(); }
- Q_EMIT emitResult();
+ emitResult();
}
diff --git a/plugins/messageviewerplugins/externalscriptplugin/autotests/viewerpluginexternalscriptsloadjobtest.cpp \
b/plugins/messageviewerplugins/externalscriptplugin/autotests/viewerpluginexternalscriptsloadjobtest.cpp
index 067ef87f..1a786cf5 100644
--- a/plugins/messageviewerplugins/externalscriptplugin/autotests/viewerpluginexternalscriptsloadjobtest.cpp
+++ b/plugins/messageviewerplugins/externalscriptplugin/autotests/viewerpluginexternalscriptsloadjobtest.cpp
@@ -61,7 +61,7 @@ void \
ViewerPluginExternalScriptsLoadJobTest::shouldLoadDataInfo() \
QCOMPARE(info.executable(), QStringLiteral("bla")); QCOMPARE(info.icon(), \
QStringLiteral("blo")); QVERIFY(!info.isReadOnly());
- const QString filenamepath = QLatin1String(TEST_DATA_DIR) + \
QStringLiteral("/correctdesktop/first.desktop"); + const QString \
filenamepath = QStringLiteral(TEST_DATA_DIR) + \
QStringLiteral("/correctdesktop/first.desktop"); QCOMPARE(info.fileName(), \
filenamepath); }
diff --git a/plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscriptinterface.cpp \
b/plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscriptinterface.cpp
index 10be225f..6890751c 100644
--- a/plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscriptinterface.cpp
+++ b/plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscriptinterface.cpp
@@ -109,7 +109,7 @@ void \
ViewerPluginExternalscriptInterface::createAction(KActionCollection \
*ac)
const QVector<ViewerPluginExternalScriptInfo> infos = \
ViewerPluginExternalScriptManager::self()->scriptInfos(); if \
(!infos.isEmpty()) {
connect(mActionGroup, &QActionGroup::triggered, this, \
&ViewerPluginExternalscriptInterface::slotScriptActivated);
- for (ViewerPluginExternalScriptInfo info : infos) {
+ for (const ViewerPluginExternalScriptInfo &info : infos) {
QAction *act = new QAction(info.name(), this);
act->setIconText(info.name());
const QString &description = info.description();
diff --git a/plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscriptparseargument.cpp \
b/plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscriptparseargument.cpp
index 62f46933..26e37f6b 100644
--- a/plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscriptparseargument.cpp
+++ b/plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscriptparseargument.cpp
@@ -36,25 +36,25 @@ QStringList \
ViewerPluginExternalScriptParseArgument::parse(const QStringList &sc
QStringList newArguments;
for (const QString &arg : scriptArguments) {
- if (arg == QString::fromLatin1("%s")) {
+ if (arg == QLatin1String("%s")) {
const KMime::Headers::Subject *const subject = mMessage ? \
mMessage->subject(false) : nullptr;
newArguments << QStringLiteral("\"%1\"").arg(subject ? \
subject->asUnicodeString() : QString());
- } else if (arg == QString::fromLatin1("%from")) {
+ } else if (arg == QLatin1String("%from")) {
const KMime::Headers::From *const from = mMessage ? \
mMessage->from(false) : nullptr;
newArguments << QStringLiteral("\"%1\"").arg(from ? \
from->asUnicodeString() : QString());
- } else if (arg == QString::fromLatin1("%to")) {
+ } else if (arg == QLatin1String("%to")) {
const KMime::Headers::To *const to = mMessage ? \
mMessage->to(false) : nullptr;
newArguments << QStringLiteral("\"%1\"").arg(to ? \
to->asUnicodeString() : QString());
- } else if (arg == QString::fromLatin1("%cc")) {
+ } else if (arg == QLatin1String("%cc")) {
const KMime::Headers::Cc *const cc = mMessage ? \
mMessage->cc(false) : nullptr;
newArguments << QStringLiteral("\"%1\"").arg(cc ? \
cc->asUnicodeString() : QString());
- } else if (arg == QString::fromLatin1("%bcc")) {
+ } else if (arg == QLatin1String("%bcc")) {
const KMime::Headers::Bcc *const bcc = mMessage ? \
mMessage->bcc(false) : nullptr;
newArguments << QStringLiteral("\"%1\"").arg(bcc ? \
bcc->asUnicodeString() : QString());
- } else if (arg == QString::fromLatin1("%body")) {
+ } else if (arg == QLatin1String("%body")) {
const QByteArray body = mMessage ? mMessage->body() : nullptr;
newArguments << \
QStringLiteral("\"%1\"").arg(QLatin1String(body));
- } else if (arg == QString::fromLatin1("%inreplyto")) {
+ } else if (arg == QLatin1String("%inreplyto")) {
KMime::Headers::InReplyTo *inReplyTo = mMessage ? \
mMessage->inReplyTo(false) : nullptr;
newArguments << QStringLiteral("\"%1\"").arg(inReplyTo ? \
inReplyTo->asUnicodeString() : QString()); } else {
diff --git a/plugins/webengineurlinterceptor/adblock/lib/adblockblockableitemsjob.cpp \
b/plugins/webengineurlinterceptor/adblock/lib/adblockblockableitemsjob.cpp \
index d75b1944..082be84f 100644
--- a/plugins/webengineurlinterceptor/adblock/lib/adblockblockableitemsjob.cpp
+++ b/plugins/webengineurlinterceptor/adblock/lib/adblockblockableitemsjob.cpp
@@ -113,9 +113,9 @@ void AdBlockBlockableItemsJob::adaptSource(QString \
&src, const QString &hostName
if (src.startsWith(QStringLiteral("http://")) || \
src.startsWith(QStringLiteral("https://"))) { //Nothing
} else if (src.startsWith(QStringLiteral("//"))) {
- src = QLatin1String("https:") + src;
+ src = QStringLiteral("https:") + src;
} else if (src.startsWith(QLatin1Char('/'))) {
- src = QLatin1String("https://") + hostName + src;
+ src = QStringLiteral("https://") + hostName + src;
} else {
src = QString();
}
diff --git a/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockcreatefilterdialog.cpp \
b/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockcreatefilterdialog.cpp
index 751311e1..f6ed9ed4 100644
--- a/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockcreatefilterdialog.cpp
+++ b/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockcreatefilterdialog.cpp
@@ -119,7 +119,7 @@ void AdBlockCreateFilterDialog::slotUpdateFilter()
{
QString pattern = mUi->filtercustom->text();
if (mUi->atTheBeginning->isChecked()) {
- pattern = QLatin1String("|") + pattern;
+ pattern = QStringLiteral("|") + pattern;
}
if (mUi->atTheEnd->isChecked()) {
pattern += QLatin1String("|");
@@ -130,10 +130,10 @@ void AdBlockCreateFilterDialog::slotUpdateFilter()
pattern += QLatin1Char('$') + collapseValue;
}
- pattern += (collapseValue.isEmpty() ? QLatin1String("$") : \
QLatin1String(",")) + \
AdBlockBlockableItemsWidget::elementType(mCurrentType); + pattern += \
(collapseValue.isEmpty() ? QStringLiteral("$") : QStringLiteral(",")) + \
AdBlockBlockableItemsWidget::elementType(mCurrentType);
if (mUi->exceptionFilter->isChecked()) {
- pattern = QLatin1String("@@") + pattern;
+ pattern = QStringLiteral("@@") + pattern;
}
const int numberOfElement(mUi->applyListElement->count());
for (int i = 0; i < numberOfElement; ++i) {
@@ -145,7 +145,7 @@ void AdBlockCreateFilterDialog::slotUpdateFilter()
if (mUi->restrictToDomain->isChecked()) {
if (!mUi->restrictToDomainStr->text().isEmpty()) {
- pattern += QLatin1String(",domain=") + \
mUi->restrictToDomainStr->text(); + pattern += \
QStringLiteral(",domain=") + mUi->restrictToDomainStr->text(); }
}
if (mUi->matchCase->isChecked()) {
diff --git a/sieveeditor/imapfoldercompletion/selectimapfoldertreeview.cpp \
b/sieveeditor/imapfoldercompletion/selectimapfoldertreeview.cpp index \
7668c0d4..31e7f0b2 100644
--- a/sieveeditor/imapfoldercompletion/selectimapfoldertreeview.cpp
+++ b/sieveeditor/imapfoldercompletion/selectimapfoldertreeview.cpp
@@ -40,7 +40,7 @@ void SelectImapFolderTreeView::generalPaletteChanged()
mTextColor = color;
}
-void SelectImapFolderTreeView::setStatus(const LoadingStatus &status)
+void SelectImapFolderTreeView::setStatus(LoadingStatus status)
{
mStatus = status;
}
diff --git a/sieveeditor/imapfoldercompletion/selectimapfoldertreeview.h \
b/sieveeditor/imapfoldercompletion/selectimapfoldertreeview.h index \
d80e2042..c8a8f1c4 100644
--- a/sieveeditor/imapfoldercompletion/selectimapfoldertreeview.h
+++ b/sieveeditor/imapfoldercompletion/selectimapfoldertreeview.h
@@ -35,7 +35,7 @@ public:
Failed
};
- void setStatus(const LoadingStatus &status);
+ void setStatus(LoadingStatus status);
protected:
void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic