From 9554c26b9d4e69bdf69321d671cb61b8eb3e05a1 Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Wed, 9 Sep 2020 13:20:34 +0200
Subject: [PATCH] Modernize code

---
 src/filter/filteractions/filteraction.h               | 4 ++--
 src/filter/filterconverter/filterconverttosieve.h     | 2 +-
 src/filter/mdnadvicedialog.cpp                        | 1 -
 src/filter/mdnadvicedialog.h                          | 2 +-
 src/kernel/mailkernel.cpp                             | 2 +-
 src/search/widgethandler/rulewidgethandlermanager.cpp | 1 -
 src/search/widgethandler/rulewidgethandlermanager.h   | 2 +-
 src/search/widgethandler/tagrulewidgethandler.cpp     | 2 +-
 src/snippets/snippetvariabledialog.h                  | 2 +-
 9 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/filter/filteractions/filteraction.h b/src/filter/filteractions/filteraction.h
index 8ec3769..ab65683 100644
--- a/src/filter/filteractions/filteraction.h
+++ b/src/filter/filteractions/filteraction.h
@@ -182,8 +182,8 @@ Q_SIGNALS:
     void filterActionModified();
 
 private:
-    QString mName;
-    QString mLabel;
+    const QString mName;
+    const QString mLabel;
 };
 }
 
diff --git a/src/filter/filterconverter/filterconverttosieve.h b/src/filter/filterconverter/filterconverttosieve.h
index 6bbbdd6..78db6e0 100644
--- a/src/filter/filterconverter/filterconverttosieve.h
+++ b/src/filter/filterconverter/filterconverttosieve.h
@@ -20,7 +20,7 @@ public:
     void convert();
 
 private:
-    QVector<MailFilter *> mListFilters;
+    const QVector<MailFilter *> mListFilters;
 };
 }
 #endif // FILTERCONVERTTOSIEVE_H
diff --git a/src/filter/mdnadvicedialog.cpp b/src/filter/mdnadvicedialog.cpp
index 11b2c89..b129172 100644
--- a/src/filter/mdnadvicedialog.cpp
+++ b/src/filter/mdnadvicedialog.cpp
@@ -85,7 +85,6 @@ static const int numMdnMessageBoxes
 
 MDNAdviceDialog::MDNAdviceDialog(const QString &text, bool canDeny, QWidget *parent)
     : QDialog(parent)
-    , m_result(MessageComposer::MDNIgnore)
 {
     setWindowTitle(i18nc("@title:window", "Message Disposition Notification Request"));
     QPushButton *user1Button = nullptr;
diff --git a/src/filter/mdnadvicedialog.h b/src/filter/mdnadvicedialog.h
index a80ff45..6875e2d 100644
--- a/src/filter/mdnadvicedialog.h
+++ b/src/filter/mdnadvicedialog.h
@@ -76,7 +76,7 @@ private:
     void slotUser1Clicked();
     void slotUser2Clicked();
     void slotYesClicked();
-    MessageComposer::MDNAdvice m_result;
+    MessageComposer::MDNAdvice m_result = MessageComposer::MDNIgnore;
 
 protected:
 
diff --git a/src/kernel/mailkernel.cpp b/src/kernel/mailkernel.cpp
index 17a6d8b..0f52696 100644
--- a/src/kernel/mailkernel.cpp
+++ b/src/kernel/mailkernel.cpp
@@ -39,7 +39,7 @@ public:
         delete kernel;
     }
 
-    Kernel *kernel;
+    Kernel *const kernel;
 };
 
 Q_GLOBAL_STATIC(KernelPrivate, sInstance)
diff --git a/src/search/widgethandler/rulewidgethandlermanager.cpp b/src/search/widgethandler/rulewidgethandlermanager.cpp
index 1ca792f..a7a72ef 100644
--- a/src/search/widgethandler/rulewidgethandlermanager.cpp
+++ b/src/search/widgethandler/rulewidgethandlermanager.cpp
@@ -33,7 +33,6 @@ using namespace MailCommon;
 MailCommon::RuleWidgetHandlerManager *MailCommon::RuleWidgetHandlerManager::self = nullptr;
 
 MailCommon::RuleWidgetHandlerManager::RuleWidgetHandlerManager()
-    : mIsBalooSearch(false)
 {
     registerHandler(new MailCommon::TagRuleWidgetHandler());
     registerHandler(new MailCommon::DateRuleWidgetHandler());
diff --git a/src/search/widgethandler/rulewidgethandlermanager.h b/src/search/widgethandler/rulewidgethandlermanager.h
index f0d90bd..98eacef 100644
--- a/src/search/widgethandler/rulewidgethandlermanager.h
+++ b/src/search/widgethandler/rulewidgethandlermanager.h
@@ -66,7 +66,7 @@ private:
     typedef QVector<const RuleWidgetHandler *>::iterator iterator;
 
     QVector<const RuleWidgetHandler *> mHandlers;
-    bool mIsBalooSearch;
+    bool mIsBalooSearch = false;
 };
 } // namespace MailCommon
 
diff --git a/src/search/widgethandler/tagrulewidgethandler.cpp b/src/search/widgethandler/tagrulewidgethandler.cpp
index 8ef6517..86e6ba6 100644
--- a/src/search/widgethandler/tagrulewidgethandler.cpp
+++ b/src/search/widgethandler/tagrulewidgethandler.cpp
@@ -35,7 +35,7 @@ private Q_SLOTS:
     void onTagsFetched(KJob *);
 
 private:
-    QComboBox * mComboBox = nullptr;
+    QComboBox *mComboBox = nullptr;
 };
 
 FillTagComboJob::FillTagComboJob(QComboBox *combo, QObject *parent)
diff --git a/src/snippets/snippetvariabledialog.h b/src/snippets/snippetvariabledialog.h
index b1744cd..60cca76 100644
--- a/src/snippets/snippetvariabledialog.h
+++ b/src/snippets/snippetvariabledialog.h
@@ -32,7 +32,7 @@ private:
     void writeConfig();
     void readConfig();
     void slotAccepted();
-    QString mVariableName;
+    const QString mVariableName;
     QMap<QString, QString> *mVariables = nullptr;
     KPIMTextEdit::PlainTextEditorWidget *mVariableValueText = nullptr;
     QCheckBox *mSaveVariable = nullptr;
-- 
GitLab