Changeset 226 for trunk/src

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.

Location:

trunk/src/gui/text

Files:

• qfont_p.h (modified) (1 diff)
• qfont_pm.cpp (modified) (2 diffs)
• qfontdatabase_pm.cpp (modified) (2 diffs)

trunk/src/gui/text/qfont_p.h

@@ -274 +274 @@
 };
 
+#ifdef Q_WS_PM
+Q_GUI_EXPORT const char *qt_fontFamilyFromStyleHint(const QFontDef &request);
+#endif
+
 QT_END_NAMESPACE
 

trunk/src/gui/text/qfont_pm.cpp

@@ -51 +51 @@
 QT_BEGIN_NAMESPACE
 
+Q_GUI_EXPORT const char *qt_fontFamilyFromStyleHint(const QFontDef &request)
+{
+    const char *family = 0;
+    switch (request.styleHint) {
+    case QFont::Helvetica:
+        family = "Helvetica";
+        break;
+    case QFont::Times:
+    case QFont::OldEnglish:
+        family = "Times New Roman";
+        break;
+    case QFont::Courier:
+        family = "Courier";
+        break;
+    case QFont::System:
+        family = "WarpSans";
+        break;
+    case QFont::AnyStyle:
+        if (request.fixedPitch)
+            family = "Courier";
+        else
+            family = "Helvetica";
+        break;
+    }
+    return family;
+}
+
 /*****************************************************************************
   QFont member functions
@@ -76 +103 @@
 QString QFont::defaultFamily() const
 {
-    switch(d->request.styleHint) {
-        case QFont::Times:
-            return QString::fromLatin1("Times New Roman");
-        case QFont::Courier:
-            return QString::fromLatin1("Courier New");
-        case QFont::Decorative:
-            return QString::fromLatin1("Bookman Old Style");
-        case QFont::Helvetica:
-            return QString::fromLatin1("Arial");
-        case QFont::System:
-        default:
-            return QString::fromLatin1("MS Sans Serif");
-    }
+    return QLatin1String(qt_fontFamilyFromStyleHint(d->request));
 }
 
 QString QFont::lastResortFamily() const
 {
-    return QString::fromLatin1("helvetica");
+    return QString::fromLatin1("Helvetica");
 }
 
 QString QFont::lastResortFont() const
 {
-    return QString::fromLatin1("arial");
+    return QString::fromLatin1("Helvetica");
 }
 

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