Refactor help lib

Fix const correctness.
Use default member initializers.
Fix some coding style issues.

Change-Id: Ib89a2840648dcacc518cda4eb0ffce97ee8444cc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>

1 files changed, 8 insertions, 12 deletions

diff --git a/src/assistant/help/qhelpengine_p.h b/src/assistant/help/qhelpengine_p.h
index a38cc1b7a..d56b51178 100644
--- a/src/assistant/help/qhelpengine_p.h
+++ b/src/assistant/help/qhelpengine_p.h
@@ -74,7 +74,6 @@ class QHelpEngineCorePrivate : public QObject
     Q_OBJECT
 
 public:
-    QHelpEngineCorePrivate();
     virtual ~QHelpEngineCorePrivate();
 
     virtual void init(const QString &collectionFile,
@@ -88,11 +87,11 @@ public:
     QMultiMap<QString, QHelpDBReader*> virtualFolderMap;
     QStringList orderedFileNameList;
 
-    QHelpCollectionHandler *collectionHandler;
+    QHelpCollectionHandler *collectionHandler = nullptr;
     QString currentFilter;
     QString error;
-    bool needsSetup;
-    bool autoSaveFilter;
+    bool needsSetup = true;
+    bool autoSaveFilter = true;
 
 protected:
     QHelpEngineCore *q;
@@ -107,19 +106,16 @@ class QHelpEnginePrivate : public QHelpEngineCorePrivate
     Q_OBJECT
 
 public:
-    QHelpEnginePrivate();
-    ~QHelpEnginePrivate();
-
     void init(const QString &collectionFile,
         QHelpEngineCore *helpEngineCore) override;
 
-    QHelpContentModel *contentModel;
-    QHelpContentWidget *contentWidget;
+    QHelpContentModel *contentModel = nullptr;
+    QHelpContentWidget *contentWidget = nullptr;
 
-    QHelpIndexModel *indexModel;
-    QHelpIndexWidget *indexWidget;
+    QHelpIndexModel *indexModel = nullptr;
+    QHelpIndexWidget *indexWidget = nullptr;
 
-    QHelpSearchEngine *searchEngine;
+    QHelpSearchEngine *searchEngine = nullptr;
 
     void stopDataCollection();