diff --git a/src/ksieveui/debug/sievedebugdialog.cpp b/src/ksieveui/debug/sievedebugdialog.cpp
index b4eaa1f33216945bc28844747bcfbbeb4a113cf9..d55d64dea8f667bcde0f271271a16c449c22f325 100644
--- a/src/ksieveui/debug/sievedebugdialog.cpp
+++ b/src/ksieveui/debug/sievedebugdialog.cpp
@@ -32,7 +32,7 @@
 
 using namespace KSieveUi;
 
-SieveDebugDialog::SieveDebugDialog(SieveImapPasswordProvider* passwordProvider, QWidget *parent)
+SieveDebugDialog::SieveDebugDialog(SieveImapPasswordProvider *passwordProvider, QWidget *parent)
     : QDialog(parent)
     , mSieveJob(nullptr)
     , mPasswordProvider(passwordProvider)
diff --git a/src/ksieveui/debug/sievedebugdialog.h b/src/ksieveui/debug/sievedebugdialog.h
index 4293e14d3f2a9bb86baab734f45f633b52c11d57..27875262a05d6060ed1a53d702cca9f277a3400c 100644
--- a/src/ksieveui/debug/sievedebugdialog.h
+++ b/src/ksieveui/debug/sievedebugdialog.h
@@ -29,7 +29,6 @@ namespace KPIMTextEdit {
 class PlainTextEditorWidget;
 }
 namespace KSieveUi {
-
 class SieveImapPasswordProvider;
 
 /**
@@ -40,7 +39,7 @@ class KSIEVEUI_EXPORT SieveDebugDialog : public QDialog
 {
     Q_OBJECT
 public:
-    explicit SieveDebugDialog(SieveImapPasswordProvider* passwordProvider, QWidget *parent = nullptr);
+    explicit SieveDebugDialog(SieveImapPasswordProvider *passwordProvider, QWidget *parent = nullptr);
     ~SieveDebugDialog();
 
 Q_SIGNALS:
@@ -61,7 +60,7 @@ private:
     QUrl mUrl;
     KSyntaxHighlighting::Repository mRepo;
 
-    SieveImapPasswordProvider* mPasswordProvider;
+    SieveImapPasswordProvider *mPasswordProvider;
     KPIMTextEdit::PlainTextEditorWidget *mEdit;
     QStringList mResourceIdentifier;
     QStringList mScriptList;
diff --git a/src/ksieveui/managesievescriptsdialog.h b/src/ksieveui/managesievescriptsdialog.h
index e9c7fb663ce7dcba86cd06aaf6253bb9c2c00a59..56d4a876f7db4543d40c37e1637c81478b497010 100644
--- a/src/ksieveui/managesievescriptsdialog.h
+++ b/src/ksieveui/managesievescriptsdialog.h
@@ -39,7 +39,7 @@ class KSIEVEUI_EXPORT ManageSieveScriptsDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit ManageSieveScriptsDialog(SieveImapPasswordProvider* passwordProvider, QWidget *parent = nullptr);
+    explicit ManageSieveScriptsDialog(SieveImapPasswordProvider *passwordProvider, QWidget *parent = nullptr);
     ~ManageSieveScriptsDialog();
 
 Q_SIGNALS:
diff --git a/src/ksieveui/util/autotests/utilmethodtest.cpp b/src/ksieveui/util/autotests/utilmethodtest.cpp
index 070e4193d37149a6967e3253c0c6f5f577d62998..279162693104270e7c4b62b45ab960d9e015fe3f 100644
--- a/src/ksieveui/util/autotests/utilmethodtest.cpp
+++ b/src/ksieveui/util/autotests/utilmethodtest.cpp
@@ -30,16 +30,16 @@ class DataImapPasswordProvider : public KSieveUi::SieveImapPasswordProvider
 {
 public:
     DataImapPasswordProvider(AkonadiImapSettingInterfaceDataTest *data)
-     : mData(data)
+        : mData(data)
     {
     }
 
-    QString password(const QString &/*identifier*/) override
+    QString password(const QString & /*identifier*/) override
     {
         return mData->password;
     }
 
