-rw-r--r-- | freetype/fontfactoryttf_qws.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/freetype/fontfactoryttf_qws.h b/freetype/fontfactoryttf_qws.h index ff0fcfc..ddf5b57 100644 --- a/freetype/fontfactoryttf_qws.h +++ b/freetype/fontfactoryttf_qws.h | |||
@@ -12,48 +12,52 @@ | |||
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | 21 | ||
22 | #ifndef FONTFACTORY_FT_H | 22 | #ifndef FONTFACTORY_FT_H |
23 | #define FONTFACTORY_FT_H | 23 | #define FONTFACTORY_FT_H |
24 | 24 | ||
25 | #include <qfontmanager_qws.h> | 25 | #include <qfontmanager_qws.h> |
26 | #if QT_VERSION >= 0x030000 | 26 | #if QT_VERSION >= 0x030000 |
27 | # include <private/qfontdata_p.h> | 27 | # include <private/qfontdata_p.h> |
28 | #else | 28 | #else |
29 | # include "qfontdata_p.h" | 29 | # include "qfontdata_p.h" |
30 | #endif | 30 | #endif |
31 | 31 | ||
32 | 32 | ||
33 | #ifdef QT_NO_FREETYPE | 33 | #ifdef QT_NO_FREETYPE |
34 | 34 | ||
35 | extern "C" { | 35 | extern "C" { |
36 | |||
37 | #include <ft2build.h> | ||
38 | #include FT_FREETYPE_H | ||
39 | |||
36 | #include <freetype/freetype.h> | 40 | #include <freetype/freetype.h> |
37 | } | 41 | } |
38 | 42 | ||
39 | // ascent, descent, width(ch), width(string), maxwidth? | 43 | // ascent, descent, width(ch), width(string), maxwidth? |
40 | // leftbearing, rightbearing, minleftbearing,minrightbearing | 44 | // leftbearing, rightbearing, minleftbearing,minrightbearing |
41 | // leading | 45 | // leading |
42 | 46 | ||
43 | class QFontFactoryFT : public QFontFactory { | 47 | class QFontFactoryFT : public QFontFactory { |
44 | 48 | ||
45 | public: | 49 | public: |
46 | 50 | ||
47 | QFontFactoryFT(); | 51 | QFontFactoryFT(); |
48 | virtual ~QFontFactoryFT(); | 52 | virtual ~QFontFactoryFT(); |
49 | 53 | ||
50 | QRenderedFont * get(const QFontDef &,QDiskFont *); | 54 | QRenderedFont * get(const QFontDef &,QDiskFont *); |
51 | virtual void load(QDiskFont *) const; | 55 | virtual void load(QDiskFont *) const; |
52 | virtual QString name(); | 56 | virtual QString name(); |
53 | 57 | ||
54 | private: | 58 | private: |
55 | 59 | ||
56 | friend class QRenderedFontFT; | 60 | friend class QRenderedFontFT; |
57 | FT_Library library; | 61 | FT_Library library; |
58 | }; | 62 | }; |
59 | 63 | ||