[pim/kmail] /: codespell fixes
Allen Winter <[email protected]>
| Newsgroups | gmane.comp.kde.cvs,gmane.comp.kde.doc |
|---|---|
| Message-ID | <[email protected]> |
Git commit c6bb617d567dad85e4085ea9cbea1ce6c4ce4b67 by Allen Winter.
Committed on 12/03/2025 at 20:38.
Pushed by winterz into branch 'master'.
codespell fixes
M +6 -2 .codespellrc
M +1 -1 agents/archivemailagent/addarchivemailwidget.cpp
M +1 -1 agents/archivemailagent/archivemailmanager.cpp
M +2 -2 agents/mailfilteragent/mailfilteragent.cpp
M +1 -1 agents/sendlateragent/sendlatermanager.cpp
M +1 -1 agents/unifiedmailboxagent/unifiedmailboxagent.cpp
M +1 -1 doc/akonadi_followupreminder_agent/index.docbook
M +2 -2 doc/kmail2/menus.docbook
M +1 -1 doc/kmail2/troubleshooting.docbook
M +1 -1 ktnef/src/ktnefmain.cpp
M +1 -1 ktnef/src/qwmf.cpp
M +2 -2 ktnef/src/qwmf.h
M +1 -1 src/autotests/kmcomposerwintest.cpp
M +1 -1 src/collectionpage/collectionviewpage.cpp
M +1 -1 src/configuredialog/configureappearancepage.cpp
M +3 -3 src/editor/kmcomposerwin.cpp
M +1 -1 src/editor/plugininterface/kmailplugineditorconverttextmanagerinterface.cpp
M +1 -1 src/job/createnewcontactjob.h
M +1 -1 src/kmkernel.cpp
M +2 -2 src/kmkernel.h
M +1 -1 src/kmmainwidget.cpp
M +1 -1 src/messageactions.cpp
M +1 -1 src/searchdialog/searchwindowdialog.cpp
M +1 -1 src/widgets/vacationscriptindicatorwidget.cpp
https://invent.kde.org/pim/kmail/-/commit/c6bb617d567dad85e4085ea9cbea1ce6c4ce4b67
diff --git a/.codespellrc b/.codespellrc
index 0be43c4063..d93d9a5424 100644
--- a/.codespellrc
+++ b/.codespellrc
@@ -1,4 +1,8 @@
[codespell]
-skip = ./build*,.git,*.notifyrc,*.desktop,*.json,*.xml
+skip = ./build*,.git,*.notifyrc,*.desktop,*.json,*.xml,*.mbox,./po
interactive = 3
-ignore-words-list = accessort
+#ignore camelCase, regardless. also mixed case words with correct spelling
+ignore-regex = \b([a-z]+[A-Z0-9][a-z0-9]*|ist|mis|fpr|mIsSign|parm|parms)\b
+uri-ignore-words = ist,mis,bu
+#ampersand and semicolon also breaks words
+regex = [\w\-'’&(amp\;)]+
diff --git a/agents/archivemailagent/addarchivemailwidget.cpp b/agents/archivemailagent/addarchivemailwidget.cpp
index 88960c12bc..3ee39508de 100644
--- a/agents/archivemailagent/addarchivemailwidget.cpp
+++ b/agents/archivemailagent/addarchivemailwidget.cpp
@@ -41,7 +41,7 @@ AddArchiveMailWidget::AddArchiveMailWidget(ArchiveMailInfo *info, QWidget *paren
mFolderRequester->setNotAllowToCreateNewFolder(true);
mainLayout->addRow(folderLabel, mFolderRequester);
connect(mFolderRequester, &MailCommon::FolderRequester::folderChanged, this, &AddArchiveMailWidget::slotFolderChanged);
- if (info) { // Don't autorize to modify folder when we just modify item.
+ if (info) { // Don't authorize to modify folder when we just modify item.
mFolderRequester->setEnabled(false);
}
diff --git a/agents/archivemailagent/archivemailmanager.cpp b/agents/archivemailagent/archivemailmanager.cpp
index 5edac14f21..a0221a40b2 100644
--- a/agents/archivemailagent/archivemailmanager.cpp
+++ b/agents/archivemailagent/archivemailmanager.cpp
@@ -184,7 +184,7 @@ void ArchiveMailManager::archiveFolder(const QString &path, Akonadi::Collection:
info->setSaveCollectionId(collectionId);
info->setUrl(QUrl::fromLocalFile(path));
mListArchiveInfo.append(info);
- auto task = new ScheduledArchiveTask(this, info, Akonadi::Collection(info->saveCollectionId()), true /*immediat*/);
+ auto task = new ScheduledArchiveTask(this, info, Akonadi::Collection(info->saveCollectionId()), true /*immediate*/);
mArchiveMailKernel->jobScheduler()->registerTask(task);
}
diff --git a/agents/mailfilteragent/mailfilteragent.cpp b/agents/mailfilteragent/mailfilteragent.cpp
index 4518614d5f..040149d2c6 100644
--- a/agents/mailfilteragent/mailfilteragent.cpp
+++ b/agents/mailfilteragent/mailfilteragent.cpp
@@ -61,7 +61,7 @@ MailFilterAgent::MailFilterAgent(const QString &id)
CommonKernel->registerKernelIf(mMailFilterKernel); // register KernelIf early, it is used by the Filter classes
CommonKernel->registerSettingsIf(mMailFilterKernel); // SettingsIf is used in FolderTreeWidget
- // Initialize it after registring CommonKernel otherwise it crashs!
+ // Initialize it after registering CommonKernel otherwise it crashes!
mFilterManager = new FilterManager(this);
connect(mFilterManager, &FilterManager::percent, this, &MailFilterAgent::emitProgress);
@@ -175,7 +175,7 @@ void MailFilterAgent::clearMessage()
void MailFilterAgent::itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection)
{
- /* The monitor mimetype filter would override the collection filter, therefor we have to check
+ /* The monitor mimetype filter would override the collection filter, therefore we have to check
* for the mimetype of the item here.
*/
if (item.mimeType() != KMime::Message::mimeType()) {
diff --git a/agents/sendlateragent/sendlatermanager.cpp b/agents/sendlateragent/sendlatermanager.cpp
index f85324807a..b396e5cafa 100644
--- a/agents/sendlateragent/sendlatermanager.cpp
+++ b/agents/sendlateragent/sendlatermanager.cpp
@@ -249,7 +249,7 @@ QString SendLaterManager::printDebugInfo() const
QString SendLaterManager::infoToStr(MessageComposer::SendLaterInfo *info) const
{
- QString infoStr = QLatin1StringView("Recusive ") + (info->isRecurrence() ? QStringLiteral("true") : QStringLiteral("false"));
+ QString infoStr = QLatin1StringView("Recursive ") + (info->isRecurrence() ? QStringLiteral("true") : QStringLiteral("false"));
infoStr += QLatin1StringView("Item id :") + QString::number(info->itemId());
infoStr += QLatin1StringView("Send date:") + info->dateTime().toString();
infoStr += QLatin1StringView("Last saved date: ") + info->lastDateTimeSend().toString();
diff --git a/agents/unifiedmailboxagent/unifiedmailboxagent.cpp b/agents/unifiedmailboxagent/unifiedmailboxagent.cpp
index fd8c218571..ded41c1d4e 100644
--- a/agents/unifiedmailboxagent/unifiedmailboxagent.cpp
+++ b/agents/unifiedmailboxagent/unifiedmailboxagent.cpp
@@ -246,7 +246,7 @@ void UnifiedMailboxAgent::fixSpecialCollection(const QString &colId, Akonadi::Sp
void UnifiedMailboxAgent::fixSpecialCollections()
{
// This is a tiny hack to assign proper SpecialCollectionAttribute to special collections
- // assigned trough Identities. This should happen automatically in KMail when user changes
+ // assigned through Identities. This should happen automatically in KMail when user changes
// the special collections on the identity page, but until recent master (2018-07-24) this
// wasn't the case and there's no automatic migration, so we need to fix up manually here.
diff --git a/doc/akonadi_followupreminder_agent/index.docbook b/doc/akonadi_followupreminder_agent/index.docbook
index f84a77163f..5f1bc62a09 100644
--- a/doc/akonadi_followupreminder_agent/index.docbook
+++ b/doc/akonadi_followupreminder_agent/index.docbook
@@ -59,7 +59,7 @@ at a specific date.</para>
</mediaobject>
</screenshot>
-<para>Press the arrow-down button against the <guilabel>Date</guilabel> field to select the date from the &kde; calendar widget. It is also possible to choose your calender for the reminder using the <guilabel>Store ToDo in</guilabel> drop-down list.</para>
+<para>Press the arrow-down button against the <guilabel>Date</guilabel> field to select the date from the &kde; calendar widget. It is also possible to choose your calendar for the reminder using the <guilabel>Store ToDo in</guilabel> drop-down list.</para>
<para>To remove reminders you have scheduled, use <menuchoice><guimenu>Settings</guimenu>
<guimenuitem>Configure &kmail;...</guimenuitem></menuchoice> then select the <guilabel>Plugins</guilabel> page in &kmail; and press
the configuration button against the <guilabel>Followup Reminder Agent</guilabel> item. Then use the context menu launched with a &RMB; click on a reminder item to select the <guimenuitem>Delete</guimenuitem> action.
diff --git a/doc/kmail2/menus.docbook b/doc/kmail2/menus.docbook
index 42d1af45b1..c1e456755c 100644
--- a/doc/kmail2/menus.docbook
+++ b/doc/kmail2/menus.docbook
@@ -1391,7 +1391,7 @@ Menu</ulink> of the &kde; Fundamentals, with one additional item.</para>
<guimenuitem>New AddressBook Contact</guimenuitem>
</menuchoice></term>
<listitem><para><action>Brings up the &kontact; New Contact Dialog</action> to add a new contact your addressbook.</para></listitem>
-</varlistentry> Thes options not available in 5.14.2 @dcb2021088. -->
+</varlistentry> These options not available in 5.14.2 @dcb2021088. -->
<varlistentry id="composer-message-send-mail">
<term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>Return</keycap></keycombo></shortcut>
@@ -1568,7 +1568,7 @@ url="help:/fundamentals/menus.html#menus-edit">Edit Menu</ulink> section of the
<guimenuitem>Lowercase</guimenuitem>
</menuchoice></term>
<listitem><para>Convert the selected text to lowercase.</para></listitem>
-</varlistentry> These optons have been consolidated in the "Change Case" plugin. @dcb2021089. -->
+</varlistentry> These options have been consolidated in the "Change Case" plugin. @dcb2021089. -->
<varlistentry id="composer-edit-insert-special-character">
<term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Insert Special Character...</guimenuitem></menuchoice></term>
diff --git a/doc/kmail2/troubleshooting.docbook b/doc/kmail2/troubleshooting.docbook
index dd14f96588..d967e5c2f6 100644
--- a/doc/kmail2/troubleshooting.docbook
+++ b/doc/kmail2/troubleshooting.docbook
@@ -33,7 +33,7 @@
server. &akonadi; is an auxiliary program that functions as an intermediary between &kmail; (plus all the other &PIM;
applications) and a general purpose database daemon (most commonly "mysqld"). It also facilitates inter-process
communications among the various pieces of the &PIM; applications. Depending on the way your system is configured,
- &akonadi; may be started during the bootup / login process. Or it may not start until you invoke a &PIM;
+ &akonadi; may be started during the boot-up / login process. Or it may not start until you invoke a &PIM;
application program (like &kmail;, or &kaddressbook;, or &kontact;).</para>
<para> There are two application programs that permit one to interact with the &akonadi; server directly: <code>akonadictl</code>
diff --git a/ktnef/src/ktnefmain.cpp b/ktnef/src/ktnefmain.cpp
index 922b97bf71..fb39cffd3b 100644
--- a/ktnef/src/ktnefmain.cpp
+++ b/ktnef/src/ktnefmain.cpp
@@ -252,7 +252,7 @@ QString KTNEFMain::extractTemp(KTNEFAttach *att)
QString dir = QStandardPaths::writableLocation(QStandardPaths::TempLocation) + "/ktnef/"_L1;
mParser->extractFileTo(att->name(), dir);
QString filename = att->fileName();
- // falling back to internal TNEF attachement name if no filename is given for the attached file
+ // falling back to internal TNEF attachment name if no filename is given for the attached file
// this follows the logic of KTNEFParser::extractFileTo(...)
if (filename.isEmpty()) {
filename = att->name();
diff --git a/ktnef/src/qwmf.cpp b/ktnef/src/qwmf.cpp
index 23ce22ff2e..6bbb1451ff 100644
--- a/ktnef/src/qwmf.cpp
+++ b/ktnef/src/qwmf.cpp
@@ -734,7 +734,7 @@ void QWinMetaFile::extTextOut(long num, short *parm)
QByteArray text(ptStr, parm[2] + 1);
QFontMetrics fm(mPainter.font());
- width = fm.boundingRect(QLatin1StringView(text)).width() + fm.descent(); // because fm.width(text) isn't rigth with Italic text
+ width = fm.boundingRect(QLatin1StringView(text)).width() + fm.descent(); // because fm.width(text) isn't right with italic text
height = fm.height();
mPainter.save();
diff --git a/ktnef/src/qwmf.h b/ktnef/src/qwmf.h
index 8846699c25..0335647d5c 100644
--- a/ktnef/src/qwmf.h
+++ b/ktnef/src/qwmf.h
@@ -46,8 +46,8 @@ public:
/**
* Paint metafile to given paint-device using absolute or relative coordinate.
- * - absolute coord. Reset the world transfomation Matrix
- * - relative coord. Use the existing world transfomation Matrix
+ * - absolute coord. Reset the world transformation Matrix
+ * - relative coord. Use the existing world transformation Matrix
*
* @return true on success.
*/
diff --git a/src/autotests/kmcomposerwintest.cpp b/src/autotests/kmcomposerwintest.cpp
index 2a8eb8d831..f94e682f58 100644
--- a/src/autotests/kmcomposerwintest.cpp
+++ b/src/autotests/kmcomposerwintest.cpp
@@ -152,7 +152,7 @@ KMComposerWinTest::KMComposerWinTest(QObject *parent)
}
qputenv("GNUPGHOME", gnupgDir.path().toUtf8());
- // We need to initalize KMKernel after modifing the envionment variables, otherwise we would read the wrong configs
+ // We need to initialize KMKernel after modifying the environment variables, otherwise we would read the wrong configs
mKernel = new KMKernel(parent);
}
diff --git a/src/collectionpage/collectionviewpage.cpp b/src/collectionpage/collectionviewpage.cpp
index c2a0c85939..e7c9721e05 100644
--- a/src/collectionpage/collectionviewpage.cpp
+++ b/src/collectionpage/collectionviewpage.cpp
@@ -48,7 +48,7 @@ void CollectionViewPage::init(const Akonadi::Collection &col)
mCollectionViewWidget = new MailCommon::CollectionViewWidget(this);
topLayout->addWidget(mCollectionViewWidget);
- // Musn't be able to edit details for non-resource, system folder.
+ // Mustn't be able to edit details for non-resource, system folder.
if (!mIsLocalSystemFolder) {
auto innerLayout = qobject_cast<QFormLayout *>(mCollectionViewWidget->layout());
Q_ASSERT(innerLayout != nullptr);
diff --git a/src/configuredialog/configureappearancepage.cpp b/src/configuredialog/configureappearancepage.cpp
index 8fdd48f937..8fed3f29b3 100644
--- a/src/configuredialog/configureappearancepage.cpp
+++ b/src/configuredialog/configureappearancepage.cpp
@@ -210,7 +210,7 @@ void AppearancePageFontsTab::slotFontSelectorChanged(int index)
}
mActiveFontIndex = index;
- // Disonnect so the "Apply" button is not activated by the change
+ // Disconnect so the "Apply" button is not activated by the change
disconnect(mFontChooser, &KFontChooser::fontSelected, this, &ConfigModuleTab::slotEmitChanged);
// Display the new setting:
diff --git a/src/editor/kmcomposerwin.cpp b/src/editor/kmcomposerwin.cpp
index 8acb7371ba..01b7610759 100644
--- a/src/editor/kmcomposerwin.cpp
+++ b/src/editor/kmcomposerwin.cpp
@@ -1190,7 +1190,7 @@ void KMComposerWin::slotDelayedApplyTemplate(KJob *job)
const Akonadi::ItemFetchJob *fetchJob = qobject_cast<Akonadi::ItemFetchJob *>(job);
// const Akonadi::Item::List items = fetchJob->items();
- // Readd ? const TemplateParser::TemplateParserJob::Mode mode = static_cast<TemplateParser::TemplateParserJob::Mode>(fetchJob->property("mode").toInt());
+ // Re-add ? const TemplateParser::TemplateParserJob::Mode mode = static_cast<TemplateParser::TemplateParserJob::Mode>(fetchJob->property("mode").toInt());
const uint uoid = fetchJob->property("uoid").toUInt();
const uint uOldId = fetchJob->property("uOldid").toUInt();
mComposerBase->updateTemplate(mMsg);
@@ -1385,7 +1385,7 @@ void KMComposerWin::setupActions()
mRequestDeliveryConfirmation = new KToggleAction(i18nc("@action", "&Request Delivery Confirmation"), this);
actionCollection()->addAction(QStringLiteral("options_request_delivery_confirmation"), mRequestDeliveryConfirmation);
- // TOOD mRequestDeliveryConfirmation->setChecked(KMailSettings::self()->requestMDN());
+ // TODO mRequestDeliveryConfirmation->setChecked(KMailSettings::self()->requestMDN());
//----- Message-Encoding Submenu
mWordWrapAction = new KToggleAction(i18nc("@action", "&Wordwrap"), this);
@@ -3740,7 +3740,7 @@ void KMComposerWin::runKeyResolver()
auto resolvedKeys = result.solution.encryptionKeys[addrSpec];
GpgME::Key key;
if (resolvedKeys.size() == 0) { // no key found for recipient
- // Search for any key, also for not accepted ons, to at least give the user more info.
+ // Search for any key, also for not accepted ones, to at least give the user more info.
key = Kleo::KeyCache::instance()->findBestByMailBox(addrSpec.toUtf8().constData(), GpgME::UnknownProtocol, Kleo::KeyCache::KeyUsage::Encrypt);
key.update(); // We need tofu information for key.
recipient->setKey(key);
diff --git a/src/editor/plugininterface/kmailplugineditorconverttextmanagerinterface.cpp b/src/editor/plugininterface/kmailplugineditorconverttextmanagerinterface.cpp
index fd47098aec..c88f578cc9 100644
--- a/src/editor/plugininterface/kmailplugineditorconverttextmanagerinterface.cpp
+++ b/src/editor/plugininterface/kmailplugineditorconverttextmanagerinterface.cpp
@@ -28,7 +28,7 @@ void KMailPluginEditorConvertTextManagerInterface::reformatText()
{
for (MessageComposer::PluginEditorConvertTextInterface *interface : std::as_const(mListPluginInterface)) {
if (interface->reformatText()) {
- // TODO signal that it was reformating.
+ // TODO signal that it was reformatting.
// Stop it.?
}
}
diff --git a/src/job/createnewcontactjob.h b/src/job/createnewcontactjob.h
index 7d2472724a..4db044475f 100644
--- a/src/job/createnewcontactjob.h
+++ b/src/job/createnewcontactjob.h
@@ -13,7 +13,7 @@
/**
* @brief The CreateNewContactJob class
* The job will check if there is address book folder to store new contact to akonadi
- * otherise it will allow to create new one.
+ * otherwise it will allow to create new one.
*/
class CreateNewContactJob : public KJob
{
diff --git a/src/kmkernel.cpp b/src/kmkernel.cpp
index 72134147ca..023a24e6fa 100644
--- a/src/kmkernel.cpp
+++ b/src/kmkernel.cpp
@@ -1479,7 +1479,7 @@ void KMKernel::transportRenamed(int id, const QString &oldName, const QString &n
const QString information = i18np("This identity has been changed to use the modified transport:",
"These %1 identities have been changed to use the modified transport:",
changedIdents.count());
- // Don't set parent otherwise we will swith to current KMail and we configure it. So not good
+ // Don't set parent otherwise we will switch to current KMail and we configure it. So not good
KMessageBox::informationList(nullptr, information, changedIdents);
im->commit();
}
diff --git a/src/kmkernel.h b/src/kmkernel.h
index a6e4398448..f643d89130 100644
--- a/src/kmkernel.h
+++ b/src/kmkernel.h
@@ -519,7 +519,7 @@ public Q_SLOTS:
void slotRequestConfigSync();
/**
- * Sync the config immediatley
+ * Sync the config immediately
*/
void slotSyncConfig();
@@ -596,7 +596,7 @@ private:
bool the_firstStart = false;
/** are we going down? set from here */
bool the_shuttingDown = false;
- /** true unles kmail is closed by session management */
+ /** true unless kmail is closed by session management */
bool the_firstInstance = false;
KSharedConfig::Ptr mConfig;
diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp
index 5aa68b11c9..240d3e51a8 100644
--- a/src/kmmainwidget.cpp
+++ b/src/kmmainwidget.cpp
@@ -3058,7 +3058,7 @@ void KMMainWidget::setupActions()
connect(action, &QAction::triggered, mLaunchExternalComponent, &KMLaunchExternalComponent::slotConfigureFollowupReminder);
}
- // Disable the standard action delete key sortcut.
+ // Disable the standard action delete key shortcut.
QAction *const standardDelAction = akonadiStandardAction(Akonadi::StandardActionManager::DeleteItems);
standardDelAction->setShortcut(QKeySequence());
diff --git a/src/messageactions.cpp b/src/messageactions.cpp
index c6c912f873..ccf64d3062 100644
--- a/src/messageactions.cpp
+++ b/src/messageactions.cpp
@@ -413,7 +413,7 @@ void MessageActions::updateMailingListActions(const Akonadi::Item &messageItem)
clearMailingListActions();
} else {
// A mailing list menu with only a title is pretty boring
- // so make sure theres at least some content
+ // so make sure there's at least some content
QString listId;
if (mailList.features() & MessageCore::MailingList::Id) {
// From a list-id in the form, "Birds of France <bof.yahoo.com>",
diff --git a/src/searchdialog/searchwindowdialog.cpp b/src/searchdialog/searchwindowdialog.cpp
index 8336d30e6c..4a402c41eb 100644
--- a/src/searchdialog/searchwindowdialog.cpp
+++ b/src/searchdialog/searchwindowdialog.cpp
@@ -113,7 +113,7 @@ SearchWindowDialog::SearchWindowDialog(KMMainWidget *widget, const Akonadi::Coll
inserting, which looks rather strange - the user cannot read
the results so far as they are constantly re-sorted --dnaber
- Sorting is now disabled when a search is started and reenabled
+ Sorting is now disabled when a search is started and re-enabled
when it stops. Items are appended to the list. This not only
solves the above problem, but speeds searches with many hits
up considerably. - till
diff --git a/src/widgets/vacationscriptindicatorwidget.cpp b/src/widgets/vacationscriptindicatorwidget.cpp
index aa9794a0d5..c0f7fc1f25 100644
--- a/src/widgets/vacationscriptindicatorwidget.cpp
+++ b/src/widgets/vacationscriptindicatorwidget.cpp
@@ -34,7 +34,7 @@ void ServerLabel::mouseReleaseEvent(QMouseEvent *event)
VacationLabel::VacationLabel(const QString &text, QWidget *parent)
: QLabel(text, parent)
{
- // changing the palette doesn't work, seems to be overwriten by the
+ // changing the palette doesn't work, seems to be overwritten by the
// statusbar again, stylesheets seems to work though
setStyleSheet(QStringLiteral("background-color: %1; color: %2;").arg(QColor(Qt::yellow).name(), QColor(Qt::black).name()));
setContentsMargins(4, 0, 2, 0);