Preferences: Add default implementation for filtering

The default "matches" method now takes the widget and looks for all
child labels, checkboxes, push buttons and group boxes.
Because of that, the former "createWidget" method
can be called multiple times without creating a new widget
(-->widget()), and the "finished" method must ensure that the created
widget gets deleted, since not all widgets that were created are added
to the UI anymore.

Change-Id: Ia231c7c78dd8819146668e6447d36d22e7836904
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

2 files changed, 14 insertions, 18 deletions

diff --git a/src/plugins/updateinfo/settingspage.cpp b/src/plugins/updateinfo/settingspage.cpp
index 2125baad61..b6d0de60c5 100644
--- a/src/plugins/updateinfo/settingspage.cpp
+++ b/src/plugins/updateinfo/settingspage.cpp
@@ -36,7 +36,7 @@ using namespace UpdateInfo;
 using namespace UpdateInfo::Internal;
 
 SettingsPage::SettingsPage(UpdateInfoPlugin *plugin)
-    : m_page(0)
+    : m_widget(0)
     , m_plugin(plugin)
 {
     setId(Constants::FILTER_OPTIONS_PAGE);
@@ -46,15 +46,15 @@ SettingsPage::SettingsPage(UpdateInfoPlugin *plugin)
     setDisplayCategory(QCoreApplication::translate("Core", Core::Constants::SETTINGS_TR_CATEGORY_CORE));
 }
 
-QWidget *SettingsPage::createPage(QWidget *parent)
+QWidget *SettingsPage::widget()
 {
-    m_page = new QWidget(parent);
-    m_ui.setupUi(m_page);
-    if (m_searchKeywords.isEmpty())
-        m_searchKeywords = m_ui.m_info->text();
-    m_ui.m_timeTable->setItemText(m_ui.m_timeTable->currentIndex(), QTime(m_plugin->scheduledUpdateTime())
-        .toString(QLatin1String("hh:mm")));
-    return m_page;
+    if (!m_widget) {
+        m_widget = new QWidget;
+        m_ui.setupUi(m_widget);
+        m_ui.m_timeTable->setItemText(m_ui.m_timeTable->currentIndex(), QTime(m_plugin->scheduledUpdateTime())
+            .toString(QLatin1String("hh:mm")));
+    }
+    return m_widget;
 }
 
 void SettingsPage::apply()
@@ -66,9 +66,5 @@ void SettingsPage::apply()
 
 void SettingsPage::finish()
 {
-}
-
-bool SettingsPage::matches(const QString &searchKey) const
-{
-    return m_searchKeywords.contains(searchKey, Qt::CaseInsensitive);
+    delete m_widget;
 }
diff --git a/src/plugins/updateinfo/settingspage.h b/src/plugins/updateinfo/settingspage.h
index 9806eafb43..dc8ded50b2 100644
--- a/src/plugins/updateinfo/settingspage.h
+++ b/src/plugins/updateinfo/settingspage.h
@@ -34,6 +34,8 @@
 
 #include <coreplugin/dialogs/ioptionspage.h>
 
+#include <QPointer>
+
 namespace UpdateInfo {
 namespace Internal {
 
@@ -46,15 +48,13 @@ class SettingsPage : public Core::IOptionsPage
 public:
     explicit SettingsPage(UpdateInfoPlugin *plugin);
 
-    QWidget *createPage(QWidget *parent);
+    QWidget *widget();
     void apply();
     void finish();
-    bool matches(const QString &searchKey) const;
 
 private:
-    QWidget *m_page;
+    QPointer<QWidget> m_widget;
     Ui::SettingsWidget m_ui;
-    QString m_searchKeywords;
     UpdateInfoPlugin *m_plugin;
 };