[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim] /: Use QStringLiteral
From: Montel Laurent <montel () kde ! org>
Date: 2015-06-30 20:52:49
Message-ID: E1ZA2WP-0005cx-3a () scm ! kde ! org
[Download RAW message or body]
Git commit 3abefad6b97f6b0f22cbbab546043ff6e5ecfbee by Montel Laurent.
Committed on 30/06/2015 at 20:52.
Pushed by mlaurent into branch 'master'.
Use QStringLiteral
M +1 -1 importwizard/autodetect/balsa/balsaaddressbook.cpp
M +2 -2 importwizard/autodetect/balsa/balsasettings.cpp
M +6 -6 importwizard/autodetect/claws-mail/clawsmailsettings.cpp
M +19 -19 importwizard/autodetect/opera/operasettings.cpp
M +27 -27 importwizard/autodetect/sylpheed/sylpheedsettings.cpp
M +1 -1 kmail/configuredialog/configureaccountpage.cpp
M +13 -13 knotes/apps/knotesapp.cpp
M +2 -2 knotes/apps/knotestray.cpp
M +4 -4 knotes/kontactplugin/knotes_part.cpp
M +1 -1 knotes/kontactplugin/knotes_plugin.cpp
M +4 -4 knotes/kontactplugin/summarywidget.cpp
M +3 -3 knotes/notes/knote.cpp
M +1 -1 knotes/print/knotegrantleeprint.cpp
M +1 -1 knotes/print/knoteprintselectthemecombobox.cpp
M +2 -0 libksieve/ksieveui/editor/sieveeditorwidget.cpp
M +6 -6 mailcommon/filter/filterimporter/filterimporterbalsa.cpp
M +1 -1 mailcommon/folder/foldercollection.cpp
M +2 -2 mailimporter/filter_thunderbird.cpp
M +1 -1 messagelist/core/manager.cpp
M +4 -4 messagelist/pane.cpp
M +1 -1 messagelist/widget.cpp
M +4 -4 messageviewer/adblock/adblockmanager.cpp
M +5 -5 messageviewer/adblock/adblocksettingwidget.cpp
M +2 -2 pimcommon/translator/translatorwidget.cpp
M +3 -3 pimsettingexporter/core/addressbook/importaddressbookjob.cpp
M +3 -3 pimsettingexporter/core/calendar/importcalendarjob.cpp
M +1 -1 pimsettingexporter/core/mail/exportmailjob.cpp
M +25 -25 pimsettingexporter/core/mail/importmailjob.cpp
M +1 -1 pimsettingexporter/core/utils.cpp
http://commits.kde.org/kdepim/3abefad6b97f6b0f22cbbab546043ff6e5ecfbee
diff --git a/importwizard/autodetect/balsa/balsaaddressbook.cpp \
b/importwizard/autodetect/balsa/balsaaddressbook.cpp index 24e03ca..ece7ca0 100644
--- a/importwizard/autodetect/balsa/balsaaddressbook.cpp
+++ b/importwizard/autodetect/balsa/balsaaddressbook.cpp
@@ -93,7 +93,7 @@ void BalsaAddressBook::readAddressBook(const KConfigGroup &grp)
}
}
} else if (type == QLatin1String("LibBalsaAddressBookVcard")) {
- const QString path = grp.readEntry(QLatin1String("Path"));
+ const QString path = grp.readEntry(QStringLiteral("Path"));
if (!path.isEmpty()) {
QMap<QString, QVariant> settings;
settings.insert(QStringLiteral("Path"), path);
diff --git a/importwizard/autodetect/balsa/balsasettings.cpp \
b/importwizard/autodetect/balsa/balsasettings.cpp index 37f05eb..e8f8eef 100644
--- a/importwizard/autodetect/balsa/balsasettings.cpp
+++ b/importwizard/autodetect/balsa/balsasettings.cpp
@@ -146,7 +146,7 @@ void BalsaSettings::readTransport(const KConfigGroup &grp)
break;
}
- const QString ssl = grp.readEntry(QLatin1String("SSL"));
+ const QString ssl = grp.readEntry(QStringLiteral("SSL"));
if (ssl == QLatin1String("true")) {
mt->setEncryption(MailTransport::Transport::EnumEncryption::SSL);
} else if (ssl == QLatin1String("false")) {
@@ -155,7 +155,7 @@ void BalsaSettings::readTransport(const KConfigGroup &grp)
qCDebug(IMPORTWIZARD_LOG) << " unknown ssl value :" << ssl;
}
- const QString anonymous = grp.readEntry(QLatin1String("Anonymous"));
+ const QString anonymous = grp.readEntry(QStringLiteral("Anonymous"));
//TODO
storeTransport(mt, /*( smtp == defaultSmtp )*/true); //FIXME
diff --git a/importwizard/autodetect/claws-mail/clawsmailsettings.cpp \
b/importwizard/autodetect/claws-mail/clawsmailsettings.cpp index ed985c9..0039a02 \
100644
--- a/importwizard/autodetect/claws-mail/clawsmailsettings.cpp
+++ b/importwizard/autodetect/claws-mail/clawsmailsettings.cpp
@@ -49,8 +49,8 @@ void ClawsMailSettings::importSettings(const QString &filename, \
const QString &p if (configCommon.hasGroup("Common")) {
KConfigGroup common = configCommon.group("Common");
checkMailOnStartup = (common.readEntry("check_on_startup", 1) == 1);
- if (common.readEntry(QLatin1String("autochk_newmail"), 1) == 1) {
- intervalCheckMail = \
common.readEntry(QLatin1String("autochk_interval"), -1); + if \
(common.readEntry(QStringLiteral("autochk_newmail"), 1) == 1) { + \
intervalCheckMail = common.readEntry(QStringLiteral("autochk_interval"), -1); }
readGlobalSettings(common);
}
@@ -102,21 +102,21 @@ void ClawsMailSettings::readSettingsColor(const KConfigGroup \
&group) }
//[Reader] QuotedText3
}
- const QString misspellColor = \
group.readEntry(QLatin1String("misspelled_color")); + const QString \
misspellColor = group.readEntry(QStringLiteral("misspelled_color")); if \
(!misspellColor.isEmpty()) { const QColor col = QColor(misspellColor);
if (col.isValid()) {
addKmailConfig(QLatin1String("Reader"), \
QStringLiteral("MisspelledColor"), writeColor(col)); }
}
- const QString uriColor = group.readEntry(QLatin1String("uri_color"));
+ const QString uriColor = group.readEntry(QStringLiteral("uri_color"));
if (!uriColor.isEmpty()) {
const QColor col(uriColor);
if (col.isValid()) {
addKmailConfig(QLatin1String("Reader"), QStringLiteral("LinkColor"), \
writeColor(col)); }
}
- const QString newColor = group.readEntry(QLatin1String("color_new"));
+ const QString newColor = group.readEntry(QStringLiteral("color_new"));
if (!newColor.isEmpty()) {
const QColor col(newColor);
if (col.isValid()) {
@@ -141,7 +141,7 @@ QString ClawsMailSettings::writeColor(const QColor &col)
void ClawsMailSettings::readTemplateFormat(const KConfigGroup &group)
{
SylpheedSettings::readTemplateFormat(group);
- const QString composerNewMessage = \
group.readEntry(QLatin1String("compose_body_format")); + const QString \
composerNewMessage = group.readEntry(QStringLiteral("compose_body_format")); if \
(!composerNewMessage.isEmpty()) {
addKmailConfig(QLatin1String("TemplateParser"), \
QStringLiteral("TemplateNewMessage"), convertToKmailTemplate(composerNewMessage)); }
diff --git a/importwizard/autodetect/opera/operasettings.cpp \
b/importwizard/autodetect/opera/operasettings.cpp index 0fbec75..428f9a5 100644
--- a/importwizard/autodetect/opera/operasettings.cpp
+++ b/importwizard/autodetect/opera/operasettings.cpp
@@ -102,7 +102,7 @@ void OperaSettings::readAccount(const KConfigGroup &grp)
settings.insert(QLatin1String("Host"), serverName);
settings.insert(QLatin1String("Login"), userName);
- const int leaveOnServer = grp.readEntry(QLatin1String("Leave On Server"), \
-1); + const int leaveOnServer = grp.readEntry(QStringLiteral("Leave On \
Server"), -1); if (leaveOnServer == 1) {
settings.insert(QLatin1String("LeaveOnServer"), true);
} else if (leaveOnServer == 0) {
@@ -111,9 +111,9 @@ void OperaSettings::readAccount(const KConfigGroup &grp)
qCDebug(IMPORTWIZARD_LOG) << " leave on server option unknown : " << \
leaveOnServer; }
- const int removeMailFromSever = grp.readEntry(QLatin1String("Remove From \
Server Delay Enabled"), -1); + const int removeMailFromSever = \
grp.readEntry(QStringLiteral("Remove From Server Delay Enabled"), -1); if \
(removeMailFromSever == 1) {
- int removeDelay = grp.readEntry(QLatin1String("Remove From Server \
Delay"), -1); + int removeDelay = grp.readEntry(QStringLiteral("Remove \
From Server Delay"), -1); if (removeDelay != -1) {
//Opera store delay as second !!! :)
removeDelay = removeDelay / (24 * 60 * 60);
@@ -125,7 +125,7 @@ void OperaSettings::readAccount(const KConfigGroup &grp)
settings.insert(QLatin1String("Port"), port);
}
//TODO:
- const int delay = grp.readEntry(QLatin1String("Initial Poll Delay"), -1);
+ const int delay = grp.readEntry(QStringLiteral("Initial Poll Delay"), -1);
Q_UNUSED(delay);
if (pollInterval == 0) {
@@ -171,12 +171,12 @@ void OperaSettings::readAccount(const KConfigGroup &grp)
void OperaSettings::readTransport(const KConfigGroup &grp)
{
- const QString outgoingProtocol = grp.readEntry(QLatin1String("Outgoing \
Protocol")); + const QString outgoingProtocol = \
grp.readEntry(QStringLiteral("Outgoing Protocol")); if (outgoingProtocol == \
QLatin1String("SMTP")) {
- const int authMethod = grp.readEntry(QLatin1String("Outgoing Authentication \
Method"), -1); + const int authMethod = grp.readEntry(QStringLiteral("Outgoing \
Authentication Method"), -1); MailTransport::Transport *mt = createTransport();
- const int port = grp.readEntry(QLatin1String("Outgoing Port"), -1);
- const int secure = grp.readEntry(QLatin1String("Secure Connection Out"), \
-1); + const int port = grp.readEntry(QStringLiteral("Outgoing Port"), -1);
+ const int secure = grp.readEntry(QStringLiteral("Secure Connection Out"), \
-1); if (secure == 1) {
mt->setEncryption(MailTransport::Transport::EnumEncryption::TLS);
}
@@ -184,15 +184,15 @@ void OperaSettings::readTransport(const KConfigGroup &grp)
mt->setPort(port);
}
- const QString hostName = grp.readEntry(QLatin1String("Outgoing \
Servername")); + const QString hostName = \
grp.readEntry(QStringLiteral("Outgoing Servername")); mt->setHost(hostName);
- const QString userName = grp.readEntry(QLatin1String("Outgoing Username"));
+ const QString userName = grp.readEntry(QStringLiteral("Outgoing Username"));
if (!userName.isEmpty()) {
mt->setUserName(userName);
}
- const int outgoingTimeOut = grp.readEntry(QLatin1String("Outgoing Timeout"), \
-1); //TODO ? + const int outgoingTimeOut = \
grp.readEntry(QStringLiteral("Outgoing Timeout"), -1); //TODO ? \
Q_UNUSED(outgoingTimeOut);
switch (authMethod) {
@@ -221,15 +221,15 @@ void OperaSettings::readTransport(const KConfigGroup &grp)
void OperaSettings::readIdentity(const KConfigGroup &grp)
{
- QString realName = grp.readEntry(QLatin1String("Real Name"));
+ QString realName = grp.readEntry(QStringLiteral("Real Name"));
KIdentityManagement::Identity *newIdentity = createIdentity(realName);
- const QString cc = grp.readEntry(QLatin1String("Auto CC"));
+ const QString cc = grp.readEntry(QStringLiteral("Auto CC"));
newIdentity->setCc(cc);
- const QString bcc = grp.readEntry(QLatin1String("Auto BCC"));
+ const QString bcc = grp.readEntry(QStringLiteral("Auto BCC"));
newIdentity->setBcc(bcc);
- const QString replyTo = grp.readEntry(QLatin1String("Replyto"));
+ const QString replyTo = grp.readEntry(QStringLiteral("Replyto"));
if (!replyTo.isEmpty()) {
newIdentity->setReplyToAddr(replyTo);
}
@@ -237,18 +237,18 @@ void OperaSettings::readIdentity(const KConfigGroup &grp)
newIdentity->setFullName(realName);
newIdentity->setIdentityName(realName);
- const QString email = grp.readEntry(QLatin1String("Email"));
+ const QString email = grp.readEntry(QStringLiteral("Email"));
newIdentity->setPrimaryEmailAddress(email);
- const QString organization = grp.readEntry(QLatin1String("Organization"));
+ const QString organization = grp.readEntry(QStringLiteral("Organization"));
if (!organization.isEmpty()) {
newIdentity->setOrganization(organization);
}
- QString signatureFile = grp.readEntry(QLatin1String("Signature File"));
+ QString signatureFile = grp.readEntry(QStringLiteral("Signature File"));
if (!signatureFile.isEmpty()) {
KIdentityManagement::Signature signature;
- const int signatureHtml = grp.readEntry(QLatin1String("Signature is HTML"), \
-1); + const int signatureHtml = grp.readEntry(QStringLiteral("Signature is \
HTML"), -1); if (signatureFile.contains(QLatin1String("{Preferences}"))) {
signatureFile.replace(QLatin1String("{Preferences}"), \
MailImporter::FilterOpera::defaultSettingsPath() + QLatin1String("/")); }
diff --git a/importwizard/autodetect/sylpheed/sylpheedsettings.cpp \
b/importwizard/autodetect/sylpheed/sylpheedsettings.cpp index e4c1d33..a8fb3cf 100644
--- a/importwizard/autodetect/sylpheed/sylpheedsettings.cpp
+++ b/importwizard/autodetect/sylpheed/sylpheedsettings.cpp
@@ -51,8 +51,8 @@ void SylpheedSettings::importSettings(const QString &filename, \
const QString &pa KConfigGroup common = configCommon.group("Common");
checkMailOnStartup = (common.readEntry("check_on_startup", 1) == 1);
- if (common.readEntry(QLatin1String("autochk_newmail"), 1) == 1) {
- intervalCheckMail = \
common.readEntry(QLatin1String("autochk_interval"), -1); + if \
(common.readEntry(QStringLiteral("autochk_newmail"), 1) == 1) { + \
intervalCheckMail = common.readEntry(QStringLiteral("autochk_interval"), -1); }
readGlobalSettings(common);
}
@@ -162,19 +162,19 @@ void SylpheedSettings::readGlobalSettings(const KConfigGroup \
&group)
void SylpheedSettings::readTemplateFormat(const KConfigGroup &group)
{
- const QString replyQuote = group.readEntry(QLatin1String("reply_quote_mark"));
+ const QString replyQuote = group.readEntry(QStringLiteral("reply_quote_mark"));
if (!replyQuote.isEmpty()) {
addKmailConfig(QLatin1String("TemplateParser"), \
QStringLiteral("QuoteString"), replyQuote); }
- const QString forwardQuote = \
group.readEntry(QLatin1String("forward_quote_mark")); + const QString forwardQuote \
= group.readEntry(QStringLiteral("forward_quote_mark")); if \
(!forwardQuote.isEmpty()) { //Not implemented in kmail
}
- const QString replyQuoteFormat = \
group.readEntry(QLatin1String("reply_quote_format")); + const QString \
replyQuoteFormat = group.readEntry(QStringLiteral("reply_quote_format")); if \
(!replyQuoteFormat.isEmpty()) {
addKmailConfig(QLatin1String("TemplateParser"), \
QStringLiteral("TemplateReply"), convertToKmailTemplate(replyQuoteFormat)); }
- const QString forwardQuoteFormat = \
group.readEntry(QLatin1String("forward_quote_format")); + const QString \
forwardQuoteFormat = group.readEntry(QStringLiteral("forward_quote_format")); if \
(!forwardQuoteFormat.isEmpty()) {
addKmailConfig(QLatin1String("TemplateParser"), \
QStringLiteral("TemplateForward"), convertToKmailTemplate(forwardQuoteFormat)); }
@@ -182,7 +182,7 @@ void SylpheedSettings::readTemplateFormat(const KConfigGroup \
&group)
void SylpheedSettings::readDateFormat(const KConfigGroup &group)
{
- const QString dateFormat = group.readEntry(QLatin1String("date_format"));
+ const QString dateFormat = group.readEntry(QStringLiteral("date_format"));
if (!dateFormat.isEmpty()) {
addKmailConfig(QLatin1String("General"), QStringLiteral("customDateFormat"), \
dateFormat); }
@@ -300,15 +300,15 @@ void SylpheedSettings::readPop3Account(const KConfigGroup \
&accountConfig, bool c const QString host = \
accountConfig.readEntry("receive_server"); settings.insert(QLatin1String("Host"), \
host);
- const QString name = accountConfig.readEntry(QLatin1String("name"));
- const QString inbox = \
MailCommon::Util::convertFolderPathToCollectionStr(accountConfig.readEntry(QLatin1String("inbox")));
+ const QString name = accountConfig.readEntry(QStringLiteral("name"));
+ const QString inbox = \
MailCommon::Util::convertFolderPathToCollectionStr(accountConfig.readEntry(QStringLiteral("inbox")));
settings.insert(QLatin1String("TargetCollection"), inbox);
int port = 0;
if (SylpheedSettingsUtils::readConfig(QLatin1String("pop_port"), accountConfig, \
port, true)) { settings.insert(QLatin1String("Port"), port);
}
if (accountConfig.hasKey(QLatin1String("ssl_pop"))) {
- const int sslPop = accountConfig.readEntry(QLatin1String("ssl_pop"), 0);
+ const int sslPop = accountConfig.readEntry(QStringLiteral("ssl_pop"), 0);
switch (sslPop) {
case 0:
//Nothing
@@ -325,22 +325,22 @@ void SylpheedSettings::readPop3Account(const KConfigGroup \
&accountConfig, bool c }
}
if (accountConfig.hasKey(QLatin1String("remove_mail"))) {
- const bool removeMail = \
(accountConfig.readEntry(QLatin1String("remove_mail"), 1) == 1); + const bool \
removeMail = (accountConfig.readEntry(QStringLiteral("remove_mail"), 1) == 1); \
settings.insert(QLatin1String("LeaveOnServer"), removeMail); }
if (accountConfig.hasKey(QLatin1String("message_leave_time"))) {
- settings.insert(QLatin1String("LeaveOnServerDays"), \
accountConfig.readEntry(QLatin1String("message_leave_time"))); + \
settings.insert(QLatin1String("LeaveOnServerDays"), \
accountConfig.readEntry(QStringLiteral("message_leave_time"))); }
- const QString user = accountConfig.readEntry(QLatin1String("user_id"));
+ const QString user = accountConfig.readEntry(QStringLiteral("user_id"));
settings.insert(QLatin1String("Login"), user);
- const QString password = accountConfig.readEntry(QLatin1String("password"));
+ const QString password = accountConfig.readEntry(QStringLiteral("password"));
settings.insert(QLatin1String("Password"), password);
//use_apop_auth
if (accountConfig.hasKey(QLatin1String("use_apop_auth"))) {
- const bool useApop = \
(accountConfig.readEntry(QLatin1String("use_apop_auth"), 1) == 1); + const \
bool useApop = (accountConfig.readEntry(QStringLiteral("use_apop_auth"), 1) == 1); \
if (useApop) {
settings.insert(QLatin1String("AuthenticationMethod"), \
MailTransport::Transport::EnumAuthenticationType::APOP); }
@@ -352,7 +352,7 @@ void SylpheedSettings::readPop3Account(const KConfigGroup \
&accountConfig, bool c
const QString agentIdentifyName = \
AbstractBase::createResource(QStringLiteral("akonadi_pop3_resource"), name, \
settings); addCheckMailOnStartup(agentIdentifyName, checkMailOnStartup);
- const bool enableManualCheck = \
(accountConfig.readEntry(QLatin1String("receive_at_get_all"), 0) == 1); + const \
bool enableManualCheck = \
(accountConfig.readEntry(QStringLiteral("receive_at_get_all"), 0) == 1); \
addToManualCheck(agentIdentifyName, enableManualCheck); }
@@ -362,8 +362,8 @@ void SylpheedSettings::readImapAccount(const KConfigGroup \
&accountConfig, bool c const QString host = \
accountConfig.readEntry("receive_server"); \
settings.insert(QLatin1String("ImapServer"), host);
- const QString name = accountConfig.readEntry(QLatin1String("name"));
- const int sslimap = accountConfig.readEntry(QLatin1String("ssl_imap"), 0);
+ const QString name = accountConfig.readEntry(QStringLiteral("name"));
+ const int sslimap = accountConfig.readEntry(QStringLiteral("ssl_imap"), 0);
switch (sslimap) {
case 0:
//None
@@ -392,7 +392,7 @@ void SylpheedSettings::readImapAccount(const KConfigGroup \
&accountConfig, bool c
settings.insert(QLatin1String("TrashCollection"), \
MailCommon::Util::convertFolderPathToCollectionId(trashFolder)); }
- const int auth = accountConfig.readEntry(QLatin1String("imap_auth_method"), 0);
+ const int auth = accountConfig.readEntry(QStringLiteral("imap_auth_method"), 0);
switch (auth) {
case 0:
break;
@@ -415,20 +415,20 @@ void SylpheedSettings::readImapAccount(const KConfigGroup \
&accountConfig, bool c
settings.insert(QLatin1String("IntervalCheckTime"), intervalCheckMail);
}
- const QString password = accountConfig.readEntry(QLatin1String("password"));
+ const QString password = accountConfig.readEntry(QStringLiteral("password"));
settings.insert(QLatin1String("Password"), password);
const QString agentIdentifyName = \
AbstractBase::createResource(QStringLiteral("akonadi_imap_resource"), name, \
settings); addCheckMailOnStartup(agentIdentifyName, checkMailOnStartup);
- const bool enableManualCheck = \
(accountConfig.readEntry(QLatin1String("receive_at_get_all"), 0) == 1); + const \
bool enableManualCheck = \
(accountConfig.readEntry(QStringLiteral("receive_at_get_all"), 0) == 1); \
addToManualCheck(agentIdentifyName, enableManualCheck); }
void SylpheedSettings::readAccount(const KConfigGroup &accountConfig , bool \
checkMailOnStartup, int intervalCheckMail) {
if (accountConfig.hasKey(QLatin1String("protocol"))) {
- const int protocol = accountConfig.readEntry(QLatin1String("protocol"), 0);
+ const int protocol = accountConfig.readEntry(QStringLiteral("protocol"), 0);
switch (protocol) {
case 0:
readPop3Account(accountConfig, checkMailOnStartup, intervalCheckMail);
@@ -501,19 +501,19 @@ QString SylpheedSettings::readTransport(const KConfigGroup \
&accountConfig)
if (SylpheedSettingsUtils::readConfig(QLatin1String("smtp_port"), \
accountConfig, port, true)) { mt->setPort(port);
}
- const QString user = accountConfig.readEntry(QLatin1String("smtp_user_id"));
+ const QString user = \
accountConfig.readEntry(QStringLiteral("smtp_user_id"));
if (!user.isEmpty()) {
mt->setUserName(user);
mt->setRequiresAuthentication(true);
}
- const QString password = \
accountConfig.readEntry(QLatin1String("smtp_password")); + const QString \
password = accountConfig.readEntry(QStringLiteral("smtp_password")); if \
(!password.isEmpty()) { mt->setStorePassword(true);
mt->setPassword(password);
}
- if (accountConfig.readEntry(QLatin1String("use_smtp_auth"), 0) == 1) {
- const int authMethod = \
accountConfig.readEntry(QLatin1String("smtp_auth_method"), 0); + if \
(accountConfig.readEntry(QStringLiteral("use_smtp_auth"), 0) == 1) { + \
const int authMethod = accountConfig.readEntry(QStringLiteral("smtp_auth_method"), \
0); switch (authMethod) {
case 0: //Automatic:
mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::PLAIN); \
//???? @@ -531,7 +531,7 @@ QString SylpheedSettings::readTransport(const KConfigGroup \
&accountConfig)
qCDebug(IMPORTWIZARD_LOG) << " smtp authentication unknown :" << \
authMethod; }
}
- const int sslSmtp = accountConfig.readEntry(QLatin1String("ssl_smtp"), 0);
+ const int sslSmtp = accountConfig.readEntry(QStringLiteral("ssl_smtp"), 0);
switch (sslSmtp) {
case 0:
mt->setEncryption(MailTransport::Transport::EnumEncryption::None);
diff --git a/kmail/configuredialog/configureaccountpage.cpp \
b/kmail/configuredialog/configureaccountpage.cpp index 2e17e6e..200d38a 100644
--- a/kmail/configuredialog/configureaccountpage.cpp
+++ b/kmail/configuredialog/configureaccountpage.cpp
@@ -184,7 +184,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab(QWidget \
*parent)
KConfig specialMailCollection(QLatin1String("specialmailcollectionsrc"));
if (specialMailCollection.hasGroup(QLatin1String("SpecialCollections"))) {
KConfigGroup grp = \
specialMailCollection.group(QLatin1String("SpecialCollections"));
- mAccountsReceiving.mAccountsReceiving->setSpecialCollectionIdentifier(grp.readEntry(QLatin1String("DefaultResourceId")));
+ mAccountsReceiving.mAccountsReceiving->setSpecialCollectionIdentifier(grp.readEntry(QStringLiteral("DefaultResourceId")));
}
ConfigAgentDelegate *configDelegate = new \
ConfigAgentDelegate(mAccountsReceiving.mAccountsReceiving->view());
mAccountsReceiving.mAccountsReceiving->setItemDelegate(configDelegate);
diff --git a/knotes/apps/knotesapp.cpp b/knotes/apps/knotesapp.cpp
index 25ec323..ce0d4fa 100644
--- a/knotes/apps/knotesapp.cpp
+++ b/knotes/apps/knotesapp.cpp
@@ -109,7 +109,7 @@ KNotesApp::KNotesApp()
}
new KNotesAdaptor(this);
- QDBusConnection::sessionBus().registerObject(QLatin1String("/KNotes") , this);
+ QDBusConnection::sessionBus().registerObject(QStringLiteral("/KNotes") , this);
qApp->setQuitOnLastWindowClosed(false);
// create the GUI...
QAction *action = new QAction(QIcon::fromTheme(QStringLiteral("document-new")),
@@ -165,17 +165,17 @@ KNotesApp::KNotesApp()
//FIXME: no shortcut removing!?
KStandardAction::quit(this, SLOT(slotQuit()),
actionCollection())->setShortcut(0);
- setXMLFile(QLatin1String("knotesappui.rc"));
+ setXMLFile(QStringLiteral("knotesappui.rc"));
m_guiBuilder = new KXMLGUIBuilder(this);
m_guiFactory = new KXMLGUIFactory(m_guiBuilder, this);
m_guiFactory->addClient(this);
QMenu *contextMenu = static_cast<QMenu *>(m_guiFactory->container(
- QLatin1String("knotes_context"),
+ QStringLiteral("knotes_context"),
this));
m_noteMenu = static_cast<QMenu *>(m_guiFactory->container(
- QLatin1String("notes_menu"), this));
+ QStringLiteral("notes_menu"), this));
// get the most recent XML UI file
QString xmlFileName(componentName() + QLatin1String("ui.rc"));
@@ -486,21 +486,21 @@ void KNotesApp::updateNoteActions()
}
if (m_noteActions.isEmpty()) {
- actionCollection()->action(QLatin1String("hide_all_notes"))->setEnabled(false);
- actionCollection()->action(QLatin1String("show_all_notes"))->setEnabled(false);
- actionCollection()->action(QLatin1String("print_selected_notes"))->setEnabled(false);
- actionCollection()->action(QLatin1String("edit_find"))->setEnabled(false);
+ actionCollection()->action(QStringLiteral("hide_all_notes"))->setEnabled(false);
+ actionCollection()->action(QStringLiteral("show_all_notes"))->setEnabled(false);
+ actionCollection()->action(QStringLiteral("print_selected_notes"))->setEnabled(false);
+ actionCollection()->action(QStringLiteral("edit_find"))->setEnabled(false);
QAction *action = new QAction(i18n("No Notes"), this);
action->setEnabled(false);
m_noteActions.append(action);
} else {
qSort(m_noteActions.begin(), m_noteActions.end(), qActionLessThan);
- actionCollection()->action(QLatin1String("hide_all_notes"))->setEnabled(true);
- actionCollection()->action(QLatin1String("show_all_notes"))->setEnabled(true);
- actionCollection()->action(QLatin1String("print_selected_notes"))->setEnabled(true);
- actionCollection()->action(QLatin1String("edit_find"))->setEnabled(true);
+ actionCollection()->action(QStringLiteral("hide_all_notes"))->setEnabled(true);
+ actionCollection()->action(QStringLiteral("show_all_notes"))->setEnabled(true);
+ actionCollection()->action(QStringLiteral("print_selected_notes"))->setEnabled(true);
+ actionCollection()->action(QStringLiteral("edit_find"))->setEnabled(true);
}
- plugActionList(QLatin1String("notes"), m_noteActions);
+ plugActionList(QStringLiteral("notes"), m_noteActions);
}
void KNotesApp::slotActivateRequested(bool, const QPoint &)
diff --git a/knotes/apps/knotestray.cpp b/knotes/apps/knotestray.cpp
index ceb43b7..15559ea 100644
--- a/knotes/apps/knotestray.cpp
+++ b/knotes/apps/knotestray.cpp
@@ -29,11 +29,11 @@ KNotesTray::KNotesTray(QWidget *parent)
: KStatusNotifierItem(parent)
{
setToolTipTitle(i18n("KNotes: Sticky notes for KDE"));
- setToolTipIconByName(QLatin1String("knotes"));
+ setToolTipIconByName(QStringLiteral("knotes"));
setStatus(KStatusNotifierItem::Active);
setCategory(KStatusNotifierItem::ApplicationStatus);
setStandardActionsEnabled(false);
- mIcon = QIcon::fromTheme(QLatin1String("knotes"));
+ mIcon = QIcon::fromTheme(QStringLiteral("knotes"));
}
KNotesTray::~KNotesTray()
diff --git a/knotes/kontactplugin/knotes_part.cpp \
b/knotes/kontactplugin/knotes_part.cpp index 3fc1faa..9d00487 100644
--- a/knotes/kontactplugin/knotes_part.cpp
+++ b/knotes/kontactplugin/knotes_part.cpp
@@ -100,7 +100,7 @@ KNotesPart::KNotesPart(QObject *parent)
mNoteTreeModel(Q_NULLPTR)
{
(void) new KNotesAdaptor(this);
- QDBusConnection::sessionBus().registerObject(QLatin1String("/KNotes"), this);
+ QDBusConnection::sessionBus().registerObject(QStringLiteral("/KNotes"), this);
setComponentName(QStringLiteral("knotes"), QStringLiteral("knotes"));
@@ -229,7 +229,7 @@ KNotesPart::KNotesPart(QObject *parent)
mModelProxy->setSelectionModel(mSelectionModel);
mModelProxy->setSourceModel(mNoteTreeModel);
- KSharedConfigPtr _config = \
KSharedConfig::openConfig(QLatin1String("kcmknotessummaryrc")); + KSharedConfigPtr \
_config = KSharedConfig::openConfig(QStringLiteral("kcmknotessummaryrc"));
mModelState =
new KViewStateMaintainer<Akonadi::ETMViewStateSaver>(_config->group("CheckState"), \
this); @@ -251,7 +251,7 @@ KNotesPart::KNotesPart(QObject *parent)
slotOnCurrentChanged();
setWidget(mNotesWidget);
- setXMLFile(QLatin1String("knotes_part.rc"));
+ setXMLFile(QStringLiteral("knotes_part.rc"));
updateNetworkListener();
updateClickMessage();
}
@@ -770,7 +770,7 @@ void KNotesPart::slotSaveAs()
doc.setHtml(knoteItem->description());
if (htmlFormatAndSaveAsHtml) {
QString htmlStr = doc.toHtml();
- htmlStr.replace(QLatin1String("meta name=\"qrichtext\" content=\"1\""), \
QStringLiteral("meta http-equiv=\"Content-Type\" content=\"text/html; \
charset=UTF-8\"")); + htmlStr.replace(QStringLiteral("meta \
name=\"qrichtext\" content=\"1\""), QStringLiteral("meta http-equiv=\"Content-Type\" \
content=\"text/html; charset=UTF-8\"")); stream << htmlStr;
} else {
stream << knoteItem->realName() + QLatin1Char('\n');
diff --git a/knotes/kontactplugin/knotes_plugin.cpp \
b/knotes/kontactplugin/knotes_plugin.cpp index 675d9b0..1c72545 100644
--- a/knotes/kontactplugin/knotes_plugin.cpp
+++ b/knotes/kontactplugin/knotes_plugin.cpp
@@ -107,7 +107,7 @@ KontactInterface::Summary \
*KNotesPlugin::createSummaryWidget(QWidget *parentWidg
const KAboutData KNotesPlugin::aboutData()
{
- KAboutData aboutData = KAboutData(QLatin1String("knotes"),
+ KAboutData aboutData = KAboutData(QStringLiteral("knotes"),
xi18nc("@title", "KNotes"),
QLatin1String(KDEPIM_VERSION),
xi18nc("@title", "Popup Notes"),
diff --git a/knotes/kontactplugin/summarywidget.cpp \
b/knotes/kontactplugin/summarywidget.cpp index d73d994..eb24635 100644
--- a/knotes/kontactplugin/summarywidget.cpp
+++ b/knotes/kontactplugin/summarywidget.cpp
@@ -62,7 +62,7 @@ KNotesSummaryWidget::KNotesSummaryWidget(KontactInterface::Plugin \
*plugin, QWidg mPlugin(plugin),
mInProgress(false)
{
- mDefaultPixmap = KIconLoader::global()->loadIcon(QLatin1String("knotes"), \
KIconLoader::Desktop); + mDefaultPixmap = \
KIconLoader::global()->loadIcon(QStringLiteral("knotes"), KIconLoader::Desktop); \
QVBoxLayout *mainLayout = new QVBoxLayout(this); mainLayout->setSpacing(3);
mainLayout->setMargin(3);
@@ -94,7 +94,7 @@ KNotesSummaryWidget::KNotesSummaryWidget(KontactInterface::Plugin \
*plugin, QWidg mModelProxy->setSelectionModel(mSelectionModel);
mModelProxy->setSourceModel(mNoteTreeModel);
- KSharedConfigPtr _config = \
KSharedConfig::openConfig(QLatin1String("kcmknotessummaryrc")); + KSharedConfigPtr \
_config = KSharedConfig::openConfig(QStringLiteral("kcmknotessummaryrc"));
mModelState =
new KViewStateMaintainer<Akonadi::ETMViewStateSaver>(_config->group("CheckState"), \
this); @@ -152,11 +152,11 @@ void KNotesSummaryWidget::slotPopupMenu(const QString \
¬e) {
QMenu popup(this);
const QAction *modifyNoteAction = popup.addAction(
- \
KIconLoader::global()->loadIcon(QLatin1String("document-edit"), KIconLoader::Small), \
+ \
KIconLoader::global()->loadIcon(QStringLiteral("document-edit"), KIconLoader::Small), \
i18n("Modify Note...")); popup.addSeparator();
const QAction *deleteNoteAction = popup.addAction(
- \
KIconLoader::global()->loadIcon(QLatin1String("edit-delete"), KIconLoader::Small), + \
KIconLoader::global()->loadIcon(QStringLiteral("edit-delete"), KIconLoader::Small), \
i18n("Delete Note..."));
const QAction *ret = popup.exec(QCursor::pos());
diff --git a/knotes/notes/knote.cpp b/knotes/notes/knote.cpp
index ef469e7..6344623 100644
--- a/knotes/notes/knote.cpp
+++ b/knotes/notes/knote.cpp
@@ -162,7 +162,7 @@ void KNote::slotKill(bool force)
i18n("Confirm Delete"),
KGuiItem(i18n("&Delete"), QStringLiteral("edit-delete")),
KStandardGuiItem::cancel(),
- QLatin1String("ConfirmDeleteNote")) != KMessageBox::Continue)) {
+ QStringLiteral("ConfirmDeleteNote")) != KMessageBox::Continue)) \
{ return;
}
@@ -553,7 +553,7 @@ void KNote::slotSaveAs()
QTextStream stream(&file);
if (htmlFormatAndSaveAsHtml) {
QString htmlStr = m_editor->toHtml();
- htmlStr.replace(QLatin1String("meta name=\"qrichtext\" content=\"1\""), \
QStringLiteral("meta http-equiv=\"Content-Type\" content=\"text/html; \
charset=UTF-8\"")); + htmlStr.replace(QStringLiteral("meta \
name=\"qrichtext\" content=\"1\""), QStringLiteral("meta http-equiv=\"Content-Type\" \
content=\"text/html; charset=UTF-8\"")); stream << htmlStr;
} else {
stream << m_editor->toPlainText();
@@ -803,7 +803,7 @@ void KNote::createNoteHeader()
m_label->setAutoFillBackground(true);
m_label->installEventFilter(this); // receive events ( for dragging &
// action menu )
- m_button = new KNoteButton(QLatin1String("knotes_close"), this);
+ m_button = new KNoteButton(QStringLiteral("knotes_close"), this);
headerLayout->addWidget(m_button);
connect(m_button, &KNoteButton::clicked, this, &KNote::slotClose);
diff --git a/knotes/print/knotegrantleeprint.cpp \
b/knotes/print/knotegrantleeprint.cpp index dcf1659..82c840c 100644
--- a/knotes/print/knotegrantleeprint.cpp
+++ b/knotes/print/knotegrantleeprint.cpp
@@ -36,7 +36,7 @@ KNoteGrantleePrint::KNoteGrantleePrint(const QString &themePath, \
QObject *parent mTemplateLoader->setTemplateDirs(QStringList() << themePath);
mEngine->addTemplateLoader(mTemplateLoader);
- mSelfcontainedTemplate = mEngine->loadByName(QLatin1String("theme.html"));
+ mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("theme.html"));
if (mSelfcontainedTemplate->error()) {
mErrorMessage = mSelfcontainedTemplate->errorString() + \
QLatin1String("<br>"); }
diff --git a/knotes/print/knoteprintselectthemecombobox.cpp \
b/knotes/print/knoteprintselectthemecombobox.cpp index 3b022f5..bbd7478 100644
--- a/knotes/print/knoteprintselectthemecombobox.cpp
+++ b/knotes/print/knoteprintselectthemecombobox.cpp
@@ -39,7 +39,7 @@ void KNotePrintSelectThemeComboBox::loadThemes()
clear();
const QString defaultTheme = KNotesGlobalConfig::self()->theme();
- const QString relativePath = QLatin1String("knotes/print/themes/");
+ const QString relativePath = QStringLiteral("knotes/print/themes/");
QStringList themesDirectories = \
QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, relativePath, \
QStandardPaths::LocateDirectory); if (themesDirectories.count() < 2) {
//Make sure to add local directory
diff --git a/libksieve/ksieveui/editor/sieveeditorwidget.cpp \
b/libksieve/ksieveui/editor/sieveeditorwidget.cpp index ea854ac..312ad73 100644
--- a/libksieve/ksieveui/editor/sieveeditorwidget.cpp
+++ b/libksieve/ksieveui/editor/sieveeditorwidget.cpp
@@ -106,6 +106,8 @@ SieveEditorWidget::SieveEditorWidget(bool useMenuBar, QWidget \
*parent)
connect(menuBar, &SieveEditorMenuBar::gotoLine, this, \
&SieveEditorWidget::goToLine);
connect(menuBar, &SieveEditorMenuBar::comment, this, \
&SieveEditorWidget::comment);
connect(menuBar, &SieveEditorMenuBar::uncomment, this, \
&SieveEditorWidget::uncomment); + connect(menuBar, \
&SieveEditorMenuBar::zoomIn, this, &SieveEditorWidget::zoomIn); + \
connect(menuBar, &SieveEditorMenuBar::zoomOut, this, &SieveEditorWidget::zoomOut);
connect(this, &SieveEditorWidget::copyAvailable, menuBar, \
&SieveEditorMenuBar::slotCopyAvailable);
connect(this, &SieveEditorWidget::redoAvailable, menuBar, \
&SieveEditorMenuBar::slotRedoAvailable);
diff --git a/mailcommon/filter/filterimporter/filterimporterbalsa.cpp \
b/mailcommon/filter/filterimporter/filterimporterbalsa.cpp index be370c7..143fa5b \
100644
--- a/mailcommon/filter/filterimporter/filterimporterbalsa.cpp
+++ b/mailcommon/filter/filterimporter/filterimporterbalsa.cpp
@@ -61,24 +61,24 @@ void FilterImporterBalsa::readConfig(KConfig *config)
void FilterImporterBalsa::parseFilter(const KConfigGroup &grp)
{
MailCommon::MailFilter *filter = new MailCommon::MailFilter();
- const QString name = grp.readEntry(QLatin1String("Name"));
+ const QString name = grp.readEntry(QStringLiteral("Name"));
filter->pattern()->setName(name);
filter->setToolbarName(name);
//TODO not implemented in kmail.
- const QString popupText = grp.readEntry(QLatin1String("Popup-text"));
+ const QString popupText = grp.readEntry(QStringLiteral("Popup-text"));
- const QString sound = grp.readEntry(QLatin1String("Sound"));
+ const QString sound = grp.readEntry(QStringLiteral("Sound"));
if (!sound.isEmpty()) {
const QString actionName = QLatin1String("play sound");
createFilterAction(filter, actionName, sound);
}
- const int actionType = grp.readEntry(QLatin1String("Action-type"), -1);
- const QString actionStr = grp.readEntry(QLatin1String("Action-string"));
+ const int actionType = grp.readEntry(QStringLiteral("Action-type"), -1);
+ const QString actionStr = grp.readEntry(QStringLiteral("Action-string"));
parseAction(actionType, actionStr, filter);
- const QString condition = grp.readEntry(QLatin1String("Condition"));
+ const QString condition = grp.readEntry(QStringLiteral("Condition"));
parseCondition(condition, filter);
appendFilter(filter);
diff --git a/mailcommon/folder/foldercollection.cpp \
b/mailcommon/folder/foldercollection.cpp index 9de19cf..70e543f 100644
--- a/mailcommon/folder/foldercollection.cpp
+++ b/mailcommon/folder/foldercollection.cpp
@@ -190,7 +190,7 @@ void FolderCollection::readConfig()
mHideInSelectionDialog = configGroup.readEntry("HideInSelectionDialog", false);
if (configGroup.hasKey(QLatin1String("IgnoreNewMail"))) {
- if (configGroup.readEntry(QLatin1String("IgnoreNewMail"), false)) {
+ if (configGroup.readEntry(QStringLiteral("IgnoreNewMail"), false)) {
//migrate config.
Akonadi::NewMailNotifierAttribute *newMailNotifierAttr = \
mCollection.attribute<Akonadi::NewMailNotifierAttribute>(Akonadi::Entity::AddIfMissing);
newMailNotifierAttr->setIgnoreNewMail(true);
diff --git a/mailimporter/filter_thunderbird.cpp \
b/mailimporter/filter_thunderbird.cpp index 554f4be..2f22f26 100644
--- a/mailimporter/filter_thunderbird.cpp
+++ b/mailimporter/filter_thunderbird.cpp
@@ -82,7 +82,7 @@ QMap<QString, QString> FilterThunderbird::listProfile(QString \
¤tProfile, c if (uniqProfile) {
KConfigGroup group = config.group(profileList.at(0));
const QString path = group.readEntry("Path");
- const QString name = group.readEntry(QLatin1String("Name"));
+ const QString name = group.readEntry(QStringLiteral("Name"));
currentProfile = path;
lstProfile.insert(name, path);
return lstProfile;
@@ -90,7 +90,7 @@ QMap<QString, QString> FilterThunderbird::listProfile(QString \
¤tProfile, c Q_FOREACH (const QString &profileName, profileList) {
KConfigGroup group = config.group(profileName);
const QString path = group.readEntry("Path");
- const QString name = group.readEntry(QLatin1String("Name"));
+ const QString name = group.readEntry(QStringLiteral("Name"));
if (group.hasKey("Default") && (group.readEntry("Default", 0) == 1)) \
{ currentProfile = path;
}
diff --git a/messagelist/core/manager.cpp b/messagelist/core/manager.cpp
index 54e6a8d..29b2a6e 100644
--- a/messagelist/core/manager.cpp
+++ b/messagelist/core/manager.cpp
@@ -504,7 +504,7 @@ const Theme *Manager::defaultTheme()
{
KConfigGroup conf(Settings::self()->config(), \
MessageList::Util::storageModelThemesGroup());
- const QString themeId = conf.readEntry(QLatin1String("DefaultSet"), "");
+ const QString themeId = conf.readEntry(QStringLiteral("DefaultSet"), "");
Theme *opt = Q_NULLPTR;
diff --git a/messagelist/pane.cpp b/messagelist/pane.cpp
index 22f8538..1cf9af9 100644
--- a/messagelist/pane.cpp
+++ b/messagelist/pane.cpp
@@ -1088,7 +1088,7 @@ void Pane::readConfig(bool restoreSession)
{
if (MessageList::Core::Settings::self()->config()->hasGroup(QLatin1String("MessageListPane"))) \
{
KConfigGroup conf(MessageList::Core::Settings::self()->config(), \
"MessageListPane");
- const int numberOfTab = conf.readEntry(QLatin1String("tabNumber"), 0);
+ const int numberOfTab = conf.readEntry(QStringLiteral("tabNumber"), 0);
if (numberOfTab == 0) {
createNewTab();
} else {
@@ -1097,7 +1097,7 @@ void Pane::readConfig(bool restoreSession)
restoreHeaderSettings(i);
if (restoreSession) {
#if 0 //TODO fix me
- Akonadi::Collection::Id id = \
grp.readEntry(QLatin1String("collectionId"), -1); + \
Akonadi::Collection::Id id = grp.readEntry(QStringLiteral("collectionId"), -1); \
ETMViewStateSaver *saver = new ETMViewStateSaver; \
saver->setSelectionModel(selectionModel);
@@ -1111,7 +1111,7 @@ void Pane::readConfig(bool restoreSession)
#endif
}
}
- setCurrentIndex(conf.readEntry(QLatin1String("currentIndex"), 0));
+ setCurrentIndex(conf.readEntry(QStringLiteral("currentIndex"), 0));
}
} else {
createNewTab();
@@ -1124,7 +1124,7 @@ void Pane::restoreHeaderSettings(int index)
KConfigGroup grp(MessageList::Core::Settings::self()->config(), \
QString::fromLatin1("MessageListTab%1").arg(index)); if (grp.exists()) {
Widget *w = qobject_cast<Widget *>(widget(index));
- w->view()->header()->restoreState(grp.readEntry(QLatin1String("HeaderState"), \
QByteArray())); + \
w->view()->header()->restoreState(grp.readEntry(QStringLiteral("HeaderState"), \
QByteArray())); }
}
diff --git a/messagelist/widget.cpp b/messagelist/widget.cpp
index 0b2ba25..ef69c14 100644
--- a/messagelist/widget.cpp
+++ b/messagelist/widget.cpp
@@ -222,7 +222,7 @@ void Widget::slotTagsFetched(KJob *job)
Akonadi::TagFetchJob *fetchJob = static_cast<Akonadi::TagFetchJob *>(job);
KConfigGroup conf(MessageList::Core::Settings::self()->config(), \
"MessageListView");
- const QString tagSelected = conf.readEntry(QLatin1String("TagSelected"));
+ const QString tagSelected = conf.readEntry(QStringLiteral("TagSelected"));
if (tagSelected.isEmpty()) {
setCurrentStatusFilterItem();
return;
diff --git a/messageviewer/adblock/adblockmanager.cpp \
b/messageviewer/adblock/adblockmanager.cpp index 81ea3f8..e553a6f 100644
--- a/messageviewer/adblock/adblockmanager.cpp
+++ b/messageviewer/adblock/adblockmanager.cpp
@@ -112,20 +112,20 @@ void AdBlockManager::loadSettings()
const QStringList itemList = \
config.groupList().filter(QRegExp(QLatin1String("FilterList \\d+"))); Q_FOREACH \
(const QString &item, itemList) { KConfigGroup filtersGroup(&config, item);
- const bool isFilterEnabled = \
filtersGroup.readEntry(QLatin1String("FilterEnabled"), false); + const bool \
isFilterEnabled = filtersGroup.readEntry(QStringLiteral("FilterEnabled"), false); if \
(!isFilterEnabled) { continue;
}
- const QString url = filtersGroup.readEntry(QLatin1String("url"));
+ const QString url = filtersGroup.readEntry(QStringLiteral("url"));
if (url.isEmpty()) {
continue;
}
- const QString path = filtersGroup.readEntry(QLatin1String("path"));
+ const QString path = filtersGroup.readEntry(QStringLiteral("path"));
if (path.isEmpty()) {
continue;
}
- const QDateTime lastDateTime = \
filtersGroup.readEntry(QLatin1String("lastUpdate"), QDateTime()); + const \
QDateTime lastDateTime = filtersGroup.readEntry(QStringLiteral("lastUpdate"), \
QDateTime());
if (!lastDateTime.isValid() || today > lastDateTime.addDays(days) || \
!QFile(path).exists()) { updateSubscription(path, url, item);
} else {
diff --git a/messageviewer/adblock/adblocksettingwidget.cpp \
b/messageviewer/adblock/adblocksettingwidget.cpp index 60f84d8..1158c16 100644
--- a/messageviewer/adblock/adblocksettingwidget.cpp
+++ b/messageviewer/adblock/adblocksettingwidget.cpp
@@ -205,11 +205,11 @@ void AdBlockSettingWidget::doLoadFromGlobalSettings()
const QStringList itemList = \
config.groupList().filter(QRegExp(QLatin1String("FilterList \\d+"))); Q_FOREACH \
(const QString &item, itemList) { KConfigGroup filtersGroup(&config, item);
- const bool isFilterEnabled = \
filtersGroup.readEntry(QLatin1String("FilterEnabled"), false);
- const QString url = filtersGroup.readEntry(QLatin1String("url"));
- const QString path = filtersGroup.readEntry(QLatin1String("path"));
- const QString name = filtersGroup.readEntry(QLatin1String("name"));
- const QDateTime lastUpdate = \
filtersGroup.readEntry(QLatin1String("lastUpdate"), QDateTime()); + const bool \
isFilterEnabled = filtersGroup.readEntry(QStringLiteral("FilterEnabled"), false); + \
const QString url = filtersGroup.readEntry(QStringLiteral("url")); + const \
QString path = filtersGroup.readEntry(QStringLiteral("path")); + const QString \
name = filtersGroup.readEntry(QStringLiteral("name")); + const QDateTime \
lastUpdate = filtersGroup.readEntry(QStringLiteral("lastUpdate"), QDateTime()); if \
(url.isEmpty() || path.isEmpty() || name.isEmpty()) { continue;
}
diff --git a/pimcommon/translator/translatorwidget.cpp \
b/pimcommon/translator/translatorwidget.cpp index cfd2975..a21d041 100644
--- a/pimcommon/translator/translatorwidget.cpp
+++ b/pimcommon/translator/translatorwidget.cpp
@@ -195,8 +195,8 @@ void TranslatorWidget::writeConfig()
void TranslatorWidget::readConfig()
{
KConfigGroup myGroup(KSharedConfig::openConfig(), "TranslatorWidget");
- const QString from = myGroup.readEntry(QLatin1String("FromLanguage"));
- const QString to = myGroup.readEntry(QLatin1String("ToLanguage"));
+ const QString from = myGroup.readEntry(QStringLiteral("FromLanguage"));
+ const QString to = myGroup.readEntry(QStringLiteral("ToLanguage"));
if (from.isEmpty()) {
return;
}
diff --git a/pimsettingexporter/core/addressbook/importaddressbookjob.cpp \
b/pimsettingexporter/core/addressbook/importaddressbookjob.cpp index 610a1c8..a267e8f \
100644
--- a/pimsettingexporter/core/addressbook/importaddressbookjob.cpp
+++ b/pimsettingexporter/core/addressbook/importaddressbookjob.cpp
@@ -148,13 +148,13 @@ void \
ImportAddressbookJob::addSpecificResourceSettings(KSharedConfig::Ptr resour if \
(resourceName == QLatin1String("akonadi_vcard_resource")) {
KConfigGroup general = resourceConfig->group(QLatin1String("General"));
if (general.hasKey(QLatin1String("DisplayName"))) {
- settings.insert(QLatin1String("DisplayName"), \
general.readEntry(QLatin1String("DisplayName"))); + \
settings.insert(QLatin1String("DisplayName"), \
general.readEntry(QStringLiteral("DisplayName"))); }
if (general.hasKey(QLatin1String("ReadOnly"))) {
- settings.insert(QLatin1String("ReadOnly"), \
general.readEntry(QLatin1String("ReadOnly"), false)); + \
settings.insert(QLatin1String("ReadOnly"), \
general.readEntry(QStringLiteral("ReadOnly"), false)); }
if (general.hasKey(QLatin1String("MonitorFile"))) {
- settings.insert(QLatin1String("MonitorFile"), \
general.readEntry(QLatin1String("MonitorFile"), true)); + \
settings.insert(QLatin1String("MonitorFile"), \
general.readEntry(QStringLiteral("MonitorFile"), true)); }
}
}
diff --git a/pimsettingexporter/core/calendar/importcalendarjob.cpp \
b/pimsettingexporter/core/calendar/importcalendarjob.cpp index 34931d4..7cd8128 \
100644
--- a/pimsettingexporter/core/calendar/importcalendarjob.cpp
+++ b/pimsettingexporter/core/calendar/importcalendarjob.cpp
@@ -145,13 +145,13 @@ void \
ImportCalendarJob::addSpecificResourceSettings(KSharedConfig::Ptr resourceC if \
(resourceName == QLatin1String("akonadi_ical_resource")) {
KConfigGroup general = resourceConfig->group(QLatin1String("General"));
if (general.hasKey(QLatin1String("DisplayName"))) {
- settings.insert(QLatin1String("DisplayName"), \
general.readEntry(QLatin1String("DisplayName"))); + \
settings.insert(QLatin1String("DisplayName"), \
general.readEntry(QStringLiteral("DisplayName"))); }
if (general.hasKey(QLatin1String("ReadOnly"))) {
- settings.insert(QLatin1String("ReadOnly"), \
general.readEntry(QLatin1String("ReadOnly"), false)); + \
settings.insert(QLatin1String("ReadOnly"), \
general.readEntry(QStringLiteral("ReadOnly"), false)); }
if (general.hasKey(QLatin1String("MonitorFile"))) {
- settings.insert(QLatin1String("MonitorFile"), \
general.readEntry(QLatin1String("MonitorFile"), true)); + \
settings.insert(QLatin1String("MonitorFile"), \
general.readEntry(QStringLiteral("MonitorFile"), true)); }
}
}
diff --git a/pimsettingexporter/core/mail/exportmailjob.cpp \
b/pimsettingexporter/core/mail/exportmailjob.cpp index f7e2ef7..977a5dd 100644
--- a/pimsettingexporter/core/mail/exportmailjob.cpp
+++ b/pimsettingexporter/core/mail/exportmailjob.cpp
@@ -430,7 +430,7 @@ void ExportMailJob::backupIdentity()
if (group.hasKey(vcard)) {
const QString vcardFileName = group.readEntry(vcard);
if (!vcardFileName.isEmpty()) {
- const int uoid = group.readEntry(QLatin1String("uoid"), -1);
+ const int uoid = group.readEntry(QStringLiteral("uoid"), -1);
QFile file(vcardFileName);
if (file.exists()) {
const bool fileAdded = \
archive()->addLocalFile(vcardFileName, Utils::identitiesPath() + \
QString::number(uoid) + QDir::separator() + file.fileName());
diff --git a/pimsettingexporter/core/mail/importmailjob.cpp \
b/pimsettingexporter/core/mail/importmailjob.cpp index ab1a61d..04bdcdc 100644
--- a/pimsettingexporter/core/mail/importmailjob.cpp
+++ b/pimsettingexporter/core/mail/importmailjob.cpp
@@ -177,15 +177,15 @@ void ImportMailJob::restoreTransports()
int defaultTransport = -1;
if (transportConfig->hasGroup(QLatin1String("General"))) {
KConfigGroup group = \
transportConfig->group(QLatin1String("General"));
- defaultTransport = \
group.readEntry(QLatin1String("default-transport"), -1); + \
defaultTransport = group.readEntry(QStringLiteral("default-transport"), -1); }
const QStringList transportList = \
transportConfig->groupList().filter(QRegExp(QLatin1String("Transport \\d+"))); \
Q_FOREACH (const QString &transport, transportList) { KConfigGroup group = \
transportConfig->group(transport);
- const int transportId = group.readEntry(QLatin1String("id"), -1);
+ const int transportId = group.readEntry(QStringLiteral("id"), -1);
MailTransport::Transport *mt = \
MailTransport::TransportManager::self()->createTransport();
- mt->setName(group.readEntry(QLatin1String("name")));
+ mt->setName(group.readEntry(QStringLiteral("name")));
const QString hostStr(QLatin1String("host"));
if (group.hasKey(hostStr)) {
mt->setHost(group.readEntry(hostStr));
@@ -500,31 +500,31 @@ void ImportMailJob::restoreMails()
KConfigGroup general = \
resourceConfig->group(QLatin1String("General")); if \
(general.hasKey(QLatin1String("DisplayName"))) {
- settings.insert(QLatin1String("DisplayName"), \
general.readEntry(QLatin1String("DisplayName"))); + \
settings.insert(QLatin1String("DisplayName"), \
general.readEntry(QStringLiteral("DisplayName"))); }
if (general.hasKey(QLatin1String("ReadOnly"))) {
- settings.insert(QLatin1String("ReadOnly"), \
general.readEntry(QLatin1String("ReadOnly"), false)); + \
settings.insert(QLatin1String("ReadOnly"), \
general.readEntry(QStringLiteral("ReadOnly"), false)); }
if (general.hasKey(QLatin1String("MonitorFile"))) {
- settings.insert(QLatin1String("MonitorFile"), \
general.readEntry(QLatin1String("MonitorFile"), false)); + \
settings.insert(QLatin1String("MonitorFile"), \
general.readEntry(QStringLiteral("MonitorFile"), false)); }
if (resourceConfig->hasGroup(QLatin1String("Locking"))) {
KConfigGroup locking = \
resourceConfig->group(QLatin1String("Locking")); if \
(locking.hasKey(QLatin1String("Lockfile"))) {
- settings.insert(QLatin1String("Lockfile"), \
locking.readEntry(QLatin1String("Lockfile"))); + \
settings.insert(QLatin1String("Lockfile"), \
locking.readEntry(QStringLiteral("Lockfile"))); }
//TODO verify
if (locking.hasKey(QLatin1String("LockfileMethod"))) {
- settings.insert(QLatin1String("LockfileMethod"), \
locking.readEntry(QLatin1String("LockfileMethod"), 4)); + \
settings.insert(QLatin1String("LockfileMethod"), \
locking.readEntry(QStringLiteral("LockfileMethod"), 4)); }
}
if (resourceConfig->hasGroup(QLatin1String("Compacting"))) {
KConfigGroup compacting = \
resourceConfig->group(QLatin1String("Compacting"));
if (compacting.hasKey(QLatin1String("CompactFrequency"))) {
- settings.insert(QLatin1String("CompactFrequency"), \
compacting.readEntry(QLatin1String("CompactFrequency"), 1)); + \
settings.insert(QLatin1String("CompactFrequency"), \
compacting.readEntry(QStringLiteral("CompactFrequency"), 1)); }
if (compacting.hasKey(QLatin1String("MessageCount"))) {
- settings.insert(QLatin1String("MessageCount"), \
compacting.readEntry(QLatin1String("MessageCount"), 50)); + \
settings.insert(QLatin1String("MessageCount"), \
compacting.readEntry(QStringLiteral("MessageCount"), 50)); }
}
const QString newResource = \
mCreateResource->createResource(QStringLiteral("akonadi_mbox_resource"), filename, \
settings); @@ -538,13 +538,13 @@ void ImportMailJob::restoreMails()
settings.insert(QLatin1String("Path"), newUrl.path());
KConfigGroup general = \
resourceConfig->group(QLatin1String("General"));
if (general.hasKey(QLatin1String("TopLevelIsContainer"))) {
- settings.insert(QLatin1String("TopLevelIsContainer"), \
general.readEntry(QLatin1String("TopLevelIsContainer"), false)); + \
settings.insert(QLatin1String("TopLevelIsContainer"), \
general.readEntry(QStringLiteral("TopLevelIsContainer"), false)); }
if (general.hasKey(QLatin1String("ReadOnly"))) {
- settings.insert(QLatin1String("ReadOnly"), \
general.readEntry(QLatin1String("ReadOnly"), false)); + \
settings.insert(QLatin1String("ReadOnly"), \
general.readEntry(QStringLiteral("ReadOnly"), false)); }
if (general.hasKey(QLatin1String("MonitorFilesystem"))) {
- settings.insert(QLatin1String("MonitorFilesystem"), \
general.readEntry(QLatin1String("MonitorFilesystem"), true)); + \
settings.insert(QLatin1String("MonitorFilesystem"), \
general.readEntry(QStringLiteral("MonitorFilesystem"), true)); }
const QString newResource = \
mCreateResource->createResource(resourceName.contains(QLatin1String("akonadi_mixedmaildir_resource_")) \
? @@ -856,7 +856,7 @@ void ImportMailJob::restoreIdentity()
fileIdentity->copyTo(mTempDirName);
KSharedConfig::Ptr identityConfig = \
KSharedConfig::openConfig(mTempDirName + QLatin1Char('/') + \
QLatin1String("emailidentities"));
KConfigGroup general = identityConfig->group(QLatin1String("General"));
- const int defaultIdentity = general.readEntry(QLatin1String("Default \
Identity"), -1); + const int defaultIdentity = \
general.readEntry(QStringLiteral("Default Identity"), -1);
const QStringList identityList = \
identityConfig->groupList().filter(QRegExp(QLatin1String("Identity #\\d+"))); \
Q_FOREACH (const QString &identityStr, identityList) { @@ -899,7 +899,7 @@ void \
ImportMailJob::restoreIdentity() }
}
}
- QString name = group.readEntry(QLatin1String("Name"));
+ QString name = group.readEntry(QStringLiteral("Name"));
KIdentityManagement::Identity *identity = \
&mIdentityManager->newFromScratch(uniqueIdentityName(name)); \
group.writeEntry(QLatin1String("Name"), name); @@ -1019,7 +1019,7 @@ void \
ImportMailJob::importFolderArchiveConfig(const KArchiveFile *archiveconfigu
Q_FOREACH (const QString &str, archiveList) {
KConfigGroup oldGroup = archiveConfig->group(str);
- const Akonadi::Collection::Id id = \
convertPathToId(oldGroup.readEntry(QLatin1String("topLevelCollectionId"))); + \
const Akonadi::Collection::Id id = \
convertPathToId(oldGroup.readEntry(QStringLiteral("topLevelCollectionId"))); if (id \
!= -1) {
oldGroup.writeEntry(QLatin1String("topLevelCollectionId"), id);
}
@@ -1120,7 +1120,7 @@ void ImportMailJob::importKmailConfig(const KArchiveFile \
*kmailsnippet, const QS const QString accountOrder(QLatin1String("AccountOrder"));
if (kmailConfig->hasGroup(accountOrder)) {
KConfigGroup group = kmailConfig->group(accountOrder);
- QStringList orderList = group.readEntry(QLatin1String("order"), \
QStringList()); + QStringList orderList = \
group.readEntry(QStringLiteral("order"), QStringList()); QStringList newOrderList;
if (!orderList.isEmpty()) {
Q_FOREACH (const QString &account, orderList) {
@@ -1202,13 +1202,13 @@ void ImportMailJob::mergeLdapConfig(const KArchiveFile \
*archivefile, const QStri
KSharedConfig::Ptr existingConfig = KSharedConfig::openConfig(filename);
KConfigGroup grpExisting = existingConfig->group(QLatin1String("LDAP"));
- int existingNumberHosts = grpExisting.readEntry(QLatin1String("NumHosts"), 0);
- int existingNumberSelectedHosts = \
grpExisting.readEntry(QLatin1String("NumSelectedHosts"), 0); + int \
existingNumberHosts = grpExisting.readEntry(QStringLiteral("NumHosts"), 0); + int \
existingNumberSelectedHosts = \
grpExisting.readEntry(QStringLiteral("NumSelectedHosts"), 0);
KSharedConfig::Ptr importingLdapConfig = KSharedConfig::openConfig(copyToDirName \
+ QLatin1Char('/') + filename);
KConfigGroup grpImporting = importingLdapConfig->group(QLatin1String("LDAP"));
- int importingNumberHosts = grpImporting.readEntry(QLatin1String("NumHosts"), 0);
- int importingNumberSelectedHosts = \
grpImporting.readEntry(QLatin1String("NumSelectedHosts"), 0); + int \
importingNumberHosts = grpImporting.readEntry(QStringLiteral("NumHosts"), 0); + \
int importingNumberSelectedHosts = \
grpImporting.readEntry(QStringLiteral("NumSelectedHosts"), 0);
grpExisting.writeEntry(QLatin1String("NumHosts"), (existingNumberHosts + \
importingNumberHosts));
grpExisting.writeEntry(QLatin1String("NumSelectedHosts"), \
(existingNumberSelectedHosts + importingNumberSelectedHosts)); @@ -1294,17 +1294,17 \
@@ void ImportMailJob::mergeSieveTemplate(const KArchiveFile \
*archivefile, const QS
KSharedConfig::Ptr importingSieveTemplateConfig = \
KSharedConfig::openConfig(copyToDirName + QLatin1Char('/') + filename);
KConfigGroup grpExisting = existingConfig->group(QLatin1String("template"));
- int numberOfExistingTemplate = \
grpExisting.readEntry(QLatin1String("templateCount"), 0); + int \
numberOfExistingTemplate = grpExisting.readEntry(QStringLiteral("templateCount"), 0); \
KConfigGroup grpImportExisting = \
importingSieveTemplateConfig->group(QLatin1String("template"));
- const int numberOfImportingTemplate = \
grpImportExisting.readEntry(QLatin1String("templateCount"), 0); + const int \
numberOfImportingTemplate = \
grpImportExisting.readEntry(QStringLiteral("templateCount"), 0);
for (int i = 0; i < numberOfImportingTemplate; ++i) {
KConfigGroup templateDefine = \
importingSieveTemplateConfig->group(QString::fromLatin1("templateDefine_%1").arg(i)); \
KConfigGroup newTemplateDefineGrp = \
existingConfig->group(QString::fromLatin1("templateDefine_%1").arg(numberOfExistingTemplate));
- newTemplateDefineGrp.writeEntry(QLatin1String("Name"), \
templateDefine.readEntry(QLatin1String("Name")));
- newTemplateDefineGrp.writeEntry(QLatin1String("Text"), \
templateDefine.readEntry(QLatin1String("Text"))); + \
newTemplateDefineGrp.writeEntry(QLatin1String("Name"), \
templateDefine.readEntry(QStringLiteral("Name"))); + \
newTemplateDefineGrp.writeEntry(QLatin1String("Text"), \
templateDefine.readEntry(QStringLiteral("Text"))); ++numberOfExistingTemplate;
newTemplateDefineGrp.sync();
}
diff --git a/pimsettingexporter/core/utils.cpp b/pimsettingexporter/core/utils.cpp
index 078f8aa6..be85019 100644
--- a/pimsettingexporter/core/utils.cpp
+++ b/pimsettingexporter/core/utils.cpp
@@ -139,7 +139,7 @@ QUrl Utils::adaptResourcePath(KSharedConfigPtr resourceConfig, \
const QString &st QUrl Utils::resourcePath(KSharedConfigPtr resourceConfig, const \
QString &defaultPath) {
KConfigGroup group = resourceConfig->group(QLatin1String("General"));
- QString url = group.readEntry(QLatin1String("Path"), defaultPath);
+ QString url = group.readEntry(QStringLiteral("Path"), defaultPath);
if (!url.isEmpty()) {
url.replace(QLatin1String("$HOME"), QDir::homePath());
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic