QQuickTheme: rename themeFont() and themePalette()

We don't have the conflicting virtual getters anymore.

Change-Id: Ia20bfa0a0b1aa67c35a23270eb0241018f8e0ada
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

34 files changed, 74 insertions, 74 deletions

diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp
index e92dc3cd..f5d80fb9 100644
--- a/src/quicktemplates2/qquickapplicationwindow.cpp
+++ b/src/quicktemplates2/qquickapplicationwindow.cpp
@@ -265,7 +265,7 @@ void QQuickApplicationWindowPrivate::updateFont(const QFont &f)
 
 void QQuickApplicationWindowPrivate::resolveFont()
 {
-    QFont resolvedFont = font.resolve(QQuickTheme::themeFont(QQuickTheme::System));
+    QFont resolvedFont = font.resolve(QQuickTheme::font(QQuickTheme::System));
     setFont_helper(resolvedFont);
 }
 
@@ -287,7 +287,7 @@ void QQuickApplicationWindowPrivate::updatePalette(const QPalette &p)
 
 void QQuickApplicationWindowPrivate::resolvePalette()
 {
-    QPalette resolvedPalette = palette.resolve(QQuickTheme::themePalette(QQuickTheme::System));
+    QPalette resolvedPalette = palette.resolve(QQuickTheme::palette(QQuickTheme::System));
     setPalette_helper(resolvedPalette);
 }
 
@@ -683,7 +683,7 @@ void QQuickApplicationWindow::setFont(const QFont &font)
     if (d->font.resolve() == font.resolve() && d->font == font)
         return;
 
-    QFont resolvedFont = font.resolve(QQuickTheme::themeFont(QQuickTheme::System));
+    QFont resolvedFont = font.resolve(QQuickTheme::font(QQuickTheme::System));
     d->setFont_helper(resolvedFont);
 }
 
@@ -762,7 +762,7 @@ void QQuickApplicationWindow::setPalette(const QPalette &palette)
     if (d->palette.resolve() == palette.resolve() && d->palette == palette)
         return;
 
-    QPalette resolvedPalette = palette.resolve(QQuickTheme::themePalette(QQuickTheme::System));
+    QPalette resolvedPalette = palette.resolve(QQuickTheme::palette(QQuickTheme::System));
     d->setPalette_helper(resolvedPalette);
 }
 
