| author | zecke <zecke> | 2002-11-06 21:46:09 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2002-11-06 21:46:09 (UTC) |
| commit | 86a2bf4747f46a9915dffac376b888faa5400ec8 (patch) (side-by-side diff) | |
| tree | 247946d61e915e1c238ce87a7ee14f014fc6e804 | |
| parent | 7a0e2678368c1cbb036085aaa594801e93e0b1c1 (diff) | |
| download | opie-86a2bf4747f46a9915dffac376b888faa5400ec8.zip opie-86a2bf4747f46a9915dffac376b888faa5400ec8.tar.gz opie-86a2bf4747f46a9915dffac376b888faa5400ec8.tar.bz2 | |
Some ugly ifdefs inside fontdatabase for now :(
This temp. helps the x11 port
| -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 @@ -54,4 +54,4 @@ static QString fontFamily( const QString& key ) -QValueList<FontFactory> *FontDatabase::factoryList = 0; +QValueList<FontFactory> *FontDatabase::factoryList = 0; /*! @@ -94,2 +94,7 @@ QStringList FontDatabase::families() const #else + +#ifndef QWS + QStringList list; + return list; +#else QStringList list; @@ -117,2 +122,3 @@ QStringList FontDatabase::families() const #endif +#endif } @@ -146,2 +152,6 @@ void FontDatabase::loadRenderers() { +#ifndef QWS + return; +#else + #ifndef QT_NO_COMPONENT @@ -185,2 +195,3 @@ void FontDatabase::loadRenderers() #endif +#endif } @@ -192,2 +203,5 @@ void FontDatabase::readFonts( QFontFactory *factory ) { +#ifndef QWS +return; +#else // Load in font definition file @@ -232,2 +246,3 @@ void FontDatabase::readFonts( QFontFactory *factory ) fclose(fontdef); +#endif } |