-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 @@ -51,10 +51,10 @@ static QString fontFamily( const QString& key ) return family; } #endif -QValueList<FontFactory> *FontDatabase::factoryList = 0; +QValueList<FontFactory> *FontDatabase::factoryList = 0; /*! \class FontDatabase fontdatabase.h \brief The FontDatabase class provides information about available fonts. @@ -91,8 +91,13 @@ QStringList FontDatabase::families() const { #ifndef QT_NO_FONTDATABASE return QFontDatabase::families(); #else + +#ifndef QWS + QStringList list; + return list; +#else QStringList list; QDict<void> familyDict; QDiskFont *qdf; for ( qdf=qt_fontmanager->diskfonts.first(); qdf!=0; @@ -114,8 +119,9 @@ QStringList FontDatabase::families() const } return list; #endif +#endif } #ifdef QT_NO_FONTDATABASE /*! @@ -143,8 +149,12 @@ QValueList<int> FontDatabase::standardSizes() that the plugins can read available. */ void FontDatabase::loadRenderers() { +#ifndef QWS + return; +#else + #ifndef QT_NO_COMPONENT if ( !factoryList ) factoryList = new QValueList<FontFactory>; @@ -182,15 +192,19 @@ void FontDatabase::loadRenderers() delete lib; } } #endif +#endif } /*! \internal */ void FontDatabase::readFonts( QFontFactory *factory ) { +#ifndef QWS +return; +#else // Load in font definition file QString fn = fontDir() + "fontdir"; FILE* fontdef=fopen(fn.local8Bit(),"r"); if(!fontdef) { @@ -229,6 +243,7 @@ void FontDatabase::readFonts( QFontFactory *factory ) } fgets(buf,200,fontdef); } fclose(fontdef); +#endif } |