Lighthouse: using QFont enums when possible in QPlatformFontdatabase

also, make it possible to register fonts in QPlatformDatabases with a
null handle

Reviewed-by: paul

5 files changed, 25 insertions, 22 deletions

diff --git a/src/gui/text/qfontdatabase_qpa.cpp b/src/gui/text/qfontdatabase_qpa.cpp
index 19ce1be..e54093c 100644
--- a/src/gui/text/qfontdatabase_qpa.cpp
+++ b/src/gui/text/qfontdatabase_qpa.cpp
@@ -156,14 +156,11 @@ QFontEngine *loadSingleEngine(int script,
     QFontEngine *engine = QFontCache::instance()->findEngine(key);
     if (!engine) {
         QPlatformFontDatabase *pfdb = QApplicationPrivate::platformIntegration()->fontDatabase();
-        if (size->handle) {
-            engine = pfdb->fontEngine(def,QUnicodeTables::Script(script),size->handle);
-            if (engine) {
-                QFontCache::Key key(def,script);
-                QFontCache::instance()->instance()->insertEngine(key,engine);
-            }
+        engine = pfdb->fontEngine(def,QUnicodeTables::Script(script),size->handle);
+        if (engine) {
+            QFontCache::Key key(def,script);
+            QFontCache::instance()->instance()->insertEngine(key,engine);
         }
-
     }
     return engine;
 }
diff --git a/src/gui/text/qplatformfontdatabase_qpa.cpp b/src/gui/text/qplatformfontdatabase_qpa.cpp
index 370c921..7a89fe4 100644
--- a/src/gui/text/qplatformfontdatabase_qpa.cpp
+++ b/src/gui/text/qplatformfontdatabase_qpa.cpp
@@ -65,9 +65,9 @@ void QPlatformFontDatabase::registerQPF2Font(const QByteArray &dataArray, void *
         QByteArray writingSystemBits = QFontEngineQPA::extractHeaderField(data, QFontEngineQPA::Tag_WritingSystems).toByteArray();
 
         if (!fontName.isEmpty() && pixelSize) {
-            int fontWeight = 50;
+            QFont::Weight fontWeight = QFont::Normal;
             if (weight.type() == QVariant::Int || weight.type() == QVariant::UInt)
-                fontWeight = weight.toInt();
+                fontWeight = QFont::Weight(weight.toInt());
 
             QFont::Style fontStyle = static_cast<QFont::Style>(style.toInt());
 
@@ -80,16 +80,16 @@ void QPlatformFontDatabase::registerQPF2Font(const QByteArray &dataArray, void *
                     currentByte >>= 1;
                 }
             }
-
-            registerFont(fontName,QString(),fontWeight,fontStyle,100,true,false,pixelSize,writingSystems,handle);
+            QFont::Stretch stretch = QFont::Unstretched;
+            registerFont(fontName,QString(),fontWeight,fontStyle,stretch,true,false,pixelSize,writingSystems,handle);
         }
     } else {
         qDebug() << "header verification of QPF2 font failed. maybe it is corrupt?";
     }
 }
 
