Changeset 226 for trunk/src/gui/text/qfontdatabase_pm.cpp

Timestamp:

Oct 14, 2009, 11:07:33 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Use single source for mapping font style hints to default family names.

File:

• trunk/src/gui/text/qfontdatabase_pm.cpp (modified) (2 diffs)

trunk/src/gui/text/qfontdatabase_pm.cpp

@@ -302 +302 @@
 }
 
-static const char *styleHint(const QFontDef &request)
-{
-    const char *stylehint = 0;
-    switch (request.styleHint) {
-    case QFont::SansSerif:
-        stylehint = "Helvetica";
-        break;
-    case QFont::Serif:
-        stylehint = "Roman";
-        break;
-    case QFont::TypeWriter:
-        stylehint = "Courier";
-        break;
-    default:
-        if (request.fixedPitch)
-            stylehint = "Courier";
-        else
-            stylehint = "Helvetica";
-        break;
-    }
-    return stylehint;
-}
-
 static QFontDef fontDescToFontDef(const QFontDef &req, const QtFontDesc &desc)
 {
@@ -387 +364 @@
     QStringList families = familyList(req);
 
-    const char *stylehint = styleHint(d->request);
-    if (stylehint)
-        families << QLatin1String(stylehint);
+    const char *styleHint = qt_fontFamilyFromStyleHint(d->request);
+    if (styleHint)
+        families << QLatin1String(styleHint);
 
     // add the default family