diff --git a/kaddressbook/plugins/checkgravatar/gravatar/widgets/gravatarupdatedialog.cpp b/kaddressbook/plugins/checkgravatar/gravatar/widgets/gravatarupdatedialog.cpp index 4d43b3febdf4de3460ba0564a0c2298421104df8..d930848638554c74d801356b120dc7365de4f4a7 100644 --- a/kaddressbook/plugins/checkgravatar/gravatar/widgets/gravatarupdatedialog.cpp +++ b/kaddressbook/plugins/checkgravatar/gravatar/widgets/gravatarupdatedialog.cpp @@ -14,7 +14,9 @@ #include using namespace KABGravatar; - +namespace { +static const char myConfigGroupName[] = "GravatarUpdateDialog"; +} GravatarUpdateDialog::GravatarUpdateDialog(QWidget *parent) : QDialog(parent) { @@ -96,7 +98,7 @@ void GravatarUpdateDialog::setOriginalPixmap(const QPixmap &pix) void GravatarUpdateDialog::readConfig() { - KConfigGroup grp(KSharedConfig::openConfig(), "GravatarUpdateDialog"); + KConfigGroup grp(KSharedConfig::openConfig(), myConfigGroupName); const QSize size = grp.readEntry("Size", QSize(300, 200)); if (size.isValid()) { resize(size); @@ -105,7 +107,7 @@ void GravatarUpdateDialog::readConfig() void GravatarUpdateDialog::writeConfig() { - KConfigGroup grp(KSharedConfig::openConfig(), "GravatarUpdateDialog"); + KConfigGroup grp(KSharedConfig::openConfig(), myConfigGroupName); grp.writeEntry("Size", size()); grp.sync(); } diff --git a/kaddressbook/plugins/mergelib/manualmerge/mergecontactsdialog.cpp b/kaddressbook/plugins/mergelib/manualmerge/mergecontactsdialog.cpp index 8d9050dd3aeec0d8a3d0251636f7e2d2c70d9e21..b8bcf3176761f4d042b51cba5f1b3d47e84816bc 100644 --- a/kaddressbook/plugins/mergelib/manualmerge/mergecontactsdialog.cpp +++ b/kaddressbook/plugins/mergelib/manualmerge/mergecontactsdialog.cpp @@ -23,6 +23,9 @@ #include using namespace KABMergeContacts; +namespace { +static const char myConfigGroupName[] = "MergeContactsDialog"; +} MergeContactsDialog::MergeContactsDialog(QWidget *parent) : QDialog(parent) { @@ -89,7 +92,7 @@ void MergeContactsDialog::slotCustomizeMergeContact(const Akonadi::Item::List &l void MergeContactsDialog::readConfig() { - KConfigGroup grp(KSharedConfig::openConfig(), "MergeContactsDialog"); + KConfigGroup grp(KSharedConfig::openConfig(), myConfigGroupName); const QSize size = grp.readEntry("Size", QSize(300, 200)); if (size.isValid()) { resize(size); @@ -98,7 +101,7 @@ void MergeContactsDialog::readConfig() void MergeContactsDialog::writeConfig() { - KConfigGroup grp(KSharedConfig::openConfig(), "MergeContactsDialog"); + KConfigGroup grp(KSharedConfig::openConfig(), myConfigGroupName); grp.writeEntry("Size", size()); grp.sync(); } diff --git a/kaddressbook/plugins/mergelib/searchduplicate/searchandmergecontactduplicatecontactdialog.cpp b/kaddressbook/plugins/mergelib/searchduplicate/searchandmergecontactduplicatecontactdialog.cpp index 46d0959e9132ec2dcd8707525dd4472348f9c537..4ce11575ccd916b8da6d2afa347778a365b4fb9d 100644 --- a/kaddressbook/plugins/mergelib/searchduplicate/searchandmergecontactduplicatecontactdialog.cpp +++ b/kaddressbook/plugins/mergelib/searchduplicate/searchandmergecontactduplicatecontactdialog.cpp @@ -22,7 +22,9 @@ #include using namespace KABMergeContacts; - +namespace { +static const char myConfigGroupName[] = "SearchAndMergeContactDuplicateContactDialog"; +} SearchAndMergeContactDuplicateContactDialog::SearchAndMergeContactDuplicateContactDialog(QWidget *parent) : QDialog(parent) { @@ -91,7 +93,7 @@ void SearchAndMergeContactDuplicateContactDialog::searchPotentialDuplicateContac void SearchAndMergeContactDuplicateContactDialog::readConfig() { - KConfigGroup grp(KSharedConfig::openConfig(), "MergeContactDuplicateContactDialog"); + KConfigGroup grp(KSharedConfig::openConfig(), myConfigGroupName); const QSize size = grp.readEntry("Size", QSize(300, 200)); if (size.isValid()) { resize(size); @@ -100,7 +102,7 @@ void SearchAndMergeContactDuplicateContactDialog::readConfig() void SearchAndMergeContactDuplicateContactDialog::writeConfig() { - KConfigGroup grp(KSharedConfig::openConfig(), "MergeContactDuplicateContactDialog"); + KConfigGroup grp(KSharedConfig::openConfig(), myConfigGroupName); grp.writeEntry("Size", size()); grp.sync(); } diff --git a/kmail/editorconvertertextplugins/markdown/markdownlib/markdownconfigurewidget.cpp b/kmail/editorconvertertextplugins/markdown/markdownlib/markdownconfigurewidget.cpp index f18e5203e98e93d14f0cf125eac0a3a8c4f6ce6c..049d3befa4bb59746f69e6b4fd4c0d8b5cbc3aa4 100644 --- a/kmail/editorconvertertextplugins/markdown/markdownlib/markdownconfigurewidget.cpp +++ b/kmail/editorconvertertextplugins/markdown/markdownlib/markdownconfigurewidget.cpp @@ -10,6 +10,9 @@ #include #include #include +namespace { +static const char myConfigGroupName[] = "Markdown"; +} MarkdownConfigureWidget::MarkdownConfigureWidget(QWidget *parent) : MessageComposer::PluginEditorConvertTextConfigureWidget(parent) { @@ -33,14 +36,14 @@ MarkdownConfigureWidget::~MarkdownConfigureWidget() void MarkdownConfigureWidget::loadSettings() { - KConfigGroup grp(KSharedConfig::openConfig(), "Markdown"); + KConfigGroup grp(KSharedConfig::openConfig(), myConfigGroupName); mLatexSupport->setChecked(grp.readEntry("Enable Embedded Latex", false)); mExtraDefinitionLists->setChecked(grp.readEntry("Enable Extra Definition Lists", false)); } void MarkdownConfigureWidget::saveSettings() { - KConfigGroup grp(KSharedConfig::openConfig(), "Markdown"); + KConfigGroup grp(KSharedConfig::openConfig(), myConfigGroupName); grp.writeEntry("Enable Embedded Latex", mLatexSupport->isChecked()); grp.writeEntry("Enable Extra Definition Lists", mExtraDefinitionLists->isChecked()); } diff --git a/kmail/editorplugins/insertemail/selectmaildialog.cpp b/kmail/editorplugins/insertemail/selectmaildialog.cpp index 26588ef24d16e4250ebbe88b48a050687b08f193..d12109a4fb6b604cc75c593ddfec0f842b7f615a 100644 --- a/kmail/editorplugins/insertemail/selectmaildialog.cpp +++ b/kmail/editorplugins/insertemail/selectmaildialog.cpp @@ -11,6 +11,9 @@ #include #include +namespace { +static const char myConfigGroupName[] = "SelectMailDialog"; +} SelectMailDialog::SelectMailDialog(QWidget *parent) : QDialog(parent) { @@ -46,7 +49,7 @@ void SelectMailDialog::accept() void SelectMailDialog::readConfig() { - KConfigGroup grp(KSharedConfig::openConfig(), "SelectMailDialog"); + KConfigGroup grp(KSharedConfig::openConfig(), myConfigGroupName); const QSize size = grp.readEntry("Size", QSize(300, 200)); if (size.isValid()) { resize(size); @@ -55,7 +58,7 @@ void SelectMailDialog::readConfig() void SelectMailDialog::writeConfig() { - KConfigGroup grp(KSharedConfig::openConfig(), "SelectMailDialog"); + KConfigGroup grp(KSharedConfig::openConfig(), myConfigGroupName); grp.writeEntry("Size", size()); grp.sync(); } diff --git a/kmail/editorplugins/insertshorturl/insertshorturlconfigurewidget.cpp b/kmail/editorplugins/insertshorturl/insertshorturlconfigurewidget.cpp index ede0480a3240e01918b7f121bc61bb9705157469..313ee64990ea3d64e358c31f29c792e01fca0246 100644 --- a/kmail/editorplugins/insertshorturl/insertshorturlconfigurewidget.cpp +++ b/kmail/editorplugins/insertshorturl/insertshorturlconfigurewidget.cpp @@ -14,7 +14,9 @@ #include #include #include - +namespace { +static const char myConfigGroupName[] = "ShortUrl"; +} InsertShorturlConfigureWidget::InsertShorturlConfigureWidget(QWidget *parent) : QWidget(parent) { @@ -49,7 +51,7 @@ void InsertShorturlConfigureWidget::slotChanged() void InsertShorturlConfigureWidget::loadConfig() { - KConfigGroup grp(KSharedConfig::openConfig(), "ShortUrl"); + KConfigGroup grp(KSharedConfig::openConfig(), myConfigGroupName); const QString engineName = grp.readEntry("EngineName"); int index = mShortUrlServer->findData(engineName); if (index < 0) { @@ -62,7 +64,7 @@ void InsertShorturlConfigureWidget::loadConfig() void InsertShorturlConfigureWidget::writeConfig() { if (mChanged) { - KConfigGroup grp(KSharedConfig::openConfig(), "ShortUrl"); + KConfigGroup grp(KSharedConfig::openConfig(), myConfigGroupName); grp.writeEntry("EngineName", mShortUrlServer->itemData(mShortUrlServer->currentIndex()).toString()); grp.sync(); } diff --git a/kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfigurewidget.cpp b/kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfigurewidget.cpp index a835f1bcf4a6d379b070d2b2111a68615f4d8fc0..1c06d51643dadf6758e1a863aae89eec5ef2858d 100644 --- a/kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfigurewidget.cpp +++ b/kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfigurewidget.cpp @@ -10,7 +10,9 @@ #include #include #include - +namespace { +static const char myConfigGroupName[] = "Check Before Send"; +} CheckBeforeSendConfigureWidget::CheckBeforeSendConfigureWidget(QWidget *parent) : MessageComposer::PluginEditorCheckBeforeSendConfigureWidget(parent) { @@ -47,7 +49,7 @@ CheckBeforeSendConfigureWidget::~CheckBeforeSendConfigureWidget() void CheckBeforeSendConfigureWidget::loadSettings() { - KConfigGroup grp(KSharedConfig::openConfig(), "Check Before Send"); + KConfigGroup grp(KSharedConfig::openConfig(), myConfigGroupName); mCheckPlainTextMail->setChecked(grp.readEntry("SendPlainText", false)); mCheckMailTransport->setChecked(grp.readEntry("SmtpDefinedInIdentity", false)); mCheckDuplicateEmailsAddresses->setChecked(grp.readEntry("CheckDuplicatedEmails", false)); @@ -56,7 +58,7 @@ void CheckBeforeSendConfigureWidget::loadSettings() void CheckBeforeSendConfigureWidget::saveSettings() { - KConfigGroup grp(KSharedConfig::openConfig(), "Check Before Send"); + KConfigGroup grp(KSharedConfig::openConfig(), myConfigGroupName); grp.writeEntry("SendPlainText", mCheckPlainTextMail->isChecked()); grp.writeEntry("SmtpDefinedInIdentity", mCheckMailTransport->isChecked()); grp.writeEntry("CheckDuplicatedEmails", mCheckDuplicateEmailsAddresses->isChecked()); diff --git a/kmail/editorsendcheckplugins/confirm-address/confirmaddressinterface.cpp b/kmail/editorsendcheckplugins/confirm-address/confirmaddressinterface.cpp index 84b99138aaaf3df3b24def779894b6c4aa898795..9761e16fd53a664fb7bb973d3159617e820daea8 100644 --- a/kmail/editorsendcheckplugins/confirm-address/confirmaddressinterface.cpp +++ b/kmail/editorsendcheckplugins/confirm-address/confirmaddressinterface.cpp @@ -17,7 +17,9 @@ #include #include #include - +namespace { +static const char myConfigGroupName[] = "Confirm Address"; +} ConfirmAddressInterface::ConfirmAddressInterface(QObject *parent) : MessageComposer::PluginEditorCheckBeforeSendInterface(parent) { @@ -82,7 +84,7 @@ bool ConfirmAddressInterface::exec(const MessageComposer::PluginEditorCheckBefor void ConfirmAddressInterface::slotAddWhiteListEmails(const QStringList &lst, uint currentIdentity) { - KConfigGroup grp(KSharedConfig::openConfig(), "Confirm Address"); + KConfigGroup grp(KSharedConfig::openConfig(), myConfigGroupName); KConfigGroup identityGroup = grp.group(QStringLiteral("Confirm Address %1").arg(currentIdentity)); QStringList oldWhiteList = identityGroup.readEntry("Emails", QStringList()); for (const QString &email : lst) { @@ -97,7 +99,7 @@ void ConfirmAddressInterface::slotAddWhiteListEmails(const QStringList &lst, uin void ConfirmAddressInterface::reloadConfig() { - KConfigGroup grp(KSharedConfig::openConfig(), "Confirm Address"); + KConfigGroup grp(KSharedConfig::openConfig(), myConfigGroupName); mHashSettings.clear(); KIdentityManagement::IdentityManager *im = KIdentityManagement::IdentityManager::self(); diff --git a/kmail/grammarplugins/grammalecte/src/grammalectemanager.cpp b/kmail/grammarplugins/grammalecte/src/grammalectemanager.cpp index 2ca54b9b01a2db8c7ae8c303af45729a2dae54f7..e59219956f6362d9102cda785d8b70f97bf910a5 100644 --- a/kmail/grammarplugins/grammalecte/src/grammalectemanager.cpp +++ b/kmail/grammarplugins/grammalecte/src/grammalectemanager.cpp @@ -8,7 +8,9 @@ #include #include #include - +namespace { +static const char myConfigGroupName[] = "Grammalecte"; +} GrammalecteManager::GrammalecteManager(QObject *parent) : QObject(parent) { @@ -27,7 +29,7 @@ GrammalecteManager *GrammalecteManager::self() void GrammalecteManager::saveSettings() { - KConfigGroup grp(KSharedConfig::openConfig(), "Grammalecte"); + KConfigGroup grp(KSharedConfig::openConfig(), myConfigGroupName); grp.writeEntry(QStringLiteral("pythonpath"), mPythonPath); grp.writeEntry(QStringLiteral("grammalectepath"), mGrammalectePath); grp.writeEntry(QStringLiteral("options"), mOptions); @@ -45,7 +47,7 @@ void GrammalecteManager::setOptions(const QStringList &saveOptions) void GrammalecteManager::loadSettings() { - KConfigGroup grp(KSharedConfig::openConfig(), "Grammalecte"); + KConfigGroup grp(KSharedConfig::openConfig(), myConfigGroupName); mPythonPath = grp.readEntry(QStringLiteral("pythonpath")); if (mPythonPath.isEmpty()) { mPythonPath = QStandardPaths::findExecutable(QStringLiteral("python3")); diff --git a/kmail/grammarplugins/languagetool/src/languagetoolmanager.cpp b/kmail/grammarplugins/languagetool/src/languagetoolmanager.cpp index 6e789f39b4a11fea14b409289c0380fdfb4955ce..ff9d1de6ace6b7fbceb3ca71e5a5eddb4e9fb649 100644 --- a/kmail/grammarplugins/languagetool/src/languagetoolmanager.cpp +++ b/kmail/grammarplugins/languagetool/src/languagetoolmanager.cpp @@ -11,7 +11,9 @@ #include #include #include - +namespace { +static const char myConfigGroupName[] = "LanguageTool"; +} LanguageToolManager::LanguageToolManager(QObject *parent) : QObject(parent) , mNetworkAccessManager(new QNetworkAccessManager(this)) @@ -82,7 +84,7 @@ void LanguageToolManager::setLanguageToolPath(const QString &path) void LanguageToolManager::loadSettings() { - KConfigGroup grp(KSharedConfig::openConfig(), "LanguageTool"); + KConfigGroup grp(KSharedConfig::openConfig(), myConfigGroupName); mLanguageToolPath = grp.readEntry(QStringLiteral("languagetoolpath"), QStringLiteral("https://languagetool.org/api/v2")); mLanguage = grp.readEntry(QStringLiteral("language"), QStringLiteral("en")); mUseLocalInstance = grp.readEntry(QStringLiteral("useLocalInstance"), false); @@ -91,7 +93,7 @@ void LanguageToolManager::loadSettings() void LanguageToolManager::saveSettings() { - KConfigGroup grp(KSharedConfig::openConfig(), "LanguageTool"); + KConfigGroup grp(KSharedConfig::openConfig(), myConfigGroupName); grp.writeEntry(QStringLiteral("languagetoolpath"), mLanguageToolPath); grp.writeEntry(QStringLiteral("language"), mLanguage); grp.writeEntry(QStringLiteral("useLocalInstance"), mUseLocalInstance);