From f6558301c61c3e8b165ab68725b5d002ff12fcbd Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Thu, 27 Aug 2020 22:11:32 +0200
Subject: [PATCH] Clean up code

---
 src/pimcommon/genericplugins/abstractgenericplugin.cpp   | 1 -
 src/pimcommon/genericplugins/abstractgenericplugin.h     | 2 +-
 src/pimcommon/logactivities/logactivitiesmanager.cpp     | 3 +--
 src/pimcommon/shareserviceurl/shareserviceurlmanager.cpp | 4 ++--
 src/pimcommon/templatewidgets/templatelistwidget.cpp     | 5 ++---
 src/pimcommon/widgets/customtreeview.cpp                 | 1 -
 src/pimcommon/widgets/customtreeview.h                   | 2 +-
 src/pimcommon/widgets/purposemenuwidget.h                | 2 +-
 8 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/pimcommon/genericplugins/abstractgenericplugin.cpp b/src/pimcommon/genericplugins/abstractgenericplugin.cpp
index bf56f93..2a980d5 100644
--- a/src/pimcommon/genericplugins/abstractgenericplugin.cpp
+++ b/src/pimcommon/genericplugins/abstractgenericplugin.cpp
@@ -10,7 +10,6 @@ using namespace PimCommon;
 
 AbstractGenericPlugin::AbstractGenericPlugin(QObject *parent)
     : QObject(parent)
-    , mIsEnabled(true)
 {
 }
 
diff --git a/src/pimcommon/genericplugins/abstractgenericplugin.h b/src/pimcommon/genericplugins/abstractgenericplugin.h
index 34c841a..7caed8f 100644
--- a/src/pimcommon/genericplugins/abstractgenericplugin.h
+++ b/src/pimcommon/genericplugins/abstractgenericplugin.h
@@ -37,7 +37,7 @@ Q_SIGNALS:
     void configChanged();
 
 private:
-    bool mIsEnabled;
+    bool mIsEnabled = true;
 };
 }
 #endif // AbstractGENERICPLUGIN_H
diff --git a/src/pimcommon/logactivities/logactivitiesmanager.cpp b/src/pimcommon/logactivities/logactivitiesmanager.cpp
index ddaedfc..c9084e3 100644
--- a/src/pimcommon/logactivities/logactivitiesmanager.cpp
+++ b/src/pimcommon/logactivities/logactivitiesmanager.cpp
@@ -17,8 +17,7 @@ class PimCommon::LogActivitiesManagerPrivate
 {
 public:
     LogActivitiesManagerPrivate()
-        : mDialog{nullptr}
-        , mEnableLogActivities{false}
+        : mDialog(nullptr)
     {
     }
 
diff --git a/src/pimcommon/shareserviceurl/shareserviceurlmanager.cpp b/src/pimcommon/shareserviceurl/shareserviceurlmanager.cpp
index 2bb3c5f..3b5c54a 100644
--- a/src/pimcommon/shareserviceurl/shareserviceurlmanager.cpp
+++ b/src/pimcommon/shareserviceurl/shareserviceurlmanager.cpp
@@ -23,8 +23,8 @@ public:
     {
     }
 
-    QIcon typeToIcon(ShareServiceUrlManager::ServiceType type) const;
-    QString typeToI18n(ShareServiceUrlManager::ServiceType type) const;
+    Q_REQUIRED_RESULT QIcon typeToIcon(ShareServiceUrlManager::ServiceType type) const;
+    Q_REQUIRED_RESULT QString typeToI18n(ShareServiceUrlManager::ServiceType type) const;
     void initializeMenu();
     KActionMenu *mMenu = nullptr;
     ShareServiceUrlManager *const q;
diff --git a/src/pimcommon/templatewidgets/templatelistwidget.cpp b/src/pimcommon/templatewidgets/templatelistwidget.cpp
index 0c50031..f8a9f38 100644
--- a/src/pimcommon/templatewidgets/templatelistwidget.cpp
+++ b/src/pimcommon/templatewidgets/templatelistwidget.cpp
@@ -27,8 +27,7 @@ class TemplateListWidgetPrivate
 {
 public:
     TemplateListWidgetPrivate(const QString &configName, TemplateListWidget *qq)
-        : dirty(false)
-        , config(KSharedConfig::openConfig(configName, KConfig::NoGlobals))
+        : config(KSharedConfig::openConfig(configName, KConfig::NoGlobals))
         , q(qq)
     {
     }
@@ -278,7 +277,7 @@ public:
     }
 
     QString knewstuffConfigName;
-    bool dirty;
+    bool dirty =false;
     KSharedConfig::Ptr config;
     TemplateListWidget * const q;
 };
diff --git a/src/pimcommon/widgets/customtreeview.cpp b/src/pimcommon/widgets/customtreeview.cpp
index 6cb0119..48860b1 100644
--- a/src/pimcommon/widgets/customtreeview.cpp
+++ b/src/pimcommon/widgets/customtreeview.cpp
@@ -14,7 +14,6 @@ using namespace PimCommon;
 
 CustomTreeView::CustomTreeView(QWidget *parent)
     : QTreeWidget(parent)
-    , mShowDefaultText(true)
 {
 }
 
diff --git a/src/pimcommon/widgets/customtreeview.h b/src/pimcommon/widgets/customtreeview.h
index f26bcdc..1b8cacc 100644
--- a/src/pimcommon/widgets/customtreeview.h
+++ b/src/pimcommon/widgets/customtreeview.h
@@ -37,7 +37,7 @@ protected:
     void changeEvent(QEvent *event) override;
 
 protected:
-    bool mShowDefaultText;
+    bool mShowDefaultText = true;
 
 private:
     QColor mTextColor;
diff --git a/src/pimcommon/widgets/purposemenuwidget.h b/src/pimcommon/widgets/purposemenuwidget.h
index 1e6bf0f..1733eee 100644
--- a/src/pimcommon/widgets/purposemenuwidget.h
+++ b/src/pimcommon/widgets/purposemenuwidget.h
@@ -33,7 +33,7 @@ private:
     void slotShareActionFinished(const QJsonObject &output, int error, const QString &message);
     Purpose::Menu *mShareMenu = nullptr;
     QTemporaryFile *mTemporaryShareFile = nullptr;
-    QWidget *mParentWidget = nullptr;
+    QWidget *const mParentWidget;
 };
 }
 
-- 
GitLab