From daa5e45d2e11b16381847ba41df91ef8add6d670 Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Fri, 10 Jul 2020 13:22:01 +0200
Subject: [PATCH] Minor coding style

---
 src/filter/dialog/selectthunderbirdfilterfileswidget.h | 2 +-
 src/filter/filteractions/filteractionwidget.cpp        | 8 ++------
 src/filter/filtermanager.cpp                           | 2 +-
 src/filter/kmfilterlistbox.cpp                         | 3 +--
 src/folder/accountconfigorderdialog.cpp                | 2 +-
 src/search/searchrule/searchruleencryption.cpp         | 2 +-
 src/search/widgethandler/tagrulewidgethandler.cpp      | 2 +-
 7 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/filter/dialog/selectthunderbirdfilterfileswidget.h b/src/filter/dialog/selectthunderbirdfilterfileswidget.h
index a963365..d127583 100644
--- a/src/filter/dialog/selectthunderbirdfilterfileswidget.h
+++ b/src/filter/dialog/selectthunderbirdfilterfileswidget.h
@@ -47,7 +47,7 @@ private:
 
     void slotUrlChanged(const QString &path);
     void slotItemSelectionChanged();
-    Ui::SelectThunderbirdFilterFilesWidget *ui = nullptr;
+    Ui::SelectThunderbirdFilterFilesWidget *const ui;
 };
 }
 #endif // SELECTTHUNDERBIRDFILTERFILESWIDGET_H
diff --git a/src/filter/filteractions/filteractionwidget.cpp b/src/filter/filteractions/filteractionwidget.cpp
index 3e34670..b6943dd 100644
--- a/src/filter/filteractions/filteractionwidget.cpp
+++ b/src/filter/filteractions/filteractionwidget.cpp
@@ -46,10 +46,6 @@ class Q_DECL_HIDDEN FilterActionWidget::Private
 public:
     Private(FilterActionWidget *qq)
         : q(qq)
-        , mComboBox(nullptr)
-        , mAdd(nullptr)
-        , mRemove(nullptr)
-        , mLayout(nullptr)
     {
     }
 
@@ -65,7 +61,7 @@ public:
     void slotAddWidget();
     void slotRemoveWidget();
 
-    FilterActionWidget *q;
+    FilterActionWidget *const q;
     QList<MailCommon::FilterAction *> mActionList;
     QComboBox *mComboBox = nullptr;
     QPushButton *mAdd = nullptr;
@@ -273,7 +269,7 @@ public:
 
     void regenerateActionListFromWidgets();
 
-    FilterActionWidgetLister *q;
+    FilterActionWidgetLister *const q;
     QVector<MailCommon::FilterAction *> *mActionList = nullptr;
 };
 
diff --git a/src/filter/filtermanager.cpp b/src/filter/filtermanager.cpp
index 1ad6c69..c2b1bd2 100644
--- a/src/filter/filtermanager.cpp
+++ b/src/filter/filtermanager.cpp
@@ -59,7 +59,7 @@ public:
     FilterManager *const q;
     OrgFreedesktopAkonadiMailFilterAgentInterface *mMailFilterAgentInterface = nullptr;
     QVector<MailCommon::MailFilter *> mFilters;
-    Akonadi::Monitor *mMonitor = nullptr;
+    Akonadi::Monitor * const mMonitor;
     bool mInitialized = false;
 };
 
diff --git a/src/filter/kmfilterlistbox.cpp b/src/filter/kmfilterlistbox.cpp
index b6aa66c..96ef410 100644
--- a/src/filter/kmfilterlistbox.cpp
+++ b/src/filter/kmfilterlistbox.cpp
@@ -113,7 +113,7 @@ using namespace MailCommon;
 KMFilterListBox::KMFilterListBox(const QString &title, QWidget *parent)
     : QGroupBox(title, parent)
 {
-    QVBoxLayout *layout = new QVBoxLayout();
+    QVBoxLayout *layout = new QVBoxLayout(this);
 
     //----------- the list box
     mListWidget = new QListWidget(this);
@@ -202,7 +202,6 @@ KMFilterListBox::KMFilterListBox(const QString &title, QWidget *parent)
     mBtnRename->setWhatsThis(i18n(_wt_filterlist_rename));
 
     layout->addWidget(hb);
-    setLayout(layout);
 
     QShortcut *shortcut = new QShortcut(this);
     shortcut->setKey(Qt::Key_Delete);
diff --git a/src/folder/accountconfigorderdialog.cpp b/src/folder/accountconfigorderdialog.cpp
index 1313ebf..1004d42 100644
--- a/src/folder/accountconfigorderdialog.cpp
+++ b/src/folder/accountconfigorderdialog.cpp
@@ -42,7 +42,7 @@ using namespace MailCommon;
 struct InstanceStruct {
     QString name;
     QIcon icon;
-    bool isValid() const
+    Q_REQUIRED_RESULT bool isValid() const
     {
         return !name.isEmpty();
     }
diff --git a/src/search/searchrule/searchruleencryption.cpp b/src/search/searchrule/searchruleencryption.cpp
index e052210..c17111d 100644
--- a/src/search/searchrule/searchruleencryption.cpp
+++ b/src/search/searchrule/searchruleencryption.cpp
@@ -48,7 +48,7 @@ bool SearchRuleEncryption::matches(const Akonadi::Item &item) const
     }
     const auto msg = item.payload<KMime::Message::Ptr>();
 
-    bool rc = (shouldBeEncrypted == CryptoUtils::isEncrypted(msg.data()));
+    const bool rc = (shouldBeEncrypted == CryptoUtils::isEncrypted(msg.data()));
     if (FilterLog::instance()->isLogging()) {
         QString msg = (rc ? QStringLiteral("<font color=#00FF00>1 = </font>")
                        : QStringLiteral("<font color=#FF0000>0 = </font>"));
diff --git a/src/search/widgethandler/tagrulewidgethandler.cpp b/src/search/widgethandler/tagrulewidgethandler.cpp
index d428750..baed2a3 100644
--- a/src/search/widgethandler/tagrulewidgethandler.cpp
+++ b/src/search/widgethandler/tagrulewidgethandler.cpp
@@ -47,7 +47,7 @@ private Q_SLOTS:
     void onTagsFetched(KJob *);
 
 private:
-    QComboBox *mComboBox = nullptr;
+    QComboBox * mComboBox = nullptr;
 };
 
 FillTagComboJob::FillTagComboJob(QComboBox *combo, QObject *parent)