-    QString sieveCustomPassword(const QString &/*identifier*/) override
+    QString sieveCustomPassword(const QString & /*identifier*/) override
     {
         return mData->sieveCustomPassword;
     }
diff --git a/src/ksieveui/util/sieveimappasswordprovider.h b/src/ksieveui/util/sieveimappasswordprovider.h
index 9587b28d8ad884546531f6754006df9cb14dfc2d..be0db6d3476d74cf5732acfc7c1f88cb931cc542 100644
--- a/src/ksieveui/util/sieveimappasswordprovider.h
+++ b/src/ksieveui/util/sieveimappasswordprovider.h
@@ -24,9 +24,7 @@
 
 class QString;
 
-namespace KSieveUi
-{
-
+namespace KSieveUi {
 class KSIEVEUI_EXPORT SieveImapPasswordProvider
 {
 public:
@@ -34,6 +32,5 @@ public:
     virtual QString password(const QString &identifier) = 0;
     virtual QString sieveCustomPassword(const QString &identifier) = 0;
 };
-
 }
 #endif
diff --git a/src/ksieveui/util/util.cpp b/src/ksieveui/util/util.cpp
index 3355e9c48929bc2d265d9c5b2eb4a998a39df106..a7b294f0873c22dc12be95f7fde18d5dd514eb92 100644
--- a/src/ksieveui/util/util.cpp
+++ b/src/ksieveui/util/util.cpp
@@ -61,7 +61,8 @@ KSieveUi::Util::AccountInfo KSieveUi::Util::fullAccountInfo(const QString &ident
     return accountInfo;
 }
 
-KSieveUi::Util::AccountInfo KSieveUi::Util::findAccountInfo(const QString &identifier, SieveImapPasswordProvider *provider, bool withVacationFileName, std::unique_ptr<KSieveUi::AbstractAkonadiImapSettingInterface> &interface)
+KSieveUi::Util::AccountInfo KSieveUi::Util::findAccountInfo(const QString &identifier, SieveImapPasswordProvider *provider, bool withVacationFileName,
+                                                            std::unique_ptr<KSieveUi::AbstractAkonadiImapSettingInterface> &interface)
 {
     KSieveUi::Util::AccountInfo accountInfo;
     if (!interface) {
diff --git a/src/ksieveui/util/util_p.h b/src/ksieveui/util/util_p.h
index aff33e6ae1f3c7ff5497f200c93aa63999a93bc0..f92433c1988ec465d9bea9e1af73174c348b0f7c 100644
--- a/src/ksieveui/util/util_p.h
+++ b/src/ksieveui/util/util_p.h
@@ -80,7 +80,8 @@ bool hasKep14Support(const QStringList &sieveCapabilities, const QStringList &av
  */
 bool isKep14ProtectedName(const QString &scriptName);
 
-KSIEVEUI_TESTS_EXPORT KSieveUi::Util::AccountInfo findAccountInfo(const QString &identifier, SieveImapPasswordProvider *provider, bool withVacationFileName, std::unique_ptr<KSieveUi::AbstractAkonadiImapSettingInterface> &interface);
+KSIEVEUI_TESTS_EXPORT KSieveUi::Util::AccountInfo findAccountInfo(const QString &identifier, SieveImapPasswordProvider *provider, bool withVacationFileName,
+                                                                  std::unique_ptr<KSieveUi::AbstractAkonadiImapSettingInterface> &interface);
 /**
  * Returns all sieve account info with the given @p identifier.
  */
diff --git a/src/ksieveui/vacation/multiimapvacationmanager.cpp b/src/ksieveui/vacation/multiimapvacationmanager.cpp
index 1c1f47b533c4aaf886b0516121ff22615682587e..4c4d89f7b5aa2189cdfb180c353ec5474d1aa615 100644
--- a/src/ksieveui/vacation/multiimapvacationmanager.cpp
+++ b/src/ksieveui/vacation/multiimapvacationmanager.cpp
@@ -28,7 +28,7 @@
 #include "libksieve_debug.h"
 
 using namespace KSieveUi;
-MultiImapVacationManager::MultiImapVacationManager(SieveImapPasswordProvider* passwordProvider, QObject *parent)
+MultiImapVacationManager::MultiImapVacationManager(SieveImapPasswordProvider *passwordProvider, QObject *parent)
     : QObject(parent)
     , mPasswordProvider(passwordProvider)
     , mNumberOfJobs(0)
diff --git a/src/ksieveui/vacation/multiimapvacationmanager.h b/src/ksieveui/vacation/multiimapvacationmanager.h
index 3f647af3d7fc5db334fa214caa1ce403580cfc74..f0ab620d9c0d5a449c6299c9ee58ab20beddcb51 100644
--- a/src/ksieveui/vacation/multiimapvacationmanager.h
+++ b/src/ksieveui/vacation/multiimapvacationmanager.h
@@ -35,7 +35,7 @@ class KSIEVEUI_EXPORT MultiImapVacationManager : public QObject
 {
     Q_OBJECT
 public:
-    explicit MultiImapVacationManager(SieveImapPasswordProvider* passwordProvider, QObject *parent = nullptr);
+    explicit MultiImapVacationManager(SieveImapPasswordProvider *passwordProvider, QObject *parent = nullptr);
     ~MultiImapVacationManager();
 
     void checkVacation();
@@ -52,7 +52,7 @@ private Q_SLOTS:
     void slotCheckKep14Ended(KSieveUi::CheckKolabKep14SupportJob *job, bool success);
 
 private:
-    SieveImapPasswordProvider* mPasswordProvider;
+    SieveImapPasswordProvider *mPasswordProvider;
     int mNumberOfJobs;
     bool mCheckInProgress;
 
diff --git a/src/ksieveui/vacation/vacation.cpp b/src/ksieveui/vacation/vacation.cpp
index 9a91adcd85b8d1fe32f82e91a6971512d1903b76..b9083bf5e5f6055aaefc90adeba8524b55e6c790 100644
--- a/src/ksieveui/vacation/vacation.cpp
+++ b/src/ksieveui/vacation/vacation.cpp
@@ -27,7 +27,7 @@
 
 using namespace KSieveUi;
 
-Vacation::Vacation(SieveImapPasswordProvider* passwordProvider, QObject *parent, bool checkOnly, const QUrl &url)
+Vacation::Vacation(SieveImapPasswordProvider *passwordProvider, QObject *parent, bool checkOnly, const QUrl &url)
     : QObject(parent)
     , mPasswordProvider(passwordProvider)
     , mSieveJob(nullptr)
diff --git a/src/ksieveui/vacation/vacation.h b/src/ksieveui/vacation/vacation.h
index 5e024bcc4de80e8b000a43829cb03844060e7561..1310465fd1a72fcd9e1376a09567c3a1caf14edc 100644
--- a/src/ksieveui/vacation/vacation.h
+++ b/src/ksieveui/vacation/vacation.h
@@ -33,7 +33,7 @@ class Vacation : public QObject
     Q_OBJECT
 
 public:
-    explicit Vacation(SieveImapPasswordProvider* passwordProvider, QObject *parent = nullptr, bool checkonly = false, const QUrl &url = QUrl());
+    explicit Vacation(SieveImapPasswordProvider *passwordProvider, QObject *parent = nullptr, bool checkonly = false, const QUrl &url = QUrl());
     virtual ~Vacation();
 
     bool isUsable() const;
@@ -59,7 +59,7 @@ protected Q_SLOTS:
     void slotPutInactiveResult(KManageSieve::SieveJob *, bool);
 protected:
     // IO:
-    SieveImapPasswordProvider* mPasswordProvider;
+    SieveImapPasswordProvider *mPasswordProvider;
     KManageSieve::SieveJob *mSieveJob;
     QUrl mUrl;
     QString mServerName;
diff --git a/src/ksieveui/vacation/vacationmanager.cpp b/src/ksieveui/vacation/vacationmanager.cpp
index 8271db03b29cf8413c7c22eadcee15e264a6b14e..e63c94c6ae495066251a5869698133ff572ab3e1 100644
--- a/src/ksieveui/vacation/vacationmanager.cpp
+++ b/src/ksieveui/vacation/vacationmanager.cpp
@@ -44,7 +44,7 @@ public:
     bool mQuestionAsked;
 };
 
-VacationManager::VacationManager(SieveImapPasswordProvider* passwordProvider, QWidget *parent)
+VacationManager::VacationManager(SieveImapPasswordProvider *passwordProvider, QWidget *parent)
     : QObject(parent)
     , d(new KSieveUi::VacationManagerPrivate(parent))
 {
diff --git a/src/ksieveui/vacation/vacationmanager.h b/src/ksieveui/vacation/vacationmanager.h
index a225d2301b3b6eb2b160432113843536d8bf3d0a..5204e18f89dd5fee3c73982d9f9f327cdcc59fca 100644
--- a/src/ksieveui/vacation/vacationmanager.h
+++ b/src/ksieveui/vacation/vacationmanager.h
@@ -32,7 +32,7 @@ class KSIEVEUI_EXPORT VacationManager : public QObject
 {
     Q_OBJECT
 public:
-    explicit VacationManager(SieveImapPasswordProvider* passwordProvider, QWidget *parent);
+    explicit VacationManager(SieveImapPasswordProvider *passwordProvider, QWidget *parent);
     ~VacationManager();
 
     void checkVacation();
diff --git a/src/ksieveui/widgets/custommanagesievewidget.cpp b/src/ksieveui/widgets/custommanagesievewidget.cpp
index 54d893d47d4c8368d47b830ba82d4fcadd27d546..a97f91e9b56d8081130c6c69d51795b12470c987 100644
--- a/src/ksieveui/widgets/custommanagesievewidget.cpp
+++ b/src/ksieveui/widgets/custommanagesievewidget.cpp
@@ -27,7 +27,7 @@
 
 using namespace KSieveUi;
 
-CustomManageSieveWidget::CustomManageSieveWidget(SieveImapPasswordProvider* passwordProvider, QWidget *parent)
+CustomManageSieveWidget::CustomManageSieveWidget(SieveImapPasswordProvider *passwordProvider, QWidget *parent)
     : KSieveUi::ManageSieveWidget(parent)
     , mPasswordProvider(passwordProvider)
 {
diff --git a/src/ksieveui/widgets/custommanagesievewidget.h b/src/ksieveui/widgets/custommanagesievewidget.h
index 6c08cf96bff648f0993f1a2ed2461e474c11969a..a6e3c5ef29fc325d1fc770b67cd164867cda854c 100644
--- a/src/ksieveui/widgets/custommanagesievewidget.h
+++ b/src/ksieveui/widgets/custommanagesievewidget.h
@@ -26,14 +26,14 @@ class CustomManageSieveWidget : public KSieveUi::ManageSieveWidget
 {
     Q_OBJECT
 public:
-    explicit CustomManageSieveWidget(SieveImapPasswordProvider* passwordProvider, QWidget *parent = nullptr);
+    explicit CustomManageSieveWidget(SieveImapPasswordProvider *passwordProvider, QWidget *parent = nullptr);
     virtual ~CustomManageSieveWidget();
 
 protected:
     bool refreshList() override;
 
 private:
-    SieveImapPasswordProvider* mPasswordProvider;
+    SieveImapPasswordProvider *mPasswordProvider;
 };
 }