diff --git a/agents/archivemailagent/addarchivemaildialog.cpp b/agents/archivemailagent/addarchivemaildialog.cpp
index 26defdf7a..dccb016b8 100644
--- a/agents/archivemailagent/addarchivemaildialog.cpp
+++ b/agents/archivemailagent/addarchivemaildialog.cpp
@@ -167,7 +167,7 @@ void AddArchiveMailDialog::slotUpdateOkButton()
 
 void AddArchiveMailDialog::slotFolderChanged(const Akonadi::Collection &collection)
 {
-    Q_UNUSED(collection);
+    Q_UNUSED(collection)
     slotUpdateOkButton();
 }
 
diff --git a/agents/archivemailagent/archivemailkernel.cpp b/agents/archivemailagent/archivemailkernel.cpp
index 9f2fcde4e..8118cf17e 100644
--- a/agents/archivemailagent/archivemailkernel.cpp
+++ b/agents/archivemailagent/archivemailkernel.cpp
@@ -112,11 +112,11 @@ Akonadi::Collection::Id ArchiveMailKernel::lastSelectedFolder()
 
 void ArchiveMailKernel::setLastSelectedFolder(Akonadi::Collection::Id col)
 {
-    Q_UNUSED(col);
+    Q_UNUSED(col)
 }
 
 void ArchiveMailKernel::expunge(Akonadi::Collection::Id col, bool sync)
 {
-    Q_UNUSED(col);
-    Q_UNUSED(sync);
+    Q_UNUSED(col)
+    Q_UNUSED(sync)
 }
