Changeset 222 for trunk/src/gui/text/qfontdatabase.cpp

Timestamp:

Oct 14, 2009, 2:32:13 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Changed to using the Freetype2 library for populating the fonts. Implemented font matching against populated fonts.

File:

• trunk/src/gui/text/qfontdatabase.cpp (modified) (8 diffs)

trunk/src/gui/text/qfontdatabase.cpp

@@ -54 +54 @@
 #include <locale.h>
 #endif
-#ifdef Q_WS_PM
-#include "qt_os2.h"
-#endif
 
 #include <stdlib.h>
@@ -148 +145 @@
                                 uint yres = 0, uint avgwidth = 0, bool add = false);
 #endif // Q_WS_X11
-#ifdef Q_WS_QWS
+#if defined(Q_WS_QWS) || defined(Q_WS_PM)
     QByteArray fileName;
     int fileIndex;
-#endif
-#ifdef Q_WS_PM
-    unsigned short pointSize; // in deca-points
-    LONG lMatch;
 #endif
 };
@@ -219 +212 @@
         weightName = setwidthName = 0;
 #endif // Q_WS_X11
-#if defined(Q_WS_PM)
-        faceName[0] = 0;
-#endif
     }
 
@@ -234 +224 @@
             free(pixelSizes[count].encodings);
 #endif
-#ifdef Q_WS_QWS
+#if defined(Q_WS_QWS) || defined(Q_WS_PM)
             pixelSizes[count].fileName.~QByteArray();
 #endif
@@ -252 +242 @@
     const char *setwidthName;
 #endif // Q_WS_X11
-#ifdef Q_WS_QWS
+#if defined(Q_WS_QWS) || defined(Q_WS_PM)
     bool antialiased;
 #endif
-#ifdef Q_WS_PM
-    CHAR faceName[FACESIZE];
-#endif
-
-#ifdef Q_WS_PM
-    QtFontSize *pixelSize(unsigned short size, bool = false,
-                          unsigned short pointSize = 0);
-#else
+
     QtFontSize *pixelSize(unsigned short size, bool = false);
-#endif
 };
 
@@ -280 +262 @@
 }
 
-#ifdef Q_WS_PM
-QtFontSize *QtFontStyle::pixelSize(unsigned short size, bool add,
-                                   unsigned short pointSize)
-#else
 QtFontSize *QtFontStyle::pixelSize(unsigned short size, bool add)
-#endif
 {
     for (int i = 0; i < count; i++) {
-#ifdef Q_WS_PM
-        if (pixelSizes[i].pixelSize == size &&
-        (size == SMOOTH_SCALABLE || !pointSize ||
-         pixelSizes[i].pointSize == pointSize))
-        return pixelSizes + i;
-#else
         if (pixelSizes[i].pixelSize == size)
             return pixelSizes + i;
-#endif
     }
     if (!add)
@@ -310 +280 @@
     pixelSizes[count].encodings = 0;
 #endif
-#ifdef Q_WS_QWS
+#if defined(Q_WS_QWS) || defined(Q_WS_PM)
     new (&pixelSizes[count].fileName) QByteArray;
     pixelSizes[count].fileIndex = 0;
-#endif
-#ifdef Q_WS_PM
-    pixelSizes[count].pointSize = pointSize;
-    pixelSizes[count].lMatch = 0;
 #endif
     return pixelSizes + (count++);
@@ -401 +367 @@
     {
         memset(writingSystems, 0, sizeof(writingSystems));
-#ifdef Q_WS_PM
-        // the concept of writing systems isn't used, let's support just Any
-        writingSystems[QFontDatabase::Any] = Supported;
-#endif
     }
     ~QtFontFamily() {