Const'ify pointer

src/kmkernel.cpp

@@ -126,6 +126,8 @@ static bool s_askingToGoOnline = false;
 /********************************************************************/
 KMKernel::KMKernel(QObject *parent)
     : QObject(parent)
+    , mJobScheduler(new JobScheduler(this))
+    , mFolderArchiveManager(new FolderArchiveManager(this))
 {
     //Initialize kmail sieveimap interface
     KSieveUi::SieveImapInstanceInterfaceManager::self()->setSieveImapInstanceInterface(new KMailSieveImapInstanceInterface);
@@ -143,8 +145,6 @@ KMKernel::KMKernel(QObject *parent)
     mySelf = this;
     the_firstInstance = true;
 
-    the_undoStack = nullptr;
-    the_msgSender = nullptr;
     mFilterEditDialog = nullptr;
     // make sure that we check for config updates before doing anything else
     KMKernel::config();
@@ -153,8 +153,6 @@ KMKernel::KMKernel(QObject *parent)
     // would be unexpected
     KMailSettings::self();
 
-    mJobScheduler = new JobScheduler(this);
-
     mAutoCorrection = new PimCommon::AutoCorrection();
     KMime::setUseOutlookAttachmentEncoding(MessageComposer::MessageComposerSettings::self()->outlookCompatibleAttachments());
 
@@ -225,7 +223,7 @@ KMKernel::KMKernel(QObject *parent)
     CommonKernel->registerKernelIf(this);
     CommonKernel->registerSettingsIf(this);
     CommonKernel->registerFilterIf(this);
-    mFolderArchiveManager = new FolderArchiveManager(this);
+
     mIndexedItems = new Akonadi::Search::PIM::IndexedItems(this);
     mCheckIndexingManager = new CheckIndexingManager(mIndexedItems, this);
     mUnityServiceManager = new KMail::UnityServiceManager(this);

src/kmkernel.h

@@ -511,7 +511,7 @@ private:
     ConfigureDialog *mConfigureDialog = nullptr;
 
     QTimer *mBackgroundTasksTimer = nullptr;
-    MailCommon::JobScheduler *mJobScheduler = nullptr;
+    MailCommon::JobScheduler *const mJobScheduler;
     KMail::MailServiceImpl *mMailService = nullptr;
 
     bool mSystemNetworkStatus = true;
@@ -527,7 +527,7 @@ private:
 
     QPointer<MailCommon::KMFilterDialog> mFilterEditDialog;
     PimCommon::AutoCorrection *mAutoCorrection = nullptr;
-    FolderArchiveManager *mFolderArchiveManager = nullptr;
+    FolderArchiveManager *const mFolderArchiveManager;
     CheckIndexingManager *mCheckIndexingManager = nullptr;
     Akonadi::Search::PIM::IndexedItems *mIndexedItems = nullptr;
     MailCommon::MailCommonSettings *mMailCommonSettings = nullptr;