1 files changed, 8 insertions, 25 deletions
diff --git a/src/plugins/beautifier/generalsettings.h b/src/plugins/beautifier/generalsettings.h
index b381dacb26a..0be68b98e35 100644
--- a/src/plugins/beautifier/generalsettings.h
+++ b/src/plugins/beautifier/generalsettings.h
@@ -5,38 +5,21 @@
 
 #include <utils/mimeutils.h>
 
-#include <QList>
+#include <coreplugin/dialogs/ioptionspage.h>
 
 namespace Beautifier::Internal {
 
-class GeneralSettings
+class GeneralSettings : public Core::PagedSettings
 {
 public:
-    explicit GeneralSettings();
-    static GeneralSettings *instance();
+    GeneralSettings();
 
-    void read();
-    void save();
+    QList<Utils::MimeType> allowedMimeTypes() const;
 
-    bool autoFormatOnSave() const;
-    void setAutoFormatOnSave(bool autoFormatOnSave);
-
-    QString autoFormatTool() const;
-    void setAutoFormatTool(const QString &autoFormatTool);
-
-    QList<Utils::MimeType> autoFormatMime() const;
-    QString autoFormatMimeAsString() const;
-    void setAutoFormatMime(const QList<Utils::MimeType> &autoFormatMime);
-    void setAutoFormatMime(const QString &mimeList);
-
-    bool autoFormatOnlyCurrentProject() const;
-    void setAutoFormatOnlyCurrentProject(bool autoFormatOnlyCurrentProject);
-
-private:
-    bool m_autoFormatOnSave = false;
-    bool m_autoFormatOnlyCurrentProject = true;
-    QString m_autoFormatTool;
-    QList<Utils::MimeType> m_autoFormatMime;
+    Utils::BoolAspect autoFormatOnSave{this};
+    Utils::BoolAspect autoFormatOnlyCurrentProject{this};
+    Utils::SelectionAspect autoFormatTools{this};
+    Utils::StringAspect autoFormatMime{this};
 };
 
 } // Beautifier::Internal