-rw-r--r-- | library/fontdatabase.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/library/fontdatabase.cpp b/library/fontdatabase.cpp index 899d5cf..c7a5211 100644 --- a/library/fontdatabase.cpp +++ b/library/fontdatabase.cpp | |||
@@ -52,8 +52,8 @@ static QString fontFamily( const QString& key ) | |||
52 | } | 52 | } |
53 | #endif | 53 | #endif |
54 | 54 | ||
55 | QValueList<FontFactory> *FontDatabase::factoryList = 0; | ||
56 | 55 | ||
56 | QValueList<FontFactory> *FontDatabase::factoryList = 0; | ||
57 | /*! | 57 | /*! |
58 | \class FontDatabase fontdatabase.h | 58 | \class FontDatabase fontdatabase.h |
59 | \brief The FontDatabase class provides information about available fonts. | 59 | \brief The FontDatabase class provides information about available fonts. |
@@ -92,6 +92,11 @@ QStringList FontDatabase::families() const | |||
92 | #ifndef QT_NO_FONTDATABASE | 92 | #ifndef QT_NO_FONTDATABASE |
93 | return QFontDatabase::families(); | 93 | return QFontDatabase::families(); |
94 | #else | 94 | #else |
95 | |||
96 | #ifndef QWS | ||
97 | QStringList list; | ||
98 | return list; | ||
99 | #else | ||
95 | QStringList list; | 100 | QStringList list; |
96 | QDict<void> familyDict; | 101 | QDict<void> familyDict; |
97 | QDiskFont *qdf; | 102 | QDiskFont *qdf; |
@@ -115,6 +120,7 @@ QStringList FontDatabase::families() const | |||
115 | 120 | ||
116 | return list; | 121 | return list; |
117 | #endif | 122 | #endif |
123 | #endif | ||
118 | } | 124 | } |
119 | 125 | ||
120 | #ifdef QT_NO_FONTDATABASE | 126 | #ifdef QT_NO_FONTDATABASE |
@@ -144,6 +150,10 @@ QValueList<int> FontDatabase::standardSizes() | |||
144 | */ | 150 | */ |
145 | void FontDatabase::loadRenderers() | 151 | void FontDatabase::loadRenderers() |
146 | { | 152 | { |
153 | #ifndef QWS | ||
154 | return; | ||
155 | #else | ||
156 | |||
147 | #ifndef QT_NO_COMPONENT | 157 | #ifndef QT_NO_COMPONENT |
148 | if ( !factoryList ) | 158 | if ( !factoryList ) |
149 | factoryList = new QValueList<FontFactory>; | 159 | factoryList = new QValueList<FontFactory>; |
@@ -183,6 +193,7 @@ void FontDatabase::loadRenderers() | |||
183 | } | 193 | } |
184 | } | 194 | } |
185 | #endif | 195 | #endif |
196 | #endif | ||
186 | } | 197 | } |
187 | 198 | ||
188 | /*! | 199 | /*! |
@@ -190,6 +201,9 @@ void FontDatabase::loadRenderers() | |||
190 | */ | 201 | */ |
191 | void FontDatabase::readFonts( QFontFactory *factory ) | 202 | void FontDatabase::readFonts( QFontFactory *factory ) |
192 | { | 203 | { |
204 | #ifndef QWS | ||
205 | return; | ||
206 | #else | ||
193 | // Load in font definition file | 207 | // Load in font definition file |
194 | QString fn = fontDir() + "fontdir"; | 208 | QString fn = fontDir() + "fontdir"; |
195 | FILE* fontdef=fopen(fn.local8Bit(),"r"); | 209 | FILE* fontdef=fopen(fn.local8Bit(),"r"); |
@@ -230,5 +244,6 @@ void FontDatabase::readFonts( QFontFactory *factory ) | |||
230 | fgets(buf,200,fontdef); | 244 | fgets(buf,200,fontdef); |
231 | } | 245 | } |
232 | fclose(fontdef); | 246 | fclose(fontdef); |
247 | #endif | ||
233 | } | 248 | } |
234 | 249 | ||