-void QPlatformFontDatabase::registerFont(const QString &familyname, const QString &foundryname, int weight,
-                                         QFont::Style style, int stretch, bool antialiased, bool scalable, int pixelSize,
+void QPlatformFontDatabase::registerFont(const QString &familyname, const QString &foundryname, QFont::Weight weight,
+                                         QFont::Style style, QFont::Stretch stretch, bool antialiased, bool scalable, int pixelSize,
                                          const QSupportedWritingSystems &writingSystems, void *usrPtr)
 {
     if (scalable)
diff --git a/src/gui/text/qplatformfontdatabase_qpa.h b/src/gui/text/qplatformfontdatabase_qpa.h
index 75b0a18..aa465ab 100644
--- a/src/gui/text/qplatformfontdatabase_qpa.h
+++ b/src/gui/text/qplatformfontdatabase_qpa.h
@@ -96,8 +96,8 @@ public:
 
     //callback
     static void registerQPF2Font(const QByteArray &dataArray, void *handle);
-    static void registerFont(const QString &familyname, const QString &foundryname, int weight,
-                             QFont::Style style, int stetch, bool antialiased, bool scalable, int pixelSize,
+    static void registerFont(const QString &familyname, const QString &foundryname, QFont::Weight weight,
+                             QFont::Style style, QFont::Stretch stretch, bool antialiased, bool scalable, int pixelSize,
                              const QSupportedWritingSystems &writingSystems, void *handle);
 };
 
diff --git a/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp b/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp
index 4634477..ee520be 100644
--- a/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp
+++ b/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp
@@ -278,7 +278,7 @@ QStringList QBasicUnixFontDatabase::addTTFile(const QByteArray &fontData, const
         }
         numFaces = face->num_faces;
 
-        int weight = QFont::Normal;
+        QFont::Weight weight = QFont::Normal;
 
         QFont::Style style = QFont::StyleNormal;
         if (face->style_flags & FT_STYLE_FLAG_ITALIC)
@@ -315,7 +315,9 @@ QStringList QBasicUnixFontDatabase::addTTFile(const QByteArray &fontData, const
         fontFile->fileName = file;
         fontFile->indexValue = index;
 
-        registerFont(family,"",weight,style,100,true,true,0,writingSystems,fontFile);
+        QFont::Stretch stretch = QFont::Unstretched;
+
+        registerFont(family,"",weight,style,stretch,true,true,0,writingSystems,fontFile);
 
         families.append(family);
 
diff --git a/src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.cpp
index c9d1b74..92f30fc 100644
--- a/src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.cpp
+++ b/src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.cpp
@@ -395,7 +395,7 @@ void QFontconfigDatabase::populateFontDatabase()
                          : ((slant_value == FC_SLANT_OBLIQUE)
                             ? QFont::StyleOblique
                             : QFont::StyleNormal);
-        int weight = getFCWeight(weight_value);
+        QFont::Weight weight = QFont::Weight(getFCWeight(weight_value));
 
         double pixel_size = 0;
         if (!scalable) {
@@ -404,7 +404,8 @@ void QFontconfigDatabase::populateFontDatabase()
             FcPatternGetDouble (fonts->fonts[i], FC_PIXEL_SIZE, 0, &pixel_size);
         }
 
-        QPlatformFontDatabase::registerFont(familyName,QLatin1String((const char *)foundry_value),weight,style,100,antialias,scalable,pixel_size,writingSystems,fontFile);
+        QFont::Stretch stretch = QFont::Unstretched;
+        QPlatformFontDatabase::registerFont(familyName,QLatin1String((const char *)foundry_value),weight,style,stretch,antialias,scalable,pixel_size,writingSystems,fontFile);
 //        qDebug() << familyName << (const char *)foundry_value << weight << style << &writingSystems << scalable << true << pixel_size;
     }
 
@@ -426,10 +427,11 @@ void QFontconfigDatabase::populateFontDatabase()
     QSupportedWritingSystems ws;
     ws.setSupported(QFontDatabase::Latin);
 
+
     while (f->qtname) {
-        registerFont(f->qtname,"",50,QFont::StyleNormal,100,true,true,0,ws,0);
-        registerFont(f->qtname,"",50,QFont::StyleItalic,100,true,true,0,ws,0);
-        registerFont(f->qtname,"",50,QFont::StyleOblique,100,true,true,0,ws,0);
+        registerFont(f->qtname,QLatin1String(""),QFont::Normal,QFont::StyleNormal,QFont::Unstretched,true,true,0,ws,0);
+        registerFont(f->qtname,QLatin1String(""),QFont::Normal,QFont::StyleItalic,QFont::Unstretched,true,true,0,ws,0);
+        registerFont(f->qtname,QLatin1String(""),QFont::Normal,QFont::StyleOblique,QFont::Unstretched,true,true,0,ws,0);
         ++f;
     }
 
@@ -444,6 +446,8 @@ void QFontconfigDatabase::populateFontDatabase()
 
 QFontEngine *QFontconfigDatabase::fontEngine(const QFontDef &f, QUnicodeTables::Script script, void *usrPtr)
 {
+    if (!usrPtr)
+        return 0;
     QFontDef fontDef = f;
 
     QFontEngineFT *engine;