Clean up code + const'ify

plugins/messageviewerconfigureplugins/dkim-verify/dkimadvancedwidget.cpp

@@ -54,9 +54,8 @@ DKIMAdvancedWidget::~DKIMAdvancedWidget()
 
 void DKIMAdvancedWidget::slotConfigureAuthenticationServer()
 {
-    QPointer<DKIMAuthenticationVerifiedServerDialog> dlg = new DKIMAuthenticationVerifiedServerDialog(this);
-    dlg->exec();
-    delete dlg;
+    DKIMAuthenticationVerifiedServerDialog dlg(this);
+    dlg.exec();
 }
 
 void DKIMAdvancedWidget::loadSettings()

plugins/messageviewerconfigureplugins/dkim-verify/dkimpolicywidget.cpp

@@ -75,9 +75,8 @@ DKIMPolicyWidget::DKIMPolicyWidget(QWidget *parent)
     mRulesButton->setEnabled(false);
     ruleLayout->addWidget(mRulesButton);
     connect(mRulesButton, &QPushButton::clicked, this, [this]() {
-        QPointer<MessageViewer::DKIMManageRulesDialog> dlg = new MessageViewer::DKIMManageRulesDialog(this);
-        dlg->exec();
-        delete dlg;
+        MessageViewer::DKIMManageRulesDialog dlg(this);
+        dlg.exec();
     });
     ruleLayout->addStretch(1);
 

plugins/messageviewerconfigureplugins/expireaccounttrashfolder/expireaccounttrashfolderconfigdialog.cpp

@@ -19,12 +19,12 @@ static const char myConfigGroupName[] = "ExpireAccountTrashFolderConfigDialog";
 
 ExpireAccountTrashFolderConfigDialog::ExpireAccountTrashFolderConfigDialog(QWidget *parent)
     : QDialog(parent)
+    , mExpireAccountTrashFolderConfig(new ExpireAccountTrashFolderConfigWidget(this))
 {
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
     mainLayout->setObjectName(QStringLiteral("mainLayout"));
     setWindowTitle(i18nc("@title:window", "Configure Expiry Account Trash Folder"));
 
-    mExpireAccountTrashFolderConfig = new ExpireAccountTrashFolderConfigWidget(this);
     mExpireAccountTrashFolderConfig->setObjectName(QStringLiteral("mExpireAccountTrashFolderConfig"));
     mainLayout->addWidget(mExpireAccountTrashFolderConfig);
 

plugins/messageviewerconfigureplugins/expireaccounttrashfolder/expireaccounttrashfolderconfigdialog.h

@@ -20,7 +20,7 @@ public:
 private:
     void writeConfig();
     void readConfig();
-    ExpireAccountTrashFolderConfigWidget *mExpireAccountTrashFolderConfig = nullptr;
+    ExpireAccountTrashFolderConfigWidget *const mExpireAccountTrashFolderConfig;
 };
 
 #endif // EXPIREACCOUNTTRASHFOLDERCONFIGDIALOG_H

plugins/messageviewerconfigureplugins/expireaccounttrashfolder/expireaccounttrashfolderconfigwidget.cpp

@@ -13,12 +13,12 @@
 
 ExpireAccountTrashFolderConfigWidget::ExpireAccountTrashFolderConfigWidget(QWidget *parent)
     : QWidget(parent)
+    , mCollectionExpiryWidget(new MailCommon::CollectionExpiryWidget(this))
 {
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
     mainLayout->setObjectName(QStringLiteral("mainLayout"));
     mainLayout->setContentsMargins({});
 
-    mCollectionExpiryWidget = new MailCommon::CollectionExpiryWidget(this);
     mCollectionExpiryWidget->setObjectName(QStringLiteral("mCollectionExpiryWidget"));
     connect(mCollectionExpiryWidget, &MailCommon::CollectionExpiryWidget::saveAndExpireRequested, this, &ExpireAccountTrashFolderConfigWidget::slotSaveAndExpireRequested);
     mainLayout->addWidget(mCollectionExpiryWidget);

plugins/messageviewerconfigureplugins/expireaccounttrashfolder/expireaccounttrashfolderconfigwidget.h

@@ -22,7 +22,7 @@ public:
 private:
     void save(bool saveSettings, bool expireNow);
     void slotSaveAndExpireRequested();
-    MailCommon::CollectionExpiryWidget *mCollectionExpiryWidget = nullptr;
+    MailCommon::CollectionExpiryWidget *const mCollectionExpiryWidget;
 };
 
 #endif // EXPIREACCOUNTTRASHFOLDERCONFIGWIDGET_H

plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingsdialog.cpp

@@ -18,12 +18,12 @@ static const char myConfigGroupName[] = "FolderConfigureSettingsDialog";
 
 FolderConfigureSettingsDialog::FolderConfigureSettingsDialog(QWidget *parent)
     : QDialog(parent)
+    , mFolderConfigureSettingsWidget(new FolderConfigureSettingsWidget(this))
 {
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
     mainLayout->setObjectName(QStringLiteral("mainLayout"));
     setWindowTitle(i18nc("@title:window", "Configure Folder Settings"));
 
-    mFolderConfigureSettingsWidget = new FolderConfigureSettingsWidget(this);
     mFolderConfigureSettingsWidget->setObjectName(QStringLiteral("mFolderConfigureSettingsWidget"));
     mainLayout->addWidget(mFolderConfigureSettingsWidget);
 

plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingsdialog.h

@@ -21,7 +21,7 @@ private:
     void slotSave();
     void readConfig();
     void writeConfig();
-    FolderConfigureSettingsWidget *mFolderConfigureSettingsWidget = nullptr;
+    FolderConfigureSettingsWidget *const mFolderConfigureSettingsWidget;
 };
 
 #endif // FOLDERCONFIGURESETTINGSDIALOG_H

plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingsexperywidget.cpp

@@ -10,8 +10,8 @@
 
 FolderConfigureSettingsExperyWidget::FolderConfigureSettingsExperyWidget(QWidget *parent)
     : FolderConfigureSettingsPageBase(parent)
+    , mCollectionExpiryWidget(new MailCommon::CollectionExpiryWidget(this))
 {
-    mCollectionExpiryWidget = new MailCommon::CollectionExpiryWidget(this);
     mCollectionExpiryWidget->setObjectName(QStringLiteral("mCollectionExpiryWidget"));
     mCollectionExpiryWidget->hideExpireNowButton();
     addMainWidget(mCollectionExpiryWidget);

plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingsexperywidget.h

@@ -21,7 +21,7 @@ public:
     ~FolderConfigureSettingsExperyWidget();
     void save(Akonadi::Collection &col);
 private:
-    MailCommon::CollectionExpiryWidget *mCollectionExpiryWidget = nullptr;
+    MailCommon::CollectionExpiryWidget *const mCollectionExpiryWidget;
 };
 
 #endif // FOLDERCONFIGURESETTINGSEXPERYWIDGET_H

plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingsgeneralwidget.cpp

@@ -10,10 +10,10 @@
 
 FolderConfigureSettingsGeneralWidget::FolderConfigureSettingsGeneralWidget(QWidget *parent)
     : FolderConfigureSettingsPageBase(parent)
+    , mCollectionGeneralWidget(new MailCommon::CollectionGeneralWidget(this))
 {
     QWidget *mainWidget = new QWidget(this);
     QHBoxLayout *mainLayout = new QHBoxLayout(mainWidget);
-    mCollectionGeneralWidget = new MailCommon::CollectionGeneralWidget(this);
     mCollectionGeneralWidget->setObjectName(QStringLiteral("mCollectionGeneralWidget"));
     mainLayout->addWidget(mCollectionGeneralWidget);
     addMainWidget(mainWidget);

plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingsgeneralwidget.h

@@ -22,7 +22,7 @@ public:
     ~FolderConfigureSettingsGeneralWidget();
     void save(Akonadi::Collection &col);
 private:
-    MailCommon::CollectionGeneralWidget *mCollectionGeneralWidget = nullptr;
+    MailCommon::CollectionGeneralWidget *const mCollectionGeneralWidget;
 };
 
 #endif // FOLDERCONFIGURESETTINGSGENERALWIDGET_H

plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingstemplatewidget.cpp

@@ -10,8 +10,8 @@
 
 FolderConfigureSettingsTemplateWidget::FolderConfigureSettingsTemplateWidget(QWidget *parent)
     : FolderConfigureSettingsPageBase(parent)
+    , mCollectionTemplateWidget(new MailCommon::CollectionTemplatesWidget(this))
 {
-    mCollectionTemplateWidget = new MailCommon::CollectionTemplatesWidget(this);
     mCollectionTemplateWidget->setObjectName(QStringLiteral("mCollectionTemplateWidget"));
     addMainWidget(mCollectionTemplateWidget);
 }

plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingstemplatewidget.h

@@ -22,7 +22,7 @@ public:
     ~FolderConfigureSettingsTemplateWidget();
     void save(Akonadi::Collection &col);
 private:
-    MailCommon::CollectionTemplatesWidget *mCollectionTemplateWidget = nullptr;
+    MailCommon::CollectionTemplatesWidget *const mCollectionTemplateWidget;
 };
 
 #endif // FOLDERCONFIGURESETTINGSTEMPLATEWIDGET_H

plugins/messageviewerplugins/createeventplugin/createeventjob.h

@@ -28,8 +28,8 @@ private:
     void slotRelationCreated(KJob *job);
     void createEvent();
     Akonadi::Item mItem;
-    Akonadi::Collection mCollection;
-    KCalendarCore::Event::Ptr mEventPtr;
+    const Akonadi::Collection mCollection;
+    const KCalendarCore::Event::Ptr mEventPtr;
 };
 }
 

plugins/messageviewerplugins/createnoteplugin/createnotejob.h

@@ -33,8 +33,8 @@ private Q_SLOTS:
 
 private:
     void createNote();
-    Akonadi::Item mItem;
-    Akonadi::Collection mCollection;
+    const Akonadi::Item mItem;
+    const Akonadi::Collection mCollection;
     Akonadi::NoteUtils::NoteMessageWrapper mNote;
 };
 }

plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscriptinterface.cpp

@@ -21,8 +21,8 @@ using namespace MessageViewer;
 
 ViewerPluginExternalscriptInterface::ViewerPluginExternalscriptInterface(KActionCollection *ac, QWidget *parent)
     : ViewerPluginInterface(parent)
+    , mActionGroup(new QActionGroup(this))
 {
-    mActionGroup = new QActionGroup(this);
     createAction(ac);
 }
 

plugins/templateparser/templateparseremailaddressrequesterakonadi.cpp

@@ -14,11 +14,11 @@ K_PLUGIN_CLASS_WITH_JSON(TemplateParserEmailAddressRequesterAkonadi,
 
 TemplateParserEmailAddressRequesterAkonadi::TemplateParserEmailAddressRequesterAkonadi(QWidget *parent, const QList<QVariant> &)
     : TemplateParser::TemplateParserEmailAddressRequesterBase(parent)
+    , mEmailAddressRequester(new Akonadi::EmailAddressRequester(this))
 {
     QHBoxLayout *mainLayout = new QHBoxLayout(this);
     mainLayout->setObjectName(QStringLiteral("mainLayout"));
     mainLayout->setContentsMargins({});
-    mEmailAddressRequester = new Akonadi::EmailAddressRequester(this);
     mEmailAddressRequester->setObjectName(QStringLiteral("EmailAddressRequester"));
     mainLayout->addWidget(mEmailAddressRequester);
     connect(mEmailAddressRequester, &Akonadi::EmailAddressRequester::textChanged, this, &TemplateParser::TemplateParserEmailAddressRequesterBase::textChanged);

plugins/templateparser/templateparseremailaddressrequesterakonadi.h

@@ -26,7 +26,7 @@ public:
     void clear() override;
 
 private:
-    Akonadi::EmailAddressRequester *mEmailAddressRequester = nullptr;
+    Akonadi::EmailAddressRequester *const mEmailAddressRequester;
 };
 
 #endif // TEMPLATEPARSEREMAILADDRESSREQUESTERAKONADI_H

plugins/webengineurlinterceptor/adblock/adblockinterceptorinterface.cpp

@@ -18,8 +18,8 @@
 
 AdblockInterceptorInterface::AdblockInterceptorInterface(QObject *parent)
     : WebEngineViewer::NetworkPluginUrlInterceptorInterface(parent)
+    , mAdblockManager(new AdBlock::AdblockManager(this))
 {
-    mAdblockManager = new AdBlock::AdblockManager(this);
 }
 
 AdblockInterceptorInterface::~AdblockInterceptorInterface()

plugins/webengineurlinterceptor/adblock/adblockinterceptorinterface.h

@@ -35,7 +35,7 @@ private:
     mutable WebEngineViewer::WebHitTestResult mCurrentWebHitTest;
     QAction *mShowBlockableItems = nullptr;
     QAction *mBlockImage = nullptr;
-    AdBlock::AdblockManager *mAdblockManager = nullptr;
+    AdBlock::AdblockManager *const mAdblockManager;
     QWebEngineView *mWebEngineView = nullptr;
 };