const'ify pointer + use Q_REQUIRED_RESULT

src/conflictresolver.h

@@ -91,7 +91,7 @@ public:
      * @see setMandatoryRoles
      * @see setAllowedWeekdays
      */
-    KCalendarCore::Period::List availableSlots() const;
+    Q_REQUIRED_RESULT KCalendarCore::Period::List availableSlots() const;
 
     /**
       Finds a free slot in the future which has at least the same size as

src/incidenceattachment.h

@@ -73,7 +73,7 @@ private:
     AttachmentIconView *mAttachmentView = nullptr;
     Ui::EventOrTodoDesktop *const mUi;
 
-    QMenu *mPopupMenu = nullptr;
+    QMenu *const mPopupMenu;
     QAction *mOpenAction = nullptr;
     QAction *mSaveAsAction = nullptr;
 #ifndef QT_NO_CLIPBOARD

src/incidencedefaults.cpp

@@ -52,7 +52,7 @@ public:
     bool mCleanupTemporaryFiles;
 
     /// Methods
-    KCalendarCore::Person organizerAsPerson() const;
+    Q_REQUIRED_RESULT KCalendarCore::Person organizerAsPerson() const;
     KCalendarCore::Attendee organizerAsAttendee(const KCalendarCore::Person &organizer) const;
 
     void todoDefaults(const KCalendarCore::Todo::Ptr &todo) const;

src/incidencedescription.h

@@ -48,7 +48,7 @@ private:
     void setupToolBar();
 
 private:
-    Ui::EventOrTodoDesktop *mUi = nullptr;
+    Ui::EventOrTodoDesktop *const mUi;
     //@cond PRIVATE
     Q_DECLARE_PRIVATE(IncidenceDescription)
     IncidenceDescriptionPrivate *const d;

src/incidencerecurrence.h

@@ -108,9 +108,9 @@ private:
     QDate currentDate() const;
 
 private:
-    Ui::EventOrTodoDesktop *mUi = nullptr;
+    Ui::EventOrTodoDesktop *const mUi;
     QDate mCurrentDate;
-    IncidenceDateTime *mDateTime = nullptr;
+    IncidenceDateTime *const mDateTime;
     KCalendarCore::DateList mExceptionDates;
 
     // So we can easily detect if the user changed the type,

src/incidenceresource.h

@@ -51,7 +51,7 @@ private:
     void slotDateChanged();
 
     void dialogOkPressed();
-    Ui::EventOrTodoDesktop *mUi = nullptr;
+    Ui::EventOrTodoDesktop *const mUi;
 
     /** completer for findResources */
     QCompleter *completer = nullptr;

src/schedulingdialog.h

@@ -56,7 +56,7 @@ private:
     QTime mSelectedTime;
     int mDuration; //!< In seconds
 
-    ConflictResolver *mResolver = nullptr;
+    ConflictResolver *const mResolver;
     CalendarSupport::FreePeriodModel *const mPeriodModel;
     VisualFreeBusyWidget *mVisualWidget = nullptr;
 };