diff options
Diffstat (limited to 'src/imports/controls')
4 files changed, 19 insertions, 19 deletions
diff --git a/src/imports/controls/imagine/qquickimaginetheme.cpp b/src/imports/controls/imagine/qquickimaginetheme.cpp index f6d78cbc..57646326 100644 --- a/src/imports/controls/imagine/qquickimaginetheme.cpp +++ b/src/imports/controls/imagine/qquickimaginetheme.cpp @@ -68,13 +68,13 @@ void QQuickImagineTheme::resolvePalettes(const QPalette &defaultPalette) systemPalette = defaultPalette.resolve(systemPalette); } -const QFont *QQuickImagineTheme::font(QPlatformTheme::Font type) const +const QFont *QQuickImagineTheme::font(Font type) const { Q_UNUSED(type); return &systemFont; } -const QPalette *QQuickImagineTheme::palette(QPlatformTheme::Palette type) const +const QPalette *QQuickImagineTheme::palette(Palette type) const { Q_UNUSED(type); return &systemPalette; diff --git a/src/imports/controls/material/qquickmaterialtheme.cpp b/src/imports/controls/material/qquickmaterialtheme.cpp index 7b21a886..adac4e07 100644 --- a/src/imports/controls/material/qquickmaterialtheme.cpp +++ b/src/imports/controls/material/qquickmaterialtheme.cpp @@ -93,24 +93,24 @@ void QQuickMaterialTheme::resolveFonts(const QFont &defaultFont) editorFont = defaultFont.resolve(editorFont); } -const QFont *QQuickMaterialTheme::font(QPlatformTheme::Font type) const +const QFont *QQuickMaterialTheme::font(Font type) const { switch (type) { - case QPlatformTheme::TabButtonFont: - case QPlatformTheme::PushButtonFont: - case QPlatformTheme::ToolButtonFont: + case TabButtonFont: + case PushButtonFont: + case ToolButtonFont: return &buttonFont; - case QPlatformTheme::TipLabelFont: + case TipLabelFont: return &toolTipFont; - case QPlatformTheme::ItemViewFont: + case ItemViewFont: return &itemViewFont; - case QPlatformTheme::ListViewFont: + case ListViewFont: return &listViewFont; - case QPlatformTheme::MenuBarFont: - case QPlatformTheme::MenuItemFont: - case QPlatformTheme::ComboMenuItemFont: + case MenuBarFont: + case MenuItemFont: + case ComboMenuItemFont: return &menuItemFont; - case QPlatformTheme::EditorFont: + case EditorFont: return &editorFont; default: return &systemFont; @@ -120,10 +120,10 @@ const QFont *QQuickMaterialTheme::font(QPlatformTheme::Font type) const QVariant QQuickMaterialTheme::themeHint(ThemeHint hint) const { switch (hint) { - case QPlatformTheme::DialogButtonBoxLayout: + case DialogButtonBoxLayout: return QVariant(QPlatformDialogHelper::AndroidLayout); default: - return QQuickProxyTheme::themeHint(hint); + return QQuickTheme::themeHint(hint); } } diff --git a/src/imports/controls/qquickdefaulttheme.cpp b/src/imports/controls/qquickdefaulttheme.cpp index e2936def..c53d4c57 100644 --- a/src/imports/controls/qquickdefaulttheme.cpp +++ b/src/imports/controls/qquickdefaulttheme.cpp @@ -86,7 +86,7 @@ void QQuickDefaultTheme::resolvePalettes(const QPalette &defaultPalette) systemPalette = defaultPalette.resolve(systemPalette); } -const QPalette *QQuickDefaultTheme::palette(QPlatformTheme::Palette type) const +const QPalette *QQuickDefaultTheme::palette(Palette type) const { Q_UNUSED(type); return &systemPalette; diff --git a/src/imports/controls/universal/qquickuniversaltheme.cpp b/src/imports/controls/universal/qquickuniversaltheme.cpp index f457b614..e5ee88b7 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(QPlatformTheme::Font type) const +const QFont *QQuickUniversalTheme::font(Font type) const { switch (type) { - case QPlatformTheme::GroupBoxTitleFont: + case GroupBoxTitleFont: return &groupBoxTitleFont; - case QPlatformTheme::TabButtonFont: + case TabButtonFont: return &tabButtonFont; default: return &systemFont; |