diff --git a/agents/followupreminderagent/followupreminderinfowidget.cpp b/agents/followupreminderagent/followupreminderinfowidget.cpp
index 77e043499..1366a0a46 100644
--- a/agents/followupreminderagent/followupreminderinfowidget.cpp
+++ b/agents/followupreminderagent/followupreminderinfowidget.cpp
@@ -172,7 +172,7 @@ bool FollowUpReminderInfoWidget::save() const
 
 void FollowUpReminderInfoWidget::slotCustomContextMenuRequested(const QPoint &pos)
 {
-    Q_UNUSED(pos);
+    Q_UNUSED(pos)
     const QList<QTreeWidgetItem *> listItems = mTreeWidget->selectedItems();
     const int nbElementSelected = listItems.count();
     if (nbElementSelected > 0) {
diff --git a/agents/followupreminderagent/followupremindernoanswerdialog.cpp b/agents/followupreminderagent/followupremindernoanswerdialog.cpp
index a5724ca11..7d91a07a9 100644
--- a/agents/followupreminderagent/followupremindernoanswerdialog.cpp
+++ b/agents/followupreminderagent/followupremindernoanswerdialog.cpp
@@ -88,8 +88,8 @@ void FollowUpReminderNoAnswerDialog::wakeUp()
 void FollowUpReminderNoAnswerDialog::slotDBusNotificationsPropertiesChanged(
     const QString &interface, const QVariantMap &changedProperties, const QStringList &invalidatedProperties)
 {
-    Q_UNUSED(interface); // always "org.freedesktop.Notifications"
-    Q_UNUSED(invalidatedProperties);
+    Q_UNUSED(interface) // always "org.freedesktop.Notifications"
+    Q_UNUSED(invalidatedProperties)
     const auto it = changedProperties.find(QStringLiteral("Inhibited"));
     if (it != changedProperties.end()) {
         const bool inhibited = it.value().toBool();
diff --git a/agents/mailfilteragent/dummykernel.cpp b/agents/mailfilteragent/dummykernel.cpp
index c952e6d01..5a990b272 100644
--- a/agents/mailfilteragent/dummykernel.cpp
+++ b/agents/mailfilteragent/dummykernel.cpp
@@ -101,7 +101,7 @@ Akonadi::Collection::Id DummyKernel::lastSelectedFolder()
 
 void DummyKernel::setLastSelectedFolder(Akonadi::Collection::Id col)
 {
-    Q_UNUSED(col);
+    Q_UNUSED(col)
 }
 
 void DummyKernel::expunge(Akonadi::Collection::Id id, bool sync)
diff --git a/agents/mailfilteragent/filterlogdialog.cpp b/agents/mailfilteragent/filterlogdialog.cpp
index 41577c9d2..10eb2189d 100644
--- a/agents/mailfilteragent/filterlogdialog.cpp
+++ b/agents/mailfilteragent/filterlogdialog.cpp
@@ -358,7 +358,7 @@ FilterLogTextEdit::FilterLogTextEdit(QWidget *parent)
 
 void FilterLogTextEdit::addExtraMenuEntry(QMenu *menu, QPoint pos)
 {
-    Q_UNUSED(pos);
+    Q_UNUSED(pos)
     if (!document()->isEmpty()) {
         auto *sep = new QAction(menu);
         sep->setSeparator(true);
diff --git a/agents/mailfilteragent/mailfilteragent.cpp b/agents/mailfilteragent/mailfilteragent.cpp
index 83abc88c5..4013a3cb7 100644
--- a/agents/mailfilteragent/mailfilteragent.cpp
+++ b/agents/mailfilteragent/mailfilteragent.cpp
@@ -129,7 +129,7 @@ MailFilterAgent::~MailFilterAgent()
 
 void MailFilterAgent::configure(WId windowId)
 {
-    Q_UNUSED(windowId);
+    Q_UNUSED(windowId)
 }
 
 void MailFilterAgent::initializeCollections()
diff --git a/agents/unifiedmailboxagent/mailkernel.cpp b/agents/unifiedmailboxagent/mailkernel.cpp
index 91f465ff1..b887c0912 100644
--- a/agents/unifiedmailboxagent/mailkernel.cpp
+++ b/agents/unifiedmailboxagent/mailkernel.cpp
@@ -118,7 +118,7 @@ Akonadi::Collection::Id MailKernel::lastSelectedFolder()
 
 void MailKernel::setLastSelectedFolder(Akonadi::Collection::Id col)
 {
-    Q_UNUSED(col);
+    Q_UNUSED(col)
 }
 
 void MailKernel::expunge(Akonadi::Collection::Id id, bool sync)
diff --git a/agents/unifiedmailboxagent/unifiedmailboxagent.cpp b/agents/unifiedmailboxagent/unifiedmailboxagent.cpp
index a1c6e9865..690f62943 100644
--- a/agents/unifiedmailboxagent/unifiedmailboxagent.cpp
+++ b/agents/unifiedmailboxagent/unifiedmailboxagent.cpp
@@ -218,7 +218,7 @@ void UnifiedMailboxAgent::retrieveItems(const Akonadi::Collection &c)
 bool UnifiedMailboxAgent::retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts)
 {
     // This method should never be called by Akonadi
-    Q_UNUSED(parts);
+    Q_UNUSED(parts)
     qCWarning(UNIFIEDMAILBOXAGENT_LOG) << "retrieveItem() for item" << item.id() << "called but we can't own any items! This is a bug in Akonadi";
     return false;
 }
diff --git a/src/collectionpage/collectionmailinglistpage.cpp b/src/collectionpage/collectionmailinglistpage.cpp
index a4fcbcf85..46159f78f 100644
--- a/src/collectionpage/collectionmailinglistpage.cpp
+++ b/src/collectionpage/collectionmailinglistpage.cpp
@@ -148,7 +148,7 @@ void CollectionMailingListPage::load(const Akonadi::Collection &col)
 
 void CollectionMailingListPage::save(Akonadi::Collection &col)
 {
-    Q_UNUSED(col);
+    Q_UNUSED(col)
     if (changed) {
         if (mFolder) {
             // settings for mailingList
diff --git a/src/configuredialog/configagentdelegate.cpp b/src/configuredialog/configagentdelegate.cpp
index 8aa272e40..28d02a173 100644
--- a/src/configuredialog/configagentdelegate.cpp
+++ b/src/configuredialog/configagentdelegate.cpp
@@ -163,7 +163,7 @@ QWidget *ConfigAgentDelegate::createEditor(QWidget *, const QStyleOptionViewItem
 
 bool ConfigAgentDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index)
 {
-    Q_UNUSED(model);
+    Q_UNUSED(model)
     if (!index.isValid()) {
         return false;
     }
diff --git a/src/configuredialog/configureappearancepage.cpp b/src/configuredialog/configureappearancepage.cpp
index cdaa7ee26..84810a870 100644
--- a/src/configuredialog/configureappearancepage.cpp
+++ b/src/configuredialog/configureappearancepage.cpp
@@ -1060,9 +1060,9 @@ void AppearancePage::MessageTagTab::slotEmitChangeCheck()
 
 void AppearancePage::MessageTagTab::slotRowsMoved(const QModelIndex &, int sourcestart, int sourceEnd, const QModelIndex &, int destinationRow)
 {
-    Q_UNUSED(sourceEnd);
-    Q_UNUSED(sourcestart);
-    Q_UNUSED(destinationRow);
+    Q_UNUSED(sourceEnd)
+    Q_UNUSED(sourcestart)
+    Q_UNUSED(destinationRow)
     updateButtons();
     slotEmitChangeCheck();
 }
diff --git a/src/editor/attachment/attachmentview.cpp b/src/editor/attachment/attachmentview.cpp
index f0d10c835..c35085399 100644
--- a/src/editor/attachment/attachmentview.cpp
+++ b/src/editor/attachment/attachmentview.cpp
@@ -99,7 +99,7 @@ void AttachmentView::saveHeaderState()
 
 void AttachmentView::contextMenuEvent(QContextMenuEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
     Q_EMIT contextMenuRequested();
 }
 
@@ -178,7 +178,7 @@ void AttachmentView::selectNewAttachment()
 
 void AttachmentView::startDrag(Qt::DropActions supportedActions)
 {
-    Q_UNUSED(supportedActions);
+    Q_UNUSED(supportedActions)
 
     const QModelIndexList selection = selectionModel()->selectedRows();
     if (!selection.isEmpty()) {
diff --git a/src/editor/kmcomposereditorng.cpp b/src/editor/kmcomposereditorng.cpp
index 3839f1868..9c7605327 100644
--- a/src/editor/kmcomposereditorng.cpp
+++ b/src/editor/kmcomposereditorng.cpp
@@ -42,7 +42,7 @@ KMComposerEditorNg::~KMComposerEditorNg()
 
 void KMComposerEditorNg::addExtraMenuEntry(QMenu *menu, QPoint pos)
 {
-    Q_UNUSED(pos);
+    Q_UNUSED(pos)
     const QList<QAction *> lstAct = mComposerWin->pluginToolsActionListForPopupMenu();
     for (QAction *a : lstAct) {
         menu->addSeparator();
@@ -111,7 +111,7 @@ QString KMComposerEditorNg::smartQuote(const QString &msg)
 
 void KMComposerEditorNg::showSpellConfigDialog(const QString &configFileName)
 {
-    Q_UNUSED(configFileName);
+    Q_UNUSED(configFileName)
     QPointer<SpellCheckerConfigDialog> dialog = new SpellCheckerConfigDialog(this);
     if (!spellCheckingLanguage().isEmpty()) {
         dialog->setLanguage(spellCheckingLanguage());
diff --git a/src/editor/kmcomposerwin.cpp b/src/editor/kmcomposerwin.cpp
index 5f87024b9..fc77059e0 100644
--- a/src/editor/kmcomposerwin.cpp
+++ b/src/editor/kmcomposerwin.cpp
@@ -643,7 +643,7 @@ void KMComposerWin::addAttachment(const QVector<KMail::Composer::AttachmentInfo>
 
 void KMComposerWin::addAttachment(const QString &name, KMime::Headers::contentEncoding cte, const QString &charset, const QByteArray &data, const QByteArray &mimeType)
 {
-    Q_UNUSED(cte);
+    Q_UNUSED(cte)
     mComposerBase->addAttachment(name, name, charset, data, mimeType);
 }
 
@@ -3742,7 +3742,7 @@ void KMComposerWin::slotIdentityDeleted(uint uoid)
 
 void KMComposerWin::slotTransportRemoved(int id, const QString &name)
 {
-    Q_UNUSED(name);
+    Q_UNUSED(name)
     if (mComposerBase->transportComboBox()->currentTransportId() == id) {
         mIncorrectIdentityFolderWarning->mailTransportIsInvalid();
     }
diff --git a/src/job/createnewcontactjob.cpp b/src/job/createnewcontactjob.cpp
index 1805e8859..cb810263d 100644
--- a/src/job/createnewcontactjob.cpp
+++ b/src/job/createnewcontactjob.cpp
@@ -117,7 +117,7 @@ void CreateNewContactJob::createContact()
 
 void CreateNewContactJob::contactStored(const Akonadi::Item &item)
 {
-    Q_UNUSED(item);
+    Q_UNUSED(item)
     PimCommon::BroadcastStatus::instance()->setStatusMsg(i18n("Contact created successfully"));
 }
 
diff --git a/src/kmkernel.cpp b/src/kmkernel.cpp
index 0276a6032..bd782f88c 100644
--- a/src/kmkernel.cpp
+++ b/src/kmkernel.cpp
@@ -1500,7 +1500,7 @@ MessageComposer::MessageSender *KMKernel::msgSender()
 
 void KMKernel::transportRemoved(int id, const QString &name)
 {
-    Q_UNUSED(id);
+    Q_UNUSED(id)
 
     // reset all identities using the deleted transport
     QStringList changedIdents;
@@ -1531,7 +1531,7 @@ void KMKernel::transportRemoved(int id, const QString &name)
 
 void KMKernel::transportRenamed(int id, const QString &oldName, const QString &newName)
 {
-    Q_UNUSED(id);
+    Q_UNUSED(id)
 
     QStringList changedIdents;
     KIdentityManagement::IdentityManager *im = identityManager();
@@ -1959,8 +1959,8 @@ void KMKernel::setShuttingDown(bool flag)
 
 void KMKernel::expunge(Akonadi::Collection::Id col, bool sync)
 {
-    Q_UNUSED(col);
-    Q_UNUSED(sync);
+    Q_UNUSED(col)
+    Q_UNUSED(sync)
 }
 
 #ifdef WITH_KUSERFEEDBACK
diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp
index 1276c3ecd..f0995dda7 100644
--- a/src/kmmainwidget.cpp
+++ b/src/kmmainwidget.cpp
@@ -1239,7 +1239,7 @@ void KMMainWidget::slotCollectionChanged(const Akonadi::Collection &collection,
 
 void KMMainWidget::slotItemAdded(const Akonadi::Item &msg, const Akonadi::Collection &col)
 {
-    Q_UNUSED(msg);
+    Q_UNUSED(msg)
     if (col.isValid()) {
         if (col == CommonKernel->outboxCollectionFolder()) {
             startUpdateMessageActionsTimer();
diff --git a/src/kontactplugin/kmail/summarywidget.cpp b/src/kontactplugin/kmail/summarywidget.cpp
index 08181f45d..bfe9e808b 100644
--- a/src/kontactplugin/kmail/summarywidget.cpp
+++ b/src/kontactplugin/kmail/summarywidget.cpp
@@ -92,7 +92,7 @@ void SummaryWidget::slotCollectionChanged()
 
 void SummaryWidget::updateSummary(bool force)
 {
-    Q_UNUSED(force);
+    Q_UNUSED(force)
     QTimer::singleShot(0, this, &SummaryWidget::slotUpdateFolderList);
 }
 
diff --git a/src/kontactplugin/summary/summaryview_part.cpp b/src/kontactplugin/summary/summaryview_part.cpp
index ff8ab4606..f95565899 100644
--- a/src/kontactplugin/summary/summaryview_part.cpp
+++ b/src/kontactplugin/summary/summaryview_part.cpp
@@ -43,7 +43,7 @@ SummaryViewPart::SummaryViewPart(KontactInterface::Core *core, const KAboutData
     : KParts::Part(parent)
     , mCore(core)
 {
-    Q_UNUSED(aboutData);
+    Q_UNUSED(aboutData)
     setComponentName(QStringLiteral("kontactsummary"), i18n("Kontact Summary"));
 
     loadLayout();
diff --git a/src/messageactions.cpp b/src/messageactions.cpp
index fcd1ac6a8..8dc34452b 100644
--- a/src/messageactions.cpp
+++ b/src/messageactions.cpp
@@ -316,7 +316,7 @@ void MessageActions::slotItemRemoved(const Akonadi::Item &item)
 
 void MessageActions::slotItemModified(const Akonadi::Item &item, const QSet< QByteArray > &partIdentifiers)
 {
-    Q_UNUSED(partIdentifiers);
+    Q_UNUSED(partIdentifiers)
     if (item == mCurrentItem) {
         mCurrentItem = item;
         const int numberOfVisibleItems = mVisibleItems.count();
diff --git a/src/unityservicemanager.cpp b/src/unityservicemanager.cpp
index ed43df5e7..a457b4efc 100644
--- a/src/unityservicemanager.cpp
+++ b/src/unityservicemanager.cpp
@@ -158,13 +158,13 @@ void UnityServiceManager::initUnity()
     mUnityServiceWatcher->setWatchMode(QDBusServiceWatcher::WatchForUnregistration | QDBusServiceWatcher::WatchForRegistration);
     mUnityServiceWatcher->addWatchedService(QStringLiteral("com.canonical.Unity"));
     connect(mUnityServiceWatcher, &QDBusServiceWatcher::serviceRegistered, this, [this](const QString &service) {
-        Q_UNUSED(service);
+        Q_UNUSED(service)
         mUnityServiceAvailable = true;
         updateCount();
     });
 
     connect(mUnityServiceWatcher, &QDBusServiceWatcher::serviceUnregistered, this, [this](const QString &service) {
-        Q_UNUSED(service);
+        Q_UNUSED(service)
         mUnityServiceAvailable = false;
     });