1 files changed, 14 insertions, 24 deletions
diff --git a/src/plugins/autotest/gtest/gtestsettings.h b/src/plugins/autotest/gtest/gtestsettings.h
index 11fb144e227..ea0ab565e6c 100644
--- a/src/plugins/autotest/gtest/gtestsettings.h
+++ b/src/plugins/autotest/gtest/gtestsettings.h
@@ -5,32 +5,22 @@
 
 #include <coreplugin/dialogs/ioptionspage.h>
 
-#include <utils/aspects.h>
+namespace Autotest::Internal {
 
-namespace Autotest {
-namespace Internal {
-
-class GTestSettings : public Utils::AspectContainer
-{
-public:
-    GTestSettings();
-
-    Utils::IntegerAspect iterations;
-    Utils::IntegerAspect seed;
-    Utils::BoolAspect runDisabled;
-    Utils::BoolAspect shuffle;
-    Utils::BoolAspect repeat;
-    Utils::BoolAspect throwOnFailure;
-    Utils::BoolAspect breakOnFailure;
-    Utils::SelectionAspect groupMode;
-    Utils::StringAspect gtestFilter;
-};
-
-class GTestSettingsPage final : public Core::IOptionsPage
+class GTestSettings : public Core::PagedSettings
 {
 public:
-    GTestSettingsPage(GTestSettings *settings, Utils::Id settingsId);
+    explicit GTestSettings(Utils::Id settingsId);
+
+    Utils::IntegerAspect iterations{this};
+    Utils::IntegerAspect seed{this};
+    Utils::BoolAspect runDisabled{this};
+    Utils::BoolAspect shuffle{this};
+    Utils::BoolAspect repeat{this};
+    Utils::BoolAspect throwOnFailure{this};
+    Utils::BoolAspect breakOnFailure{this};
+    Utils::SelectionAspect groupMode{this};
+    Utils::StringAspect gtestFilter{this};
 };
 
-} // namespace Internal
-} // namespace Autotest
+} // Autotest::Internal