Changeset 226 for trunk/src/gui/text/qfont_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/qfont_pm.cpp (modified) (2 diffs)

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");
 }