1 files changed, 13 insertions, 12 deletions
diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.h b/src/plugins/coreplugin/dialogs/ioptionspage.h
index e3ceab0fd0..36ee209b38 100644
--- a/src/plugins/coreplugin/dialogs/ioptionspage.h
+++ b/src/plugins/coreplugin/dialogs/ioptionspage.h
@@ -25,9 +25,10 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
+#include <coreplugin/core_global.h>
 
 #include <utils/icon.h>
+#include <utils/id.h>
 
 #include <QObject>
 #include <QPointer>
@@ -55,30 +56,30 @@ public:
 
     static const QList<IOptionsPage *> allOptionsPages();
 
-    Id id() const { return m_id; }
+    Utils::Id id() const { return m_id; }
     QString displayName() const { return m_displayName; }
-    Id category() const { return m_category; }
+    Utils::Id category() const { return m_category; }
     QString displayCategory() const { return m_displayCategory; }
     QIcon categoryIcon() const;
 
     using WidgetCreator = std::function<IOptionsPageWidget *()>;
     void setWidgetCreator(const WidgetCreator &widgetCreator);
 
-    virtual bool matches(const QString &searchKeyWord) const;
+    virtual bool matches(const QRegularExpression &regexp) const;
     virtual QWidget *widget();
     virtual void apply();
     virtual void finish();
 
 protected:
-    void setId(Id id) { m_id = id; }
+    void setId(Utils::Id id) { m_id = id; }
     void setDisplayName(const QString &displayName) { m_displayName = displayName; }
-    void setCategory(Id category) { m_category = category; }
+    void setCategory(Utils::Id category) { m_category = category; }
     void setDisplayCategory(const QString &displayCategory) { m_displayCategory = displayCategory; }
     void setCategoryIcon(const Utils::Icon &categoryIcon) { m_categoryIcon = categoryIcon; }
     void setCategoryIconPath(const QString &categoryIconPath);
 
-    Id m_id;
-    Id m_category;
+    Utils::Id m_id;
+    Utils::Id m_category;
     QString m_displayName;
     QString m_displayCategory;
     Utils::Icon m_categoryIcon;
@@ -107,19 +108,19 @@ public:
 
     static const QList<IOptionsPageProvider *> allOptionsPagesProviders();
 
-    Id category() const { return m_category; }
+    Utils::Id category() const { return m_category; }
     QString displayCategory() const { return m_displayCategory; }
     QIcon categoryIcon() const;
 
     virtual QList<IOptionsPage *> pages() const = 0;
-    virtual bool matches(const QString & /* searchKeyWord*/) const = 0;
+    virtual bool matches(const QRegularExpression &regexp) const = 0;
 
 protected:
-    void setCategory(Id category) { m_category = category; }
+    void setCategory(Utils::Id category) { m_category = category; }
     void setDisplayCategory(const QString &displayCategory) { m_displayCategory = displayCategory; }
     void setCategoryIcon(const Utils::Icon &categoryIcon) { m_categoryIcon = categoryIcon; }
 
-    Id m_category;
+    Utils::Id m_category;
     QString m_displayCategory;
     Utils::Icon m_categoryIcon;
 };