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/importwiz= ard/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 =3D=3D QLatin1String("LibBalsaAddressBookVcard")) { - const QString path =3D grp.readEntry(QLatin1String("Path")); + const QString path =3D grp.readEntry(QStringLiteral("Path")); if (!path.isEmpty()) { QMap 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 &g= rp) break; } = - const QString ssl =3D grp.readEntry(QLatin1String("SSL")); + const QString ssl =3D grp.readEntry(QStringLiteral("SSL")); if (ssl =3D=3D QLatin1String("true")) { mt->setEncryption(MailTransport::Transport::EnumEncryption::SSL); } else if (ssl =3D=3D QLatin1String("false")) { @@ -155,7 +155,7 @@ void BalsaSettings::readTransport(const KConfigGroup &g= rp) qCDebug(IMPORTWIZARD_LOG) << " unknown ssl value :" << ssl; } = - const QString anonymous =3D grp.readEntry(QLatin1String("Anonymous")); + const QString anonymous =3D grp.readEntry(QStringLiteral("Anonymous")); = //TODO storeTransport(mt, /*( smtp =3D=3D defaultSmtp )*/true); //FIXME diff --git a/importwizard/autodetect/claws-mail/clawsmailsettings.cpp b/imp= ortwizard/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 &fil= ename, const QString &p if (configCommon.hasGroup("Common")) { KConfigGroup common =3D configCommon.group("Common"); checkMailOnStartup =3D (common.readEntry("check_on_startup", 1= ) =3D=3D 1); - if (common.readEntry(QLatin1String("autochk_newmail"), 1) =3D= =3D 1) { - intervalCheckMail =3D common.readEntry(QLatin1String("auto= chk_interval"), -1); + if (common.readEntry(QStringLiteral("autochk_newmail"), 1) =3D= =3D 1) { + intervalCheckMail =3D common.readEntry(QStringLiteral("aut= ochk_interval"), -1); } readGlobalSettings(common); } @@ -102,21 +102,21 @@ void ClawsMailSettings::readSettingsColor(const KConf= igGroup &group) } //[Reader] QuotedText3 } - const QString misspellColor =3D group.readEntry(QLatin1String("mis= spelled_color")); + const QString misspellColor =3D group.readEntry(QStringLiteral("mi= sspelled_color")); if (!misspellColor.isEmpty()) { const QColor col =3D QColor(misspellColor); if (col.isValid()) { addKmailConfig(QLatin1String("Reader"), QStringLiteral("Mi= sspelledColor"), writeColor(col)); } } - const QString uriColor =3D group.readEntry(QLatin1String("uri_colo= r")); + const QString uriColor =3D group.readEntry(QStringLiteral("uri_col= or")); if (!uriColor.isEmpty()) { const QColor col(uriColor); if (col.isValid()) { addKmailConfig(QLatin1String("Reader"), QStringLiteral("Li= nkColor"), writeColor(col)); } } - const QString newColor =3D group.readEntry(QLatin1String("color_ne= w")); + const QString newColor =3D group.readEntry(QStringLiteral("color_n= ew")); 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 =3D group.readEntry(QLatin1String("co= mpose_body_format")); + const QString composerNewMessage =3D group.readEntry(QStringLiteral("c= ompose_body_format")); if (!composerNewMessage.isEmpty()) { addKmailConfig(QLatin1String("TemplateParser"), QStringLiteral("Te= mplateNewMessage"), 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 =3D grp.readEntry(QLatin1String("Leave On = Server"), -1); + const int leaveOnServer =3D grp.readEntry(QStringLiteral("Leave On= Server"), -1); if (leaveOnServer =3D=3D 1) { settings.insert(QLatin1String("LeaveOnServer"), true); } else if (leaveOnServer =3D=3D 0) { @@ -111,9 +111,9 @@ void OperaSettings::readAccount(const KConfigGroup &grp) qCDebug(IMPORTWIZARD_LOG) << " leave on server option unknown = : " << leaveOnServer; } = - const int removeMailFromSever =3D grp.readEntry(QLatin1String("Rem= ove From Server Delay Enabled"), -1); + const int removeMailFromSever =3D grp.readEntry(QStringLiteral("Re= move From Server Delay Enabled"), -1); if (removeMailFromSever =3D=3D 1) { - int removeDelay =3D grp.readEntry(QLatin1String("Remove From S= erver Delay"), -1); + int removeDelay =3D grp.readEntry(QStringLiteral("Remove From = Server Delay"), -1); if (removeDelay !=3D -1) { //Opera store delay as second !!! :) removeDelay =3D removeDelay / (24 * 60 * 60); @@ -125,7 +125,7 @@ void OperaSettings::readAccount(const KConfigGroup &grp) settings.insert(QLatin1String("Port"), port); } //TODO: - const int delay =3D grp.readEntry(QLatin1String("Initial Poll Dela= y"), -1); + const int delay =3D grp.readEntry(QStringLiteral("Initial Poll Del= ay"), -1); Q_UNUSED(delay); = if (pollInterval =3D=3D 0) { @@ -171,12 +171,12 @@ void OperaSettings::readAccount(const KConfigGroup &g= rp) = void OperaSettings::readTransport(const KConfigGroup &grp) { - const QString outgoingProtocol =3D grp.readEntry(QLatin1String("Outgoi= ng Protocol")); + const QString outgoingProtocol =3D grp.readEntry(QStringLiteral("Outgo= ing Protocol")); if (outgoingProtocol =3D=3D QLatin1String("SMTP")) { - const int authMethod =3D grp.readEntry(QLatin1String("Outgoing Aut= hentication Method"), -1); + const int authMethod =3D grp.readEntry(QStringLiteral("Outgoing Au= thentication Method"), -1); MailTransport::Transport *mt =3D createTransport(); - const int port =3D grp.readEntry(QLatin1String("Outgoing Port"), -= 1); - const int secure =3D grp.readEntry(QLatin1String("Secure Connectio= n Out"), -1); + const int port =3D grp.readEntry(QStringLiteral("Outgoing Port"), = -1); + const int secure =3D grp.readEntry(QStringLiteral("Secure Connecti= on Out"), -1); if (secure =3D=3D 1) { mt->setEncryption(MailTransport::Transport::EnumEncryption::TL= S); } @@ -184,15 +184,15 @@ void OperaSettings::readTransport(const KConfigGroup = &grp) mt->setPort(port); } = - const QString hostName =3D grp.readEntry(QLatin1String("Outgoing S= ervername")); + const QString hostName =3D grp.readEntry(QStringLiteral("Outgoing = Servername")); mt->setHost(hostName); = - const QString userName =3D grp.readEntry(QLatin1String("Outgoing U= sername")); + const QString userName =3D grp.readEntry(QStringLiteral("Outgoing = Username")); if (!userName.isEmpty()) { mt->setUserName(userName); } = - const int outgoingTimeOut =3D grp.readEntry(QLatin1String("Outgoin= g Timeout"), -1); //TODO ? + const int outgoingTimeOut =3D grp.readEntry(QStringLiteral("Outgoi= ng 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 =3D grp.readEntry(QLatin1String("Real Name")); + QString realName =3D grp.readEntry(QStringLiteral("Real Name")); KIdentityManagement::Identity *newIdentity =3D createIdentity(realName= ); - const QString cc =3D grp.readEntry(QLatin1String("Auto CC")); + const QString cc =3D grp.readEntry(QStringLiteral("Auto CC")); newIdentity->setCc(cc); = - const QString bcc =3D grp.readEntry(QLatin1String("Auto BCC")); + const QString bcc =3D grp.readEntry(QStringLiteral("Auto BCC")); newIdentity->setBcc(bcc); = - const QString replyTo =3D grp.readEntry(QLatin1String("Replyto")); + const QString replyTo =3D 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 =3D grp.readEntry(QLatin1String("Email")); + const QString email =3D grp.readEntry(QStringLiteral("Email")); newIdentity->setPrimaryEmailAddress(email); = - const QString organization =3D grp.readEntry(QLatin1String("Organizati= on")); + const QString organization =3D grp.readEntry(QStringLiteral("Organizat= ion")); if (!organization.isEmpty()) { newIdentity->setOrganization(organization); } = - QString signatureFile =3D grp.readEntry(QLatin1String("Signature File"= )); + QString signatureFile =3D grp.readEntry(QStringLiteral("Signature File= ")); if (!signatureFile.isEmpty()) { KIdentityManagement::Signature signature; - const int signatureHtml =3D grp.readEntry(QLatin1String("Signature= is HTML"), -1); + const int signatureHtml =3D grp.readEntry(QStringLiteral("Signatur= e is HTML"), -1); if (signatureFile.contains(QLatin1String("{Preferences}"))) { signatureFile.replace(QLatin1String("{Preferences}"), MailImpo= rter::FilterOpera::defaultSettingsPath() + QLatin1String("/")); } diff --git a/importwizard/autodetect/sylpheed/sylpheedsettings.cpp b/import= wizard/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 &file= name, const QString &pa KConfigGroup common =3D configCommon.group("Common"); checkMailOnStartup =3D (common.readEntry("check_on_startup", 1= ) =3D=3D 1); = - if (common.readEntry(QLatin1String("autochk_newmail"), 1) =3D= =3D 1) { - intervalCheckMail =3D common.readEntry(QLatin1String("auto= chk_interval"), -1); + if (common.readEntry(QStringLiteral("autochk_newmail"), 1) =3D= =3D 1) { + intervalCheckMail =3D common.readEntry(QStringLiteral("aut= ochk_interval"), -1); } readGlobalSettings(common); } @@ -162,19 +162,19 @@ void SylpheedSettings::readGlobalSettings(const KConf= igGroup &group) = void SylpheedSettings::readTemplateFormat(const KConfigGroup &group) { - const QString replyQuote =3D group.readEntry(QLatin1String("reply_quot= e_mark")); + const QString replyQuote =3D group.readEntry(QStringLiteral("reply_quo= te_mark")); if (!replyQuote.isEmpty()) { addKmailConfig(QLatin1String("TemplateParser"), QStringLiteral("Qu= oteString"), replyQuote); } - const QString forwardQuote =3D group.readEntry(QLatin1String("forward_= quote_mark")); + const QString forwardQuote =3D group.readEntry(QStringLiteral("forward= _quote_mark")); if (!forwardQuote.isEmpty()) { //Not implemented in kmail } - const QString replyQuoteFormat =3D group.readEntry(QLatin1String("repl= y_quote_format")); + const QString replyQuoteFormat =3D group.readEntry(QStringLiteral("rep= ly_quote_format")); if (!replyQuoteFormat.isEmpty()) { addKmailConfig(QLatin1String("TemplateParser"), QStringLiteral("Te= mplateReply"), convertToKmailTemplate(replyQuoteFormat)); } - const QString forwardQuoteFormat =3D group.readEntry(QLatin1String("fo= rward_quote_format")); + const QString forwardQuoteFormat =3D group.readEntry(QStringLiteral("f= orward_quote_format")); if (!forwardQuoteFormat.isEmpty()) { addKmailConfig(QLatin1String("TemplateParser"), QStringLiteral("Te= mplateForward"), convertToKmailTemplate(forwardQuoteFormat)); } @@ -182,7 +182,7 @@ void SylpheedSettings::readTemplateFormat(const KConfig= Group &group) = void SylpheedSettings::readDateFormat(const KConfigGroup &group) { - const QString dateFormat =3D group.readEntry(QLatin1String("date_forma= t")); + const QString dateFormat =3D group.readEntry(QStringLiteral("date_form= at")); if (!dateFormat.isEmpty()) { addKmailConfig(QLatin1String("General"), QStringLiteral("customDat= eFormat"), dateFormat); } @@ -300,15 +300,15 @@ void SylpheedSettings::readPop3Account(const KConfigG= roup &accountConfig, bool c const QString host =3D accountConfig.readEntry("receive_server"); settings.insert(QLatin1String("Host"), host); = - const QString name =3D accountConfig.readEntry(QLatin1String("name")); - const QString inbox =3D MailCommon::Util::convertFolderPathToCollectio= nStr(accountConfig.readEntry(QLatin1String("inbox"))); + const QString name =3D accountConfig.readEntry(QStringLiteral("name")); + const QString inbox =3D MailCommon::Util::convertFolderPathToCollectio= nStr(accountConfig.readEntry(QStringLiteral("inbox"))); settings.insert(QLatin1String("TargetCollection"), inbox); int port =3D 0; if (SylpheedSettingsUtils::readConfig(QLatin1String("pop_port"), accou= ntConfig, port, true)) { settings.insert(QLatin1String("Port"), port); } if (accountConfig.hasKey(QLatin1String("ssl_pop"))) { - const int sslPop =3D accountConfig.readEntry(QLatin1String("ssl_po= p"), 0); + const int sslPop =3D accountConfig.readEntry(QStringLiteral("ssl_p= op"), 0); switch (sslPop) { case 0: //Nothing @@ -325,22 +325,22 @@ void SylpheedSettings::readPop3Account(const KConfigG= roup &accountConfig, bool c } } if (accountConfig.hasKey(QLatin1String("remove_mail"))) { - const bool removeMail =3D (accountConfig.readEntry(QLatin1String("= remove_mail"), 1) =3D=3D 1); + const bool removeMail =3D (accountConfig.readEntry(QStringLiteral(= "remove_mail"), 1) =3D=3D 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 =3D accountConfig.readEntry(QLatin1String("user_id"= )); + const QString user =3D accountConfig.readEntry(QStringLiteral("user_id= ")); settings.insert(QLatin1String("Login"), user); = - const QString password =3D accountConfig.readEntry(QLatin1String("pass= word")); + const QString password =3D accountConfig.readEntry(QStringLiteral("pas= sword")); settings.insert(QLatin1String("Password"), password); = //use_apop_auth if (accountConfig.hasKey(QLatin1String("use_apop_auth"))) { - const bool useApop =3D (accountConfig.readEntry(QLatin1String("use= _apop_auth"), 1) =3D=3D 1); + const bool useApop =3D (accountConfig.readEntry(QStringLiteral("us= e_apop_auth"), 1) =3D=3D 1); if (useApop) { settings.insert(QLatin1String("AuthenticationMethod"), MailTra= nsport::Transport::EnumAuthenticationType::APOP); } @@ -352,7 +352,7 @@ void SylpheedSettings::readPop3Account(const KConfigGro= up &accountConfig, bool c = const QString agentIdentifyName =3D AbstractBase::createResource(QStri= ngLiteral("akonadi_pop3_resource"), name, settings); addCheckMailOnStartup(agentIdentifyName, checkMailOnStartup); - const bool enableManualCheck =3D (accountConfig.readEntry(QLatin1Strin= g("receive_at_get_all"), 0) =3D=3D 1); + const bool enableManualCheck =3D (accountConfig.readEntry(QStringLiter= al("receive_at_get_all"), 0) =3D=3D 1); addToManualCheck(agentIdentifyName, enableManualCheck); } = @@ -362,8 +362,8 @@ void SylpheedSettings::readImapAccount(const KConfigGro= up &accountConfig, bool c const QString host =3D accountConfig.readEntry("receive_server"); settings.insert(QLatin1String("ImapServer"), host); = - const QString name =3D accountConfig.readEntry(QLatin1String("name")); - const int sslimap =3D accountConfig.readEntry(QLatin1String("ssl_imap"= ), 0); + const QString name =3D accountConfig.readEntry(QStringLiteral("name")); + const int sslimap =3D accountConfig.readEntry(QStringLiteral("ssl_imap= "), 0); switch (sslimap) { case 0: //None @@ -392,7 +392,7 @@ void SylpheedSettings::readImapAccount(const KConfigGro= up &accountConfig, bool c settings.insert(QLatin1String("TrashCollection"), MailCommon::Util= ::convertFolderPathToCollectionId(trashFolder)); } = - const int auth =3D accountConfig.readEntry(QLatin1String("imap_auth_me= thod"), 0); + const int auth =3D accountConfig.readEntry(QStringLiteral("imap_auth_m= ethod"), 0); switch (auth) { case 0: break; @@ -415,20 +415,20 @@ void SylpheedSettings::readImapAccount(const KConfigG= roup &accountConfig, bool c settings.insert(QLatin1String("IntervalCheckTime"), intervalCheckM= ail); } = - const QString password =3D accountConfig.readEntry(QLatin1String("pass= word")); + const QString password =3D accountConfig.readEntry(QStringLiteral("pas= sword")); settings.insert(QLatin1String("Password"), password); = const QString agentIdentifyName =3D AbstractBase::createResource(QStri= ngLiteral("akonadi_imap_resource"), name, settings); addCheckMailOnStartup(agentIdentifyName, checkMailOnStartup); = - const bool enableManualCheck =3D (accountConfig.readEntry(QLatin1Strin= g("receive_at_get_all"), 0) =3D=3D 1); + const bool enableManualCheck =3D (accountConfig.readEntry(QStringLiter= al("receive_at_get_all"), 0) =3D=3D 1); addToManualCheck(agentIdentifyName, enableManualCheck); } = void SylpheedSettings::readAccount(const KConfigGroup &accountConfig , boo= l checkMailOnStartup, int intervalCheckMail) { if (accountConfig.hasKey(QLatin1String("protocol"))) { - const int protocol =3D accountConfig.readEntry(QLatin1String("prot= ocol"), 0); + const int protocol =3D accountConfig.readEntry(QStringLiteral("pro= tocol"), 0); switch (protocol) { case 0: readPop3Account(accountConfig, checkMailOnStartup, intervalChe= ckMail); @@ -501,19 +501,19 @@ QString SylpheedSettings::readTransport(const KConfig= Group &accountConfig) if (SylpheedSettingsUtils::readConfig(QLatin1String("smtp_port"), = accountConfig, port, true)) { mt->setPort(port); } - const QString user =3D accountConfig.readEntry(QLatin1String("smtp= _user_id")); + const QString user =3D accountConfig.readEntry(QStringLiteral("smt= p_user_id")); = if (!user.isEmpty()) { mt->setUserName(user); mt->setRequiresAuthentication(true); } - const QString password =3D accountConfig.readEntry(QLatin1String("= smtp_password")); + const QString password =3D accountConfig.readEntry(QStringLiteral(= "smtp_password")); if (!password.isEmpty()) { mt->setStorePassword(true); mt->setPassword(password); } - if (accountConfig.readEntry(QLatin1String("use_smtp_auth"), 0) =3D= =3D 1) { - const int authMethod =3D accountConfig.readEntry(QLatin1String= ("smtp_auth_method"), 0); + if (accountConfig.readEntry(QStringLiteral("use_smtp_auth"), 0) = =3D=3D 1) { + const int authMethod =3D accountConfig.readEntry(QStringLitera= l("smtp_auth_method"), 0); switch (authMethod) { case 0: //Automatic: mt->setAuthenticationType(MailTransport::Transport::EnumAu= thenticationType::PLAIN); //???? @@ -531,7 +531,7 @@ QString SylpheedSettings::readTransport(const KConfigGr= oup &accountConfig) qCDebug(IMPORTWIZARD_LOG) << " smtp authentication unknown= :" << authMethod; } } - const int sslSmtp =3D accountConfig.readEntry(QLatin1String("ssl_s= mtp"), 0); + const int sslSmtp =3D accountConfig.readEntry(QStringLiteral("ssl_= smtp"), 0); switch (sslSmtp) { case 0: mt->setEncryption(MailTransport::Transport::EnumEncryption::No= ne); diff --git a/kmail/configuredialog/configureaccountpage.cpp b/kmail/configu= redialog/configureaccountpage.cpp index 2e17e6e..200d38a 100644 --- a/kmail/configuredialog/configureaccountpage.cpp +++ b/kmail/configuredialog/configureaccountpage.cpp @@ -184,7 +184,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab(QWid= get *parent) KConfig specialMailCollection(QLatin1String("specialmailcollectionsrc"= )); if (specialMailCollection.hasGroup(QLatin1String("SpecialCollections")= )) { KConfigGroup grp =3D specialMailCollection.group(QLatin1String("Sp= ecialCollections")); - mAccountsReceiving.mAccountsReceiving->setSpecialCollectionIdentif= ier(grp.readEntry(QLatin1String("DefaultResourceId"))); + mAccountsReceiving.mAccountsReceiving->setSpecialCollectionIdentif= ier(grp.readEntry(QStringLiteral("DefaultResourceId"))); } ConfigAgentDelegate *configDelegate =3D new ConfigAgentDelegate(mAccou= ntsReceiving.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 =3D new QAction(QIcon::fromTheme(QStringLiteral("docu= ment-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 =3D new KXMLGUIBuilder(this); m_guiFactory =3D new KXMLGUIFactory(m_guiBuilder, this); m_guiFactory->addClient(this); = QMenu *contextMenu =3D static_cast(m_guiFactory->container( - QLatin1String("knotes_context"), + QStringLiteral("knotes_context"), this)); m_noteMenu =3D static_cast(m_guiFactory->container( - QLatin1String("notes_menu"), thi= s)); + QStringLiteral("notes_menu"), th= is)); = // 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"))->setEn= abled(false); - actionCollection()->action(QLatin1String("show_all_notes"))->setEn= abled(false); - actionCollection()->action(QLatin1String("print_selected_notes"))-= >setEnabled(false); - actionCollection()->action(QLatin1String("edit_find"))->setEnabled= (false); + actionCollection()->action(QStringLiteral("hide_all_notes"))->setE= nabled(false); + actionCollection()->action(QStringLiteral("show_all_notes"))->setE= nabled(false); + actionCollection()->action(QStringLiteral("print_selected_notes"))= ->setEnabled(false); + actionCollection()->action(QStringLiteral("edit_find"))->setEnable= d(false); QAction *action =3D 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"))->setEn= abled(true); - actionCollection()->action(QLatin1String("show_all_notes"))->setEn= abled(true); - actionCollection()->action(QLatin1String("print_selected_notes"))-= >setEnabled(true); - actionCollection()->action(QLatin1String("edit_find"))->setEnabled= (true); + actionCollection()->action(QStringLiteral("hide_all_notes"))->setE= nabled(true); + actionCollection()->action(QStringLiteral("show_all_notes"))->setE= nabled(true); + actionCollection()->action(QStringLiteral("print_selected_notes"))= ->setEnabled(true); + actionCollection()->action(QStringLiteral("edit_find"))->setEnable= d(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 =3D QIcon::fromTheme(QLatin1String("knotes")); + mIcon =3D QIcon::fromTheme(QStringLiteral("knotes")); } = KNotesTray::~KNotesTray() diff --git a/knotes/kontactplugin/knotes_part.cpp b/knotes/kontactplugin/kn= otes_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 =3D KSharedConfig::openConfig(QLatin1String("= kcmknotessummaryrc")); + KSharedConfigPtr _config =3D KSharedConfig::openConfig(QStringLiteral(= "kcmknotessummaryrc")); = mModelState =3D new KViewStateMaintainer(_config->grou= p("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 =3D doc.toHtml(); - htmlStr.replace(QLatin1String("meta name=3D\"qrichtext\" conte= nt=3D\"1\""), QStringLiteral("meta http-equiv=3D\"Content-Type\" content=3D= \"text/html; charset=3DUTF-8\"")); + htmlStr.replace(QStringLiteral("meta name=3D\"qrichtext\" cont= ent=3D\"1\""), QStringLiteral("meta http-equiv=3D\"Content-Type\" content= =3D\"text/html; charset=3DUTF-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::createSummaryW= idget(QWidget *parentWidg = const KAboutData KNotesPlugin::aboutData() { - KAboutData aboutData =3D KAboutData(QLatin1String("knotes"), + KAboutData aboutData =3D 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 =3D KIconLoader::global()->loadIcon(QLatin1String("knot= es"), KIconLoader::Desktop); + mDefaultPixmap =3D KIconLoader::global()->loadIcon(QStringLiteral("kno= tes"), KIconLoader::Desktop); QVBoxLayout *mainLayout =3D 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 =3D KSharedConfig::openConfig(QLatin1String("= kcmknotessummaryrc")); + KSharedConfigPtr _config =3D KSharedConfig::openConfig(QStringLiteral(= "kcmknotessummaryrc")); = mModelState =3D new KViewStateMaintainer(_config->grou= p("CheckState"), this); @@ -152,11 +152,11 @@ void KNotesSummaryWidget::slotPopupMenu(const QString= ¬e) { QMenu popup(this); const QAction *modifyNoteAction =3D 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 =3D popup.addAction( - KIconLoader::global()->loadIcon(= QLatin1String("edit-delete"), KIconLoader::Small), + KIconLoader::global()->loadIcon(= QStringLiteral("edit-delete"), KIconLoader::Small), i18n("Delete Note...")); = const QAction *ret =3D 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")) !=3D KMessageBox::= Continue)) { + QStringLiteral("ConfirmDeleteNote")) !=3D KMessageBox:= :Continue)) { return; } = @@ -553,7 +553,7 @@ void KNote::slotSaveAs() QTextStream stream(&file); if (htmlFormatAndSaveAsHtml) { QString htmlStr =3D m_editor->toHtml(); - htmlStr.replace(QLatin1String("meta name=3D\"qrichtext\" conte= nt=3D\"1\""), QStringLiteral("meta http-equiv=3D\"Content-Type\" content=3D= \"text/html; charset=3DUTF-8\"")); + htmlStr.replace(QStringLiteral("meta name=3D\"qrichtext\" cont= ent=3D\"1\""), QStringLiteral("meta http-equiv=3D\"Content-Type\" content= =3D\"text/html; charset=3DUTF-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 =3D new KNoteButton(QLatin1String("knotes_close"), this); + m_button =3D 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/knotegrantl= eeprint.cpp index dcf1659..82c840c 100644 --- a/knotes/print/knotegrantleeprint.cpp +++ b/knotes/print/knotegrantleeprint.cpp @@ -36,7 +36,7 @@ KNoteGrantleePrint::KNoteGrantleePrint(const QString &the= mePath, QObject *parent mTemplateLoader->setTemplateDirs(QStringList() << themePath); mEngine->addTemplateLoader(mTemplateLoader); = - mSelfcontainedTemplate =3D mEngine->loadByName(QLatin1String("theme.ht= ml")); + mSelfcontainedTemplate =3D mEngine->loadByName(QStringLiteral("theme.h= tml")); if (mSelfcontainedTemplate->error()) { mErrorMessage =3D mSelfcontainedTemplate->errorString() + QLatin1S= tring("
"); } 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 =3D KNotesGlobalConfig::self()->theme(); = - const QString relativePath =3D QLatin1String("knotes/print/themes/"); + const QString relativePath =3D QStringLiteral("knotes/print/themes/"); QStringList themesDirectories =3D QStandardPaths::locateAll(QStandardP= aths::GenericDataLocation, relativePath, QStandardPaths::LocateDirectory); if (themesDirectories.count() < 2) { //Make sure to add local directory diff --git a/libksieve/ksieveui/editor/sieveeditorwidget.cpp b/libksieve/ks= ieveui/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, Q= Widget *parent) connect(menuBar, &SieveEditorMenuBar::gotoLine, this, &SieveEditor= Widget::goToLine); connect(menuBar, &SieveEditorMenuBar::comment, this, &SieveEditorW= idget::comment); connect(menuBar, &SieveEditorMenuBar::uncomment, this, &SieveEdito= rWidget::uncomment); + connect(menuBar, &SieveEditorMenuBar::zoomIn, this, &SieveEditorWi= dget::zoomIn); + connect(menuBar, &SieveEditorMenuBar::zoomOut, this, &SieveEditorW= idget::zoomOut); = connect(this, &SieveEditorWidget::copyAvailable, menuBar, &SieveEd= itorMenuBar::slotCopyAvailable); connect(this, &SieveEditorWidget::redoAvailable, menuBar, &SieveEd= itorMenuBar::slotRedoAvailable); diff --git a/mailcommon/filter/filterimporter/filterimporterbalsa.cpp b/mai= lcommon/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 =3D new MailCommon::MailFilter(); - const QString name =3D grp.readEntry(QLatin1String("Name")); + const QString name =3D grp.readEntry(QStringLiteral("Name")); filter->pattern()->setName(name); filter->setToolbarName(name); = //TODO not implemented in kmail. - const QString popupText =3D grp.readEntry(QLatin1String("Popup-text")); + const QString popupText =3D grp.readEntry(QStringLiteral("Popup-text")= ); = - const QString sound =3D grp.readEntry(QLatin1String("Sound")); + const QString sound =3D grp.readEntry(QStringLiteral("Sound")); if (!sound.isEmpty()) { const QString actionName =3D QLatin1String("play sound"); createFilterAction(filter, actionName, sound); } = - const int actionType =3D grp.readEntry(QLatin1String("Action-type"), -= 1); - const QString actionStr =3D grp.readEntry(QLatin1String("Action-string= ")); + const int actionType =3D grp.readEntry(QStringLiteral("Action-type"), = -1); + const QString actionStr =3D grp.readEntry(QStringLiteral("Action-strin= g")); parseAction(actionType, actionStr, filter); = - const QString condition =3D grp.readEntry(QLatin1String("Condition")); + const QString condition =3D grp.readEntry(QStringLiteral("Condition")); parseCondition(condition, filter); = appendFilter(filter); diff --git a/mailcommon/folder/foldercollection.cpp b/mailcommon/folder/fol= dercollection.cpp index 9de19cf..70e543f 100644 --- a/mailcommon/folder/foldercollection.cpp +++ b/mailcommon/folder/foldercollection.cpp @@ -190,7 +190,7 @@ void FolderCollection::readConfig() mHideInSelectionDialog =3D configGroup.readEntry("HideInSelectionDialo= g", false); = if (configGroup.hasKey(QLatin1String("IgnoreNewMail"))) { - if (configGroup.readEntry(QLatin1String("IgnoreNewMail"), false)) { + if (configGroup.readEntry(QStringLiteral("IgnoreNewMail"), false))= { //migrate config. Akonadi::NewMailNotifierAttribute *newMailNotifierAttr =3D mCo= llection.attribute(Akonadi::Entity::AddI= fMissing); newMailNotifierAttr->setIgnoreNewMail(true); diff --git a/mailimporter/filter_thunderbird.cpp b/mailimporter/filter_thun= derbird.cpp index 554f4be..2f22f26 100644 --- a/mailimporter/filter_thunderbird.cpp +++ b/mailimporter/filter_thunderbird.cpp @@ -82,7 +82,7 @@ QMap FilterThunderbird::listProfile(QSt= ring ¤tProfile, c if (uniqProfile) { KConfigGroup group =3D config.group(profileList.at(0)); const QString path =3D group.readEntry("Path"); - const QString name =3D group.readEntry(QLatin1String("Name")); + const QString name =3D group.readEntry(QStringLiteral("Name")); currentProfile =3D path; lstProfile.insert(name, path); return lstProfile; @@ -90,7 +90,7 @@ QMap FilterThunderbird::listProfile(QSt= ring ¤tProfile, c Q_FOREACH (const QString &profileName, profileList) { KConfigGroup group =3D config.group(profileName); const QString path =3D group.readEntry("Path"); - const QString name =3D group.readEntry(QLatin1String("Name= ")); + const QString name =3D group.readEntry(QStringLiteral("Nam= e")); if (group.hasKey("Default") && (group.readEntry("Default",= 0) =3D=3D 1)) { currentProfile =3D 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::stora= geModelThemesGroup()); = - const QString themeId =3D conf.readEntry(QLatin1String("DefaultSet"), = ""); + const QString themeId =3D conf.readEntry(QStringLiteral("DefaultSet"),= ""); = Theme *opt =3D 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(QLatin1Str= ing("MessageListPane"))) { KConfigGroup conf(MessageList::Core::Settings::self()->config(), "= MessageListPane"); - const int numberOfTab =3D conf.readEntry(QLatin1String("tabNumber"= ), 0); + const int numberOfTab =3D conf.readEntry(QStringLiteral("tabNumber= "), 0); if (numberOfTab =3D=3D 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 =3D grp.readEntry(QLatin1St= ring("collectionId"), -1); + Akonadi::Collection::Id id =3D grp.readEntry(QStringLi= teral("collectionId"), -1); ETMViewStateSaver *saver =3D 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(), QStrin= g::fromLatin1("MessageListTab%1").arg(index)); if (grp.exists()) { Widget *w =3D qobject_cast(widget(index)); - w->view()->header()->restoreState(grp.readEntry(QLatin1String("Hea= derState"), QByteArray())); + w->view()->header()->restoreState(grp.readEntry(QStringLiteral("He= aderState"), 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 =3D static_cast= (job); = KConfigGroup conf(MessageList::Core::Settings::self()->config(), "Mess= ageListView"); - const QString tagSelected =3D conf.readEntry(QLatin1String("TagSelecte= d")); + const QString tagSelected =3D conf.readEntry(QStringLiteral("TagSelect= ed")); if (tagSelected.isEmpty()) { setCurrentStatusFilterItem(); return; diff --git a/messageviewer/adblock/adblockmanager.cpp b/messageviewer/adblo= ck/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 =3D config.groupList().filter(QRegExp(QLati= n1String("FilterList \\d+"))); Q_FOREACH (const QString &item, itemList) { KConfigGroup filtersGroup(&config, item); - const bool isFilterEnabled =3D filtersGroup.readEntry(QLatin1Strin= g("FilterEnabled"), false); + const bool isFilterEnabled =3D filtersGroup.readEntry(QStringLiter= al("FilterEnabled"), false); if (!isFilterEnabled) { continue; } - const QString url =3D filtersGroup.readEntry(QLatin1String("url")); + const QString url =3D filtersGroup.readEntry(QStringLiteral("url")= ); if (url.isEmpty()) { continue; } - const QString path =3D filtersGroup.readEntry(QLatin1String("path"= )); + const QString path =3D filtersGroup.readEntry(QStringLiteral("path= ")); if (path.isEmpty()) { continue; } = - const QDateTime lastDateTime =3D filtersGroup.readEntry(QLatin1Str= ing("lastUpdate"), QDateTime()); + const QDateTime lastDateTime =3D filtersGroup.readEntry(QStringLit= eral("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 =3D config.groupList().filter(QRegExp(QLati= n1String("FilterList \\d+"))); Q_FOREACH (const QString &item, itemList) { KConfigGroup filtersGroup(&config, item); - const bool isFilterEnabled =3D filtersGroup.readEntry(QLatin1Strin= g("FilterEnabled"), false); - const QString url =3D filtersGroup.readEntry(QLatin1String("url")); - const QString path =3D filtersGroup.readEntry(QLatin1String("path"= )); - const QString name =3D filtersGroup.readEntry(QLatin1String("name"= )); - const QDateTime lastUpdate =3D filtersGroup.readEntry(QLatin1Strin= g("lastUpdate"), QDateTime()); + const bool isFilterEnabled =3D filtersGroup.readEntry(QStringLiter= al("FilterEnabled"), false); + const QString url =3D filtersGroup.readEntry(QStringLiteral("url")= ); + const QString path =3D filtersGroup.readEntry(QStringLiteral("path= ")); + const QString name =3D filtersGroup.readEntry(QStringLiteral("name= ")); + const QDateTime lastUpdate =3D filtersGroup.readEntry(QStringLiter= al("lastUpdate"), QDateTime()); if (url.isEmpty() || path.isEmpty() || name.isEmpty()) { continue; } diff --git a/pimcommon/translator/translatorwidget.cpp b/pimcommon/translat= or/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 =3D myGroup.readEntry(QLatin1String("FromLanguage")= ); - const QString to =3D myGroup.readEntry(QLatin1String("ToLanguage")); + const QString from =3D myGroup.readEntry(QStringLiteral("FromLanguage"= )); + const QString to =3D 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::addSpecificResourceSetting= s(KSharedConfig::Ptr resour if (resourceName =3D=3D QLatin1String("akonadi_vcard_resource")) { KConfigGroup general =3D resourceConfig->group(QLatin1String("Gene= ral")); if (general.hasKey(QLatin1String("DisplayName"))) { - settings.insert(QLatin1String("DisplayName"), general.readEntr= y(QLatin1String("DisplayName"))); + settings.insert(QLatin1String("DisplayName"), general.readEntr= y(QStringLiteral("DisplayName"))); } if (general.hasKey(QLatin1String("ReadOnly"))) { - settings.insert(QLatin1String("ReadOnly"), general.readEntry(Q= Latin1String("ReadOnly"), false)); + settings.insert(QLatin1String("ReadOnly"), general.readEntry(Q= StringLiteral("ReadOnly"), false)); } if (general.hasKey(QLatin1String("MonitorFile"))) { - settings.insert(QLatin1String("MonitorFile"), general.readEntr= y(QLatin1String("MonitorFile"), true)); + settings.insert(QLatin1String("MonitorFile"), general.readEntr= y(QStringLiteral("MonitorFile"), true)); } } } diff --git a/pimsettingexporter/core/calendar/importcalendarjob.cpp b/pimse= ttingexporter/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(K= SharedConfig::Ptr resourceC if (resourceName =3D=3D QLatin1String("akonadi_ical_resource")) { KConfigGroup general =3D resourceConfig->group(QLatin1String("Gene= ral")); if (general.hasKey(QLatin1String("DisplayName"))) { - settings.insert(QLatin1String("DisplayName"), general.readEntr= y(QLatin1String("DisplayName"))); + settings.insert(QLatin1String("DisplayName"), general.readEntr= y(QStringLiteral("DisplayName"))); } if (general.hasKey(QLatin1String("ReadOnly"))) { - settings.insert(QLatin1String("ReadOnly"), general.readEntry(Q= Latin1String("ReadOnly"), false)); + settings.insert(QLatin1String("ReadOnly"), general.readEntry(Q= StringLiteral("ReadOnly"), false)); } if (general.hasKey(QLatin1String("MonitorFile"))) { - settings.insert(QLatin1String("MonitorFile"), general.readEntr= y(QLatin1String("MonitorFile"), true)); + settings.insert(QLatin1String("MonitorFile"), general.readEntr= y(QStringLiteral("MonitorFile"), true)); } } } diff --git a/pimsettingexporter/core/mail/exportmailjob.cpp b/pimsettingexp= orter/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 =3D group.readEntry(vcard); if (!vcardFileName.isEmpty()) { - const int uoid =3D group.readEntry(QLatin1String("uoid= "), -1); + const int uoid =3D group.readEntry(QStringLiteral("uoi= d"), -1); QFile file(vcardFileName); if (file.exists()) { const bool fileAdded =3D archive()->addLocalFile(= vcardFileName, Utils::identitiesPath() + QString::number(uoid) + QDir::sepa= rator() + file.fileName()); diff --git a/pimsettingexporter/core/mail/importmailjob.cpp b/pimsettingexp= orter/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 =3D -1; if (transportConfig->hasGroup(QLatin1String("General"))) { KConfigGroup group =3D transportConfig->group(QLatin1Strin= g("General")); - defaultTransport =3D group.readEntry(QLatin1String("defaul= t-transport"), -1); + defaultTransport =3D group.readEntry(QStringLiteral("defau= lt-transport"), -1); } = const QStringList transportList =3D transportConfig->groupList= ().filter(QRegExp(QLatin1String("Transport \\d+"))); Q_FOREACH (const QString &transport, transportList) { KConfigGroup group =3D transportConfig->group(transport); - const int transportId =3D group.readEntry(QLatin1String("i= d"), -1); + const int transportId =3D group.readEntry(QStringLiteral("= id"), -1); MailTransport::Transport *mt =3D MailTransport::TransportM= anager::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 =3D resourceConfig->group(QLatin1Stri= ng("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.rea= dEntry(QLatin1String("ReadOnly"), false)); + settings.insert(QLatin1String("ReadOnly"), general.rea= dEntry(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 =3D resourceConfig->group(QLatin1= String("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"), l= ocking.readEntry(QLatin1String("LockfileMethod"), 4)); + settings.insert(QLatin1String("LockfileMethod"), l= ocking.readEntry(QStringLiteral("LockfileMethod"), 4)); } } if (resourceConfig->hasGroup(QLatin1String("Compacting")))= { KConfigGroup compacting =3D resourceConfig->group(QLat= in1String("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"), com= pacting.readEntry(QLatin1String("MessageCount"), 50)); + settings.insert(QLatin1String("MessageCount"), com= pacting.readEntry(QStringLiteral("MessageCount"), 50)); } } const QString newResource =3D mCreateResource->createResou= rce(QStringLiteral("akonadi_mbox_resource"), filename, settings); @@ -538,13 +538,13 @@ void ImportMailJob::restoreMails() settings.insert(QLatin1String("Path"), newUrl.path()); KConfigGroup general =3D resourceConfig->group(QLatin1Stri= ng("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.rea= dEntry(QLatin1String("ReadOnly"), false)); + settings.insert(QLatin1String("ReadOnly"), general.rea= dEntry(QStringLiteral("ReadOnly"), false)); } if (general.hasKey(QLatin1String("MonitorFilesystem"))) { - settings.insert(QLatin1String("MonitorFilesystem"), ge= neral.readEntry(QLatin1String("MonitorFilesystem"), true)); + settings.insert(QLatin1String("MonitorFilesystem"), ge= neral.readEntry(QStringLiteral("MonitorFilesystem"), true)); } = const QString newResource =3D mCreateResource->createResou= rce(resourceName.contains(QLatin1String("akonadi_mixedmaildir_resource_")) ? @@ -856,7 +856,7 @@ void ImportMailJob::restoreIdentity() fileIdentity->copyTo(mTempDirName); KSharedConfig::Ptr identityConfig =3D KSharedConfig::openConfi= g(mTempDirName + QLatin1Char('/') + QLatin1String("emailidentities")); KConfigGroup general =3D identityConfig->group(QLatin1String("= General")); - const int defaultIdentity =3D general.readEntry(QLatin1String(= "Default Identity"), -1); + const int defaultIdentity =3D general.readEntry(QStringLiteral= ("Default Identity"), -1); = const QStringList identityList =3D identityConfig->groupList()= .filter(QRegExp(QLatin1String("Identity #\\d+"))); Q_FOREACH (const QString &identityStr, identityList) { @@ -899,7 +899,7 @@ void ImportMailJob::restoreIdentity() } } } - QString name =3D group.readEntry(QLatin1String("Name")); + QString name =3D group.readEntry(QStringLiteral("Name")); = KIdentityManagement::Identity *identity =3D &mIdentityMana= ger->newFromScratch(uniqueIdentityName(name)); group.writeEntry(QLatin1String("Name"), name); @@ -1019,7 +1019,7 @@ void ImportMailJob::importFolderArchiveConfig(const K= ArchiveFile *archiveconfigu = Q_FOREACH (const QString &str, archiveList) { KConfigGroup oldGroup =3D archiveConfig->group(str); - const Akonadi::Collection::Id id =3D convertPathToId(oldGroup.read= Entry(QLatin1String("topLevelCollectionId"))); + const Akonadi::Collection::Id id =3D convertPathToId(oldGroup.read= Entry(QStringLiteral("topLevelCollectionId"))); if (id !=3D -1) { oldGroup.writeEntry(QLatin1String("topLevelCollectionId"), id); } @@ -1120,7 +1120,7 @@ void ImportMailJob::importKmailConfig(const KArchiveF= ile *kmailsnippet, const QS const QString accountOrder(QLatin1String("AccountOrder")); if (kmailConfig->hasGroup(accountOrder)) { KConfigGroup group =3D kmailConfig->group(accountOrder); - QStringList orderList =3D group.readEntry(QLatin1String("order"), = QStringList()); + QStringList orderList =3D group.readEntry(QStringLiteral("order"),= QStringList()); QStringList newOrderList; if (!orderList.isEmpty()) { Q_FOREACH (const QString &account, orderList) { @@ -1202,13 +1202,13 @@ void ImportMailJob::mergeLdapConfig(const KArchiveF= ile *archivefile, const QStri = KSharedConfig::Ptr existingConfig =3D KSharedConfig::openConfig(filena= me); KConfigGroup grpExisting =3D existingConfig->group(QLatin1String("LDAP= ")); - int existingNumberHosts =3D grpExisting.readEntry(QLatin1String("NumHo= sts"), 0); - int existingNumberSelectedHosts =3D grpExisting.readEntry(QLatin1Strin= g("NumSelectedHosts"), 0); + int existingNumberHosts =3D grpExisting.readEntry(QStringLiteral("NumH= osts"), 0); + int existingNumberSelectedHosts =3D grpExisting.readEntry(QStringLiter= al("NumSelectedHosts"), 0); = KSharedConfig::Ptr importingLdapConfig =3D KSharedConfig::openConfig(c= opyToDirName + QLatin1Char('/') + filename); KConfigGroup grpImporting =3D importingLdapConfig->group(QLatin1String= ("LDAP")); - int importingNumberHosts =3D grpImporting.readEntry(QLatin1String("Num= Hosts"), 0); - int importingNumberSelectedHosts =3D grpImporting.readEntry(QLatin1Str= ing("NumSelectedHosts"), 0); + int importingNumberHosts =3D grpImporting.readEntry(QStringLiteral("Nu= mHosts"), 0); + int importingNumberSelectedHosts =3D grpImporting.readEntry(QStringLit= eral("NumSelectedHosts"), 0); = grpExisting.writeEntry(QLatin1String("NumHosts"), (existingNumberHosts= + importingNumberHosts)); grpExisting.writeEntry(QLatin1String("NumSelectedHosts"), (existingNum= berSelectedHosts + importingNumberSelectedHosts)); @@ -1294,17 +1294,17 @@ void ImportMailJob::mergeSieveTemplate(const KArchi= veFile *archivefile, const QS KSharedConfig::Ptr importingSieveTemplateConfig =3D KSharedConfig::ope= nConfig(copyToDirName + QLatin1Char('/') + filename); = KConfigGroup grpExisting =3D existingConfig->group(QLatin1String("temp= late")); - int numberOfExistingTemplate =3D grpExisting.readEntry(QLatin1String("= templateCount"), 0); + int numberOfExistingTemplate =3D grpExisting.readEntry(QStringLiteral(= "templateCount"), 0); = KConfigGroup grpImportExisting =3D importingSieveTemplateConfig->group= (QLatin1String("template")); - const int numberOfImportingTemplate =3D grpImportExisting.readEntry(QL= atin1String("templateCount"), 0); + const int numberOfImportingTemplate =3D grpImportExisting.readEntry(QS= tringLiteral("templateCount"), 0); = for (int i =3D 0; i < numberOfImportingTemplate; ++i) { KConfigGroup templateDefine =3D importingSieveTemplateConfig->grou= p(QString::fromLatin1("templateDefine_%1").arg(i)); = KConfigGroup newTemplateDefineGrp =3D existingConfig->group(QStrin= g::fromLatin1("templateDefine_%1").arg(numberOfExistingTemplate)); - newTemplateDefineGrp.writeEntry(QLatin1String("Name"), templateDef= ine.readEntry(QLatin1String("Name"))); - newTemplateDefineGrp.writeEntry(QLatin1String("Text"), templateDef= ine.readEntry(QLatin1String("Text"))); + newTemplateDefineGrp.writeEntry(QLatin1String("Name"), templateDef= ine.readEntry(QStringLiteral("Name"))); + newTemplateDefineGrp.writeEntry(QLatin1String("Text"), templateDef= ine.readEntry(QStringLiteral("Text"))); ++numberOfExistingTemplate; newTemplateDefineGrp.sync(); } diff --git a/pimsettingexporter/core/utils.cpp b/pimsettingexporter/core/ut= ils.cpp index 078f8aa6..be85019 100644 --- a/pimsettingexporter/core/utils.cpp +++ b/pimsettingexporter/core/utils.cpp @@ -139,7 +139,7 @@ QUrl Utils::adaptResourcePath(KSharedConfigPtr resource= Config, const QString &st QUrl Utils::resourcePath(KSharedConfigPtr resourceConfig, const QString &d= efaultPath) { KConfigGroup group =3D resourceConfig->group(QLatin1String("General")); - QString url =3D group.readEntry(QLatin1String("Path"), defaultPath); + QString url =3D group.readEntry(QStringLiteral("Path"), defaultPath); if (!url.isEmpty()) { url.replace(QLatin1String("$HOME"), QDir::homePath()); }