Diffstat (limited to 'freetype/fontfactoryttf_qws.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | freetype/fontfactoryttf_qws.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/freetype/fontfactoryttf_qws.h b/freetype/fontfactoryttf_qws.h index 4ba8ce5..208ab61 100644 --- a/freetype/fontfactoryttf_qws.h +++ b/freetype/fontfactoryttf_qws.h | |||
@@ -12,50 +12,49 @@ | |||
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 >= 300 | 26 | #if QT_VERSION >= 300 |
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 | #include <ft2build.h> | 36 | #include <freetype/freetype.h> |
37 | #include FT_FREETYPE_H | ||
38 | } | 37 | } |
39 | 38 | ||
40 | // ascent, descent, width(ch), width(string), maxwidth? | 39 | // ascent, descent, width(ch), width(string), maxwidth? |
41 | // leftbearing, rightbearing, minleftbearing,minrightbearing | 40 | // leftbearing, rightbearing, minleftbearing,minrightbearing |
42 | // leading | 41 | // leading |
43 | 42 | ||
44 | class QFontFactoryFT : public QFontFactory { | 43 | class QFontFactoryFT : public QFontFactory { |
45 | 44 | ||
46 | public: | 45 | public: |
47 | 46 | ||
48 | QFontFactoryFT(); | 47 | QFontFactoryFT(); |
49 | virtual ~QFontFactoryFT(); | 48 | virtual ~QFontFactoryFT(); |
50 | 49 | ||
51 | QRenderedFont * get(const QFontDef &,QDiskFont *); | 50 | QRenderedFont * get(const QFontDef &,QDiskFont *); |
52 | virtual void load(QDiskFont *) const; | 51 | virtual void load(QDiskFont *) const; |
53 | virtual QString name(); | 52 | virtual QString name(); |
54 | 53 | ||
55 | private: | 54 | private: |
56 | 55 | ||
57 | friend class QRenderedFontFT; | 56 | friend class QRenderedFontFT; |
58 | FT_Library library; | 57 | FT_Library library; |
59 | }; | 58 | }; |
60 | 59 | ||
61 | #endif // QT_NO_FREETYPE | 60 | #endif // QT_NO_FREETYPE |