Add QQuickTheme::Scope

Replace the old enums that were originally copied from QPlatformTheme,
including irrelevant entries for DockWidget, MdiSubWindow, MessageBox,
with a unified enum that will be matched to cover everything needed
for theming fonts and palettes for Qt Quick Controls 2.

Task-number: QTBUG-67062
Change-Id: Ia99d092f28c00210c0c7f24d4241eb5a5d9ceb5b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

2 files changed, 15 insertions, 14 deletions

diff --git a/src/imports/controls/material/qquickmaterialtheme.cpp b/src/imports/controls/material/qquickmaterialtheme.cpp
index 6b950844..378a5bf7 100644
--- a/src/imports/controls/material/qquickmaterialtheme.cpp
+++ b/src/imports/controls/material/qquickmaterialtheme.cpp
@@ -98,25 +98,26 @@ void QQuickMaterialTheme::resolveFonts(const QFont &defaultFont)
     editorFont = defaultFont.resolve(editorFont);
 }
 
-const QFont *QQuickMaterialTheme::font(Font type) const
+const QFont *QQuickMaterialTheme::font(Scope scope) const
 {
-    switch (type) {
-    case TabButtonFont:
-    case PushButtonFont:
-    case ToolButtonFont:
+    switch (scope) {
+    case Button:
+    case TabBar:
+    case ToolBar:
         return &buttonFont;
-    case TipLabelFont:
+    case ToolTip:
         return &toolTipFont;
-    case ItemViewFont:
+    case ItemView:
         return &itemViewFont;
-    case ListViewFont:
+    case ListView:
         return &listViewFont;
-    case MenuBarFont:
-    case MenuItemFont:
-    case ComboMenuItemFont:
+    case Menu:
+    case MenuBar:
+    case ComboBox:
         return &menuItemFont;
-    case EditorFont:
-    case SpinBoxFont:
+    case TextArea:
+    case TextField:
+    case SpinBox:
         return &editorFont;
     default:
         return &systemFont;
diff --git a/src/imports/controls/material/qquickmaterialtheme_p.h b/src/imports/controls/material/qquickmaterialtheme_p.h
index 571461a7..717990ad 100644
--- a/src/imports/controls/material/qquickmaterialtheme_p.h
+++ b/src/imports/controls/material/qquickmaterialtheme_p.h
@@ -60,7 +60,7 @@ public:
     explicit QQuickMaterialTheme();
 
 protected:
-    const QFont *font(Font type) const override;
+    const QFont *font(Scope scope) const override;
 
     void resolveFonts(const QFont &defaultFont) override;