diff --git a/src/quicktemplates2/qquickbutton.cpp b/src/quicktemplates2/qquickbutton.cpp
index 5e4d3036..fbce5225 100644
--- a/src/quicktemplates2/qquickbutton.cpp
+++ b/src/quicktemplates2/qquickbutton.cpp
@@ -96,12 +96,12 @@ QQuickButton::QQuickButton(QQuickButtonPrivate &dd, QQuickItem *parent)
 
 QFont QQuickButton::defaultFont() const
 {
-    return QQuickTheme::themeFont(QQuickTheme::Button);
+    return QQuickTheme::font(QQuickTheme::Button);
 }
 
 QPalette QQuickButton::defaultPalette() const
 {
-    return QQuickTheme::themePalette(QQuickTheme::Button);
+    return QQuickTheme::palette(QQuickTheme::Button);
 }
 
 /*!
diff --git a/src/quicktemplates2/qquickcheckbox.cpp b/src/quicktemplates2/qquickcheckbox.cpp
index 55d39685..461fae30 100644
--- a/src/quicktemplates2/qquickcheckbox.cpp
+++ b/src/quicktemplates2/qquickcheckbox.cpp
@@ -183,12 +183,12 @@ void QQuickCheckBox::setCheckState(Qt::CheckState state)
 
 QFont QQuickCheckBox::defaultFont() const
 {
-    return QQuickTheme::themeFont(QQuickTheme::CheckBox);
+    return QQuickTheme::font(QQuickTheme::CheckBox);
 }
 
 QPalette QQuickCheckBox::defaultPalette() const
 {
-    return QQuickTheme::themePalette(QQuickTheme::CheckBox);
+    return QQuickTheme::palette(QQuickTheme::CheckBox);
 }
 
 void QQuickCheckBox::buttonChange(ButtonChange change)
diff --git a/src/quicktemplates2/qquickcheckdelegate.cpp b/src/quicktemplates2/qquickcheckdelegate.cpp
index 9c4a84f5..17f1f0b2 100644
--- a/src/quicktemplates2/qquickcheckdelegate.cpp
+++ b/src/quicktemplates2/qquickcheckdelegate.cpp
@@ -170,12 +170,12 @@ void QQuickCheckDelegate::setCheckState(Qt::CheckState state)
 
 QFont QQuickCheckDelegate::defaultFont() const
 {
-    return QQuickTheme::themeFont(QQuickTheme::ListView);
+    return QQuickTheme::font(QQuickTheme::ListView);
 }
 
 QPalette QQuickCheckDelegate::defaultPalette() const
 {
-    return QQuickTheme::themePalette(QQuickTheme::ListView);
+    return QQuickTheme::palette(QQuickTheme::ListView);
 }
 
 void QQuickCheckDelegate::buttonChange(ButtonChange change)
diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp
index d018be44..77abee07 100644
--- a/src/quicktemplates2/qquickcombobox.cpp
+++ b/src/quicktemplates2/qquickcombobox.cpp
@@ -1764,12 +1764,12 @@ void QQuickComboBox::localeChange(const QLocale &newLocale, const QLocale &oldLo
 
 QFont QQuickComboBox::defaultFont() const
 {
-    return QQuickTheme::themeFont(QQuickTheme::ComboBox);
+    return QQuickTheme::font(QQuickTheme::ComboBox);
 }
 
 QPalette QQuickComboBox::defaultPalette() const
 {
-    return QQuickTheme::themePalette(QQuickTheme::ComboBox);
+    return QQuickTheme::palette(QQuickTheme::ComboBox);
 }
 
 #if QT_CONFIG(accessibility)
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
index 7174ba35..14887a07 100644
--- a/src/quicktemplates2/qquickcontrol.cpp
+++ b/src/quicktemplates2/qquickcontrol.cpp
@@ -515,7 +515,7 @@ QFont QQuickControlPrivate::parentFont(const QQuickItem *item)
     if (QQuickApplicationWindow *window = qobject_cast<QQuickApplicationWindow *>(item->window()))
         return window->font();
 
-    return QQuickTheme::themeFont(QQuickTheme::System);
+    return QQuickTheme::font(QQuickTheme::System);
 }
 
 /*!
@@ -606,7 +606,7 @@ QPalette QQuickControlPrivate::parentPalette(const QQuickItem *item)
     if (QQuickApplicationWindow *window = qobject_cast<QQuickApplicationWindow *>(item->window()))
         return window->palette();
 
-    return QQuickTheme::themePalette(QQuickTheme::System);
+    return QQuickTheme::palette(QQuickTheme::System);
 }
 
 /*!
@@ -2012,12 +2012,12 @@ void QQuickControl::componentComplete()
 
 QFont QQuickControl::defaultFont() const
 {
-    return QQuickTheme::themeFont(QQuickTheme::System);
+    return QQuickTheme::font(QQuickTheme::System);
 }
 
 QPalette QQuickControl::defaultPalette() const
 {
-    return QQuickTheme::themePalette(QQuickTheme::System);
+    return QQuickTheme::palette(QQuickTheme::System);
 }
 
 void QQuickControl::focusInEvent(QFocusEvent *event)
diff --git a/src/quicktemplates2/qquickdelaybutton.cpp b/src/quicktemplates2/qquickdelaybutton.cpp
index a42057bd..ba5953a0 100644
--- a/src/quicktemplates2/qquickdelaybutton.cpp
+++ b/src/quicktemplates2/qquickdelaybutton.cpp
@@ -256,12 +256,12 @@ void QQuickDelayButton::nextCheckState()
 
 QFont QQuickDelayButton::defaultFont() const
 {
-    return QQuickTheme::themeFont(QQuickTheme::Button);
+    return QQuickTheme::font(QQuickTheme::Button);
 }
 
 QPalette QQuickDelayButton::defaultPalette() const
 {
-    return QQuickTheme::themePalette(QQuickTheme::Button);
+    return QQuickTheme::palette(QQuickTheme::Button);
 }
 
 QT_END_NAMESPACE
diff --git a/src/quicktemplates2/qquickgroupbox.cpp b/src/quicktemplates2/qquickgroupbox.cpp
index cd3b8140..7f3c7a2d 100644
--- a/src/quicktemplates2/qquickgroupbox.cpp
+++ b/src/quicktemplates2/qquickgroupbox.cpp
@@ -263,12 +263,12 @@ void QQuickGroupBox::componentComplete()
 
 QFont QQuickGroupBox::defaultFont() const
 {
-    return QQuickTheme::themeFont(QQuickTheme::GroupBox);
+    return QQuickTheme::font(QQuickTheme::GroupBox);
 }
 
 QPalette QQuickGroupBox::defaultPalette() const
 {
-    return QQuickTheme::themePalette(QQuickTheme::GroupBox);
+    return QQuickTheme::palette(QQuickTheme::GroupBox);
 }
 
 #if QT_CONFIG(accessibility)
diff --git a/src/quicktemplates2/qquickitemdelegate.cpp b/src/quicktemplates2/qquickitemdelegate.cpp
index 1ff8303a..ac409118 100644
--- a/src/quicktemplates2/qquickitemdelegate.cpp
+++ b/src/quicktemplates2/qquickitemdelegate.cpp
@@ -117,12 +117,12 @@ void QQuickItemDelegate::setHighlighted(bool highlighted)
 
 QFont QQuickItemDelegate::defaultFont() const
 {
-    return QQuickTheme::themeFont(QQuickTheme::ItemView);
+    return QQuickTheme::font(QQuickTheme::ItemView);
 }
 
 QPalette QQuickItemDelegate::defaultPalette() const
 {
-    return QQuickTheme::themePalette(QQuickTheme::ItemView);
+    return QQuickTheme::palette(QQuickTheme::ItemView);
 }
 
 #if QT_CONFIG(accessibility)
diff --git a/src/quicktemplates2/qquicklabel.cpp b/src/quicktemplates2/qquicklabel.cpp
index 9437f9b7..124483fb 100644
--- a/src/quicktemplates2/qquicklabel.cpp
+++ b/src/quicktemplates2/qquicklabel.cpp
@@ -182,7 +182,7 @@ void QQuickLabelPrivate::inheritFont(const QFont &font)
     QFont parentFont = extra.isAllocated() ? extra->requestedFont.resolve(font) : font;
     parentFont.resolve(extra.isAllocated() ? extra->requestedFont.resolve() | font.resolve() : font.resolve());
 
-    const QFont defaultFont = QQuickTheme::themeFont(QQuickTheme::Label);
+    const QFont defaultFont = QQuickTheme::font(QQuickTheme::Label);
     const QFont resolvedFont = parentFont.resolve(defaultFont);
 
     setFont_helper(resolvedFont);
@@ -224,7 +224,7 @@ void QQuickLabelPrivate::inheritPalette(const QPalette &palette)
     QPalette parentPalette = extra.isAllocated() ? extra->requestedPalette.resolve(palette) : palette;
     parentPalette.resolve(extra.isAllocated() ? extra->requestedPalette.resolve() | palette.resolve() : palette.resolve());
 
-    const QPalette defaultPalette = QQuickTheme::themePalette(QQuickTheme::Label);
+    const QPalette defaultPalette = QQuickTheme::palette(QQuickTheme::Label);
     const QPalette resolvedPalette = parentPalette.resolve(defaultPalette);
 
     setPalette_helper(resolvedPalette);
diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp
index 702c1db6..f52405c9 100644
--- a/src/quicktemplates2/qquickmenu.cpp
+++ b/src/quicktemplates2/qquickmenu.cpp
@@ -1444,12 +1444,12 @@ void QQuickMenu::timerEvent(QTimerEvent *event)
 
 QFont QQuickMenu::defaultFont() const
 {
-    return QQuickTheme::themeFont(QQuickTheme::Menu);
+    return QQuickTheme::font(QQuickTheme::Menu);
 }
 
 QPalette QQuickMenu::defaultPalette() const
 {
-    return QQuickTheme::themePalette(QQuickTheme::Menu);
+    return QQuickTheme::palette(QQuickTheme::Menu);
 }
 
 #if QT_CONFIG(accessibility)
diff --git a/src/quicktemplates2/qquickmenubar.cpp b/src/quicktemplates2/qquickmenubar.cpp
index adeb013f..6016e70d 100644
--- a/src/quicktemplates2/qquickmenubar.cpp
+++ b/src/quicktemplates2/qquickmenubar.cpp
@@ -561,12 +561,12 @@ void QQuickMenuBar::itemRemoved(int index, QQuickItem *item)
 
 QFont QQuickMenuBar::defaultFont() const
 {
-    return QQuickTheme::themeFont(QQuickTheme::MenuBar);
+    return QQuickTheme::font(QQuickTheme::MenuBar);
 }
 
 QPalette QQuickMenuBar::defaultPalette() const
 {
-    return QQuickTheme::themePalette(QQuickTheme::MenuBar);
+    return QQuickTheme::palette(QQuickTheme::MenuBar);
 }
 
 #if QT_CONFIG(accessibility)
diff --git a/src/quicktemplates2/qquickmenubaritem.cpp b/src/quicktemplates2/qquickmenubaritem.cpp
index 863e88e3..f32baff5 100644
--- a/src/quicktemplates2/qquickmenubaritem.cpp
+++ b/src/quicktemplates2/qquickmenubaritem.cpp
@@ -167,12 +167,12 @@ void QQuickMenuBarItem::geometryChanged(const QRectF &newGeometry, const QRectF
 
 QFont QQuickMenuBarItem::defaultFont() const
 {
-    return QQuickTheme::themeFont(QQuickTheme::MenuBar);
+    return QQuickTheme::font(QQuickTheme::MenuBar);
 }
 
 QPalette QQuickMenuBarItem::defaultPalette() const
 {
-    return QQuickTheme::themePalette(QQuickTheme::MenuBar);
+    return QQuickTheme::palette(QQuickTheme::MenuBar);
 }
 
 #if QT_CONFIG(accessibility)
diff --git a/src/quicktemplates2/qquickmenuitem.cpp b/src/quicktemplates2/qquickmenuitem.cpp
index bfd42634..b02b8e60 100644
--- a/src/quicktemplates2/qquickmenuitem.cpp
+++ b/src/quicktemplates2/qquickmenuitem.cpp
@@ -256,12 +256,12 @@ void QQuickMenuItem::componentComplete()
 
 QFont QQuickMenuItem::defaultFont() const
 {
-    return QQuickTheme::themeFont(QQuickTheme::Menu);
+    return QQuickTheme::font(QQuickTheme::Menu);
 }
 
 QPalette QQuickMenuItem::defaultPalette() const
 {
-    return QQuickTheme::themePalette(QQuickTheme::Menu);
+    return QQuickTheme::palette(QQuickTheme::Menu);
 }
 
 #if QT_CONFIG(accessibility)
diff --git a/src/quicktemplates2/qquickmenuseparator.cpp b/src/quicktemplates2/qquickmenuseparator.cpp
index 1e7c58c6..0e2ed9e3 100644
--- a/src/quicktemplates2/qquickmenuseparator.cpp
+++ b/src/quicktemplates2/qquickmenuseparator.cpp
@@ -73,12 +73,12 @@ QQuickMenuSeparator::QQuickMenuSeparator(QQuickItem *parent)
 
 QFont QQuickMenuSeparator::defaultFont() const
 {
-    return QQuickTheme::themeFont(QQuickTheme::Menu);
+    return QQuickTheme::font(QQuickTheme::Menu);
 }
 
 QPalette QQuickMenuSeparator::defaultPalette() const
 {
-    return QQuickTheme::themePalette(QQuickTheme::Menu);
+    return QQuickTheme::palette(QQuickTheme::Menu);
 }
 
 #if QT_CONFIG(accessibility)
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index 2a02a6c1..d5e2c940 100644
--- a/src/quicktemplates2/qquickpopup.cpp
+++ b/src/quicktemplates2/qquickpopup.cpp
@@ -2649,12 +2649,12 @@ void QQuickPopup::insetChange(const QMarginsF &newInset, const QMarginsF &oldIns
 
 QFont QQuickPopup::defaultFont() const
 {
-    return QQuickTheme::themeFont(QQuickTheme::System);
+    return QQuickTheme::font(QQuickTheme::System);
 }
 
 QPalette QQuickPopup::defaultPalette() const
 {
-    return QQuickTheme::themePalette(QQuickTheme::System);
+    return QQuickTheme::palette(QQuickTheme::System);
 }
 
 #if QT_CONFIG(accessibility)
diff --git a/src/quicktemplates2/qquickpopupitem.cpp b/src/quicktemplates2/qquickpopupitem.cpp
index aea0087f..cf2fec41 100644
--- a/src/quicktemplates2/qquickpopupitem.cpp
+++ b/src/quicktemplates2/qquickpopupitem.cpp
@@ -96,7 +96,7 @@ void QQuickPopupItemPrivate::resolveFont()
     if (QQuickApplicationWindow *window = qobject_cast<QQuickApplicationWindow *>(popup->window()))
         inheritFont(window->font());
     else
-        inheritFont(QQuickTheme::themeFont(QQuickTheme::System));
+        inheritFont(QQuickTheme::font(QQuickTheme::System));
 }
 
 void QQuickPopupItemPrivate::resolvePalette()
@@ -104,7 +104,7 @@ void QQuickPopupItemPrivate::resolvePalette()
     if (QQuickApplicationWindow *window = qobject_cast<QQuickApplicationWindow *>(popup->window()))
         inheritPalette(window->palette());
     else
-        inheritPalette(QQuickTheme::themePalette(QQuickTheme::System));
+        inheritPalette(QQuickTheme::palette(QQuickTheme::System));
 }
 
 QQuickItem *QQuickPopupItemPrivate::getContentItem()
diff --git a/src/quicktemplates2/qquickradiobutton.cpp b/src/quicktemplates2/qquickradiobutton.cpp
index 31aa4be9..bf0c414c 100644
--- a/src/quicktemplates2/qquickradiobutton.cpp
+++ b/src/quicktemplates2/qquickradiobutton.cpp
@@ -99,12 +99,12 @@ QQuickRadioButton::QQuickRadioButton(QQuickItem *parent)
 
 QFont QQuickRadioButton::defaultFont() const
 {
-    return QQuickTheme::themeFont(QQuickTheme::RadioButton);
+    return QQuickTheme::font(QQuickTheme::RadioButton);
 }
 
 QPalette QQuickRadioButton::defaultPalette() const
 {
-    return QQuickTheme::themePalette(QQuickTheme::RadioButton);
+    return QQuickTheme::palette(QQuickTheme::RadioButton);
 }
 
 #if QT_CONFIG(accessibility)
diff --git a/src/quicktemplates2/qquickradiodelegate.cpp b/src/quicktemplates2/qquickradiodelegate.cpp
index 12cb0d08..12a1ffb7 100644
--- a/src/quicktemplates2/qquickradiodelegate.cpp
+++ b/src/quicktemplates2/qquickradiodelegate.cpp
@@ -100,12 +100,12 @@ QQuickRadioDelegate::QQuickRadioDelegate(QQuickItem *parent)
 
 QFont QQuickRadioDelegate::defaultFont() const
 {
-    return QQuickTheme::themeFont(QQuickTheme::ListView);
+    return QQuickTheme::font(QQuickTheme::ListView);
 }
 
 QPalette QQuickRadioDelegate::defaultPalette() const
 {
-    return QQuickTheme::themePalette(QQuickTheme::ListView);
+    return QQuickTheme::palette(QQuickTheme::ListView);
 }
 
 #if QT_CONFIG(accessibility)
diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp
index 46519dc7..3ce776eb 100644
--- a/src/quicktemplates2/qquickspinbox.cpp
+++ b/src/quicktemplates2/qquickspinbox.cpp
@@ -1036,12 +1036,12 @@ void QQuickSpinBox::localeChange(const QLocale &newLocale, const QLocale &oldLoc
 
 QFont QQuickSpinBox::defaultFont() const
 {
-    return QQuickTheme::themeFont(QQuickTheme::SpinBox);
+    return QQuickTheme::font(QQuickTheme::SpinBox);
 }
 
 QPalette QQuickSpinBox::defaultPalette() const
 {
-    return QQuickTheme::themePalette(QQuickTheme::SpinBox);
+    return QQuickTheme::palette(QQuickTheme::SpinBox);
 }
 
 #if QT_CONFIG(accessibility)
diff --git a/src/quicktemplates2/qquickswipedelegate.cpp b/src/quicktemplates2/qquickswipedelegate.cpp
index b4c1c18e..97c17a6b 100644
--- a/src/quicktemplates2/qquickswipedelegate.cpp
+++ b/src/quicktemplates2/qquickswipedelegate.cpp
@@ -1221,12 +1221,12 @@ void QQuickSwipeDelegate::geometryChanged(const QRectF &newGeometry, const QRect
 
 QFont QQuickSwipeDelegate::defaultFont() const
 {
-    return QQuickTheme::themeFont(QQuickTheme::ListView);
+    return QQuickTheme::font(QQuickTheme::ListView);
 }
 
 QPalette QQuickSwipeDelegate::defaultPalette() const
 {
-    return QQuickTheme::themePalette(QQuickTheme::ListView);
+    return QQuickTheme::palette(QQuickTheme::ListView);
 }
 
 #if QT_CONFIG(accessibility)
diff --git a/src/quicktemplates2/qquickswitch.cpp b/src/quicktemplates2/qquickswitch.cpp
index 55e53246..675cb6ae 100644
--- a/src/quicktemplates2/qquickswitch.cpp
+++ b/src/quicktemplates2/qquickswitch.cpp
@@ -231,12 +231,12 @@ void QQuickSwitch::buttonChange(ButtonChange change)
 
 QFont QQuickSwitch::defaultFont() const
 {
-    return QQuickTheme::themeFont(QQuickTheme::Switch);
+    return QQuickTheme::font(QQuickTheme::Switch);
 }
 
 QPalette QQuickSwitch::defaultPalette() const
 {
-    return QQuickTheme::themePalette(QQuickTheme::Switch);
+    return QQuickTheme::palette(QQuickTheme::Switch);
 }
 
 QT_END_NAMESPACE
diff --git a/src/quicktemplates2/qquickswitchdelegate.cpp b/src/quicktemplates2/qquickswitchdelegate.cpp
index 765525fb..3a849be0 100644
--- a/src/quicktemplates2/qquickswitchdelegate.cpp
+++ b/src/quicktemplates2/qquickswitchdelegate.cpp
@@ -200,12 +200,12 @@ void QQuickSwitchDelegate::touchEvent(QTouchEvent *event)
 
 QFont QQuickSwitchDelegate::defaultFont() const
 {
-    return QQuickTheme::themeFont(QQuickTheme::ListView);
+    return QQuickTheme::font(QQuickTheme::ListView);
 }
 
 QPalette QQuickSwitchDelegate::defaultPalette() const
 {
-    return QQuickTheme::themePalette(QQuickTheme::ListView);
+    return QQuickTheme::palette(QQuickTheme::ListView);
 }
 
 void QQuickSwitchDelegate::mirrorChange()
diff --git a/src/quicktemplates2/qquicktabbar.cpp b/src/quicktemplates2/qquicktabbar.cpp
index 1db04ba0..745023c3 100644
--- a/src/quicktemplates2/qquicktabbar.cpp
+++ b/src/quicktemplates2/qquicktabbar.cpp
@@ -383,12 +383,12 @@ void QQuickTabBar::itemRemoved(int index, QQuickItem *item)
 
 QFont QQuickTabBar::defaultFont() const
 {
-    return QQuickTheme::themeFont(QQuickTheme::TabBar);
+    return QQuickTheme::font(QQuickTheme::TabBar);
 }
 
 QPalette QQuickTabBar::defaultPalette() const
 {
-    return QQuickTheme::themePalette(QQuickTheme::TabBar);
+    return QQuickTheme::palette(QQuickTheme::TabBar);
 }
 
 #if QT_CONFIG(accessibility)
diff --git a/src/quicktemplates2/qquicktabbutton.cpp b/src/quicktemplates2/qquicktabbutton.cpp
index 597f4a5e..6e20b0da 100644
--- a/src/quicktemplates2/qquicktabbutton.cpp
+++ b/src/quicktemplates2/qquicktabbutton.cpp
@@ -72,12 +72,12 @@ QQuickTabButton::QQuickTabButton(QQuickItem *parent)
 
 QFont QQuickTabButton::defaultFont() const
 {
-    return QQuickTheme::themeFont(QQuickTheme::TabBar);
+    return QQuickTheme::font(QQuickTheme::TabBar);
 }
 
 QPalette QQuickTabButton::defaultPalette() const
 {
-    return QQuickTheme::themePalette(QQuickTheme::TabBar);
+    return QQuickTheme::palette(QQuickTheme::TabBar);
 }
 
 #if QT_CONFIG(accessibility)
diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp
index bd023610..ee7d0ae3 100644
--- a/src/quicktemplates2/qquicktextarea.cpp
+++ b/src/quicktemplates2/qquicktextarea.cpp
@@ -234,7 +234,7 @@ void QQuickTextAreaPrivate::inheritFont(const QFont &font)
     QFont parentFont = extra.isAllocated() ? extra->requestedFont.resolve(font) : font;
     parentFont.resolve(extra.isAllocated() ? extra->requestedFont.resolve() | font.resolve() : font.resolve());
 
-    const QFont defaultFont = QQuickTheme::themeFont(QQuickTheme::TextArea);
+    const QFont defaultFont = QQuickTheme::font(QQuickTheme::TextArea);
     const QFont resolvedFont = parentFont.resolve(defaultFont);
 
     setFont_helper(resolvedFont);
@@ -276,7 +276,7 @@ void QQuickTextAreaPrivate::inheritPalette(const QPalette &palette)
     QPalette parentPalette = extra.isAllocated() ? extra->requestedPalette.resolve(palette) : palette;
     parentPalette.resolve(extra.isAllocated() ? extra->requestedPalette.resolve() | palette.resolve() : palette.resolve());
 
-    const QPalette defaultPalette = QQuickTheme::themePalette(QQuickTheme::TextArea);
+    const QPalette defaultPalette = QQuickTheme::palette(QQuickTheme::TextArea);
     const QPalette resolvedPalette = parentPalette.resolve(defaultPalette);
 
     setPalette_helper(resolvedPalette);
diff --git a/src/quicktemplates2/qquicktextfield.cpp b/src/quicktemplates2/qquicktextfield.cpp
index 00b173ce..15acfeb6 100644
--- a/src/quicktemplates2/qquicktextfield.cpp
+++ b/src/quicktemplates2/qquicktextfield.cpp
@@ -215,7 +215,7 @@ void QQuickTextFieldPrivate::inheritFont(const QFont &font)
     QFont parentFont = extra.isAllocated() ? extra->requestedFont.resolve(font) : font;
     parentFont.resolve(extra.isAllocated() ? extra->requestedFont.resolve() | font.resolve() : font.resolve());
 
-    const QFont defaultFont = QQuickTheme::themeFont(QQuickTheme::TextField);
+    const QFont defaultFont = QQuickTheme::font(QQuickTheme::TextField);
     const QFont resolvedFont = parentFont.resolve(defaultFont);
 
     setFont_helper(resolvedFont);
@@ -257,7 +257,7 @@ void QQuickTextFieldPrivate::inheritPalette(const QPalette &palette)
     QPalette parentPalette = extra.isAllocated() ? extra->requestedPalette.resolve(palette) : palette;
     parentPalette.resolve(extra.isAllocated() ? extra->requestedPalette.resolve() | palette.resolve() : palette.resolve());
 
-    const QPalette defaultPalette = QQuickTheme::themePalette(QQuickTheme::TextField);
+    const QPalette defaultPalette = QQuickTheme::palette(QQuickTheme::TextField);
     const QPalette resolvedPalette = parentPalette.resolve(defaultPalette);
 
     setPalette_helper(resolvedPalette);
diff --git a/src/quicktemplates2/qquicktheme.cpp b/src/quicktemplates2/qquicktheme.cpp
index 45c3e81a..b8ced7b9 100644
--- a/src/quicktemplates2/qquicktheme.cpp
+++ b/src/quicktemplates2/qquicktheme.cpp
@@ -129,7 +129,7 @@ QQuickTheme *QQuickTheme::instance()
     return QQuickThemePrivate::instance.data();
 }
 
-QFont QQuickTheme::themeFont(Scope scope)
+QFont QQuickTheme::font(Scope scope)
 {
     const QFont *font = nullptr;
     if (QQuickTheme *theme = instance())
@@ -145,12 +145,12 @@ QFont QQuickTheme::themeFont(Scope scope)
     }
 
     if (scope != System)
-        return themeFont(System);
+        return QQuickTheme::font(System);
 
     return QFont();
 }
 
-QPalette QQuickTheme::themePalette(Scope scope)
+QPalette QQuickTheme::palette(Scope scope)
 {
     const QPalette *palette = nullptr;
     if (QQuickTheme *theme = instance())
@@ -166,7 +166,7 @@ QPalette QQuickTheme::themePalette(Scope scope)
     }
 
     if (scope != System)
-        return themePalette(System);
+        return QQuickTheme::palette(System);
 
     return QPalette();
 }
diff --git a/src/quicktemplates2/qquicktheme_p.h b/src/quicktemplates2/qquicktheme_p.h
index 47f9a166..44610c09 100644
--- a/src/quicktemplates2/qquicktheme_p.h
+++ b/src/quicktemplates2/qquicktheme_p.h
@@ -87,8 +87,8 @@ public:
         Tumbler
     };
 
-    static QFont themeFont(Scope scope);
-    static QPalette themePalette(Scope scope);
+    static QFont font(Scope scope);
+    static QPalette palette(Scope scope);
 
 protected:
     void setFont(Scope scope, const QFont &font);
diff --git a/src/quicktemplates2/qquicktoolbar.cpp b/src/quicktemplates2/qquicktoolbar.cpp
index d554c098..0abf0364 100644
--- a/src/quicktemplates2/qquicktoolbar.cpp
+++ b/src/quicktemplates2/qquicktoolbar.cpp
@@ -141,12 +141,12 @@ void QQuickToolBar::setPosition(Position position)
 
 QFont QQuickToolBar::defaultFont() const
 {
-    return QQuickTheme::themeFont(QQuickTheme::ToolBar);
+    return QQuickTheme::font(QQuickTheme::ToolBar);
 }
 
 QPalette QQuickToolBar::defaultPalette() const
 {
-    return QQuickTheme::themePalette(QQuickTheme::ToolBar);
+    return QQuickTheme::palette(QQuickTheme::ToolBar);
 }
 
 #if QT_CONFIG(accessibility)
diff --git a/src/quicktemplates2/qquicktoolbutton.cpp b/src/quicktemplates2/qquicktoolbutton.cpp
index 3a8aa7b3..eb70fbc4 100644
--- a/src/quicktemplates2/qquicktoolbutton.cpp
+++ b/src/quicktemplates2/qquicktoolbutton.cpp
@@ -71,12 +71,12 @@ QQuickToolButton::QQuickToolButton(QQuickItem *parent)
 
 QFont QQuickToolButton::defaultFont() const
 {
-    return QQuickTheme::themeFont(QQuickTheme::ToolBar);
+    return QQuickTheme::font(QQuickTheme::ToolBar);
 }
 
 QPalette QQuickToolButton::defaultPalette() const
 {
-    return QQuickTheme::themePalette(QQuickTheme::ToolBar);
+    return QQuickTheme::palette(QQuickTheme::ToolBar);
 }
 
 QT_END_NAMESPACE
diff --git a/src/quicktemplates2/qquicktoolseparator.cpp b/src/quicktemplates2/qquicktoolseparator.cpp
index 9b8bd678..625e85e9 100644
--- a/src/quicktemplates2/qquicktoolseparator.cpp
+++ b/src/quicktemplates2/qquicktoolseparator.cpp
@@ -133,12 +133,12 @@ bool QQuickToolSeparator::isVertical() const
 
 QFont QQuickToolSeparator::defaultFont() const
 {
-    return QQuickTheme::themeFont(QQuickTheme::ToolBar);
+    return QQuickTheme::font(QQuickTheme::ToolBar);
 }
 
 QPalette QQuickToolSeparator::defaultPalette() const
 {
-    return QQuickTheme::themePalette(QQuickTheme::ToolBar);
+    return QQuickTheme::palette(QQuickTheme::ToolBar);
 }
 
 #if QT_CONFIG(accessibility)
diff --git a/src/quicktemplates2/qquicktooltip.cpp b/src/quicktemplates2/qquicktooltip.cpp
index c62c063d..00090f66 100644
--- a/src/quicktemplates2/qquicktooltip.cpp
+++ b/src/quicktemplates2/qquicktooltip.cpp
@@ -297,12 +297,12 @@ void QQuickToolTip::hide()
 
 QFont QQuickToolTip::defaultFont() const
 {
-    return QQuickTheme::themeFont(QQuickTheme::ToolTip);
+    return QQuickTheme::font(QQuickTheme::ToolTip);
 }
 
 QPalette QQuickToolTip::defaultPalette() const
 {
-    return QQuickTheme::themePalette(QQuickTheme::ToolTip);
+    return QQuickTheme::palette(QQuickTheme::ToolTip);
 }
 
 void QQuickToolTip::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data)
diff --git a/src/quicktemplates2/qquicktumbler.cpp b/src/quicktemplates2/qquicktumbler.cpp
index ee4f161a..941cb14d 100644
--- a/src/quicktemplates2/qquicktumbler.cpp
+++ b/src/quicktemplates2/qquicktumbler.cpp
@@ -810,12 +810,12 @@ void QQuickTumbler::updatePolish()
 
 QFont QQuickTumbler::defaultFont() const
 {
-    return QQuickTheme::themeFont(QQuickTheme::Tumbler);
+    return QQuickTheme::font(QQuickTheme::Tumbler);
 }
 
 QPalette QQuickTumbler::defaultPalette() const
 {
-    return QQuickTheme::themePalette(QQuickTheme::Tumbler);
+    return QQuickTheme::palette(QQuickTheme::Tumbler);
 }
 
 void QQuickTumblerAttachedPrivate::init(QQuickItem *delegateItem)