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/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();
 }