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>

8 files changed, 29 insertions, 28 deletions

diff --git a/src/imports/controls/imagine/qquickimaginetheme.cpp b/src/imports/controls/imagine/qquickimaginetheme.cpp
index 57646326..bfde0c6b 100644
--- a/src/imports/controls/imagine/qquickimaginetheme.cpp
+++ b/src/imports/controls/imagine/qquickimaginetheme.cpp
@@ -68,15 +68,15 @@ void QQuickImagineTheme::resolvePalettes(const QPalette &defaultPalette)
     systemPalette = defaultPalette.resolve(systemPalette);
 }
 
-const QFont *QQuickImagineTheme::font(Font type) const
+const QFont *QQuickImagineTheme::font(Scope scope) const
 {
-    Q_UNUSED(type);
+    Q_UNUSED(scope);
     return &systemFont;
 }
 
-const QPalette *QQuickImagineTheme::palette(Palette type) const
+const QPalette *QQuickImagineTheme::palette(Scope scope) const
 {
-    Q_UNUSED(type);
+    Q_UNUSED(scope);
     return &systemPalette;
 }
 
diff --git a/src/imports/controls/imagine/qquickimaginetheme_p.h b/src/imports/controls/imagine/qquickimaginetheme_p.h
index 13a62b59..c663e940 100644
--- a/src/imports/controls/imagine/qquickimaginetheme_p.h
+++ b/src/imports/controls/imagine/qquickimaginetheme_p.h
@@ -58,8 +58,8 @@ public:
     explicit QQuickImagineTheme();
 
 protected:
-    const QFont *font(Font type) const override;
-    const QPalette *palette(Palette type) const override;
+    const QFont *font(Scope scope) const override;
+    const QPalette *palette(Scope scope) const override;
 
     void resolveFonts(const QFont &defaultFont) override;
     void resolvePalettes(const QPalette &defaultPalette) override;
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;
 
diff --git a/src/imports/controls/qquickdefaulttheme.cpp b/src/imports/controls/qquickdefaulttheme.cpp
index c53d4c57..40ed269a 100644
--- a/src/imports/controls/qquickdefaulttheme.cpp
+++ b/src/imports/controls/qquickdefaulttheme.cpp
@@ -86,9 +86,9 @@ void QQuickDefaultTheme::resolvePalettes(const QPalette &defaultPalette)
     systemPalette = defaultPalette.resolve(systemPalette);
 }
 
-const QPalette *QQuickDefaultTheme::palette(Palette type) const
+const QPalette *QQuickDefaultTheme::palette(Scope scope) const
 {
-    Q_UNUSED(type);
+    Q_UNUSED(scope);
     return &systemPalette;
 }
 
diff --git a/src/imports/controls/qquickdefaulttheme_p.h b/src/imports/controls/qquickdefaulttheme_p.h
index 161dd57f..1d5897bd 100644
--- a/src/imports/controls/qquickdefaulttheme_p.h
+++ b/src/imports/controls/qquickdefaulttheme_p.h
@@ -58,7 +58,7 @@ public:
     explicit QQuickDefaultTheme();
 
 protected:
-    const QPalette *palette(Palette type) const override;
+    const QPalette *palette(Scope scope) const override;
 
     void resolvePalettes(const QPalette &defaultPalette) override;
 
diff --git a/src/imports/controls/universal/qquickuniversaltheme.cpp b/src/imports/controls/universal/qquickuniversaltheme.cpp
index e5ee88b7..0f85261d 100644
--- a/src/imports/controls/universal/qquickuniversaltheme.cpp
+++ b/src/imports/controls/universal/qquickuniversaltheme.cpp
@@ -67,12 +67,12 @@ void QQuickUniversalTheme::resolveFonts(const QFont &defaultFont)
     tabButtonFont = defaultFont.resolve(tabButtonFont);
 }
 
-const QFont *QQuickUniversalTheme::font(Font type) const
+const QFont *QQuickUniversalTheme::font(Scope scope) const
 {
-    switch (type) {
-    case GroupBoxTitleFont:
+    switch (scope) {
+    case GroupBox:
         return &groupBoxTitleFont;
-    case TabButtonFont:
+    case TabBar:
         return &tabButtonFont;
     default:
         return &systemFont;
diff --git a/src/imports/controls/universal/qquickuniversaltheme_p.h b/src/imports/controls/universal/qquickuniversaltheme_p.h
index fe547ccd..5782ff93 100644
--- a/src/imports/controls/universal/qquickuniversaltheme_p.h
+++ b/src/imports/controls/universal/qquickuniversaltheme_p.h
@@ -59,7 +59,7 @@ public:
     explicit QQuickUniversalTheme();
 
 protected:
-    const QFont *font(Font type) const override;
+    const QFont *font(Scope scope) const override;
 
     void resolveFonts(const QFont &defaultFont) override;