Const'ify more pointer

korganizer/emailaddressselectionldapdialog/emailaddressselectionldapdialog.cpp

@@ -21,9 +21,9 @@ K_PLUGIN_CLASS_WITH_JSON(EmailAddressSelectionLdapDialog, "emailaddressselection
 
 EmailAddressSelectionLdapDialog::EmailAddressSelectionLdapDialog(QWidget *parent, const QList<QVariant> &)
     : Akonadi::AbstractEmailAddressSelectionDialog(parent)
+    , mView(new Akonadi::RecipientsPickerWidget(true, nullptr, this))
 {
     auto mainLayout = new QVBoxLayout(this);
-    mView = new Akonadi::RecipientsPickerWidget(true, nullptr, this);
     mainLayout->addWidget(mView);
     connect(mView->emailAddressSelectionWidget()->view(), &QTreeView::doubleClicked, this, &QDialog::accept);
 

korganizer/emailaddressselectionldapdialog/emailaddressselectionldapdialog.h

@@ -31,7 +31,7 @@ private:
     void readConfig();
     void slotSearchLDAP();
     void ldapSearchResult();
-    Akonadi::RecipientsPickerWidget *mView = nullptr;
+    Akonadi::RecipientsPickerWidget *const mView;
     PimCommon::LdapSearchDialog *mLdapSearchDialog = nullptr;
 };
 

plugins/customtoolsplugins/translatorplugin/translatorview.cpp

@@ -14,10 +14,10 @@
 
 TranslatorView::TranslatorView(KActionCollection *ac, QWidget *parent)
     : PimCommon::CustomToolsViewInterface(parent)
+    , mTranslatorWidget(new PimCommon::TranslatorWidget(this))
 {
     auto layout = new QHBoxLayout(this);
     layout->setContentsMargins({});
-    mTranslatorWidget = new PimCommon::TranslatorWidget(this);
     connect(mTranslatorWidget, &PimCommon::TranslatorWidget::toolsWasClosed, this, &TranslatorView::toolsWasClosed);
 
     layout->addWidget(mTranslatorWidget);

plugins/messageviewerconfigureplugins/dkim-verify/dkimadvancedwidget.cpp

@@ -17,24 +17,24 @@ using namespace PimCommon::ConfigureImmutableWidgetUtils;
 
 DKIMAdvancedWidget::DKIMAdvancedWidget(QWidget *parent)
     : QWidget(parent)
+    , mSha1Policy(new QComboBox(this))
+    , mCheckDKIMWhenOnlyTesting(new QCheckBox(i18n("Still verify the signature, if a domain is only testing DKIM"), this))
+    , mUseAuthenticationResultRelaxedParser(new QCheckBox(i18n("Use relaxed parsing when reading \"Authentication-Result\" header"), this))
+    , mSmallKeyPolicy(new QComboBox(this))
 {
     auto mainLayout = new QFormLayout(this);
     mainLayout->setObjectName(QStringLiteral("mainLayout"));
 
-    mCheckDKIMWhenOnlyTesting = new QCheckBox(i18n("Still verify the signature, if a domain is only testing DKIM"), this);
     mCheckDKIMWhenOnlyTesting->setObjectName(QStringLiteral("mCheckDKIMWhenOnlyTesting"));
     mainLayout->addRow(mCheckDKIMWhenOnlyTesting);
 
-    mUseAuthenticationResultRelaxedParser = new QCheckBox(i18n("Use relaxed parsing when reading \"Authentication-Result\" header"), this);
     mUseAuthenticationResultRelaxedParser->setObjectName(QStringLiteral("mUseAuthenticationResultRelaxedParser"));
     mainLayout->addRow(mUseAuthenticationResultRelaxedParser);
 
-    mSha1Policy = new QComboBox(this);
     mSha1Policy->setObjectName(QStringLiteral("rsa1-policy"));
     mSha1Policy->addItems({i18n("Nothing"), i18n("Warning"), i18n("Error")});
     mainLayout->addRow(i18n("Treat RSA-SHA1 sign algorithm as:"), mSha1Policy);
 
-    mSmallKeyPolicy = new QComboBox(this);
     mSmallKeyPolicy->setObjectName(QStringLiteral("mSmallKeyPolicy"));
     mSmallKeyPolicy->addItems({i18n("Nothing"), i18n("Warning"), i18n("Error")});
     mainLayout->addRow(i18n("Treat small Key as:"), mSmallKeyPolicy);

plugins/messageviewerconfigureplugins/dkim-verify/dkimadvancedwidget.h

@@ -22,9 +22,9 @@ public:
 
 private:
     void slotConfigureAuthenticationServer();
-    QComboBox *mSha1Policy = nullptr;
-    QCheckBox *mCheckDKIMWhenOnlyTesting = nullptr;
-    QCheckBox *mUseAuthenticationResultRelaxedParser = nullptr;
-    QComboBox *mSmallKeyPolicy = nullptr;
+    QComboBox *const mSha1Policy;
+    QCheckBox *const mCheckDKIMWhenOnlyTesting;
+    QCheckBox *const mUseAuthenticationResultRelaxedParser;
+    QComboBox *const mSmallKeyPolicy;
 };
 

plugins/messageviewerconfigureplugins/dkim-verify/dkimauthenticationverifiedserverdialog.cpp

@@ -19,12 +19,12 @@ static const char myConfigGroupName[] = "DKIMAuthenticationVerifiedServerDialog"
 
 DKIMAuthenticationVerifiedServerDialog::DKIMAuthenticationVerifiedServerDialog(QWidget *parent)
     : QDialog(parent)
+    , mAuthenticationVerifiedWidget(new DKIMAuthenticationVerifiedServerWidget(this))
 {
     setWindowTitle(i18nc("@title:window", "Configure Authentication Verified Server"));
     auto mainLayout = new QVBoxLayout(this);
     mainLayout->setObjectName(QStringLiteral("mainlayout"));
 
-    mAuthenticationVerifiedWidget = new DKIMAuthenticationVerifiedServerWidget(this);
     mAuthenticationVerifiedWidget->setObjectName(QStringLiteral("mAuthenticationVerifiedWidget"));
     mainLayout->addWidget(mAuthenticationVerifiedWidget);
 

plugins/messageviewerconfigureplugins/dkim-verify/dkimauthenticationverifiedserverdialog.h

@@ -20,6 +20,6 @@ private:
     void slotAccepted();
     void readConfig();
     void writeConfig();
-    DKIMAuthenticationVerifiedServerWidget *mAuthenticationVerifiedWidget = nullptr;
+    DKIMAuthenticationVerifiedServerWidget *const mAuthenticationVerifiedWidget;
 };
 

plugins/messageviewerconfigureplugins/dkim-verify/dkimconfiguredialog.cpp

@@ -20,12 +20,12 @@ static const char myConfigGroupName[] = "DKIMConfigureDialog";
 
 DKIMConfigureDialog::DKIMConfigureDialog(QWidget *parent)
     : QDialog(parent)
+    , mConfigureWidget(new DKIMConfigureWidget(this))
 {
     setWindowTitle(i18nc("@title:window", "Configure DKIM"));
     auto mainLayout = new QVBoxLayout(this);
     mainLayout->setObjectName(QStringLiteral("mainlayout"));
 
-    mConfigureWidget = new DKIMConfigureWidget(this);
     mConfigureWidget->setObjectName(QStringLiteral("mConfigureWidget"));
     mainLayout->addWidget(mConfigureWidget);
 

plugins/messageviewerconfigureplugins/dkim-verify/dkimconfiguredialog.h

@@ -22,5 +22,5 @@ private:
     void readConfig();
     void slotAccepted();
     void writeConfig();
-    DKIMConfigureWidget *mConfigureWidget = nullptr;
+    DKIMConfigureWidget *const mConfigureWidget;
 };

plugins/messageviewerconfigureplugins/dkim-verify/dkimgeneralwidget.cpp

@@ -16,16 +16,18 @@
 using namespace PimCommon::ConfigureImmutableWidgetUtils;
 DKIMGeneralWidget::DKIMGeneralWidget(QWidget *parent)
     : QWidget(parent)
+    , mEnableDkimSupport(new QCheckBox(i18n("Enable DKIM Support"), this))
+    , mSaveResult(new QCheckBox(i18n("Save DKIM Result"), this))
+    , mSaveKey(new QComboBox(this))
+    , mUseOnlyAuthenticationResult(new QCheckBox(i18n("Replace DKIM result by Authentication-Result header value"), this))
 {
     auto mainLayout = new QVBoxLayout(this);
     mainLayout->setObjectName(QStringLiteral("mainLayout"));
 
-    mEnableDkimSupport = new QCheckBox(i18n("Enable DKIM Support"));
     mEnableDkimSupport->setObjectName(QStringLiteral("enableDkimSupport"));
     mEnableDkimSupport->setChecked(false);
     mainLayout->addWidget(mEnableDkimSupport);
 
-    mSaveResult = new QCheckBox(i18n("Save DKIM Result"));
     mSaveResult->setObjectName(QStringLiteral("mSaveResult"));
     mSaveResult->setChecked(false);
     mainLayout->addWidget(mSaveResult);
@@ -37,13 +39,11 @@ DKIMGeneralWidget::DKIMGeneralWidget(QWidget *parent)
     saveKeyLabel->setObjectName(QStringLiteral("saveKeyLabel"));
     saveKeyLayout->addWidget(saveKeyLabel);
 
-    mSaveKey = new QComboBox(this);
     mSaveKey->setObjectName(QStringLiteral("mSaveKey"));
     mSaveKey->addItems({i18n("Nothing"), i18n("Save"), i18n("Save and Compare")});
     saveKeyLayout->addWidget(mSaveKey);
     saveKeyLayout->addStretch(1);
 
-    mUseOnlyAuthenticationResult = new QCheckBox(i18n("Replace DKIM result by Authentication-Result header value"));
     mUseOnlyAuthenticationResult->setObjectName(QStringLiteral("mUseOnlyAuthenticationResult"));
     mUseOnlyAuthenticationResult->setChecked(false);
     mainLayout->addWidget(mUseOnlyAuthenticationResult);

plugins/messageviewerconfigureplugins/dkim-verify/dkimgeneralwidget.h

@@ -21,9 +21,9 @@ public:
     void resetSettings();
 
 private:
-    QCheckBox *mEnableDkimSupport = nullptr;
-    QCheckBox *mSaveResult = nullptr;
-    QComboBox *mSaveKey = nullptr;
-    QCheckBox *mUseOnlyAuthenticationResult = nullptr;
+    QCheckBox *const mEnableDkimSupport;
+    QCheckBox *const mSaveResult;
+    QComboBox *const mSaveKey;
+    QCheckBox *const mUseOnlyAuthenticationResult;
 };
 

plugins/messageviewerconfigureplugins/dkim-verify/dkimpolicywidget.cpp

@@ -18,11 +18,17 @@ using namespace PimCommon::ConfigureImmutableWidgetUtils;
 
 DKIMPolicyWidget::DKIMPolicyWidget(QWidget *parent)
     : QWidget(parent)
+    , mVerifyIfEmailMustBeSigned(new QCheckBox(i18n("Check if e-mail should be signed"), this))
+    , mUseDMARC(new QCheckBox(i18n("Use DMARC to heuristically determine if an e-mail should be signed"), this))
+    , mUseDefaultRules(new QCheckBox(i18n("Use default rule"), this))
+    , mAutoGenerateRule(new QCheckBox(i18n("Autogenerate rule"), this))
+    , mReadAuthResultHeader(new QCheckBox(i18n("Read Authentication-Results header"), this))
+    , mAutoGenerateOnlyIfSenderInSDID(new QCheckBox(i18n("Autogenerate when Sender in SDID"), this))
+    , mRulesButton(new QPushButton(i18n("Show Rules"), this))
 {
     auto mainLayout = new QVBoxLayout(this);
     mainLayout->setObjectName(QStringLiteral("mainLayout"));
 
-    mVerifyIfEmailMustBeSigned = new QCheckBox(i18n("Check if e-mail should be signed"), this);
     mVerifyIfEmailMustBeSigned->setObjectName(QStringLiteral("mVerifyIfEmailMustBeSigned"));
     mainLayout->addWidget(mVerifyIfEmailMustBeSigned);
     connect(mVerifyIfEmailMustBeSigned, &QCheckBox::toggled, this, [this](bool state) {
@@ -34,22 +40,18 @@ DKIMPolicyWidget::DKIMPolicyWidget(QWidget *parent)
         mReadAuthResultHeader->setEnabled(state);
     });
 
-    mUseDMARC = new QCheckBox(i18n("Use DMARC to heuristically determine if an e-mail should be signed"), this);
     mUseDMARC->setObjectName(QStringLiteral("mUseDMARC"));
     mUseDMARC->setEnabled(false);
     mainLayout->addWidget(mUseDMARC);
 
-    mReadAuthResultHeader = new QCheckBox(i18n("Read Authentication-Results header"), this);
     mReadAuthResultHeader->setObjectName(QStringLiteral("mReadAuthResultHeader"));
     mReadAuthResultHeader->setEnabled(false);
     mainLayout->addWidget(mReadAuthResultHeader);
 
-    mUseDefaultRules = new QCheckBox(i18n("Use default rule"), this);
     mUseDefaultRules->setObjectName(QStringLiteral("mUseDefaultRules"));
     mUseDefaultRules->setEnabled(false);
     mainLayout->addWidget(mUseDefaultRules);
 
-    mAutoGenerateRule = new QCheckBox(i18n("Autogenerate rule"), this);
     mAutoGenerateRule->setObjectName(QStringLiteral("mAutoGenerateRule"));
     mAutoGenerateRule->setEnabled(false);
     mainLayout->addWidget(mAutoGenerateRule);
@@ -61,14 +63,12 @@ DKIMPolicyWidget::DKIMPolicyWidget(QWidget *parent)
     auto item = new QSpacerItem(30, 0);
     autogenerateOnlyLayout->addItem(item);
 
-    mAutoGenerateOnlyIfSenderInSDID = new QCheckBox(i18n("Autogenerate when Sender in SDID"), this);
     mAutoGenerateOnlyIfSenderInSDID->setObjectName(QStringLiteral("mAutoGenerateOnlyIfSenderInSDID"));
     mAutoGenerateOnlyIfSenderInSDID->setEnabled(false);
     autogenerateOnlyLayout->addWidget(mAutoGenerateOnlyIfSenderInSDID);
 
     auto ruleLayout = new QHBoxLayout;
     mainLayout->addLayout(ruleLayout);
-    mRulesButton = new QPushButton(i18n("Show Rules"), this);
     mRulesButton->setObjectName(QStringLiteral("rules"));
     mRulesButton->setEnabled(false);
     ruleLayout->addWidget(mRulesButton);

plugins/messageviewerconfigureplugins/dkim-verify/dkimpolicywidget.h

@@ -21,12 +21,12 @@ public:
     void resetSettings();
 
 private:
-    QCheckBox *mVerifyIfEmailMustBeSigned = nullptr;
-    QCheckBox *mUseDMARC = nullptr;
-    QCheckBox *mUseDefaultRules = nullptr;
-    QCheckBox *mAutoGenerateRule = nullptr;
-    QCheckBox *mReadAuthResultHeader = nullptr;
-    QCheckBox *mAutoGenerateOnlyIfSenderInSDID = nullptr;
-    QPushButton *mRulesButton = nullptr;
+    QCheckBox *const mVerifyIfEmailMustBeSigned;
+    QCheckBox *const mUseDMARC;
+    QCheckBox *const mUseDefaultRules;
+    QCheckBox *const mAutoGenerateRule;
+    QCheckBox *const mReadAuthResultHeader;
+    QCheckBox *const mAutoGenerateOnlyIfSenderInSDID;
+    QPushButton *const mRulesButton;
 };