From cd918f69bf1ce64db732502e317c58ad378d53cf Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 23 Sep 2020 08:14:46 +0200 Subject: [PATCH] GIT_SILENT: coding style --- src/collectionpage/collectionexpiryjob.cpp | 2 -- src/collectionpage/collectionexpirypage.cpp | 1 - src/collectionpage/collectionexpirypage.h | 2 -- src/collectionpage/collectionexpirywidget.cpp | 3 --- src/collectionpage/collectionexpirywidget.h | 15 ++++++++------- src/collectionpage/collectiongeneralpage.cpp | 1 - src/collectionpage/collectiongeneralwidget.cpp | 7 ------- src/collectionpage/collectiontemplateswidget.cpp | 1 - src/collectionpage/collectionviewwidget.cpp | 1 - .../filteractionaddtoaddressbook.cpp | 6 +++--- src/filter/filtermanager.cpp | 2 +- src/filter/kmfilterdialog.cpp | 1 - src/folder/foldertreewidgetproxymodel.cpp | 2 +- src/mdn/sendmdnhandler.cpp | 2 +- src/search/searchrule/searchrulenumerical.cpp | 4 ---- src/search/searchrule/searchrulestring.cpp | 4 ---- src/snippets/snippetsmanager.cpp | 3 +-- src/snippets/snippetsmodel.cpp | 1 - src/snippets/snippettreeview.cpp | 1 - src/widgets/redirectdialog.cpp | 2 +- 20 files changed, 16 insertions(+), 45 deletions(-) diff --git a/src/collectionpage/collectionexpiryjob.cpp b/src/collectionpage/collectionexpiryjob.cpp index e1e1915..c24dbae 100644 --- a/src/collectionpage/collectionexpiryjob.cpp +++ b/src/collectionpage/collectionexpiryjob.cpp @@ -16,12 +16,10 @@ using namespace MailCommon; CollectionExpiryJob::CollectionExpiryJob(QObject *parent) : QObject(parent) { - } CollectionExpiryJob::~CollectionExpiryJob() { - } void CollectionExpiryJob::start() diff --git a/src/collectionpage/collectionexpirypage.cpp b/src/collectionpage/collectionexpirypage.cpp index caf3ee8..687e241 100644 --- a/src/collectionpage/collectionexpirypage.cpp +++ b/src/collectionpage/collectionexpirypage.cpp @@ -70,7 +70,6 @@ void CollectionExpiryPage::load(const Akonadi::Collection &collection) settings.mExpireAction = attr->expireAction(); settings.mExpireToFolderId = attr->expireToFolderId(); - mCollectionExpiryWidget->load(settings); } else { mCollectionExpiryWidget->load({}); diff --git a/src/collectionpage/collectionexpirypage.h b/src/collectionpage/collectionexpirypage.h index f7f2fc9..769bff8 100644 --- a/src/collectionpage/collectionexpirypage.h +++ b/src/collectionpage/collectionexpirypage.h @@ -13,8 +13,6 @@ #include #include - - namespace MailCommon { class CollectionExpiryWidget; /** diff --git a/src/collectionpage/collectionexpirywidget.cpp b/src/collectionpage/collectionexpirywidget.cpp index f59aa37..a3fd37c 100644 --- a/src/collectionpage/collectionexpirywidget.cpp +++ b/src/collectionpage/collectionexpirywidget.cpp @@ -4,7 +4,6 @@ SPDX-License-Identifier: GPL-2.0-or-later */ - #include "collectionexpirywidget.h" #include "collectionexpiryjob.h" #include "kernel/mailkernel.h" @@ -16,7 +15,6 @@ #include - #include #include #include @@ -101,7 +99,6 @@ CollectionExpiryWidget::CollectionExpiryWidget(QWidget *parent) CollectionExpiryWidget::~CollectionExpiryWidget() { - } void CollectionExpiryWidget::slotChanged() diff --git a/src/collectionpage/collectionexpirywidget.h b/src/collectionpage/collectionexpirywidget.h index 96fec02..f292436 100644 --- a/src/collectionpage/collectionexpirywidget.h +++ b/src/collectionpage/collectionexpirywidget.h @@ -19,13 +19,14 @@ namespace MailCommon { class FolderRequester; struct MAILCOMMON_EXPORT CollectionExpirySettings { - Q_REQUIRED_RESULT bool isValid() const { - return daysToExpireRead != -1 || - daysToExpireUnread != -1 || - mUnreadExpireUnits != ExpireCollectionAttribute::ExpireNever || - mReadExpireUnits != ExpireCollectionAttribute::ExpireNever || - mExpireAction != ExpireCollectionAttribute::ExpireDelete || - mExpireToFolderId != -1; + Q_REQUIRED_RESULT bool isValid() const + { + return daysToExpireRead != -1 + || daysToExpireUnread != -1 + || mUnreadExpireUnits != ExpireCollectionAttribute::ExpireNever + || mReadExpireUnits != ExpireCollectionAttribute::ExpireNever + || mExpireAction != ExpireCollectionAttribute::ExpireDelete + || mExpireToFolderId != -1; } bool expiryGloballyOn = false; diff --git a/src/collectionpage/collectiongeneralpage.cpp b/src/collectionpage/collectiongeneralpage.cpp index 7a3a3f0..e25ab69 100644 --- a/src/collectionpage/collectiongeneralpage.cpp +++ b/src/collectionpage/collectiongeneralpage.cpp @@ -230,7 +230,6 @@ void CollectionGeneralPage::save(Collection &collection) } else { annotationsAttribute->setAnnotations(annotations); } - } void CollectionGeneralPage::slotFolderContentsSelectionChanged(int) diff --git a/src/collectionpage/collectiongeneralwidget.cpp b/src/collectionpage/collectiongeneralwidget.cpp index 8ef279f..3d3449f 100644 --- a/src/collectionpage/collectiongeneralwidget.cpp +++ b/src/collectionpage/collectiongeneralwidget.cpp @@ -88,13 +88,10 @@ CollectionGeneralWidget::CollectionGeneralWidget(QWidget *parent) "sender email address, signature and signing or encryption keys " "automatically. Identities can be set up in the main configuration " "dialog. (Settings -> Configure KMail)")); - - } CollectionGeneralWidget::~CollectionGeneralWidget() { - } void CollectionGeneralWidget::addLine(QWidget *parent, QVBoxLayout *layout) @@ -115,7 +112,6 @@ void CollectionGeneralWidget::slotIdentityCheckboxChanged() } } - void CollectionGeneralWidget::save(Akonadi::Collection &collection) { if (!mNotifyOnNewMailCheckBox->isChecked()) { @@ -132,7 +128,6 @@ void CollectionGeneralWidget::save(Akonadi::Collection &collection) mFolderCollection->setHideInSelectionDialog(mHideInSelectionDialogCheckBox->isChecked()); mFolderCollection->writeConfig(); } - } void CollectionGeneralWidget::load(const Akonadi::Collection &col) @@ -151,6 +146,4 @@ void CollectionGeneralWidget::load(const Akonadi::Collection &col) mKeepRepliesInSameFolderCheckBox->setChecked(keepInFolder); mKeepRepliesInSameFolderCheckBox->setEnabled(mFolderCollection->canCreateMessages()); mHideInSelectionDialogCheckBox->setChecked(mFolderCollection->hideInSelectionDialog()); - - } diff --git a/src/collectionpage/collectiontemplateswidget.cpp b/src/collectionpage/collectiontemplateswidget.cpp index 3eba414..daf34e1 100644 --- a/src/collectionpage/collectiontemplateswidget.cpp +++ b/src/collectionpage/collectiontemplateswidget.cpp @@ -52,7 +52,6 @@ CollectionTemplatesWidget::CollectionTemplatesWidget(QWidget *parent) CollectionTemplatesWidget::~CollectionTemplatesWidget() { - } void CollectionTemplatesWidget::save(Akonadi::Collection &) diff --git a/src/collectionpage/collectionviewwidget.cpp b/src/collectionpage/collectionviewwidget.cpp index b3d182e..016d7eb 100644 --- a/src/collectionpage/collectionviewwidget.cpp +++ b/src/collectionpage/collectionviewwidget.cpp @@ -110,7 +110,6 @@ CollectionViewWidget::CollectionViewWidget(QWidget *parent) CollectionViewWidget::~CollectionViewWidget() { - } void CollectionViewWidget::load(const Akonadi::Collection &col) diff --git a/src/filter/filteractions/filteractionaddtoaddressbook.cpp b/src/filter/filteractions/filteractionaddtoaddressbook.cpp index ecd3680..b571335 100644 --- a/src/filter/filteractions/filteractionaddtoaddressbook.cpp +++ b/src/filter/filteractions/filteractionaddtoaddressbook.cpp @@ -140,13 +140,14 @@ QWidget *FilterActionAddToAddressBook::createParamWidget(QWidget *parent) const } namespace { - Akonadi::Tag::List namesToTags(const QStringList &names) { Akonadi::Tag::List tags; tags.reserve(names.size()); std::transform(names.cbegin(), names.cend(), std::back_inserter(tags), - [](const QString &name) { return Akonadi::Tag{name}; }); + [](const QString &name) { + return Akonadi::Tag{name}; + }); return tags; } @@ -158,7 +159,6 @@ QStringList tagsToNames(const Akonadi::Tag::List &tags) std::bind(&Akonadi::Tag::name, std::placeholders::_1)); return names; } - } void FilterActionAddToAddressBook::setParamWidgetValue(QWidget *paramWidget) const diff --git a/src/filter/filtermanager.cpp b/src/filter/filtermanager.cpp index 6121bf1..52a19a3 100644 --- a/src/filter/filtermanager.cpp +++ b/src/filter/filtermanager.cpp @@ -46,7 +46,7 @@ public: FilterManager *const q; OrgFreedesktopAkonadiMailFilterAgentInterface *mMailFilterAgentInterface = nullptr; QVector mFilters; - Akonadi::Monitor * const mMonitor; + Akonadi::Monitor *const mMonitor; bool mInitialized = false; }; diff --git a/src/filter/kmfilterdialog.cpp b/src/filter/kmfilterdialog.cpp index 896c821..60cbeee 100644 --- a/src/filter/kmfilterdialog.cpp +++ b/src/filter/kmfilterdialog.cpp @@ -9,7 +9,6 @@ SPDX-License-Identifier: GPL-2.0-or-later */ - #include "kmfilterdialog.h" #include "mailcommon_debug.h" #include "kmfilterlistbox.h" diff --git a/src/folder/foldertreewidgetproxymodel.cpp b/src/folder/foldertreewidgetproxymodel.cpp index 8b13235..6dcf73e 100644 --- a/src/folder/foldertreewidgetproxymodel.cpp +++ b/src/folder/foldertreewidgetproxymodel.cpp @@ -63,7 +63,7 @@ public: QColor brokenAccountColor; qreal threshold = 0.0; - FolderTreeWidgetProxyModel * const q; + FolderTreeWidgetProxyModel *const q; bool enableCheck = false; bool hideVirtualFolder = false; bool hideSpecificFolder = false; diff --git a/src/mdn/sendmdnhandler.cpp b/src/mdn/sendmdnhandler.cpp index e7d7993..f9da227 100644 --- a/src/mdn/sendmdnhandler.cpp +++ b/src/mdn/sendmdnhandler.cpp @@ -37,7 +37,7 @@ public: void handleMessages(); - SendMdnHandler * const q; + SendMdnHandler *const q; IKernel *const mKernel; QQueue mItemQueue; QTimer mTimer; diff --git a/src/search/searchrule/searchrulenumerical.cpp b/src/search/searchrule/searchrulenumerical.cpp index 5f238fa..e47a303 100644 --- a/src/search/searchrule/searchrulenumerical.cpp +++ b/src/search/searchrule/searchrulenumerical.cpp @@ -87,14 +87,10 @@ bool SearchRuleNumerical::matchesInternal(long numericalValue, long numericalMsg return !msgContents.contains(contents(), Qt::CaseInsensitive); case SearchRule::FuncRegExp: - { return msgContents.contains(QRegularExpression(contents(), QRegularExpression::CaseInsensitiveOption)); - } case SearchRule::FuncNotRegExp: - { return !msgContents.contains(QRegularExpression(contents(), QRegularExpression::CaseInsensitiveOption)); - } case FuncIsGreater: return numericalMsgContents > numericalValue; diff --git a/src/search/searchrule/searchrulestring.cpp b/src/search/searchrule/searchrulestring.cpp index 061c2d5..e723b9f 100644 --- a/src/search/searchrule/searchrulestring.cpp +++ b/src/search/searchrule/searchrulestring.cpp @@ -258,14 +258,10 @@ bool SearchRuleString::matchesInternal(const QString &msgContents) const return !msgContents.contains(contents(), Qt::CaseInsensitive); case SearchRule::FuncRegExp: - { return msgContents.contains(QRegularExpression(contents(), QRegularExpression::CaseInsensitiveOption)); - } case SearchRule::FuncNotRegExp: - { return !msgContents.contains(QRegularExpression(contents(), QRegularExpression::CaseInsensitiveOption)); - } case SearchRule::FuncStartWith: return msgContents.startsWith(contents()); diff --git a/src/snippets/snippetsmanager.cpp b/src/snippets/snippetsmanager.cpp index 3dd6ffb..87f7b4c 100644 --- a/src/snippets/snippetsmanager.cpp +++ b/src/snippets/snippetsmanager.cpp @@ -7,7 +7,6 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ - #include "snippetsmanager.h" #include "mailcommon_debug.h" #include "snippetdialog.h" @@ -63,7 +62,7 @@ public: void save(); - SnippetsManager * const q = nullptr; + SnippetsManager *const q = nullptr; SnippetsModel *mModel = nullptr; QItemSelectionModel *mSelectionModel = nullptr; KActionCollection *mActionCollection = nullptr; diff --git a/src/snippets/snippetsmodel.cpp b/src/snippets/snippetsmodel.cpp index 0044e74..e8ed834 100644 --- a/src/snippets/snippetsmodel.cpp +++ b/src/snippets/snippetsmodel.cpp @@ -7,7 +7,6 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ - #include "snippetsmodel.h" #include diff --git a/src/snippets/snippettreeview.cpp b/src/snippets/snippettreeview.cpp index 81dc7a3..b470a48 100644 --- a/src/snippets/snippettreeview.cpp +++ b/src/snippets/snippettreeview.cpp @@ -7,7 +7,6 @@ SPDX-License-Identifier: GPL-2.0-or-later */ - #include "snippettreeview.h" #include "snippetsmanager.h" diff --git a/src/widgets/redirectdialog.cpp b/src/widgets/redirectdialog.cpp index 8ae90fd..07a4824 100644 --- a/src/widgets/redirectdialog.cpp +++ b/src/widgets/redirectdialog.cpp @@ -48,7 +48,7 @@ public: void slotUser2(); void slotAddressChanged(const QString &); QString redirectLabelType(TypeAddress type) const; - RedirectDialog * const q = nullptr; + RedirectDialog *const q = nullptr; RedirectWidget *mEditTo = nullptr; RedirectWidget *mEditCc = nullptr; RedirectWidget *mEditBcc = nullptr;