From b9e92bd3c9771aac2ba8d2f922b2e8f2129d3d61 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 3 Aug 2021 13:18:38 +0200 Subject: [PATCH] Const'ify pointer --- src/collectionpage/collectionexpirywidget.cpp | 10 +++++----- src/collectionpage/collectionexpirywidget.h | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/collectionpage/collectionexpirywidget.cpp b/src/collectionpage/collectionexpirywidget.cpp index adc17cc..6341241 100644 --- a/src/collectionpage/collectionexpirywidget.cpp +++ b/src/collectionpage/collectionexpirywidget.cpp @@ -61,19 +61,21 @@ public: CollectionExpiryWidget::CollectionExpiryWidget(QWidget *parent) : QWidget(parent) + , mExpireReadMailSB(new DaysSpinBox(this)) + , mExpireUnreadMailSB(new DaysSpinBox(this)) + , mFolderSelector(new FolderRequester(this)) + , mExpireNowPB(new QPushButton(i18n("Save Settings and Expire Now"), this)) + , mExpireMailWithInvalidDateCB(new QCheckBox(i18n("Expire messages with invalid date"), this)) { auto formLayout = new QFormLayout(this); formLayout->setContentsMargins({}); - mExpireReadMailSB = new DaysSpinBox(this); connect(mExpireReadMailSB, qOverload(&KPluralHandlingSpinBox::valueChanged), this, &CollectionExpiryWidget::slotChanged); formLayout->addRow(i18n("Expire read messages after:"), mExpireReadMailSB); - mExpireUnreadMailSB = new DaysSpinBox(this); connect(mExpireUnreadMailSB, qOverload(&KPluralHandlingSpinBox::valueChanged), this, &CollectionExpiryWidget::slotChanged); formLayout->addRow(i18n("Expire unread messages after:"), mExpireUnreadMailSB); - mExpireMailWithInvalidDateCB = new QCheckBox(i18n("Expire messages with invalid date"), this); connect(mExpireMailWithInvalidDateCB, &QCheckBox::toggled, this, &CollectionExpiryWidget::slotChanged); formLayout->addRow(QString(), mExpireMailWithInvalidDateCB); @@ -90,7 +92,6 @@ CollectionExpiryWidget::CollectionExpiryWidget(QWidget *parent) connect(mMoveToRB, &QRadioButton::toggled, this, &CollectionExpiryWidget::slotChanged); moveToHBox->addWidget(mMoveToRB); - mFolderSelector = new FolderRequester(this); mFolderSelector->setMustBeReadWrite(true); mFolderSelector->setShowOutbox(false); moveToHBox->addWidget(mFolderSelector); @@ -103,7 +104,6 @@ CollectionExpiryWidget::CollectionExpiryWidget(QWidget *parent) formLayout->addRow(QString(), mDeletePermanentlyRB); - mExpireNowPB = new QPushButton(i18n("Save Settings and Expire Now"), this); connect(mExpireNowPB, &QPushButton::clicked, this, &CollectionExpiryWidget::saveAndExpireRequested); formLayout->addRow(QString(), mExpireNowPB); diff --git a/src/collectionpage/collectionexpirywidget.h b/src/collectionpage/collectionexpirywidget.h index 300e56b..a7fd4ce 100644 --- a/src/collectionpage/collectionexpirywidget.h +++ b/src/collectionpage/collectionexpirywidget.h @@ -50,13 +50,13 @@ private: Q_REQUIRED_RESULT bool validateExpireFolder(bool expireNow); Q_REQUIRED_RESULT MailCommon::ExpireCollectionAttribute *assignFolderAttribute(Akonadi::Collection &collection, bool &expireNow); void slotChanged(); - KPluralHandlingSpinBox *mExpireReadMailSB = nullptr; - KPluralHandlingSpinBox *mExpireUnreadMailSB = nullptr; + KPluralHandlingSpinBox *const mExpireReadMailSB; + KPluralHandlingSpinBox *const mExpireUnreadMailSB; QRadioButton *mMoveToRB = nullptr; - FolderRequester *mFolderSelector = nullptr; + FolderRequester *const mFolderSelector; QRadioButton *mDeletePermanentlyRB = nullptr; - QPushButton *mExpireNowPB = nullptr; - QCheckBox *mExpireMailWithInvalidDateCB = nullptr; + QPushButton *const mExpireNowPB; + QCheckBox *const mExpireMailWithInvalidDateCB; }; } MAILCOMMON_EXPORT QDebug operator<<(QDebug d, const MailCommon::CollectionExpirySettings &t);