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>

1 files changed, 4 insertions, 4 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);
 }