From 94e4c571e123f1fd64725c0d8832791c1dba7aa1 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Thu, 15 Jun 2017 22:54:48 +0200 Subject: [PATCH] Coding style --- src/ksieveui/debug/sievedebugdialog.cpp | 2 +- src/ksieveui/debug/sievedebugdialog.h | 5 ++--- src/ksieveui/managesievescriptsdialog.h | 2 +- src/ksieveui/util/autotests/utilmethodtest.cpp | 6 +++--- src/ksieveui/util/sieveimappasswordprovider.h | 5 +---- src/ksieveui/util/util.cpp | 3 ++- src/ksieveui/util/util_p.h | 3 ++- src/ksieveui/vacation/multiimapvacationmanager.cpp | 2 +- src/ksieveui/vacation/multiimapvacationmanager.h | 4 ++-- src/ksieveui/vacation/vacation.cpp | 2 +- src/ksieveui/vacation/vacation.h | 4 ++-- src/ksieveui/vacation/vacationmanager.cpp | 2 +- src/ksieveui/vacation/vacationmanager.h | 2 +- src/ksieveui/widgets/custommanagesievewidget.cpp | 2 +- src/ksieveui/widgets/custommanagesievewidget.h | 4 ++-- 15 files changed, 23 insertions(+), 25 deletions(-) diff --git a/src/ksieveui/debug/sievedebugdialog.cpp b/src/ksieveui/debug/sievedebugdialog.cpp index b4eaa1f3..d55d64de 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 4293e14d..27875262 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 e9c7fb66..56d4a876 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 070e4193..27916269 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 9587b28d..be0db6d3 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 3355e9c4..a7b294f0 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 &interface) +KSieveUi::Util::AccountInfo KSieveUi::Util::findAccountInfo(const QString &identifier, SieveImapPasswordProvider *provider, bool withVacationFileName, + std::unique_ptr &interface) { KSieveUi::Util::AccountInfo accountInfo; if (!interface) { diff --git a/src/ksieveui/util/util_p.h b/src/ksieveui/util/util_p.h index aff33e6a..f92433c1 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 &interface); +KSIEVEUI_TESTS_EXPORT KSieveUi::Util::AccountInfo findAccountInfo(const QString &identifier, SieveImapPasswordProvider *provider, bool withVacationFileName, + std::unique_ptr &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 1c1f47b5..4c4d89f7 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 3f647af3..f0ab620d 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 9a91adcd..b9083bf5 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 5e024bcc..1310465f 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 8271db03..e63c94c6 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 a225d230..5204e18f 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 54d893d4..a97f91e9 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 6c08cf96..a6e3c5ef 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; }; } -- GitLab