QHelpFilterSettingsWidget: Improve API

- Make constructor explicit
- Add some const for clarity
- Fix style issues, include convention

Change-Id: Ic90c446dde66ab21a0ba621c6dfa939adb822c4e
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

4 files changed, 10 insertions, 11 deletions

diff --git a/src/assistant/help/qhelpfiltersettings.cpp b/src/assistant/help/qhelpfiltersettings.cpp
index e9a1c3f4e..206692179 100644
--- a/src/assistant/help/qhelpfiltersettings.cpp
+++ b/src/assistant/help/qhelpfiltersettings.cpp
@@ -107,7 +107,7 @@ QString QHelpFilterSettings::currentFilter() const
     return d->m_currentFilter;
 }
 
-QHelpFilterSettings QHelpFilterSettings::readSettings(QHelpFilterEngine *filterEngine)
+QHelpFilterSettings QHelpFilterSettings::readSettings(const QHelpFilterEngine *filterEngine)
 {
     QHelpFilterSettings filterSettings;
 
diff --git a/src/assistant/help/qhelpfiltersettings_p.h b/src/assistant/help/qhelpfiltersettings_p.h
index 50e30e492..da25d300e 100644
--- a/src/assistant/help/qhelpfiltersettings_p.h
+++ b/src/assistant/help/qhelpfiltersettings_p.h
@@ -73,7 +73,7 @@ public:
     void setCurrentFilter(const QString &filterName);
     QString currentFilter() const;
 
-    static QHelpFilterSettings readSettings(QHelpFilterEngine *filterEngine);
+    static QHelpFilterSettings readSettings(const QHelpFilterEngine *filterEngine);
     static bool applySettings(QHelpFilterEngine *filterEngine, const QHelpFilterSettings &settings);
 
 private:
diff --git a/src/assistant/help/qhelpfiltersettingswidget.cpp b/src/assistant/help/qhelpfiltersettingswidget.cpp
index 15cc4f475..51c66c269 100644
--- a/src/assistant/help/qhelpfiltersettingswidget.cpp
+++ b/src/assistant/help/qhelpfiltersettingswidget.cpp
@@ -407,7 +407,7 @@ void QHelpFilterSettingsWidget::setAvailableVersions(const QList<QVersionNumber>
     Reads the filter settings stored inside \a filterEngine and sets up
     this filter settings widget accordingly.
 */
-void QHelpFilterSettingsWidget::readSettings(QHelpFilterEngine *filterEngine)
+void QHelpFilterSettingsWidget::readSettings(const QHelpFilterEngine *filterEngine)
 {
     Q_D(QHelpFilterSettingsWidget);
     const QHelpFilterSettings settings = QHelpFilterSettings::readSettings(filterEngine);
@@ -419,9 +419,9 @@ void QHelpFilterSettingsWidget::readSettings(QHelpFilterEngine *filterEngine)
     widget, to the \a filterEngine. The old settings stored in the filter
     engine will be overwritten.
 */
-bool QHelpFilterSettingsWidget::applySettings(QHelpFilterEngine *filterEngine)
+bool QHelpFilterSettingsWidget::applySettings(QHelpFilterEngine *filterEngine) const
 {
-    Q_D(QHelpFilterSettingsWidget);
+    Q_D(const QHelpFilterSettingsWidget);
     return QHelpFilterSettings::applySettings(filterEngine, d->filterSettings());
 }
 
diff --git a/src/assistant/help/qhelpfiltersettingswidget.h b/src/assistant/help/qhelpfiltersettingswidget.h
index 1b6606054..c3c77305f 100644
--- a/src/assistant/help/qhelpfiltersettingswidget.h
+++ b/src/assistant/help/qhelpfiltersettingswidget.h
@@ -42,7 +42,7 @@
 
 #include <QtHelp/qhelp_global.h>
 
-#include <QtWidgets/QWidget>
+#include <QtWidgets/qwidget.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -55,7 +55,7 @@ class QHELP_EXPORT QHelpFilterSettingsWidget : public QWidget
 {
     Q_OBJECT
 public:
-    QHelpFilterSettingsWidget(QWidget *parent);
+    explicit QHelpFilterSettingsWidget(QWidget *parent = nullptr);
 
     ~QHelpFilterSettingsWidget();
 
@@ -63,8 +63,8 @@ public:
     void setAvailableVersions(const QList<QVersionNumber> &versions);
 
     // TODO: filterEngine may be moved to c'tor or to setFilterEngine() setter
-    void readSettings(QHelpFilterEngine *filterEngine);
-    bool applySettings(QHelpFilterEngine *filterEngine);
+    void readSettings(const QHelpFilterEngine *filterEngine);
+    bool applySettings(QHelpFilterEngine *filterEngine) const;
 
 private:
     QScopedPointer<class QHelpFilterSettingsWidgetPrivate> d_ptr;
@@ -74,5 +74,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif
-
+#endif // QHELPFILTERSETTINGSWIDGET_H