From e33b0118b402224e75cb7bd6468d719312505b45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Fri, 24 Mar 2017 14:29:03 +0100
Subject: Rename QBasicFontDatabase to QFreeTypeFontDatabase which is what it
 is

Change-Id: I8def2f7ae1e4c8d8a3e1f8e60549da5d691e4fb3
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
---
 .../fontdatabases/winrt/qwinrtfontdatabase.cpp             | 14 +++++++-------
 .../fontdatabases/winrt/qwinrtfontdatabase_p.h             |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/platformsupport/fontdatabases/winrt')

diff --git a/src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase.cpp b/src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase.cpp
index eb5a38855e..6ac092aa0e 100644
--- a/src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase.cpp
+++ b/src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase.cpp
@@ -144,7 +144,7 @@ QWinRTFontDatabase::~QWinRTFontDatabase()
 QString QWinRTFontDatabase::fontDir() const
 {
     qCDebug(lcQpaFonts) << __FUNCTION__;
-    QString fontDirectory = QBasicFontDatabase::fontDir();
+    QString fontDirectory = QFreeTypeFontDatabase::fontDir();
     if (!QFile::exists(fontDirectory)) {
         // Fall back to app directory + fonts, and just app directory after that
         const QString applicationDirPath = QCoreApplication::applicationDirPath();
@@ -176,7 +176,7 @@ void QWinRTFontDatabase::populateFontDatabase()
     HRESULT hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_ISOLATED, __uuidof(IDWriteFactory1), &factory);
     if (FAILED(hr)) {
         qWarning("Failed to create DirectWrite factory: %s", qPrintable(qt_error_string(hr)));
-        QBasicFontDatabase::populateFontDatabase();
+        QFreeTypeFontDatabase::populateFontDatabase();
         return;
     }
 
@@ -184,7 +184,7 @@ void QWinRTFontDatabase::populateFontDatabase()
     hr = factory->GetSystemFontCollection(&fontCollection);
     if (FAILED(hr)) {
         qWarning("Failed to open system font collection: %s", qPrintable(qt_error_string(hr)));
-        QBasicFontDatabase::populateFontDatabase();
+        QFreeTypeFontDatabase::populateFontDatabase();
         return;
     }
 
@@ -222,7 +222,7 @@ void QWinRTFontDatabase::populateFontDatabase()
         registerFontFamily(familyName);
     }
 
-    QBasicFontDatabase::populateFontDatabase();
+    QFreeTypeFontDatabase::populateFontDatabase();
 }
 
 void QWinRTFontDatabase::populateFamily(const QString &familyName)
@@ -399,7 +399,7 @@ QFontEngine *QWinRTFontDatabase::fontEngine(const QFontDef &fontDef, void *handl
 
     IDWriteFontFile *fontFile = reinterpret_cast<IDWriteFontFile *>(handle);
     if (!m_fonts.contains(fontFile))
-        return QBasicFontDatabase::fontEngine(fontDef, handle);
+        return QFreeTypeFontDatabase::fontEngine(fontDef, handle);
 
     const void *referenceKey;
     quint32 referenceKeySize;
@@ -468,7 +468,7 @@ QStringList QWinRTFontDatabase::fallbacksForFamily(const QString &family, QFont:
     QStringList result;
     if (family == QLatin1String("Helvetica"))
         result.append(QStringLiteral("Arial"));
-    result.append(QBasicFontDatabase::fallbacksForFamily(family, style, styleHint, script));
+    result.append(QFreeTypeFontDatabase::fallbacksForFamily(family, style, styleHint, script));
     return result;
 }
 
@@ -486,7 +486,7 @@ void QWinRTFontDatabase::releaseHandle(void *handle)
         return;
     }
 
-    QBasicFontDatabase::releaseHandle(handle);
+    QFreeTypeFontDatabase::releaseHandle(handle);
 }
 
 QT_END_NAMESPACE
diff --git a/src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase_p.h b/src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase_p.h
index 3b803d7613..9a2bf00fab 100644
--- a/src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase_p.h
+++ b/src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtFontDatabaseSupport/private/qbasicfontdatabase_p.h>
+#include <QtFontDatabaseSupport/private/qfreetypefontdatabase_p.h>
 #include <QtCore/QLoggingCategory>
 
 struct IDWriteFontFile;
@@ -67,7 +67,7 @@ struct FontDescription
     QByteArray uuid;
 };
 
-class QWinRTFontDatabase : public QBasicFontDatabase
+class QWinRTFontDatabase : public QFreeTypeFontDatabase
 {
 public:
     ~QWinRTFontDatabase();
-- 
cgit v1.2.3